From 8c61e885a0b1278f54c5bcb081b7673142efb6ee Mon Sep 17 00:00:00 2001 From: zvictorino Date: Fri, 29 Mar 2024 17:39:30 +0800 Subject: [PATCH 01/30] =?UTF-8?q?fix(es):=20=E4=BF=AE=E5=A4=8DES=E5=81=9A?= =?UTF-8?q?=E7=BC=A9=E5=AE=B9=E6=9B=BF=E6=8D=A2=E8=8E=B7=E5=8F=96=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E6=96=B9=E5=BC=8F=20close=20#3776?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db-tools/dbactuator/pkg/util/esutil/es_helper.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dbm-services/bigdata/db-tools/dbactuator/pkg/util/esutil/es_helper.go b/dbm-services/bigdata/db-tools/dbactuator/pkg/util/esutil/es_helper.go index 05617182a7..1f71fbf91e 100644 --- a/dbm-services/bigdata/db-tools/dbactuator/pkg/util/esutil/es_helper.go +++ b/dbm-services/bigdata/db-tools/dbactuator/pkg/util/esutil/es_helper.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "fmt" + "os" "strconv" "strings" "time" @@ -38,11 +39,18 @@ type Allocation struct { // Conn TODO func (o EsInsObject) Conn() (*elasticsearch.Client, error) { + username := os.Getenv("ES_USERNAME") + password := os.Getenv("ES_PASSWORD") + if username == "" || password == "" { + err := errors.New("环境变量ES_USERNAME、ES_PASSWORD为空，或不存在") + return nil, err + + } return elasticsearch.NewClient( elasticsearch.Config{ Addresses: []string{fmt.Sprintf("http://%s:%d", o.Host, o.HTTPPort)}, - Username: o.UserName, - Password: o.Password, + Username: username, + Password: password, }) } From b44fe4d10c2ffa93db059c5f93a40d149c8f953d Mon Sep 17 00:00:00 2001 From: iSecloud <869820505@qq.com> Date: Mon, 1 Apr 2024 10:27:55 +0800 Subject: [PATCH 02/30] =?UTF-8?q?fix(backend):=20spider=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=94=AF=E6=8C=81=E8=B7=A8=E6=9C=BA=E6=88=BF?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=20#3787?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-ui/backend/ticket/builders/tendbcluster/tendb_apply.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dbm-ui/backend/ticket/builders/tendbcluster/tendb_apply.py b/dbm-ui/backend/ticket/builders/tendbcluster/tendb_apply.py index b5c3f0ade3..f3186366ab 100644 --- a/dbm-ui/backend/ticket/builders/tendbcluster/tendb_apply.py +++ b/dbm-ui/backend/ticket/builders/tendbcluster/tendb_apply.py @@ -101,6 +101,9 @@ def format_ticket_data(self): class TenDBClusterApplyResourceParamBuilder(builders.ResourceApplyParamBuilder): + def format(self): + self.ticket_data["resource_spec"]["spider"]["group_count"] = 2 + def post_callback(self): next_flow = self.ticket.next_flow() nodes = next_flow.details["ticket_data"].pop("nodes") From 3e58113a7017617d8bcc4baee893fc89c2ee2375 Mon Sep 17 00:00:00 2001 From: hlinx <327159425@qq.com> Date: Mon, 1 Apr 2024 10:45:30 +0800 Subject: [PATCH 03/30] =?UTF-8?q?fix(frontend):=20=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=94=B3=E8=AF=B7=20reource=E5=80=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20#3789?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-ui/frontend/src/components/app-select/Index.vue | 2 +- .../src/components/business-selector/BusinessSelector.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbm-ui/frontend/src/components/app-select/Index.vue b/dbm-ui/frontend/src/components/app-select/Index.vue index 1097e8ddcd..b8f1e50afb 100644 --- a/dbm-ui/frontend/src/components/app-select/Index.vue +++ b/dbm-ui/frontend/src/components/app-select/Index.vue @@ -12,7 +12,7 @@ action-id="DB_MANAGE" :permission="data.permission.db_manage" :resource-id="data.bk_biz_id" - resource-type="BUSINESS"> + resource-type="biz">
{{ data.name }} (#{{ data.bk_biz_id }})
diff --git a/dbm-ui/frontend/src/components/business-selector/BusinessSelector.vue b/dbm-ui/frontend/src/components/business-selector/BusinessSelector.vue index 38a361a0be..2168dacea5 100644 --- a/dbm-ui/frontend/src/components/business-selector/BusinessSelector.vue +++ b/dbm-ui/frontend/src/components/business-selector/BusinessSelector.vue @@ -24,7 +24,7 @@ action-id="DB_MANAGE" :permission="item.permission.db_manage" :resource-id="item.bk_biz_id" - resource-type="BUSINESS"> + resource-type="biz"> From 6e6f1a9fde6e46c8a65d9563e98149d8c6b24ff4 Mon Sep 17 00:00:00 2001 From: durant <826035498@qq.com> Date: Mon, 1 Apr 2024 11:28:23 +0800 Subject: [PATCH 04/30] =?UTF-8?q?fix(backend):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=AD=96=E7=95=A5=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=20#3786?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...30\346\264\273\346\200\247\346\243\200\346\237\245.json" | 4 ++-- ...6\234\272 CPU \344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...\347\233\230IO\345\210\251\347\224\250\347\216\207.json" | 2 +- ...72\351\227\264\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...21\347\273\234\345\205\245\346\265\201\351\207\217.json" | 2 +- .../alarm/es/ES \345\206\231\346\213\222\347\273\235.json" | 2 +- .../alarm/es/ES \345\206\231\346\216\222\351\230\237.json" | 4 ++-- ...S \346\220\234\347\264\242\346\213\222\347\273\235.json" | 2 +- ...S \351\233\206\347\276\244\347\212\266\346\200\201.json" | 4 ++-- .../db_monitor/tpls/alarm/hdfs/HDFS CorruptBlocks.json | 4 ++-- .../tpls/alarm/hdfs/HDFS DataNode Last Contact.json | 4 ++-- .../db_monitor/tpls/alarm/hdfs/HDFS EditLogRoll.json | 4 ++-- .../db_monitor/tpls/alarm/hdfs/HDFS MissingBlocks.json | 4 ++-- .../db_monitor/tpls/alarm/hdfs/HDFS NameNode Failover.json | 4 ++-- ...71\351\207\217\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...77\347\224\250\347\216\207\345\221\212\350\255\246.json" | 4 ++-- ...fluxDB Series \345\242\236\351\225\277\351\207\217.json" | 4 ++-- ...30\344\275\277\347\224\250\345\221\212\350\255\246.json" | 4 ++-- ...45\345\274\202\345\270\270\345\221\212\350\255\246.json" | 4 ++-- ...13\347\253\257\345\217\243\345\274\202\345\270\270.json" | 4 ++-- ...47\233\230 IO \345\210\251\347\224\250\347\216\207.json" | 4 ++-- ...30\347\251\272\351\227\264\345\221\212\350\255\246.json" | 4 ++-- ...6\234\272 CPU \344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...\347\233\230IO\345\210\251\347\224\250\347\216\207.json" | 4 ++-- ...72\351\227\264\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...21\347\273\234\345\205\245\346\265\201\351\207\217.json" | 2 +- ...10\350\264\271\347\273\204\345\273\266\350\277\237.json" | 4 ++-- ...3 \346\226\207\344\273\266\350\277\207\345\244\247.json" | 4 ++-- .../db_monitor/tpls/alarm/mysql/MySQL InnoDB log waits.json | 4 ++-- ...r \346\211\247\350\241\214\345\274\202\345\270\270.json" | 4 ++-- ...43\346\216\242\346\265\213\345\274\202\345\270\270.json" | 4 ++-- .../db_monitor/tpls/alarm/mysql/MySQL Routine Definer.json | 4 ++-- ...e \345\220\214\346\255\245\345\274\202\345\270\270.json" | 4 ++-- .../db_monitor/tpls/alarm/mysql/MySQL Trigger Definer.json | 4 ++-- .../db_monitor/tpls/alarm/mysql/MySQL View Definer.json | 4 ++-- ...nt\346\272\242\345\207\272\345\221\212\350\255\246.json" | 4 ++-- .../db_monitor/tpls/alarm/mysql/MySQL restarted.json | 4 ++-- ...4\270\273\346\234\272 CPU \350\264\237\350\275\275.json" | 4 ++-- ...\347\233\230IO\345\210\251\347\224\250\347\216\207.json" | 4 ++-- ...72\351\227\264\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...21\347\273\234\345\207\272\346\265\201\351\207\217.json" | 4 ++-- ...23\345\220\214\346\255\245\345\274\202\345\270\270.json" | 4 ++-- ...L \344\273\216\345\272\223\345\273\266\350\277\237.json" | 4 ++-- ...50\345\274\225\346\223\216\346\243\200\346\237\245.json" | 4 ++-- .../MySQL \345\256\236\344\276\213 Threads_running.json" | 4 ++-- ...L \345\272\223\345\255\227\347\254\246\351\233\206.json" | 4 ++-- ...7\347\233\221\346\216\247-\350\207\264\345\221\275.json" | 4 ++-- ...7\347\233\221\346\216\247-\351\242\204\350\255\246.json" | 4 ++-- .../tpls/alarm/mysql/MySQL \346\263\250\345\205\245.json" | 4 ++-- ...43\346\216\242\346\265\213\345\274\202\345\270\270.json" | 4 ++-- ...L \350\277\236\346\216\245\345\244\261\350\264\245.json" | 4 ++-- ...45\346\225\260\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...45\346\227\245\345\277\227\350\277\207\345\244\232.json" | 4 ++-- ...L \351\205\215\347\275\256\345\274\202\345\270\270.json" | 4 ++-- .../tpls/alarm/mysql/MySQL \351\224\201\350\241\250.json" | 4 ++-- ...13\345\212\241\346\234\252\345\205\263\351\227\255.json" | 4 ++-- .../db_monitor/tpls/alarm/mysql/Mysql Partition.json | 4 ++-- ...on\346\234\215\345\212\241\347\256\241\347\220\206.json" | 4 ++-- ...66\345\277\203\350\267\263\347\233\221\346\216\247.json" | 4 ++-- ...ql\345\244\261\350\264\245\347\255\226\347\225\245.json" | 4 ++-- ...ql\346\210\220\345\212\237\347\255\226\347\225\245.json" | 4 ++-- ...66\345\277\203\350\267\263\347\233\221\346\216\247.json" | 4 ++-- .../tpls/alarm/mysql/Proxy \345\220\216\347\253\257.json" | 4 ++-- .../mysql/Proxy \347\231\275\345\220\215\345\215\225.json" | 4 ++-- ...6\234\272 CPU \344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...\347\233\230IO\345\210\251\347\224\250\347\216\207.json" | 2 +- ...72\351\227\264\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...21\347\273\234\345\205\245\346\265\201\351\207\217.json" | 2 +- ...r \345\273\266\350\277\237\345\221\212\350\255\246.json" | 4 ++-- ...74\202\345\270\270critical\344\272\213\344\273\266.json" | 4 ++-- ...274\202\345\270\270warning\344\272\213\344\273\266.json" | 4 ++-- ...44\261\350\264\245critical\344\272\213\344\273\266.json" | 4 ++-- ...207\215\345\220\257warning\344\272\213\344\273\266.json" | 4 ++-- ...346\234\272CPU\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...05\345\255\230\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...346\240\270CPU\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...\347\233\230IO\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...71\351\207\217\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...05\351\207\217\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...01\351\207\217\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...74\202\345\270\270critical\344\272\213\344\273\266.json" | 4 ++-- ...274\202\345\270\270warning\344\272\213\344\273\266.json" | 4 ++-- ...344\276\213CPU\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...05\345\255\230\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...36\344\276\213\345\206\231\345\205\245\351\207\217.json" | 4 ++-- ...36\344\276\213\350\277\236\346\216\245\346\225\260.json" | 4 ++-- ...44\261\350\264\245critical\344\272\213\344\273\266.json" | 4 ++-- ...44\345\271\263\345\235\207\345\273\266\350\277\237.json" | 4 ++-- ...2\346\225\260\351\207\217-\345\210\206\351\222\237.json" | 4 ++-- ...74\202\345\270\270critical\344\272\213\344\273\266.json" | 4 ++-- ...274\202\345\270\270warning\344\272\213\344\273\266.json" | 4 ++-- ...74\202\345\270\270critical\344\272\213\344\273\266.json" | 4 ++-- ...274\202\345\270\270warning\344\272\213\344\273\266.json" | 4 ++-- ...44\261\350\264\245critical\344\272\213\344\273\266.json" | 4 ++-- ...207\215\345\220\257warning\344\272\213\344\273\266.json" | 4 ++-- ...346\234\272CPU\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...05\345\255\230\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...346\240\270CPU\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...\347\233\230IO\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...71\351\207\217\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...05\351\207\217\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...01\351\207\217\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...74\202\345\270\270critical\344\272\213\344\273\266.json" | 4 ++-- ...274\202\345\270\270warning\344\272\213\344\273\266.json" | 4 ++-- ...13\345\220\214\346\255\245\350\220\275\345\220\216.json" | 4 ++-- ...36\344\276\213\350\277\236\346\216\245\346\225\260.json" | 4 ++-- ...44\261\350\264\245critical\344\272\213\344\273\266.json" | 4 ++-- ...351\233\206\347\276\244P99\345\273\266\350\277\237.json" | 4 ++-- ...44\345\271\263\345\235\207\345\273\266\350\277\237.json" | 4 ++-- ...2\346\225\260\351\207\217-\345\210\206\351\222\237.json" | 4 ++-- ...74\202\345\270\270critical\344\272\213\344\273\266.json" | 4 ++-- ...274\202\345\270\270warning\344\272\213\344\273\266.json" | 4 ++-- ...44\261\350\264\245critical\344\272\213\344\273\266.json" | 4 ++-- ...207\215\345\220\257warning\344\272\213\344\273\266.json" | 4 ++-- ...(TendisSSD)\344\270\273\346\234\272BinlogSize-1000.json" | 4 ++-- ...346\234\272CPU\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...05\345\255\230\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...346\240\270CPU\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...\347\233\230IO\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...71\351\207\217\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...05\351\207\217\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...01\351\207\217\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...74\202\345\270\270critical\344\272\213\344\273\266.json" | 4 ++-- ...274\202\345\270\270warning\344\272\213\344\273\266.json" | 4 ++-- ...344\276\213CPU\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...05\345\255\230\344\275\277\347\224\250\347\216\207.json" | 4 ++-- ...13\345\220\214\346\255\245\350\220\275\345\220\216.json" | 4 ++-- ...36\344\276\213\350\277\236\346\216\245\346\225\260.json" | 4 ++-- ...44\261\350\264\245critical\344\272\213\344\273\266.json" | 4 ++-- ...351\233\206\347\276\244P99\345\273\266\350\277\237.json" | 4 ++-- ...44\345\271\263\345\235\207\345\273\266\350\277\237.json" | 4 ++-- ...2\346\225\260\351\207\217-\345\210\206\351\222\237.json" | 4 ++-- ...or\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...rn\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...is\345\244\261\350\264\245\347\255\226\347\225\245.json" | 4 ++-- ...is\346\210\220\345\212\237\347\255\226\347\225\245.json" | 4 ++-- ...13\351\211\264\346\235\203\345\244\261\350\264\245.json" | 4 ++-- ...in\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...or\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...ng\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...in\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...rt\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...or\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...ng\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...in\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...rt\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...77\347\224\250\347\216\207\345\221\212\350\255\246.json" | 2 +- ...05\345\255\230\344\275\277\347\224\250\347\216\207.json" | 2 +- ...346\240\270CPU\344\275\277\347\224\250\347\216\207.json" | 2 +- ...\347\233\230IO\344\275\277\347\224\250\347\216\207.json" | 2 +- ...71\351\207\217\344\275\277\347\224\250\347\216\207.json" | 2 +- ...or\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...ng\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...or\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...ng\344\272\213\344\273\266\345\221\212\350\255\246.json" | 4 ++-- ...us\351\233\206\347\276\244\347\212\266\346\200\201.json" | 4 ++-- ...4\270\273\346\234\272 CPU \350\264\237\350\275\275.json" | 4 ++-- ...\347\233\230IO\345\210\251\347\224\250\347\216\207.json" | 4 ++-- ...05\350\256\277\351\227\256\346\213\222\347\273\235.json" | 4 ++-- ...k \346\227\245\345\277\227\347\233\221\346\216\247.json" | 4 ++-- ...30\347\251\272\351\227\264\345\221\212\350\255\246.json" | 4 ++-- ...k \350\277\236\346\216\245\345\244\261\350\264\245.json" | 4 ++-- .../db_monitor/tpls/collect/dbm_elasticsearch_exporter.json | 2 +- .../backend/db_monitor/tpls/collect/dbm_hdfs_exporter.json | 2 +- .../backend/db_monitor/tpls/collect/dbm_kafka_exporter.json | 2 +- .../db_monitor/tpls/collect/dbm_mysqld_exporter.json | 2 +- .../db_monitor/tpls/collect/dbm_mysqlproxy_exporter.json | 2 +- .../db_monitor/tpls/collect/dbm_predixy_exporter.json | 2 +- .../tpls/collect/dbm_pulsarbookkeeper_bkpull.json | 2 +- .../db_monitor/tpls/collect/dbm_pulsarbroker_bkpull.json | 2 +- .../db_monitor/tpls/collect/dbm_pulsarzookeeper_bkpull.json | 2 +- .../backend/db_monitor/tpls/collect/dbm_redis_exporter.json | 2 +- .../db_monitor/tpls/collect/dbm_spider_exporter.json | 2 +- .../db_monitor/tpls/collect/dbm_twemproxy_exporter.json | 2 +- dbm-ui/backend/db_periodic_task/local_tasks/db_monitor.py | 6 ++---- helm-charts/bk-dbm/Chart.yaml | 4 ++-- helm-charts/bk-dbm/charts/dbm/Chart.yaml | 2 +- 177 files changed, 329 insertions(+), 331 deletions(-) diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/cloud/\344\272\221\345\214\272\345\237\237\347\273\204\344\273\266 - DNS(named\345\222\214pull-crond)\345\255\230\346\264\273\346\200\247\346\243\200\346\237\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/cloud/\344\272\221\345\214\272\345\237\237\347\273\204\344\273\266 - DNS(named\345\222\214pull-crond)\345\255\230\346\264\273\346\200\247\346\243\200\346\237\245.json" index 1d3abd45fb..ee0ed8115c 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/cloud/\344\272\221\345\214\272\345\237\237\347\273\204\344\273\266 - DNS(named\345\222\214pull-crond)\345\255\230\346\264\273\346\200\247\346\243\200\346\237\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/cloud/\344\272\221\345\214\272\345\237\237\347\273\204\344\273\266 - DNS(named\345\222\214pull-crond)\345\255\230\346\264\273\346\200\247\346\243\200\346\237\245.json" @@ -161,7 +161,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -256,7 +256,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(dns_check_warning-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" index f74cf9ceee..6d9bbbe31f 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" @@ -166,7 +166,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -259,7 +259,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(CPU使用率)", - "version": 19, + "version": 20, "alert_source": "time_series", "custom_conditions": [], "export_at": "2024-03-28T21:19:53+08:00" diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" index 9506f18620..984145344a 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" @@ -167,7 +167,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" index 9aea18c556..f481f8ace6 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" @@ -202,7 +202,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -295,7 +295,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(磁盘空间使用率)", - "version": 19, + "version": 20, "alert_source": "time_series", "custom_conditions": [], "export_at": "2024-03-28T21:19:53+08:00" diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" index 76806e5e5d..63f5f8015e 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" @@ -176,7 +176,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \345\206\231\346\213\222\347\273\235.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \345\206\231\346\213\222\347\273\235.json" index a98f8a66e4..15ce4a0deb 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \345\206\231\346\213\222\347\273\235.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \345\206\231\346\213\222\347\273\235.json" @@ -175,7 +175,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \345\206\231\346\216\222\351\230\237.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \345\206\231\346\216\222\351\230\237.json" index 0fa5c7dbb4..33929798f0 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \345\206\231\346\216\222\351\230\237.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \345\206\231\346\216\222\351\230\237.json" @@ -165,7 +165,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -258,7 +258,7 @@ }, "is_enabled": true, "monitor_indicator": "MAX(elasticsearch_thread_pool_queue_count)", - "version": 19, + "version": 20, "alert_source": "time_series", "custom_conditions": [], "export_at": "2024-03-28T21:19:53+08:00" diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \346\220\234\347\264\242\346\213\222\347\273\235.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \346\220\234\347\264\242\346\213\222\347\273\235.json" index 78c802800c..76eff9d29f 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \346\220\234\347\264\242\346\213\222\347\273\235.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \346\220\234\347\264\242\346\213\222\347\273\235.json" @@ -175,7 +175,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \351\233\206\347\276\244\347\212\266\346\200\201.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \351\233\206\347\276\244\347\212\266\346\200\201.json" index 5ca3c2ebff..bc7cc6e6ce 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \351\233\206\347\276\244\347\212\266\346\200\201.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES \351\233\206\347\276\244\347\212\266\346\200\201.json" @@ -166,7 +166,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -262,7 +262,7 @@ }, "is_enabled": true, "monitor_indicator": "MAX(elasticsearch_cluster_health_status)", - "version": 19, + "version": 20, "alert_source": "time_series", "custom_conditions": [], "export_at": "2024-03-28T21:19:53+08:00" diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS CorruptBlocks.json b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS CorruptBlocks.json index 9c4a937deb..563bfc8721 100644 --- a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS CorruptBlocks.json +++ b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS CorruptBlocks.json @@ -212,7 +212,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -308,7 +308,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(hadoop_namenode_corrupt_blocks)/MIN(hadoop_namenode_State)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS DataNode Last Contact.json b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS DataNode Last Contact.json index fe1801b399..f31c49839a 100644 --- a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS DataNode Last Contact.json +++ b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS DataNode Last Contact.json @@ -143,7 +143,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -235,7 +235,7 @@ }, "is_enabled": true, "monitor_indicator": "[HDFS]-DataNode Last Contact", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS EditLogRoll.json b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS EditLogRoll.json index 0938e762ee..5db6bac919 100644 --- a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS EditLogRoll.json +++ b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS EditLogRoll.json @@ -212,7 +212,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -309,7 +309,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(hadoop_namenode_transactions_since_last_checkpoint)/MIN(hadoop_namenode_State)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS MissingBlocks.json b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS MissingBlocks.json index 6fb8117184..c2fbc2beb7 100644 --- a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS MissingBlocks.json +++ b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS MissingBlocks.json @@ -212,7 +212,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -308,7 +308,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(hadoop_namenode_missing_blocks)/MIN(hadoop_namenode_State)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS NameNode Failover.json b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS NameNode Failover.json index cd61a29aab..6637303cfc 100644 --- a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS NameNode Failover.json +++ b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS NameNode Failover.json @@ -208,7 +208,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -300,7 +300,7 @@ }, "is_enabled": true, "monitor_indicator": "MIN(hadoop_namenode_State)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS \345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS \345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" index e35d168dc5..5c5ba3ebf4 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS \345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS \345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" @@ -229,7 +229,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -325,7 +325,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(hadoop_namenode_capacity_used)/AVG(hadoop_namenode_capacity_total)*MIN(hadoop_namenode_State)*100", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB CPU \344\275\277\347\224\250\347\216\207\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB CPU \344\275\277\347\224\250\347\216\207\345\221\212\350\255\246.json" index 230517ac52..42e9937b98 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB CPU \344\275\277\347\224\250\347\216\207\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB CPU \344\275\277\347\224\250\347\216\207\345\221\212\350\255\246.json" @@ -200,7 +200,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -292,7 +292,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(CPU使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB Series \345\242\236\351\225\277\351\207\217.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB Series \345\242\236\351\225\277\351\207\217.json" index 68a0220716..4bf90df194 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB Series \345\242\236\351\225\277\351\207\217.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB Series \345\242\236\351\225\277\351\207\217.json" @@ -164,7 +164,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -256,7 +256,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(influxdb_database_numSeries)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\206\205\345\255\230\344\275\277\347\224\250\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\206\205\345\255\230\344\275\277\347\224\250\345\221\212\350\255\246.json" index 9e1d0e9c35..d6d09a6704 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\206\205\345\255\230\344\275\277\347\224\250\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\206\205\345\255\230\344\275\277\347\224\250\345\221\212\350\255\246.json" @@ -200,7 +200,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -292,7 +292,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(应用程序内存使用占比)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\206\231\345\205\245\345\274\202\345\270\270\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\206\231\345\205\245\345\274\202\345\270\270\345\221\212\350\255\246.json" index 9fe7f8bcb5..060bcd1669 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\206\231\345\205\245\345\274\202\345\270\270\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\206\231\345\205\245\345\274\202\345\270\270\345\221\212\350\255\246.json" @@ -164,7 +164,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -256,7 +256,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(influxdb_httpd_pointsWrittenFail)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\256\236\344\276\213\347\253\257\345\217\243\345\274\202\345\270\270.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\256\236\344\276\213\347\253\257\345\217\243\345\274\202\345\270\270.json" index 87ebab5e43..882f16e172 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\256\236\344\276\213\347\253\257\345\217\243\345\274\202\345\270\270.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \345\256\236\344\276\213\347\253\257\345\217\243\345\274\202\345\270\270.json" @@ -154,7 +154,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -246,7 +246,7 @@ }, "is_enabled": true, "monitor_indicator": "MAX(http_response_result_code)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \347\243\201\347\233\230 IO \345\210\251\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \347\243\201\347\233\230 IO \345\210\251\347\224\250\347\216\207.json" index f36e245f67..a5f0d72dd6 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \347\243\201\347\233\230 IO \345\210\251\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \347\243\201\347\233\230 IO \345\210\251\347\224\250\347\216\207.json" @@ -201,7 +201,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -293,7 +293,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(I/O使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \347\243\201\347\233\230\347\251\272\351\227\264\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \347\243\201\347\233\230\347\251\272\351\227\264\345\221\212\350\255\246.json" index 57bb91784b..d9a463a2ba 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \347\243\201\347\233\230\347\251\272\351\227\264\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB \347\243\201\347\233\230\347\251\272\351\227\264\345\221\212\350\255\246.json" @@ -201,7 +201,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -293,7 +293,7 @@ }, "is_enabled": true, "monitor_indicator": "MAX(磁盘空间使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" index b908db4ba9..7e1a3965e7 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" @@ -162,7 +162,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -254,7 +254,7 @@ }, "is_enabled": false, "monitor_indicator": "AVG(CPU使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" index a7c73d82c6..be0339d357 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" @@ -166,7 +166,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -258,7 +258,7 @@ }, "is_enabled": false, "monitor_indicator": "AVG(I/O使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" index ffc9e556a0..31bf1001ab 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" @@ -201,7 +201,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -293,7 +293,7 @@ }, "is_enabled": false, "monitor_indicator": "AVG(磁盘空间使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" index 31ba5a49cc..5707171bbf 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" @@ -167,7 +167,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \346\266\210\350\264\271\347\273\204\345\273\266\350\277\237.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \346\266\210\350\264\271\347\273\204\345\273\266\350\277\237.json" index 3c23f89bd1..3b23c8be37 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \346\266\210\350\264\271\347\273\204\345\273\266\350\277\237.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka \346\266\210\350\264\271\347\273\204\345\273\266\350\277\237.json" @@ -174,7 +174,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -266,7 +266,7 @@ }, "is_enabled": false, "monitor_indicator": "avg_without_time(kafka_consumergroup_lag_sum)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [ { diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Ext3 \346\226\207\344\273\266\350\277\207\345\244\247.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Ext3 \346\226\207\344\273\266\350\277\207\345\244\247.json" index 694a366b62..bb45374dc9 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Ext3 \346\226\207\344\273\266\350\277\207\345\244\247.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Ext3 \346\226\207\344\273\266\350\277\207\345\244\247.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(ext3-check)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL InnoDB log waits.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL InnoDB log waits.json index 141047fc6b..0979e6deaa 100644 --- a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL InnoDB log waits.json +++ b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL InnoDB log waits.json @@ -167,7 +167,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -264,7 +264,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(mysql_global_status_innodb_log_waits)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Monitor \346\211\247\350\241\214\345\274\202\345\270\270.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Monitor \346\211\247\350\241\214\345\274\202\345\270\270.json" index 39021b0e62..effa2a19d4 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Monitor \346\211\247\350\241\214\345\274\202\345\270\270.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Monitor \346\211\247\350\241\214\345\274\202\345\270\270.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(monitor-internal-error)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Proxy\347\253\257\345\217\243\346\216\242\346\265\213\345\274\202\345\270\270.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Proxy\347\253\257\345\217\243\346\216\242\346\265\213\345\274\202\345\270\270.json" index a34408013b..547bf79ad1 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Proxy\347\253\257\345\217\243\346\216\242\346\265\213\345\274\202\345\270\270.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Proxy\347\253\257\345\217\243\346\216\242\346\265\213\345\274\202\345\270\270.json" @@ -157,7 +157,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -249,7 +249,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(mysqlproxy_up)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Routine Definer.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Routine Definer.json index d4609e08d7..acb0bcba4e 100644 --- a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Routine Definer.json +++ b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Routine Definer.json @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(routine-definer)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Slave \345\220\214\346\255\245\345\274\202\345\270\270.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Slave \345\220\214\346\255\245\345\274\202\345\270\270.json" index fe40b1e314..53d99212fd 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Slave \345\220\214\346\255\245\345\274\202\345\270\270.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Slave \345\220\214\346\255\245\345\274\202\345\270\270.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(slave-status)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Trigger Definer.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Trigger Definer.json index 18a40f260d..5d6e12b4d6 100644 --- a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Trigger Definer.json +++ b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Trigger Definer.json @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(trigger-definer)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL View Definer.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL View Definer.json index b8bce046f4..ebdbd8f37c 100644 --- a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL View Definer.json +++ b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL View Definer.json @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(view-definer)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL int\346\272\242\345\207\272\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL int\346\272\242\345\207\272\345\221\212\350\255\246.json" index 31d4d0d099..912b8173b2 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL int\346\272\242\345\207\272\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL int\346\272\242\345\207\272\345\221\212\350\255\246.json" @@ -201,7 +201,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -292,7 +292,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(mysql_info_schema_auto_increment_column) / AVG(mysql_info_schema_auto_increment_column_max) * 100", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL restarted.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL restarted.json index bac4fc2f72..c4419f1fcf 100644 --- a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL restarted.json +++ b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL restarted.json @@ -157,7 +157,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -248,7 +248,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(mysql_global_status_uptime)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272 CPU \350\264\237\350\275\275.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272 CPU \350\264\237\350\275\275.json" index 316aac3b48..11ca9b9e1d 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272 CPU \350\264\237\350\275\275.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272 CPU \350\264\237\350\275\275.json" @@ -203,7 +203,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -295,7 +295,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(CPU使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" index 081d0ccec5..daf542f401 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" @@ -169,7 +169,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -260,7 +260,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(I/O使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" index 0e149c3fbe..fa0c0426b0 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" @@ -204,7 +204,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -296,7 +296,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(磁盘空间使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\275\221\347\273\234\345\207\272\346\265\201\351\207\217.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\275\221\347\273\234\345\207\272\346\265\201\351\207\217.json" index 410e28d6e0..77fbffaf73 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\275\221\347\273\234\345\207\272\346\265\201\351\207\217.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\270\273\346\234\272\347\275\221\347\273\234\345\207\272\346\265\201\351\207\217.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(网卡出流量)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\273\216\345\272\223\345\220\214\346\255\245\345\274\202\345\270\270.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\273\216\345\272\223\345\220\214\346\255\245\345\274\202\345\270\270.json" index f07a5f8632..1ac7b638bd 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\273\216\345\272\223\345\220\214\346\255\245\345\274\202\345\270\270.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\273\216\345\272\223\345\220\214\346\255\245\345\274\202\345\270\270.json" @@ -197,7 +197,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -293,7 +293,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(mysql_slave_status_slave_io_running) + AVG(mysql_slave_status_slave_sql_running)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\273\216\345\272\223\345\273\266\350\277\237.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\273\216\345\272\223\345\273\266\350\277\237.json" index dfc1b389ca..0102a4ba6a 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\273\216\345\272\223\345\273\266\350\277\237.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \344\273\216\345\272\223\345\273\266\350\277\237.json" @@ -192,7 +192,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -289,7 +289,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(mysql_slave_status_seconds_behind_master)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\255\230\345\202\250\345\274\225\346\223\216\346\243\200\346\237\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\255\230\345\202\250\345\274\225\346\223\216\346\243\200\346\237\245.json" index 422bf5f564..f30d9e88ef 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\255\230\345\202\250\345\274\225\346\223\216\346\243\200\346\237\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\255\230\345\202\250\345\274\225\346\223\216\346\243\200\346\237\245.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(engine)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\256\236\344\276\213 Threads_running.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\256\236\344\276\213 Threads_running.json" index e1bb7f83e5..1c8e72f0fb 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\256\236\344\276\213 Threads_running.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\256\236\344\276\213 Threads_running.json" @@ -192,7 +192,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -289,7 +289,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(mysql_global_status_threads_running)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\272\223\345\255\227\347\254\246\351\233\206.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\272\223\345\255\227\347\254\246\351\233\206.json" index b629e9bbcb..5acbb9f25f 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\272\223\345\255\227\347\254\246\351\233\206.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \345\272\223\345\255\227\347\254\246\351\233\206.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(character-consistency)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\227\245\345\277\227\347\233\221\346\216\247-\350\207\264\345\221\275.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\227\245\345\277\227\347\233\221\346\216\247-\350\207\264\345\221\275.json" index f3c7ee7cfd..393b9bdc50 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\227\245\345\277\227\347\233\221\346\216\247-\350\207\264\345\221\275.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\227\245\345\277\227\347\233\221\346\216\247-\350\207\264\345\221\275.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(mysql-err-critical)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\227\245\345\277\227\347\233\221\346\216\247-\351\242\204\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\227\245\345\277\227\347\233\221\346\216\247-\351\242\204\350\255\246.json" index 3df2be9382..0d6f0c7dce 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\227\245\345\277\227\347\233\221\346\216\247-\351\242\204\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\227\245\345\277\227\347\233\221\346\216\247-\351\242\204\350\255\246.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(mysql-err-notice)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\263\250\345\205\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\263\250\345\205\245.json" index 693c4890c2..8d4f98f82d 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\263\250\345\205\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \346\263\250\345\205\245.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(mysql-inject)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \347\253\257\345\217\243\346\216\242\346\265\213\345\274\202\345\270\270.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \347\253\257\345\217\243\346\216\242\346\265\213\345\274\202\345\270\270.json" index c58ed93559..5bb0992bb0 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \347\253\257\345\217\243\346\216\242\346\265\213\345\274\202\345\270\270.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \347\253\257\345\217\243\346\216\242\346\265\213\345\274\202\345\270\270.json" @@ -158,7 +158,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -250,7 +250,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(mysql_up)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\345\244\261\350\264\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\345\244\261\350\264\245.json" index 923943eb55..93cbf718a6 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\345\244\261\350\264\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\345\244\261\350\264\245.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(db-up)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\346\225\260\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\346\225\260\344\275\277\347\224\250\347\216\207.json" index f30a7aedc9..2b7493569a 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\346\225\260\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\346\225\260\344\275\277\347\224\250\347\216\207.json" @@ -216,7 +216,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -308,7 +308,7 @@ }, "is_enabled": true, "monitor_indicator": "100 * AVG(mysql_global_status_threads_connected) / AVG(mysql_global_variables_max_connections)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\346\227\245\345\277\227\350\277\207\345\244\232.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\346\227\245\345\277\227\350\277\207\345\244\232.json" index 394ca309a4..3b76b57469 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\346\227\245\345\277\227\350\277\207\345\244\232.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \350\277\236\346\216\245\346\227\245\345\277\227\350\277\207\345\244\232.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(mysql-connlog-size)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\205\215\347\275\256\345\274\202\345\270\270.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\205\215\347\275\256\345\274\202\345\270\270.json" index 6a451a6f4f..182e248a20 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\205\215\347\275\256\345\274\202\345\270\270.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\205\215\347\275\256\345\274\202\345\270\270.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(mysql-config-diff)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\224\201\350\241\250.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\224\201\350\241\250.json" index 4117947bdb..96e81f77ab 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\224\201\350\241\250.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\224\201\350\241\250.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(mysql-lock)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\225\277\347\251\272\351\227\262\344\272\213\345\212\241\346\234\252\345\205\263\351\227\255.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\225\277\347\251\272\351\227\262\344\272\213\345\212\241\346\234\252\345\205\263\351\227\255.json" index c379a8f4b4..2cd2a70eee 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\225\277\347\251\272\351\227\262\344\272\213\345\212\241\346\234\252\345\205\263\351\227\255.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL \351\225\277\347\251\272\351\227\262\344\272\213\345\212\241\346\234\252\345\205\263\351\227\255.json" @@ -157,7 +157,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -248,7 +248,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(mysql_engine_innodb_trx_idle_time_max)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql Partition.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql Partition.json index 85f097fed1..160f00e2fa 100644 --- a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql Partition.json +++ b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql Partition.json @@ -150,7 +150,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -244,7 +244,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(partition-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql Partition\346\234\215\345\212\241\347\256\241\347\220\206.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql Partition\346\234\215\345\212\241\347\256\241\347\220\206.json" index 5cdb016c04..be9000e338 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql Partition\346\234\215\345\212\241\347\256\241\347\220\206.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql Partition\346\234\215\345\212\241\347\256\241\347\220\206.json" @@ -150,7 +150,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -242,7 +242,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(partition_dev-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql crond\347\273\204\344\273\266\345\277\203\350\267\263\347\233\221\346\216\247.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql crond\347\273\204\344\273\266\345\277\203\350\267\263\347\233\221\346\216\247.json" index 567582dd0f..10f792812d 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql crond\347\273\204\344\273\266\345\277\203\350\267\263\347\233\221\346\216\247.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql crond\347\273\204\344\273\266\345\277\203\350\267\263\347\233\221\346\216\247.json" @@ -154,7 +154,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -245,7 +245,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(mysql_crond_heart_beat)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\345\244\261\350\264\245\347\255\226\347\225\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\345\244\261\350\264\245\347\255\226\347\225\245.json" index 59103b64a9..6fdf8e36e8 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\345\244\261\350\264\245\347\255\226\347\225\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\345\244\261\350\264\245\347\255\226\347\225\245.json" @@ -158,7 +158,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -249,7 +249,7 @@ }, "is_enabled": true, "monitor_indicator": "a", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\346\210\220\345\212\237\347\255\226\347\225\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\346\210\220\345\212\237\347\255\226\347\225\245.json" index 684b06078f..6c84c6a815 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\346\210\220\345\212\237\347\255\226\347\225\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\346\210\220\345\212\237\347\255\226\347\225\245.json" @@ -158,7 +158,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -249,7 +249,7 @@ }, "is_enabled": true, "monitor_indicator": "a", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql monitor\347\273\204\344\273\266\345\277\203\350\267\263\347\233\221\346\216\247.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql monitor\347\273\204\344\273\266\345\277\203\350\267\263\347\233\221\346\216\247.json" index 0537ed8a8f..c850b6b61b 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql monitor\347\273\204\344\273\266\345\277\203\350\267\263\347\233\221\346\216\247.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql monitor\347\273\204\344\273\266\345\277\203\350\267\263\347\233\221\346\216\247.json" @@ -157,7 +157,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -248,7 +248,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(mysql_monitor_heart_beat)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy \345\220\216\347\253\257.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy \345\220\216\347\253\257.json" index e2db46c752..a12ae44b6c 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy \345\220\216\347\253\257.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy \345\220\216\347\253\257.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(proxy-backend)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy \347\231\275\345\220\215\345\215\225.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy \347\231\275\345\220\215\345\215\225.json" index 22c5b0fb80..8251f28d43 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy \347\231\275\345\220\215\345\215\225.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy \347\231\275\345\220\215\345\215\225.json" @@ -151,7 +151,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -241,7 +241,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(proxy-user-list)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" index 0f6476e4de..c906d4cb0a 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272 CPU \344\275\277\347\224\250\347\216\207.json" @@ -165,7 +165,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -257,7 +257,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(CPU使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" index 742905d2f5..fb049f6d8e 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" @@ -167,7 +167,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" index 55f06b8ba2..59da6e6097 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\243\201\347\233\230\347\251\272\351\227\264\344\275\277\347\224\250\347\216\207.json" @@ -201,7 +201,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -293,7 +293,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(磁盘空间使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" index 12a5dcba08..48b6ad15f5 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \344\270\273\346\234\272\347\275\221\347\273\234\345\205\245\346\265\201\351\207\217.json" @@ -176,7 +176,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \345\273\266\350\277\237\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \345\273\266\350\277\237\345\221\212\350\255\246.json" index fc7b1a8993..f5442106f5 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \345\273\266\350\277\237\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/pulsar/Pulsar \345\273\266\350\277\237\345\221\212\350\255\246.json" @@ -175,7 +175,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -266,7 +266,7 @@ }, "is_enabled": true, "monitor_indicator": "SUM(pulsar_msg_backlog)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" index a5253dd871..09057c8e07 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_persist-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" index 083ce874e4..c6b92014bf 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -269,7 +269,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_persist-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" index ca7444456a..980b19b536 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(twemproxy_login-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" index 5e285f09e9..2a0ec8f631 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -269,7 +269,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(twemproxy_restart-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" index 6b1364f1f8..5db1026e1b 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]主机CPU使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" index 0211331302..2b08121c77 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]主机内存使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" index 7e85bb4056..545018e044 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]主机单核CPU使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" index ff47cec815..51de1845df 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]主机磁盘IO使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" index 9d20853a59..f9284ef988 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]主机磁盘容量使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" index 50bb50c66b..2be8724fdf 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]主机网络包量使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" index 4f3f860e45..ce74a0c5bb 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]主机网络流量使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" index 6e362e8604..f5b799d3c9 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_sync-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" index 22a5765ae7..df6a6a6dfc 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -269,7 +269,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_sync-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213CPU\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213CPU\344\275\277\347\224\250\347\216\207.json" index bddb2de06a..66d1a902b2 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213CPU\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213CPU\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]实例CPU使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" index c241185ac7..4492e6de98 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]实例内存使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\345\206\231\345\205\245\351\207\217.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\345\206\231\345\205\245\351\207\217.json" index a3c657fca8..279a7c72a1 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\345\206\231\345\205\245\351\207\217.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\345\206\231\345\205\245\351\207\217.json" @@ -165,7 +165,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -258,7 +258,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]实例写入量", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" index b8876ad7f9..279e1f5bf2 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" @@ -165,7 +165,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -258,7 +258,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]实例连接数", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" index b82d679004..071b8649ce 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_login-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" index 9c6adb9ee7..5a0481ed52 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]集群平均延迟", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" index 5f3e2d8b7d..feaac95d91 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisCache)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisCache]集群延迟超过1秒的请求数量/分钟", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)ClusterState\345\274\202\345\270\270critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)ClusterState\345\274\202\345\270\270critical\344\272\213\344\273\266.json" index c306803344..88cf02d0d0 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)ClusterState\345\274\202\345\270\270critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)ClusterState\345\274\202\345\270\270critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_cluster_state-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)ClusterState\345\274\202\345\270\270warning\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)ClusterState\345\274\202\345\270\270warning\344\272\213\344\273\266.json" index 524c2ae67a..9de6db2217 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)ClusterState\345\274\202\345\270\270warning\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)ClusterState\345\274\202\345\270\270warning\344\272\213\344\273\266.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -269,7 +269,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_cluster_state-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" index eebc894890..0f34bd6281 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_persist-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" index dfcf426a49..90c7695bb6 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -269,7 +269,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_persist-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" index f99c9874b9..3aab5ef83a 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(predixy_login-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" index ec36ffc736..303f9a501b 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -269,7 +269,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(predixy_restart-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" index 009f0af62f..a27ccdc30e 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]主机CPU使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" index 998c288025..a5c8e0cc49 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]主机内存使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" index 955296e231..8e8e178c7a 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]主机单核CPU使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" index 703e1b30a1..5410260341 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]主机磁盘IO使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" index eeffebefc4..5aad4fa83a 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]主机磁盘容量使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" index 7dc01767d3..6e4b14b876 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]主机网络包量使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" index 9988820754..6cd56eb664 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]主机网络流量使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" index f1931160de..9eefffb876 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_sync-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" index 50d127992f..b5639f3dd8 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -269,7 +269,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_sync-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\256\236\344\276\213\345\220\214\346\255\245\350\220\275\345\220\216.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\256\236\344\276\213\345\220\214\346\255\245\350\220\275\345\220\216.json" index a124e1bc3d..46ae16e0fc 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\256\236\344\276\213\345\220\214\346\255\245\350\220\275\345\220\216.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\256\236\344\276\213\345\220\214\346\255\245\350\220\275\345\220\216.json" @@ -165,7 +165,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -258,7 +258,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]实例同步落后", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" index ed61565540..1219ae95f8 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" @@ -165,7 +165,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -258,7 +258,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]实例连接数", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" index 45faf59ff9..4d5f3f218c 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_login-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244P99\345\273\266\350\277\237.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244P99\345\273\266\350\277\237.json" index 9930ed5ea9..2397d7e08b 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244P99\345\273\266\350\277\237.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244P99\345\273\266\350\277\237.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]集群P99延迟", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" index e7ec6095f7..a8a3ce7de7 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]集群平均延迟", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" index fe053cc6a3..a6e7bf855e 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisPlus)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisPlus]集群延迟超过1秒的请求数量/分钟", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" index ac52d026a5..4a954dda6b 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Persist\345\274\202\345\270\270critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_persist-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" index 76b064c521..d39c94434a 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Persist\345\274\202\345\270\270warning\344\272\213\344\273\266.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -269,7 +269,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_persist-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" index 4ab0df602e..158b92f0c4 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Proxy\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(twemproxy_login-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" index ebc78f3935..ab9c0614e8 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)Proxy\351\207\215\345\220\257warning\344\272\213\344\273\266.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -269,7 +269,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(twemproxy_restart-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272BinlogSize-1000.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272BinlogSize-1000.json" index 8b8a17458f..5058deef09 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272BinlogSize-1000.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272BinlogSize-1000.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]主机BinlogSize/1000", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" index 5ee2124aa7..5335c10b51 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]主机CPU使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" index 941b9f2587..390852878e 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]主机内存使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" index 01d3c6040e..c6c616e59e 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]主机单核CPU使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" index a1f70ed65c..32a457464a 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]主机磁盘IO使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" index fa75e53e13..773579e518 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]主机磁盘容量使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" index 0c1081d967..b313b1709c 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\275\221\347\273\234\345\214\205\351\207\217\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]主机网络包量使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" index 8996f513a0..36306de3a2 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\344\270\273\346\234\272\347\275\221\347\273\234\346\265\201\351\207\217\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]主机网络流量使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" index 9ffdf5d995..17c0c7ba04 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\220\214\346\255\245\345\274\202\345\270\270critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_sync-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" index 6abb5d806d..245a71a4e5 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\220\214\346\255\245\345\274\202\345\270\270warning\344\272\213\344\273\266.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -269,7 +269,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_sync-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213CPU\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213CPU\344\275\277\347\224\250\347\216\207.json" index ec87a7eb3c..8c3b7e2c31 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213CPU\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213CPU\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]实例CPU使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" index 44758cdc4d..72ae4e020e 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]实例内存使用率", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\345\220\214\346\255\245\350\220\275\345\220\216.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\345\220\214\346\255\245\350\220\275\345\220\216.json" index 400fda94b0..29536ae011 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\345\220\214\346\255\245\350\220\275\345\220\216.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\345\220\214\346\255\245\350\220\275\345\220\216.json" @@ -165,7 +165,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -258,7 +258,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]实例同步落后", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" index a879611cc9..820b9912f2 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\345\256\236\344\276\213\350\277\236\346\216\245\346\225\260.json" @@ -165,7 +165,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -258,7 +258,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]实例连接数", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" index 36f5cb7ed9..5578e6ee3e 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\347\231\273\345\275\225\345\244\261\350\264\245critical\344\272\213\344\273\266.json" @@ -179,7 +179,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -270,7 +270,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_login-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244P99\345\273\266\350\277\237.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244P99\345\273\266\350\277\237.json" index 720ebaf783..151a447c35 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244P99\345\273\266\350\277\237.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244P99\345\273\266\350\277\237.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]集群P99延迟", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" index 9d652c1998..b98f9ac190 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244\345\271\263\345\235\207\345\273\266\350\277\237.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]集群平均延迟", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" index 37310dc614..0966858dcf 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/Redis(TendisSSD)\351\233\206\347\276\244\345\273\266\350\277\237\350\266\205\350\277\2071\347\247\222\347\232\204\350\257\267\346\261\202\346\225\260\351\207\217-\345\210\206\351\222\237.json" @@ -178,7 +178,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -271,7 +271,7 @@ }, "is_enabled": true, "monitor_indicator": "[TendisSSD]集群延迟超过1秒的请求数量/分钟", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis cluster_state.error\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis cluster_state.error\344\272\213\344\273\266\345\221\212\350\255\246.json" index 26755e1676..57b0dd3e5e 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis cluster_state.error\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis cluster_state.error\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -164,7 +164,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -256,7 +256,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_cluster_state-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis cluster_state.warn\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis cluster_state.warn\344\272\213\344\273\266\345\221\212\350\255\246.json" index 851bdc1bfc..dbf8c22c11 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis cluster_state.warn\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis cluster_state.warn\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -164,7 +164,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -256,7 +256,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_cluster_state-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\345\210\207\346\215\242redis\345\244\261\350\264\245\347\255\226\347\225\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\345\210\207\346\215\242redis\345\244\261\350\264\245\347\255\226\347\225\245.json" index 3a983be45c..21eef8df94 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\345\210\207\346\215\242redis\345\244\261\350\264\245\347\255\226\347\225\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\345\210\207\346\215\242redis\345\244\261\350\264\245\347\255\226\347\225\245.json" @@ -158,7 +158,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -249,7 +249,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(dbha_redis_switch_err-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\345\210\207\346\215\242redis\346\210\220\345\212\237\347\255\226\347\225\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\345\210\207\346\215\242redis\346\210\220\345\212\237\347\255\226\347\225\245.json" index 4694a78a0f..80dd979e45 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\345\210\207\346\215\242redis\346\210\220\345\212\237\347\255\226\347\225\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\345\210\207\346\215\242redis\346\210\220\345\212\237\347\255\226\347\225\245.json" @@ -158,7 +158,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -249,7 +249,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(dbha_redis_switch_succ-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\346\216\242\346\265\213\351\211\264\346\235\203\345\244\261\350\264\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\346\216\242\346\265\213\351\211\264\346\235\203\345\244\261\350\264\245.json" index 99872b8719..0310a24c75 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\346\216\242\346\265\213\351\211\264\346\235\203\345\244\261\350\264\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis dbha\346\216\242\346\265\213\351\211\264\346\235\203\345\244\261\350\264\245.json" @@ -205,7 +205,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -296,7 +296,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(dbha_detect_auth_fail-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis login\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis login\344\272\213\344\273\266\345\221\212\350\255\246.json" index e814e4d472..0e715726b9 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis login\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis login\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -154,7 +154,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -246,7 +246,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_login-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis persist.error\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis persist.error\344\272\213\344\273\266\345\221\212\350\255\246.json" index ea42128a5c..a28ac08a03 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis persist.error\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis persist.error\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -165,7 +165,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -257,7 +257,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_persist-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis persist.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis persist.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" index d3edb10d3c..368226fdb0 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis persist.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis persist.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -166,7 +166,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -258,7 +258,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_persist-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis predixy.login\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis predixy.login\344\272\213\344\273\266\345\221\212\350\255\246.json" index 34546f6a2e..1a45ca9f5d 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis predixy.login\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis predixy.login\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -154,7 +154,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -246,7 +246,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(predixy_login-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis predixy_restart\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis predixy_restart\344\272\213\344\273\266\345\221\212\350\255\246.json" index e2058379cb..410d6fbee0 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis predixy_restart\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis predixy_restart\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -155,7 +155,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -247,7 +247,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(predixy_restart-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis sync.error\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis sync.error\344\272\213\344\273\266\345\221\212\350\255\246.json" index d2d0d9192f..d91f5bfe09 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis sync.error\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis sync.error\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -164,7 +164,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -256,7 +256,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_sync-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis sync.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis sync.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" index 8be4f816b2..b81561b6fd 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis sync.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis sync.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -164,7 +164,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -256,7 +256,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_sync-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis twemproxy_login\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis twemproxy_login\344\272\213\344\273\266\345\221\212\350\255\246.json" index 219780a4a4..724d0d9cd2 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis twemproxy_login\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis twemproxy_login\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -154,7 +154,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -246,7 +246,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(twemproxy_login-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis twemproxy_restart\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis twemproxy_restart\344\272\213\344\273\266\345\221\212\350\255\246.json" index 6ef387e106..7b5ad841db 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis twemproxy_restart\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis twemproxy_restart\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -155,7 +155,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -247,7 +247,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(twemproxy_restart-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207\345\221\212\350\255\246.json" index 13192d21c1..6b549e52b3 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272CPU\344\275\277\347\224\250\347\216\207\345\221\212\350\255\246.json" @@ -209,7 +209,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" index fac72b8165..4c9fc5032e 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\345\206\205\345\255\230\344\275\277\347\224\250\347\216\207.json" @@ -209,7 +209,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" index 83b7e1dee4..ac2c860848 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\345\215\225\346\240\270CPU\344\275\277\347\224\250\347\216\207.json" @@ -209,7 +209,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" index 4720b68f73..8970e38d35 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\347\243\201\347\233\230IO\344\275\277\347\224\250\347\216\207.json" @@ -209,7 +209,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" index f1cd54d8de..c149155dd5 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \344\270\273\346\234\272\347\243\201\347\233\230\345\256\271\351\207\217\344\275\277\347\224\250\347\216\207.json" @@ -209,7 +209,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \346\227\245\345\277\227.error\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \346\227\245\345\277\227.error\344\272\213\344\273\266\345\221\212\350\255\246.json" index 6c0868f24d..e5afa49abd 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \346\227\245\345\277\227.error\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \346\227\245\345\277\227.error\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -165,7 +165,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -257,7 +257,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_log-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \346\227\245\345\277\227.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \346\227\245\345\277\227.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" index 6fc3e5588b..9538ea8fea 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \346\227\245\345\277\227.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/Redis \346\227\245\345\277\227.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -165,7 +165,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -257,7 +257,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(redis_log-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/TendisSSD binlog.error\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/TendisSSD binlog.error\344\272\213\344\273\266\345\221\212\350\255\246.json" index 835aff3bc0..1aa1b33c11 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/TendisSSD binlog.error\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/TendisSSD binlog.error\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -163,7 +163,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -255,7 +255,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(tendis_binlog_len-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/TendisSSD binlog.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/TendisSSD binlog.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" index 99136a4de0..b41c1d5af7 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/TendisSSD binlog.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/redis/v1/TendisSSD binlog.warning\344\272\213\344\273\266\345\221\212\350\255\246.json" @@ -163,7 +163,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -255,7 +255,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(tendis_binlog_len-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak Ring Status\351\233\206\347\276\244\347\212\266\346\200\201.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak Ring Status\351\233\206\347\276\244\347\212\266\346\200\201.json" index 6b9c34c6eb..d8ab389083 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak Ring Status\351\233\206\347\276\244\347\212\266\346\200\201.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak Ring Status\351\233\206\347\276\244\347\212\266\346\200\201.json" @@ -150,7 +150,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -242,7 +242,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(riak-ring-status-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \344\270\273\346\234\272 CPU \350\264\237\350\275\275.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \344\270\273\346\234\272 CPU \350\264\237\350\275\275.json" index 44c442ea7a..f0f7c2ef35 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \344\270\273\346\234\272 CPU \350\264\237\350\275\275.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \344\270\273\346\234\272 CPU \350\264\237\350\275\275.json" @@ -201,7 +201,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -293,7 +293,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(CPU使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" index 5acfa31f9c..e0ac8bd8bb 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \344\270\273\346\234\272\347\243\201\347\233\230IO\345\210\251\347\224\250\347\216\207.json" @@ -167,7 +167,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -259,7 +259,7 @@ }, "is_enabled": true, "monitor_indicator": "AVG(I/O使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \345\223\215\345\272\224\346\205\242\346\210\226\350\200\205\350\256\277\351\227\256\346\213\222\347\273\235.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \345\223\215\345\272\224\346\205\242\346\210\226\350\200\205\350\256\277\351\227\256\346\213\222\347\273\235.json" index 0ffac68814..0022c0c761 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \345\223\215\345\272\224\346\205\242\346\210\226\350\200\205\350\256\277\351\227\256\346\213\222\347\273\235.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \345\223\215\345\272\224\346\205\242\346\210\226\350\200\205\350\256\277\351\227\256\346\213\222\347\273\235.json" @@ -152,7 +152,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -250,7 +250,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(riak-load-health-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \346\227\245\345\277\227\347\233\221\346\216\247.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \346\227\245\345\277\227\347\233\221\346\216\247.json" index 6a946d5445..28b0dd6864 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \346\227\245\345\277\227\347\233\221\346\216\247.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \346\227\245\345\277\227\347\233\221\346\216\247.json" @@ -153,7 +153,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -245,7 +245,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(riak-err-notice-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \347\243\201\347\233\230\347\251\272\351\227\264\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \347\243\201\347\233\230\347\251\272\351\227\264\345\221\212\350\255\246.json" index f713e03274..078159486d 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \347\243\201\347\233\230\347\251\272\351\227\264\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \347\243\201\347\233\230\347\251\272\351\227\264\345\221\212\350\255\246.json" @@ -202,7 +202,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -294,7 +294,7 @@ }, "is_enabled": true, "monitor_indicator": "MAX(磁盘空间使用率)", - "version": 16, + "version": 17, "alert_source": "time_series", "custom_conditions": [] } \ No newline at end of file diff --git "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \350\277\236\346\216\245\345\244\261\350\264\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \350\277\236\346\216\245\345\244\261\350\264\245.json" index 162f971beb..fcff535bf1 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \350\277\236\346\216\245\345\244\261\350\264\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/riak/Riak \350\277\236\346\216\245\345\244\261\350\264\245.json" @@ -153,7 +153,7 @@ "timedelta": 60, "is_enabled": true, "converge_func": "collect", - "need_biz_converge": true, + "need_biz_converge": false, "sub_converge_config": { "timedelta": 60, "count": 2, @@ -250,7 +250,7 @@ }, "is_enabled": true, "monitor_indicator": "COUNT(riak-db-up-dbm_report_channel)", - "version": 16, + "version": 17, "alert_source": "event", "custom_conditions": [] } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_elasticsearch_exporter.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_elasticsearch_exporter.json index 7138f6204d..cca5914cd4 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_elasticsearch_exporter.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_elasticsearch_exporter.json @@ -38,7 +38,7 @@ "plugin_id": "dbm_elasticsearch_exporter" }, "db_type": "es", - "version": 16, + "version": 17, "machine_types": [], "plugin_id": "dbm_elasticsearch_exporter" } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_hdfs_exporter.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_hdfs_exporter.json index 29f49680f7..daa56fea43 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_hdfs_exporter.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_hdfs_exporter.json @@ -38,7 +38,7 @@ "plugin_id": "dbm_hdfs_exporter" }, "db_type": "hdfs", - "version": 16, + "version": 17, "machine_types": [], "plugin_id": "dbm_hdfs_exporter" } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_kafka_exporter.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_kafka_exporter.json index 88db95e82d..8e47fd2280 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_kafka_exporter.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_kafka_exporter.json @@ -38,7 +38,7 @@ "plugin_id": "dbm_kafka_exporter" }, "db_type": "kafka", - "version": 16, + "version": 17, "machine_types": [], "plugin_id": "dbm_kafka_exporter", "export_at": "2023-11-22 15:25:54" diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_mysqld_exporter.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_mysqld_exporter.json index a9fa4f83a4..5849dec0e9 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_mysqld_exporter.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_mysqld_exporter.json @@ -53,7 +53,7 @@ "plugin_id": "dbm_mysqld_exporter" }, "db_type": "mysql", - "version": 16, + "version": 17, "machine_types": [], "plugin_id": "dbm_mysqld_exporter" } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_mysqlproxy_exporter.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_mysqlproxy_exporter.json index 8069e24898..c2966663fd 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_mysqlproxy_exporter.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_mysqlproxy_exporter.json @@ -34,7 +34,7 @@ "plugin_id": "dbm_mysqlproxy_exporter" }, "db_type": "mysql", - "version": 16, + "version": 17, "machine_types": [], "plugin_id": "dbm_mysqlproxy_exporter" } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_predixy_exporter.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_predixy_exporter.json index 6c85805293..45baf207d2 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_predixy_exporter.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_predixy_exporter.json @@ -36,7 +36,7 @@ "plugin_id": "dbm_predixy_exporter" }, "db_type": "redis", - "version": 16, + "version": 17, "machine_types": [], "plugin_id": "dbm_predixy_exporter" } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarbookkeeper_bkpull.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarbookkeeper_bkpull.json index aa6ab75ccf..69cce21c1c 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarbookkeeper_bkpull.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarbookkeeper_bkpull.json @@ -34,7 +34,7 @@ "plugin_id": "dbm_pulsarbookkeeper_bkpull" }, "db_type": "pulsar", - "version": 16, + "version": 17, "machine_types": [], "plugin_id": "dbm_pulsarbookkeeper_bkpull", "export_at": "2024-03-28T21:04:57+08:00" diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarbroker_bkpull.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarbroker_bkpull.json index 7333804d2f..3c5063b065 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarbroker_bkpull.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarbroker_bkpull.json @@ -34,7 +34,7 @@ "plugin_id": "dbm_pulsarbroker_bkpull" }, "db_type": "pulsar", - "version": 16, + "version": 17, "machine_types": [], "plugin_id": "dbm_pulsarbroker_bkpull", "export_at": "2024-03-28T21:05:02+08:00" diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarzookeeper_bkpull.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarzookeeper_bkpull.json index 4960e804c1..880b71691e 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarzookeeper_bkpull.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_pulsarzookeeper_bkpull.json @@ -34,7 +34,7 @@ "plugin_id": "dbm_pulsarzookeeper_bkpull" }, "db_type": "pulsar", - "version": 16, + "version": 17, "machine_types": [], "plugin_id": "dbm_pulsarzookeeper_bkpull", "export_at": "2024-03-28T21:05:09+08:00" diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_redis_exporter.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_redis_exporter.json index 1777ca9231..063e0ac8e6 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_redis_exporter.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_redis_exporter.json @@ -37,7 +37,7 @@ "plugin_id": "dbm_redis_exporter" }, "db_type": "redis", - "version": 16, + "version": 17, "machine_types": [], "plugin_id": "dbm_redis_exporter" } \ No newline at end of file diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_spider_exporter.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_spider_exporter.json index f0be8f1c31..0e914b8b26 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_spider_exporter.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_spider_exporter.json @@ -52,7 +52,7 @@ "plugin_id": "dbm_mysqld_exporter" }, "db_type": "mysql", - "version": 16, + "version": 17, "machine_types": [ "spider" ], diff --git a/dbm-ui/backend/db_monitor/tpls/collect/dbm_twemproxy_exporter.json b/dbm-ui/backend/db_monitor/tpls/collect/dbm_twemproxy_exporter.json index bb5a6ab4c6..66e89b9490 100644 --- a/dbm-ui/backend/db_monitor/tpls/collect/dbm_twemproxy_exporter.json +++ b/dbm-ui/backend/db_monitor/tpls/collect/dbm_twemproxy_exporter.json @@ -36,7 +36,7 @@ "plugin_id": "dbm_twemproxy_exporter" }, "db_type": "redis", - "version": 16, + "version": 17, "machine_types": [], "plugin_id": "dbm_twemproxy_exporter" } \ No newline at end of file diff --git a/dbm-ui/backend/db_periodic_task/local_tasks/db_monitor.py b/dbm-ui/backend/db_periodic_task/local_tasks/db_monitor.py index 245babd8ce..3e5162e8c8 100644 --- a/dbm-ui/backend/db_periodic_task/local_tasks/db_monitor.py +++ b/dbm-ui/backend/db_periodic_task/local_tasks/db_monitor.py @@ -88,17 +88,15 @@ def sync_plat_monitor_policy(): with open(os.path.join(root, alarm_tpl), "r", encoding="utf-8") as f: try: template_dict = json.loads(f.read()) + # 监控API不支持传入额外的字段 + template_dict.pop("export_at", "") policy_name = template_dict["name"] - # db_type = template_dict["db_type"] except json.decoder.JSONDecodeError: logger.error("[sync_plat_monitor_policy] load template failed: %s", alarm_tpl) continue deleted = template_dict.pop("deleted", False) - # just for test - # policy_name = policy_name + "-" + get_random_string(5) - # patch template template_dict["details"]["labels"] = list(set(template_dict["details"]["labels"])) template_dict["details"]["name"] = policy_name diff --git a/helm-charts/bk-dbm/Chart.yaml b/helm-charts/bk-dbm/Chart.yaml index 49e075ebee..d7e3afb668 100644 --- a/helm-charts/bk-dbm/Chart.yaml +++ b/helm-charts/bk-dbm/Chart.yaml @@ -79,5 +79,5 @@ dependencies: description: A Helm chart for bk-dbm name: bk-dbm type: application -version: 1.3.0-alpha.43 -appVersion: 1.3.0-alpha.43 +version: 1.3.0-alpha.44 +appVersion: 1.3.0-alpha.44 diff --git a/helm-charts/bk-dbm/charts/dbm/Chart.yaml b/helm-charts/bk-dbm/charts/dbm/Chart.yaml index 040b5e9661..1457bc8f38 100644 --- a/helm-charts/bk-dbm/charts/dbm/Chart.yaml +++ b/helm-charts/bk-dbm/charts/dbm/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.3.0-alpha.580 +appVersion: 1.3.0-alpha.582 description: A Helm chart for dbm name: dbm type: application From 25384211f4fd132e82c43dfd739865af66a8aecf Mon Sep 17 00:00:00 2001 From: ymakedaq <996156275@qq.com> Date: Fri, 29 Mar 2024 14:48:58 +0800 Subject: [PATCH 05/30] =?UTF-8?q?fix(dbm-services):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=A4=9A=E5=AE=9E=E4=BE=8B=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E9=97=AE=E9=A2=98=20close=20#3755?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql/db-tools/dbactuator/cmd/cmd.go | 4 ++ .../internal/subcmd/mysqlcmd/install_mysql.go | 4 ++ .../dbactuator/internal/subcmd/subcmd.go | 43 ++++++++++++++----- .../pkg/components/mysql/install_mysql.go | 24 +++++------ .../collections/mysql/exec_actuator_script.py | 9 +++- dbm-ui/backend/flow/utils/script_template.py | 2 +- 6 files changed, 59 insertions(+), 27 deletions(-) diff --git a/dbm-services/mysql/db-tools/dbactuator/cmd/cmd.go b/dbm-services/mysql/db-tools/dbactuator/cmd/cmd.go index 7c65cddf12..f4b9efbee4 100644 --- a/dbm-services/mysql/db-tools/dbactuator/cmd/cmd.go +++ b/dbm-services/mysql/db-tools/dbactuator/cmd/cmd.go @@ -163,6 +163,10 @@ Buildstamp:%s`, version, githash, strings.ToUpper(external), buildstamp, &subcmd.GBaseOptions.PayloadFormat, "payload-format", "m", subcmd.GBaseOptions.PayloadFormat, "command payload format, default base64, value_allowed: base64|raw", ) + cmds.PersistentFlags().StringVarP( + &subcmd.GBaseOptions.NotSensitivePayload, "non-sensitive-paylod", "c", + subcmd.GBaseOptions.NotSensitivePayload, "commandn not sensitive payload ", + ) cmds.PersistentFlags().StringVarP(&subcmd.GBaseOptions.Uid, "uid", "U", subcmd.GBaseOptions.Uid, "bill id") cmds.PersistentFlags().StringVarP(&subcmd.GBaseOptions.RootId, "root_id", "R", subcmd.GBaseOptions.NodeId, "process id") diff --git a/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/mysqlcmd/install_mysql.go b/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/mysqlcmd/install_mysql.go index 3fc5bebd24..af0aa805cb 100644 --- a/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/mysqlcmd/install_mysql.go +++ b/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/mysqlcmd/install_mysql.go @@ -67,6 +67,10 @@ func (d *DeployMySQLAct) Init() (err error) { logger.Error("DeserializeAndValidate failed, %v", err) return err } + if err = d.DeserializeNonSensitivePayload(&d.Service.MySQLConfigParams); err != nil { + logger.Error("DeserializeAndValidate failed, %v", err) + return err + } d.Service.GeneralParam = subcmd.GeneralRuntimeParam return d.Service.InitDefaultParam() } diff --git a/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/subcmd.go b/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/subcmd.go index 8b6b911808..6d2a5c3280 100644 --- a/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/subcmd.go +++ b/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/subcmd.go @@ -19,6 +19,7 @@ import ( "path/filepath" "strings" + "dbm-services/common/go-pubpkg/cmutil" "dbm-services/common/go-pubpkg/logger" "dbm-services/common/go-pubpkg/validate" "dbm-services/mysql/db-tools/dbactuator/pkg/components" @@ -53,14 +54,15 @@ func init() { 此参数是json字符串的base64编码之后的字符串 */ type BaseOptions struct { - Uid string - RootId string - NodeId string - VersionId string - Payload string - PayloadFormat string - RollBack bool - Helper bool + Uid string + RootId string + NodeId string + VersionId string + Payload string + PayloadFormat string + NotSensitivePayload string + RollBack bool + Helper bool // 是否为外部版本 // on ON External string @@ -191,6 +193,25 @@ func Deserialize(s interface{}) (p *BaseOptions, err error) { return GBaseOptions, nil } +// DeserializeNonSensitivePayload 反序列化非敏感payload,不校验参数 +func (b *BaseOptions) DeserializeNonSensitivePayload(s interface{}) (err error) { + var bp []byte + if cmutil.IsEmpty(b.NotSensitivePayload) { + return errors.New("non-sensitive payload need input") + } + bp, err = base64.StdEncoding.DecodeString(b.NotSensitivePayload) + if err != nil { + return err + } + logger.Local("DeserializeSimple not sensitive payload body: %s", b.NotSensitivePayload) + if err = json.Unmarshal(bp, &s); err != nil { + logger.Error("json.Unmarshal failed, %v", s, err) + err = errors.WithMessage(err, "error in resolving parameter") + return err + } + return nil +} + // Deserialize 反序列化payload,并校验参数 // // ps: 参数校验 from golang validate v10 @@ -266,7 +287,7 @@ func (b *BaseOptions) DeserializeSimple(s interface{}) (err error) { return nil } -// Validate TODO +// Validate validate payload func (b *BaseOptions) Validate() (err error) { if len(b.Payload) == 0 { return fmt.Errorf("payload need input") @@ -274,7 +295,7 @@ func (b *BaseOptions) Validate() (err error) { return nil } -// OutputCtx TODO +// OutputCtx output ctx // // @receiver b func (b *BaseOptions) OutputCtx(ctx string) { @@ -326,7 +347,7 @@ func SetLogger(cmd *cobra.Command, opt *BaseOptions) { defer logger.Sync() } -// ValidateSubCommand TODO +// ValidateSubCommand validate sub command func ValidateSubCommand() func(cmd *cobra.Command, args []string) error { return func(cmd *cobra.Command, args []string) error { if len(args) <= 0 { diff --git a/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/install_mysql.go b/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/install_mysql.go index 965377c9c8..33e4c9ccfe 100644 --- a/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/install_mysql.go +++ b/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/install_mysql.go @@ -40,6 +40,7 @@ import ( type InstallMySQLComp struct { GeneralParam *components.GeneralParam `json:"general"` Params *InstallMySQLParams `json:"extend"` + MySQLConfigParams *MySQLConfigParams installMySQLConfig `json:"-"` RollBackContext rollback.RollBackObjects `json:"-"` TimeZone string @@ -52,11 +53,16 @@ type InstallMySQLComp struct { AvoidReset bool `json:"-"` // 迁移单据复用了这个 actor, 需要不做reset } +// MySQLConfigParams TODO +type MySQLConfigParams struct { + MyCnfConfigs json.RawMessage `json:"mycnf_configs" validate:"required" ` +} + // InstallMySQLParams TODO type InstallMySQLParams struct { components.Medium // map[port]my.cnf - MyCnfConfigs json.RawMessage `json:"mycnf_configs" validate:"required" ` + MyCnfConfigs json.RawMessage // MySQLVerion 只需5.6 5.7 这样的大版本号 MysqlVersion string `json:"mysql_version" validate:"required"` // 字符集参数 @@ -72,14 +78,14 @@ type InstallMySQLParams struct { AllowDiskFileSystemTypes []string } -// InitDirs TODO +// InitDirs init dirs type InitDirs = []string -// Port TODO +// Port port type Port = int type socket = string -// SpiderAutoIncrModeValue TODO +// SpiderAutoIncrModeValue spider au type SpiderAutoIncrModeValue int type installMySQLConfig struct { @@ -131,15 +137,6 @@ func (i *InstallMySQLComp) Example() interface{} { CharSet: "utf8", Ports: []int{20000, 20001}, InstMem: 0, - MyCnfConfigs: []byte(`{ - "20000":{ - "client":{"port": "{{mysqld.port}}" }, - "mysql":{"socket": "{{mysqld.datadir}}/mysql.sock" }, - "mysqld":{"binlog_format": "ROW","innodb_io_capacity": "1000","innodb_read_io_threads": "8"}}, - "20001":{ - "client":{"port": "{{mysqld.port}}"}, - "mysql":{"socket": "{{mysqld.datadir}}/mysql.sock"}, - "mysqld":{"binlog_format": "ROW","innodb_io_capacity": "2000","innodb_read_io_threads": "10"}}}`), SuperAccount: AdditionalAccount{ User: "user", Pwd: "xxx", @@ -161,6 +158,7 @@ func (i *InstallMySQLComp) InitDefaultParam() (err error) { i.WorkPassword = "" i.AvoidReset = false + i.Params.MyCnfConfigs = i.MySQLConfigParams.MyCnfConfigs var mountpoint string i.InstallDir = cst.UsrLocal i.MysqlInstallDir = cst.MysqldInstallPath diff --git a/dbm-ui/backend/flow/plugins/components/collections/mysql/exec_actuator_script.py b/dbm-ui/backend/flow/plugins/components/collections/mysql/exec_actuator_script.py index 7be43b6e01..da5a0e0f89 100644 --- a/dbm-ui/backend/flow/plugins/components/collections/mysql/exec_actuator_script.py +++ b/dbm-ui/backend/flow/plugins/components/collections/mysql/exec_actuator_script.py @@ -101,13 +101,18 @@ def _execute(self, data, parent_data) -> bool: db_act_template["node_id"] = node_id db_act_template["version_id"] = self._runtime_attrs.get("version") db_act_template["uid"] = global_data["uid"] - - # 拼接mysql系统账号固定参数 if "general" in db_act_template["payload"]: db_act_template["payload"]["general"].update( {"runtime_extend": {"mysql_sys_users": get_mysql_sys_users(kwargs["bk_cloud_id"])}} ) + # mycnf_configs 参数很多，放到非敏感参数去处理 + if "mycnf_configs" in db_act_template["payload"]["extend"]: + db_act_template["non_sensitive_payload"] = base64_encode( + json.dumps({"mycnf_configs": db_act_template["payload"]["extend"].get("mycnf_configs", "")}) + ) + del db_act_template["payload"]["extend"]["mycnf_configs"] + # payload参数转换base64格式 db_act_template["payload"] = base64_encode(json.dumps(db_act_template["payload"])) diff --git a/dbm-ui/backend/flow/utils/script_template.py b/dbm-ui/backend/flow/utils/script_template.py index fddb46e96a..563e3e8921 100644 --- a/dbm-ui/backend/flow/utils/script_template.py +++ b/dbm-ui/backend/flow/utils/script_template.py @@ -36,7 +36,7 @@ cd /data/install/dbactuator-{{uid}} chmod +x dbactuator -./dbactuator {{db_type}} {{action}} --uid {{uid}} --root_id {{root_id}} --node_id {{node_id}} --version_id {{version_id}} --payload $1 +./dbactuator {{db_type}} {{action}} --uid {{uid}} --root_id {{root_id}} --node_id {{node_id}} --version_id {{version_id}} -c {{non_sensitive_payload}} --payload $1 """ # noqa # 运行dba_toolkit的命令 From 78afad70513a9c8c1e1524b7cf161a9204643b81 Mon Sep 17 00:00:00 2001 From: ymakedaq <996156275@qq.com> Date: Tue, 2 Apr 2024 14:41:27 +0800 Subject: [PATCH 06/30] =?UTF-8?q?fix(backend):=20=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E5=92=8CSQL=E5=8F=98=E6=9B=B4=E9=9C=80=E8=A6=81=E5=8A=A0?= =?UTF-8?q?=E5=A4=A7Job=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=20close=20#380?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-ui/backend/configuration/constants.py | 2 +- .../flow/engine/bamboo/scene/mysql/import_sqlfile_flow.py | 2 ++ .../backend/flow/engine/bamboo/scene/mysql/mysql_checksum.py | 3 ++- .../flow/engine/bamboo/scene/mysql/mysql_flashback_flow.py | 3 ++- .../engine/bamboo/scene/mysql/mysql_ha_full_backup_flow.py | 3 ++- .../backend/flow/engine/bamboo/scene/mysql/mysql_partition.py | 3 ++- .../flow/engine/bamboo/scene/spider/import_sqlfile_flow.py | 2 ++ .../engine/bamboo/scene/spider/spider_cluster_flashback.py | 3 ++- .../engine/bamboo/scene/spider/spider_cluster_full_backup.py | 4 +++- .../flow/engine/bamboo/scene/spider/spider_partition.py | 3 ++- 10 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dbm-ui/backend/configuration/constants.py b/dbm-ui/backend/configuration/constants.py index 72c05b15f8..cef5f9586f 100644 --- a/dbm-ui/backend/configuration/constants.py +++ b/dbm-ui/backend/configuration/constants.py @@ -17,7 +17,7 @@ DBM_PASSWORD_SECURITY_NAME = "password" DBM_MYSQL_ADMIN_USER = "ADMIN" # TODO: job超时时间最大为86400，后续考虑让job平台调大限制 -MYSQL_DATA_RESTORE_TIME = 86400 +MYSQL_DATA_RESTORE_TIME = 259200 MYSQL_USUAL_JOB_TIME = 7200 diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/import_sqlfile_flow.py b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/import_sqlfile_flow.py index bd2fd1f797..4f5537121c 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/import_sqlfile_flow.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/import_sqlfile_flow.py @@ -24,6 +24,7 @@ from backend.db_meta.enums.instance_role import InstanceRole from backend.db_meta.models import Cluster, StorageInstance from backend.db_services.mysql.sql_import.constants import BKREPO_SQLFILE_PATH +from backend.flow.consts import LONG_JOB_TIMEOUT from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList from backend.flow.plugins.components.collections.common.create_ticket import CreateTicketComponent @@ -112,6 +113,7 @@ def import_sqlfile_flow(self): act_component_code=ExecuteDBActuatorScriptComponent.code, kwargs=asdict( ExecActuatorKwargs( + job_timeout=LONG_JOB_TIMEOUT, exec_ip=cluster["backend_ip"], bk_cloud_id=cluster["bk_cloud_id"], cluster=cluster, diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_checksum.py b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_checksum.py index 131bb98819..ab4b5df116 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_checksum.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_checksum.py @@ -20,7 +20,7 @@ from backend.configuration.constants import DBType from backend.constants import IP_PORT_DIVIDER from backend.db_meta.models import Cluster -from backend.flow.consts import ACCOUNT_PREFIX, DBA_SYSTEM_USER +from backend.flow.consts import ACCOUNT_PREFIX, DBA_SYSTEM_USER, LONG_JOB_TIMEOUT from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList from backend.flow.plugins.components.collections.common.sleep_time_service import SleepTimerComponent @@ -169,6 +169,7 @@ def mysql_checksum_flow(self): act_component_code=ExecuteDBActuatorScriptComponent.code, kwargs=asdict( ExecActuatorKwargs( + job_timeout=LONG_JOB_TIMEOUT, exec_ip=info["master"]["ip"], bk_cloud_id=bk_cloud_id, run_as_system_user=DBA_SYSTEM_USER, diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_flashback_flow.py b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_flashback_flow.py index 314bdd3d12..6b7f0e6497 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_flashback_flow.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_flashback_flow.py @@ -18,7 +18,7 @@ from backend.configuration.constants import DBType from backend.db_meta.enums import InstanceInnerRole from backend.db_meta.models import Cluster -from backend.flow.consts import TruncateDataTypeEnum +from backend.flow.consts import LONG_JOB_TIMEOUT, TruncateDataTypeEnum from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList from backend.flow.plugins.components.collections.mysql.exec_actuator_script import ExecuteDBActuatorScriptComponent @@ -111,6 +111,7 @@ def mysql_flashback_flow(self): act_component_code=ExecuteDBActuatorScriptComponent.code, kwargs=asdict( ExecActuatorKwargs( + job_timeout=LONG_JOB_TIMEOUT, exec_ip=master.machine.ip, bk_cloud_id=cluster_class.bk_cloud_id, cluster=cluster, diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_ha_full_backup_flow.py b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_ha_full_backup_flow.py index d997f4f7c1..24df2cd91b 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_ha_full_backup_flow.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_ha_full_backup_flow.py @@ -20,7 +20,7 @@ from backend.db_meta.enums import ClusterType, InstanceInnerRole from backend.db_meta.exceptions import ClusterNotExistException, DBMetaBaseException from backend.db_meta.models import Cluster -from backend.flow.consts import DBA_SYSTEM_USER +from backend.flow.consts import DBA_SYSTEM_USER, LONG_JOB_TIMEOUT from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList from backend.flow.engine.exceptions import MySQLBackupLocalException @@ -129,6 +129,7 @@ def full_backup_flow(self): act_component_code=ExecuteDBActuatorScriptComponent.code, kwargs=asdict( ExecActuatorKwargs( + job_timeout=LONG_JOB_TIMEOUT, bk_cloud_id=cluster_obj.bk_cloud_id, run_as_system_user=DBA_SYSTEM_USER, exec_ip=backend_obj.machine.ip, diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_partition.py b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_partition.py index aa9c6e7106..0ee7d84fcd 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_partition.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_partition.py @@ -12,7 +12,7 @@ from backend.db_meta.enums import InstanceRole from backend.db_meta.exceptions import ClusterNotExistException, MasterInstanceNotExistException from backend.db_meta.models import Cluster, StorageInstance -from backend.flow.consts import DBA_ROOT_USER +from backend.flow.consts import DBA_ROOT_USER, LONG_JOB_TIMEOUT from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList from backend.flow.plugins.components.collections.mysql.exec_actuator_script import ExecuteDBActuatorScriptComponent @@ -137,6 +137,7 @@ def mysql_partition_flow(self): act_component_code=ExecuteDBActuatorScriptComponent.code, kwargs=asdict( ExecActuatorKwargs( + job_timeout=LONG_JOB_TIMEOUT, exec_ip=ip, bk_cloud_id=bk_cloud_id, run_as_system_user=DBA_ROOT_USER, diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/spider/import_sqlfile_flow.py b/dbm-ui/backend/flow/engine/bamboo/scene/spider/import_sqlfile_flow.py index f917bebd5c..81f040bd84 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/spider/import_sqlfile_flow.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/spider/import_sqlfile_flow.py @@ -23,6 +23,7 @@ from backend.db_meta.enums.machine_type import MachineType from backend.db_meta.models import Cluster, ProxyInstance, StorageInstance from backend.db_services.mysql.sql_import.constants import BKREPO_SQLFILE_PATH +from backend.flow.consts import LONG_JOB_TIMEOUT from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList from backend.flow.plugins.components.collections.common.create_ticket import CreateTicketComponent @@ -115,6 +116,7 @@ def import_sqlfile_flow(self): act_component_code=ExecuteDBActuatorScriptComponent.code, kwargs=asdict( ExecActuatorKwargs( + job_timeout=LONG_JOB_TIMEOUT, exec_ip=ctl_ip, bk_cloud_id=bk_cloud_id, cluster=cluster, diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_cluster_flashback.py b/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_cluster_flashback.py index d0ba223480..f4e7ccbd6f 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_cluster_flashback.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_cluster_flashback.py @@ -22,7 +22,7 @@ from backend.db_meta.enums import InstanceInnerRole, TenDBClusterSpiderRole from backend.db_meta.exceptions import ClusterNotExistException from backend.db_meta.models import Cluster, StorageInstanceTuple -from backend.flow.consts import TruncateDataTypeEnum +from backend.flow.consts import LONG_JOB_TIMEOUT, TruncateDataTypeEnum from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList from backend.flow.plugins.components.collections.mysql.exec_actuator_script import ExecuteDBActuatorScriptComponent @@ -174,6 +174,7 @@ def flashback(self): "act_component_code": ExecuteDBActuatorScriptComponent.code, "kwargs": asdict( ExecActuatorKwargs( + job_timeout=LONG_JOB_TIMEOUT, exec_ip=ip, bk_cloud_id=cluster_obj.bk_cloud_id, cluster=port_job, diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_cluster_full_backup.py b/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_cluster_full_backup.py index 0aae7716fd..2f14aa7240 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_cluster_full_backup.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_cluster_full_backup.py @@ -23,7 +23,7 @@ from backend.db_meta.enums import ClusterType, InstanceInnerRole, TenDBClusterSpiderRole from backend.db_meta.exceptions import ClusterNotExistException from backend.db_meta.models import Cluster, StorageInstanceTuple -from backend.flow.consts import DBA_SYSTEM_USER +from backend.flow.consts import DBA_SYSTEM_USER, LONG_JOB_TIMEOUT from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder, SubProcess from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList from backend.flow.engine.exceptions import IncompatibleBackupTypeAndLocal, MySQLBackupLocalException @@ -228,6 +228,7 @@ def __backup_on_remote( act_component_code=ExecuteDBActuatorScriptComponent.code, kwargs=asdict( ExecActuatorKwargs( + job_timeout=LONG_JOB_TIMEOUT, bk_cloud_id=bk_cloud_id, run_as_system_user=DBA_SYSTEM_USER, exec_ip=ip, @@ -314,6 +315,7 @@ def backup_on_spider_mnt(self, backup_id: uuid.UUID, cluster_obj: Cluster, spide act_component_code=ExecuteDBActuatorScriptComponent.code, kwargs=asdict( ExecActuatorKwargs( + job_timeout=LONG_JOB_TIMEOUT, bk_cloud_id=cluster_obj.bk_cloud_id, run_as_system_user=DBA_SYSTEM_USER, exec_ip=spider_mnt_ip, diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_partition.py b/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_partition.py index 7964b7845e..a1bf407e90 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_partition.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_partition.py @@ -9,7 +9,7 @@ from backend.configuration.constants import DBType from backend.core.consts import BK_PKG_INSTALL_PATH -from backend.flow.consts import DBA_ROOT_USER +from backend.flow.consts import DBA_ROOT_USER, LONG_JOB_TIMEOUT from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList from backend.flow.plugins.components.collections.mysql.exec_actuator_script import ExecuteDBActuatorScriptComponent @@ -151,6 +151,7 @@ def spider_partition_flow(self): run_as_system_user=DBA_ROOT_USER, get_mysql_payload_func=MysqlActPayload.get_partition_payload.__name__, cluster=cluster, + job_timeout=LONG_JOB_TIMEOUT, ) ) actuator_exec_list.append(exec_info) From 96abd2f25247d75e51732a0d089051f14c677b55 Mon Sep 17 00:00:00 2001 From: xfwduke Date: Mon, 1 Apr 2024 13:56:25 +0800 Subject: [PATCH 07/30] =?UTF-8?q?fix(mysql):=20=E5=BF=BD=E7=95=A5mysql?= =?UTF-8?q?=E6=97=A5=E5=BF=97=20binlog=20stat=E9=94=99=E8=AF=AF=20#3793?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql-monitor/pkg/itemscollect/mysqlerrlog/mysql_critical.go | 1 + 1 file changed, 1 insertion(+) diff --git a/dbm-services/mysql/db-tools/mysql-monitor/pkg/itemscollect/mysqlerrlog/mysql_critical.go b/dbm-services/mysql/db-tools/mysql-monitor/pkg/itemscollect/mysqlerrlog/mysql_critical.go index 27a9c4a064..ccddfef995 100644 --- a/dbm-services/mysql/db-tools/mysql-monitor/pkg/itemscollect/mysqlerrlog/mysql_critical.go +++ b/dbm-services/mysql/db-tools/mysql-monitor/pkg/itemscollect/mysqlerrlog/mysql_critical.go @@ -27,6 +27,7 @@ func init() { "restarting transaction", "slave SQL thread was killed", `\[Warning\]`, + "Failed to execute mysql_file_stat on file", }, "|", ), From ab6a22ca287b239b16435027560d77acc62be45f Mon Sep 17 00:00:00 2001 From: fanfanyangyang Date: Mon, 1 Apr 2024 19:11:47 +0800 Subject: [PATCH 08/30] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Edbpriv=5Faccoun?= =?UTF-8?q?t=5Flist=5Ffor=5Fiam=E7=9A=84=E5=8A=9F=E8=83=BD=20#3798?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql/db-partition/monitor/monitor.go | 2 +- dbm-services/mysql/db-priv/handler/account.go | 21 +++--- .../mysql/db-priv/handler/register_routes.go | 8 +-- dbm-services/mysql/db-priv/service/account.go | 65 +++++++++++++++---- .../mysql/db-priv/service/account_object.go | 13 ++++ .../service/migrate_account_rule_base_func.go | 4 +- 6 files changed, 86 insertions(+), 27 deletions(-) diff --git a/dbm-services/mysql/db-partition/monitor/monitor.go b/dbm-services/mysql/db-partition/monitor/monitor.go index 115190aec7..20c0d9c8ff 100644 --- a/dbm-services/mysql/db-partition/monitor/monitor.go +++ b/dbm-services/mysql/db-partition/monitor/monitor.go @@ -95,7 +95,7 @@ func TestSendEvent(dataId int, token string, serviceHost string) error { "content": "test partition monitor", }, commonData: commonData{ - Target: "127.0.0.1", + Target: "0.0.0.0", Timestamp: time.Now().In(l).UnixMilli(), Dimension: dimension, Metrics: nil, diff --git a/dbm-services/mysql/db-priv/handler/account.go b/dbm-services/mysql/db-priv/handler/account.go index 73ae1f4edc..b263216d69 100644 --- a/dbm-services/mysql/db-priv/handler/account.go +++ b/dbm-services/mysql/db-priv/handler/account.go @@ -92,10 +92,10 @@ func (m *PrivService) ModifyAccount(c *gin.Context) { return } -// GetAccount 获取账号 -func (m *PrivService) GetAccount(c *gin.Context) { - slog.Info("do GetAccount!") - var input service.AccountPara +// GetAccountList 获取账号列表 +func (m *PrivService) GetAccountList(c *gin.Context) { + slog.Info("do GetAccountList!") + var input service.GetAccountListPara body, err := ioutil.ReadAll(c.Request.Body) if err != nil { @@ -103,22 +103,25 @@ func (m *PrivService) GetAccount(c *gin.Context) { SendResponse(c, errno.ErrBind, err) return } - if err = json.Unmarshal(body, &input); err != nil { slog.Error("msg", err) SendResponse(c, errno.ErrBind, err) return } - accounts, count, err := input.GetAccount() + accounts, count, err := input.GetAccountList() + type ListResponse struct { + Count int64 `json:"count"` + Results interface{} `json:"results"` + } SendResponse(c, err, ListResponse{ - Count: count, - Items: accounts, + Count: count, + Results: accounts, }) return } -// GetAccount 获取账号 +// GetAccountIncludePsw 获取账号密码 func (m *PrivService) GetAccountIncludePsw(c *gin.Context) { slog.Info("do GetAccount!") var input service.GetAccountIncludePswPara diff --git a/dbm-services/mysql/db-priv/handler/register_routes.go b/dbm-services/mysql/db-priv/handler/register_routes.go index e6b0a81d26..1595600ef6 100644 --- a/dbm-services/mysql/db-priv/handler/register_routes.go +++ b/dbm-services/mysql/db-priv/handler/register_routes.go @@ -22,9 +22,12 @@ func (m *PrivService) Routes() []*gin.RouteInfo { return []*gin.RouteInfo{ // 账号 {Method: http.MethodPost, Path: "add_account", HandlerFunc: m.AddAccount}, - {Method: http.MethodPost, Path: "get_account", HandlerFunc: m.GetAccount}, {Method: http.MethodPost, Path: "modify_account", HandlerFunc: m.ModifyAccount}, {Method: http.MethodPost, Path: "delete_account", HandlerFunc: m.DeleteAccount}, + // 查询帐号清单 + {Method: http.MethodPost, Path: "get_account", HandlerFunc: m.GetAccountList}, + // 查询帐号，并且包含密码，为mongodb等非mysql数据库类型使用 + {Method: http.MethodPost, Path: "get_account_include_psw", HandlerFunc: m.GetAccountIncludePsw}, // 账号规则 {Method: http.MethodPost, Path: "get_account_rule_list", HandlerFunc: m.GetAccountRuleList}, @@ -73,9 +76,6 @@ func (m *PrivService) Routes() []*gin.RouteInfo { // 检查和迁移账号规则 {Method: http.MethodPost, Path: "migrate_account_rule", HandlerFunc: m.MigrateAccountRule}, - - // 查询帐号，并且包含密码，为mongodb等非mysql数据库类型使用 - {Method: http.MethodPost, Path: "get_account_include_psw", HandlerFunc: m.GetAccountIncludePsw}, } } diff --git a/dbm-services/mysql/db-priv/service/account.go b/dbm-services/mysql/db-priv/service/account.go index 7b792af512..d54c8689b7 100644 --- a/dbm-services/mysql/db-priv/service/account.go +++ b/dbm-services/mysql/db-priv/service/account.go @@ -4,6 +4,7 @@ import ( "encoding/hex" "fmt" "log/slog" + "strconv" "strings" "time" @@ -169,22 +170,61 @@ func (m *AccountPara) DeleteAccount(jsonPara string) error { return nil } -// GetAccount 获取账号 -func (m *AccountPara) GetAccount() ([]*TbAccounts, int64, error) { +// GetAccountList 获取账号列表 +func (m *GetAccountListPara) GetAccountList() ([]*TbAccounts, int64, error) { + // Cnt 用于返回匹配到的行数 + type Cnt struct { + Count int64 `gorm:"column:cnt"` + } var ( accounts []*TbAccounts - result *gorm.DB ) - if m.BkBizId == 0 { - return nil, 0, errno.BkBizIdIsEmpty + where := " 1=1 " + if m.BkBizId > 0 { + where = fmt.Sprintf("%s and bk_biz_id=%d", where, m.BkBizId) } - result = DB.Self.Model(&TbAccounts{}).Where(&TbAccounts{ - BkBizId: m.BkBizId, ClusterType: *m.ClusterType, User: m.User}).Select( - "id,bk_biz_id,user,cluster_type,creator,create_time,update_time").Scan(&accounts) - if result.Error != nil { - return nil, 0, result.Error + if m.ClusterType != nil { + where = fmt.Sprintf("%s and cluster_type='%s'", where, *m.ClusterType) } - return accounts, int64(len(accounts)), nil + if m.UserLike != "" { + where = fmt.Sprintf("%s and user like '%%%s%%'", where, m.UserLike) + } + if m.User != "" { + where = fmt.Sprintf("%s and user = '%s'", where, m.User) + } + if m.Id != nil { + m.Ids = append(m.Ids, *m.Id) + } + if len(m.Ids) != 0 { + var temp = make([]string, len(m.Ids)) + for k, id := range m.Ids { + temp[k] = strconv.FormatInt(id, 10) + } + ids := " and id in (" + strings.Join(temp, ",") + ") " + where = where + ids + } + cnt := Cnt{} + vsql := fmt.Sprintf("select count(*) as cnt from tb_accounts where %s", where) + err := DB.Self.Raw(vsql).Scan(&cnt).Error + if err != nil { + slog.Error(vsql, "execute error", err) + return nil, 0, err + } + if cnt.Count == 0 { + return nil, 0, nil + } + if m.Limit == nil { + vsql = fmt.Sprintf("select id, user, creator, bk_biz_id from tb_accounts where %s", where) + } else { + limitCondition := fmt.Sprintf("limit %d offset %d", *m.Limit, *m.Offset) + vsql = fmt.Sprintf("select id, user, creator, bk_biz_id from tb_accounts where %s %s", where, limitCondition) + } + err = DB.Self.Raw(vsql).Scan(&accounts).Error + if err != nil { + slog.Error(vsql, "execute error", err) + return nil, 0, err + } + return accounts, cnt.Count, nil } // GetAccountIncludePsw 获取帐号以及密码 @@ -199,6 +239,9 @@ func (m *GetAccountIncludePswPara) GetAccountIncludePsw() ([]*TbAccounts, int64, if len(m.Users) == 0 { return nil, 0, errno.ErrUserIsEmpty } + if m.ClusterType == nil { + return nil, 0, errno.ClusterTypeIsEmpty + } // mongodb 需要查询psw users := "'" + strings.Join(m.Users, "','") + "'" where := fmt.Sprintf("bk_biz_id=%d and cluster_type='%s' and user in (%s)", m.BkBizId, *m.ClusterType, users) diff --git a/dbm-services/mysql/db-priv/service/account_object.go b/dbm-services/mysql/db-priv/service/account_object.go index a6b36ee73f..e7bde6ba3e 100644 --- a/dbm-services/mysql/db-priv/service/account_object.go +++ b/dbm-services/mysql/db-priv/service/account_object.go @@ -55,6 +55,19 @@ type GetAccountIncludePswPara struct { ClusterType *string `json:"cluster_type"` } +type GetAccountListPara struct { + BkBizId int64 `json:"bk_biz_id"` + Ids []int64 `json:"ids"` + Id *int64 `json:"id"` + ClusterType *string `json:"cluster_type"` + // user模糊查询 + UserLike string `json:"user_like"` + // user精确查询 + User string `json:"user"` + Limit *int64 `json:"limit"` + Offset *int64 `json:"offset"` +} + // PrivLog 记录权限相关接口的调用日志 type PrivLog struct { Id int64 `gorm:"column:id;primary_key;auto_increment" json:"id"` diff --git a/dbm-services/mysql/db-priv/service/migrate_account_rule_base_func.go b/dbm-services/mysql/db-priv/service/migrate_account_rule_base_func.go index 7b338765cb..98d3bbad1b 100644 --- a/dbm-services/mysql/db-priv/service/migrate_account_rule_base_func.go +++ b/dbm-services/mysql/db-priv/service/migrate_account_rule_base_func.go @@ -135,8 +135,8 @@ func DoAddAccounts(apps map[string]int64, users []PrivModule, clusterType string // DoAddAccountRule 创建帐号规则 func DoAddAccountRule(rule *PrivModule, apps map[string]int64, clusterType string, priv map[string]string) error { - account := AccountPara{BkBizId: apps[rule.App], User: rule.User, ClusterType: &clusterType} - items, cnt, err := account.GetAccount() + account := GetAccountListPara{BkBizId: apps[rule.App], User: rule.User, ClusterType: &clusterType} + items, cnt, err := account.GetAccountList() if err != nil { return fmt.Errorf("add rule failed when get account: %s", err.Error()) } From 14ccd70d6c8cf21656af83213726e9c045b0f557 Mon Sep 17 00:00:00 2001 From: Austin <1344583166@qq.com> Date: Mon, 1 Apr 2024 10:17:07 +0800 Subject: [PATCH 09/30] =?UTF-8?q?feat(frontend):=20=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=A1=AE=E8=AE=A4=E6=96=B0=E5=A2=9E=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E8=AF=A6=E6=83=85=E5=8F=8A=E5=8C=BA=E5=88=86=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=8D=95=E6=8D=AE=E5=8F=91=E8=B5=B7=E4=BA=BA=20#3784?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../capacity-change/pages/page1/Index.vue | 2 +- .../common/components/flow-content/Index.vue | 26 +++++++++++++++++++ .../details/components/flow/Index.vue | 1 + .../components/flow/components/Common.vue | 4 +++ .../components/flow/components/MySqlFlows.vue | 4 +++ .../components/flow/components/RedisFlows.vue | 4 +++ .../details/components/flow/Index.vue | 1 + .../components/flow/components/Approve.vue | 6 ++++- .../components/flow/components/RedisFlows.vue | 7 +++-- 9 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dbm-ui/frontend/src/views/redis/capacity-change/pages/page1/Index.vue b/dbm-ui/frontend/src/views/redis/capacity-change/pages/page1/Index.vue index b6c00ba99d..5b02a38602 100644 --- a/dbm-ui/frontend/src/views/redis/capacity-change/pages/page1/Index.vue +++ b/dbm-ui/frontend/src/views/redis/capacity-change/pages/page1/Index.vue @@ -223,7 +223,7 @@ }, }; InfoBox({ - title: t('确认提交 n 个集群容量变更任务？', { n: totalNum.value }), + title: t('确认提交n个集群容量变更任务', { n: totalNum.value }), width: 480, onConfirm: () => { isSubmitting.value = true; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/flow-content/Index.vue b/dbm-ui/frontend/src/views/tickets/common/components/flow-content/Index.vue index 08a70236e3..a45b688655 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/flow-content/Index.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/flow-content/Index.vue @@ -23,6 +23,12 @@ :data="item" :href-target="getHrefTarget(content)" /> + +