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.

Sign up for GitHub

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 #5011

Closed
wants to merge 29 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4b68f66
feat: 新增降低分区定时任务负载的功能 #4545
fanfanyangyang May 24, 2024
f0af3e3
fix(frontend): 对外版权限提示 #5000
hLinx Jun 18, 2024
df50bb1
fix: partition_dbactuator_fix #4717
xfan0805 Jun 4, 2024
0e6fbcd
fix(backend): 数据校验定时任务修复 #4996
iSecloud Jun 17, 2024
c0fb6c5
feat(backend): 支持redis tools的打包 #5005
iSecloud Jun 18, 2024
e6aa10a
fix(redis): 集群版本升级更新不能降级 #4971
lukemakeit Jun 18, 2024
1fd9ee1
fix: dbpriv_limit_frequency_1_4 #4635
fanfanyangyang May 28, 2024
b473969
fix: dbpartition_avoid_duplicate_name #4640
fanfanyangyang May 29, 2024
f2dda2f
fix(redis): dashboard #4221
Jun 14, 2024
209b513
fix(frontend): 修复dirty-machine路径下searchSelectData标识错误问题 #4947
JustaCattt Jun 14, 2024
177a20a
feat(mongodb): 兼容percona mongodb，执行脚本添加dns解析 #4478
May 17, 2024
5d470bd
feat(backend): complete tendbha storage upgrade flow #4307
ymakedaq May 10, 2024
54fefb8
feat(backend): 统一隐藏返回的 IP #5007
zhangzhw8 Jun 18, 2024
32d19c8
chore(other): release #5018
zhangzhw8 Jun 18, 2024
17f6cbe
fix(mysql): 集群屏蔽dbha状态写反了 #5027
xfwduke Jun 18, 2024
2682214
feat(frontend): sqlserver部署参数变更 #5022
3octaves Jun 18, 2024
c781b9d
fix(redis): dashboard部分panel数值不准确 #5033
Jun 18, 2024
dcb8aea
fix: mysql8_create_user_fix #5035
fanfanyangyang Jun 18, 2024
d277fa9
fix: 修复中控切换时没有对旧primary信息删除 #5037
yksitu Jun 18, 2024
47dbc84
fix(frontend): 版本文件上传路径修复 #5040
jinquantianxia Jun 18, 2024
820a859
fix(redis): 集群域名重命名同步更新dbconfig #5029
lukemakeit Jun 19, 2024
a199655
refactor(backend): 集群列表的访问入口支持多域名返回 #5013
Jun 18, 2024
c38c667
feat: 新增partition_cron参数修复的功能 #5039
fanfanyangyang Jun 18, 2024
23b5323
fix(backend): 支持全业务集群查询 #5048
iSecloud Jun 19, 2024
b70df3c
fix: 备份查询接口添加bk_clould_id参数 #5010
zfrendo Jun 18, 2024
6da69b0
feat(frontend): dbconsole新增集群拓扑、变更记录开关 #5052
jinquantianxia Jun 19, 2024
fe9538e
feat(frontend): spider支持单据克隆 #4374
3octaves May 11, 2024
3704bdd
feat(frontend): mysql和redis支持批量编辑、行复制、备注 #4591
3octaves May 24, 2024
721f6c8
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion dbm-services/common/go-pubpkg/errno/50000_dbpartition_code.go
View file
Open in desktop
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
View file
Open in desktop
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
3 changes: 0 additions & 3 deletions dbm-services/go.work.sum
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion dbm-services/mongodb/db-tools/dbactuator/pkg/jobruntime/jobruntime.go
View file
Open in desktop
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
1 change: 1 addition & 0 deletions dbm-services/mysql/db-partition/assests/migrations/000006_init.down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SET NAMES utf8;
5 changes: 5 additions & 0 deletions dbm-services/mysql/db-partition/assests/migrations/000006_init.up.sql
View file
Open in desktop
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;
286 changes: 0 additions & 286 deletions dbm-services/mysql/db-partition/cron/cron_basic_func.go
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions dbm-services/mysql/db-partition/cron/cron_object.go
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions dbm-services/mysql/db-partition/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ require (
github.com/spf13/viper v1.16.0
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.46.1
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0
golang.org/x/time v0.1.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gorm.io/driver/mysql v1.5.1
gorm.io/gorm v1.25.4
Expand Down
2 changes: 2 additions & 0 deletions dbm-services/mysql/db-partition/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,8 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA=
golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
Expand Down
Loading