Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(frontend): 新增MySQL、TendbCluster导出数据单据 #4902 #5074

Merged
merged 31 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
821f65c
feat: 新增降低分区定时任务负载的功能 #4545
fanfanyangyang May 24, 2024
85eb796
fix: partition_dbactuator_fix #4717
xfan0805 Jun 4, 2024
41e5b75
fix(backend): 数据校验定时任务修复 #4996
iSecloud Jun 17, 2024
36c56cf
feat(backend): 支持redis tools的打包 #5005
iSecloud Jun 18, 2024
580b93b
fix(redis): 集群版本升级更新不能降级 #4971
lukemakeit Jun 18, 2024
3bd513a
fix: dbpriv_limit_frequency_1_4 #4635
fanfanyangyang May 28, 2024
c2cb7c6
fix: dbpartition_avoid_duplicate_name #4640
fanfanyangyang May 29, 2024
3518144
fix(redis): dashboard #4221
Jun 14, 2024
5b56d53
fix(frontend): 修复dirty-machine路径下searchSelectData标识错误问题 #4947
JustaCattt Jun 14, 2024
023c601
feat(mongodb): 兼容percona mongodb,执行脚本添加dns解析 #4478
May 17, 2024
93d5b28
feat(backend): complete tendbha storage upgrade flow #4307
ymakedaq May 10, 2024
0880747
feat(backend): 统一隐藏返回的 IP #5007
zhangzhw8 Jun 18, 2024
5c1d771
chore(other): release #5018
zhangzhw8 Jun 18, 2024
a47360b
fix(mysql): 集群屏蔽dbha状态写反了 #5027
xfwduke Jun 18, 2024
fb410e1
feat(frontend): sqlserver部署参数变更 #5022
3octaves Jun 18, 2024
6cdd1ae
fix(redis): dashboard部分panel数值不准确 #5033
Jun 18, 2024
801ac9c
fix: mysql8_create_user_fix #5035
fanfanyangyang Jun 18, 2024
e5c4250
fix: 修复中控切换时没有对旧primary信息删除 #5037
yksitu Jun 18, 2024
29c4ce4
fix(frontend): 版本文件上传路径修复 #5040
jinquantianxia Jun 18, 2024
3056616
fix(redis): 集群域名重命名同步更新dbconfig #5029
lukemakeit Jun 19, 2024
ab34edb
refactor(backend): 集群列表的访问入口支持多域名返回 #5013
Jun 18, 2024
659834e
feat: 新增partition_cron参数修复的功能 #5039
fanfanyangyang Jun 18, 2024
a7669f0
fix(backend): 支持全业务集群查询 #5048
iSecloud Jun 19, 2024
7943811
fix: 备份查询接口添加bk_clould_id参数 #5010
zfrendo Jun 18, 2024
8cbfd7d
feat(frontend): dbconsole新增集群拓扑、变更记录开关 #5052
jinquantianxia Jun 19, 2024
9b1c7c9
fix(dbm-services): 临时关闭上架对ext3文件系统的检查 #5046
ymakedaq Jun 19, 2024
9e2b223
feat(backend): 后台返回统一隐藏 IP #5026
zhangzhw8 Jun 18, 2024
81557d4
fix: mysql open area act fix #4960
xfan0805 Jun 19, 2024
83890bf
fix(redis): fix_1.4_bug #4836
OMG-By Jun 19, 2024
b7faf9b
fix: riak_dbactor渲染模版不与mysql公用 #5066
fanfanyangyang Jun 19, 2024
e37ed2d
feat(frontend): 新增MySQL、TendbCluster导出数据单据 #4902
3octaves Jun 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto_create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
git remote add upstream https://[email protected]/TencentBlueKing/blueking-dbm
git remote -v
git status
git add .
git add ${filename}
git commit -m "chore: release version ${{ steps.yaml-data.outputs.data }} #1"
git status
git push --set-upstream upstream ${{ steps.get-current-branch.outputs.current_branch }}
Expand Down
52 changes: 23 additions & 29 deletions dbm-services/common/db-resource/.golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
linters-settings:
lll:
line-length: 120
line-length: 120
funlen:
lines: 80
statements: 80
Expand All @@ -10,7 +10,7 @@ linters-settings:
enabled-checks:
- nestingReduce
- commentFormatting

run:
# default concurrency is a available CPU number
concurrency: 4
Expand All @@ -22,39 +22,33 @@ run:
tests: false
# default is true. Enables skipping of directories:
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
skip-dirs-use-default: true

skip-files:
issues:
exclude-use-default: true
exclude-files:
- ".*/mock/.*.go"
- ".*testing.go"

linters:
# enable-all: true
# disable-all: true
disable:
- errcheck
disable-all: true
enable:
- nilerr
- nakedret
#- lll
- gofmt
- gocritic
- funlen
- goconst
- gocyclo
- whitespace
- sqlclosecheck
- deadcode
- govet
- bodyclose
- gofmt
- ineffassign
- staticcheck
- typecheck
- goimports
- revive
- gosimple
- govet
- lll
- rowserrcheck
# - errorlint
# - varcheck
# - typecheck
# - nestif
# - gofumpt
# - godox
# - wsl
- funlen
# - golint
- gocyclo
fast: false
- errcheck
- unused
- sqlclosecheck
- gocritic
- bodyclose

fast: false
54 changes: 54 additions & 0 deletions dbm-services/common/go-pubpkg/.golangci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
linters-settings:
lll:
line-length: 120
funlen:
lines: 80
statements: 80
gocyclo:
min-complexity: 20
gocritic:
enabled-checks:
- nestingReduce
- commentFormatting

run:
# default concurrency is a available CPU number
concurrency: 4
# timeout for analysis, e.g. 30s, 5m, default is 1m
timeout: 2m
# exit code when at least one issue was found, default is 1
issues-exit-code: 1
# include test files or not, default is true
tests: false
# default is true. Enables skipping of directories:
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$

issues:
exclude-use-default: true
exclude-files:
- ".*/mock/.*.go"
- ".*testing.go"

linters:
disable-all: true
enable:
- funlen
- goconst
- gocyclo
- gofmt
- ineffassign
- staticcheck
- typecheck
- goimports
- revive
- gosimple
- govet
- lll
- rowserrcheck
- errcheck
- unused
- sqlclosecheck
- gocritic
- bodyclose

fast: false
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ var (
DomainNotExists = Errno{Code: 52030, Message: "domain not exists", CNMessage: "域名不存在"}
NotSupportedPartitionType = Errno{Code: 52031, Message: "not supported partition type", CNMessage: "不支持的分区类型"}
WrongPartitionNameFormat = Errno{Code: 52032, Message: "wrong partition name format ", CNMessage: "分区名格式错误"}
DownloadDbactorFail = Errno{Code: 52030, Message: "download dbactor fail", CNMessage: "下载dbactor失败"}
DownloadDbactorFail = Errno{Code: 52033, Message: "download dbactor fail", CNMessage: "下载dbactor失败"}
DownloadFileFail = Errno{Code: 52034, Message: "download file fail", CNMessage: "下载文件失败"}
)
2 changes: 1 addition & 1 deletion dbm-services/common/go-pubpkg/errno/50000_dbpriv_code.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ var (
CNMessage: "要求包含的字符类型大于字符串长度"}
TryTooManyTimes = Errno{Code: 51024, Message: "try too many times", CNMessage: "尝试太多次"}
RuleIdNull = Errno{Code: 51025, Message: "Rule ID should not be empty",
CNMessage: "安全规则的id不能为空"}
CNMessage: "规则的id不能为空"}
RuleNameNull = Errno{Code: 51026, Message: "Rule name should not be empty",
CNMessage: "安全规则的名称不能为空"}
RuleExisted = Errno{Code: 51027, Message: "Rule already existed ", CNMessage: "规则已存在"}
Expand Down
11 changes: 11 additions & 0 deletions dbm-services/common/go-pubpkg/mysqlcomm/spider.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
/*
* TencentBlueKing is pleased to support the open source community by making 蓝鲸智云-DB管理系统(BlueKing-BK-DBM) available.
* Copyright (C) 2017-2023 THL A29 Limited, a Tencent company. All rights reserved.
* Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at https://opensource.org/licenses/MIT
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/

// Package mysqlcomm mysql comm functions
package mysqlcomm

// GetTdbctlPortBySpider 根据 spider master 端口,获取 tdbctl 端口
Expand Down
3 changes: 0 additions & 3 deletions dbm-services/go.work.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1352,9 +1352,6 @@ golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY=
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func NewJobGenericRuntime(uid, rootID string,
// SetLogger set logger
func (r *JobGenericRuntime) SetLogger() {
var err error
logFile := fmt.Sprintf("redis_actuator_%s_%s.log", r.UID, r.NodeID)
logFile := fmt.Sprintf("mongo_actuator_%s_%s.log", r.UID, r.NodeID)
err = util.MkDirsIfNotExists([]string{logDir})
if err != nil {
panic(err)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SET NAMES utf8;
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SET NAMES utf8;
alter table mysql_partition_cron_log drop column bk_biz_id,drop column cluster_id,drop column ticket_id,
drop column immute_domain,drop column bk_cloud_id,drop column time_zone;
alter table spider_partition_cron_log drop column bk_biz_id,drop column cluster_id,drop column ticket_id,
drop column immute_domain,drop column bk_cloud_id,drop column time_zone;
Loading
Loading