From dcdf3a128185920edbe38e3ad6b8cc5167bfea9f Mon Sep 17 00:00:00 2001 From: zhaoxiangchun <1422928955@qq.com> Date: Wed, 25 Nov 2020 20:03:25 +0800 Subject: [PATCH] fix(monitor): modify monitor serviceType in StartService() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修改monitor服务在service代码中注册的serviceType： alerter ===> monitor --- .../notify_templates/{alerter => monitor}/content@cn/DEFAULT | 0 .../{alerter => monitor}/content@cn/DEFAULT.email | 0 .../notify_templates/{alerter => monitor}/content@en/DEFAULT | 0 .../{alerter => monitor}/content@en/DEFAULT.email | 0 .../notify_templates/{alerter => monitor}/title@cn/DEFAULT | 0 .../{alerter => monitor}/title@cn/DEFAULT.email | 0 .../notify_templates/{alerter => monitor}/title@en/DEFAULT | 0 .../{alerter => monitor}/title@en/DEFAULT.email | 0 pkg/monitor/service/service.go | 2 +- 9 files changed, 1 insertion(+), 1 deletion(-) rename build/monitor/root/opt/yunion/share/notify_templates/{alerter => monitor}/content@cn/DEFAULT (100%) rename build/monitor/root/opt/yunion/share/notify_templates/{alerter => monitor}/content@cn/DEFAULT.email (100%) rename build/monitor/root/opt/yunion/share/notify_templates/{alerter => monitor}/content@en/DEFAULT (100%) rename build/monitor/root/opt/yunion/share/notify_templates/{alerter => monitor}/content@en/DEFAULT.email (100%) rename build/monitor/root/opt/yunion/share/notify_templates/{alerter => monitor}/title@cn/DEFAULT (100%) rename build/monitor/root/opt/yunion/share/notify_templates/{alerter => monitor}/title@cn/DEFAULT.email (100%) rename build/monitor/root/opt/yunion/share/notify_templates/{alerter => monitor}/title@en/DEFAULT (100%) rename build/monitor/root/opt/yunion/share/notify_templates/{alerter => monitor}/title@en/DEFAULT.email (100%) diff --git a/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT b/build/monitor/root/opt/yunion/share/notify_templates/monitor/content@cn/DEFAULT similarity index 100% rename from build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT rename to build/monitor/root/opt/yunion/share/notify_templates/monitor/content@cn/DEFAULT diff --git a/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT.email b/build/monitor/root/opt/yunion/share/notify_templates/monitor/content@cn/DEFAULT.email similarity index 100% rename from build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT.email rename to build/monitor/root/opt/yunion/share/notify_templates/monitor/content@cn/DEFAULT.email diff --git a/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT b/build/monitor/root/opt/yunion/share/notify_templates/monitor/content@en/DEFAULT similarity index 100% rename from build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT rename to build/monitor/root/opt/yunion/share/notify_templates/monitor/content@en/DEFAULT diff --git a/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT.email b/build/monitor/root/opt/yunion/share/notify_templates/monitor/content@en/DEFAULT.email similarity index 100% rename from build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT.email rename to build/monitor/root/opt/yunion/share/notify_templates/monitor/content@en/DEFAULT.email diff --git a/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@cn/DEFAULT b/build/monitor/root/opt/yunion/share/notify_templates/monitor/title@cn/DEFAULT similarity index 100% rename from build/monitor/root/opt/yunion/share/notify_templates/alerter/title@cn/DEFAULT rename to build/monitor/root/opt/yunion/share/notify_templates/monitor/title@cn/DEFAULT diff --git a/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@cn/DEFAULT.email b/build/monitor/root/opt/yunion/share/notify_templates/monitor/title@cn/DEFAULT.email similarity index 100% rename from build/monitor/root/opt/yunion/share/notify_templates/alerter/title@cn/DEFAULT.email rename to build/monitor/root/opt/yunion/share/notify_templates/monitor/title@cn/DEFAULT.email diff --git a/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@en/DEFAULT b/build/monitor/root/opt/yunion/share/notify_templates/monitor/title@en/DEFAULT similarity index 100% rename from build/monitor/root/opt/yunion/share/notify_templates/alerter/title@en/DEFAULT rename to build/monitor/root/opt/yunion/share/notify_templates/monitor/title@en/DEFAULT diff --git a/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@en/DEFAULT.email b/build/monitor/root/opt/yunion/share/notify_templates/monitor/title@en/DEFAULT.email similarity index 100% rename from build/monitor/root/opt/yunion/share/notify_templates/alerter/title@en/DEFAULT.email rename to build/monitor/root/opt/yunion/share/notify_templates/monitor/title@en/DEFAULT.email diff --git a/pkg/monitor/service/service.go b/pkg/monitor/service/service.go index f1602eccc3..31025811fd 100644 --- a/pkg/monitor/service/service.go +++ b/pkg/monitor/service/service.go @@ -45,7 +45,7 @@ import ( func StartService() { opts := &options.Options - common_options.ParseOptions(opts, os.Args, "alerter.conf", "alerter") + common_options.ParseOptions(opts, os.Args, "monitor.conf", "monitor") commonOpts := &opts.CommonOptions common_app.InitAuth(commonOpts, func() {