customize alert add dingtalk_work_notice and delete vms (erda-project…

…#3177) (erda-project#3197) * customize alert add dingtalk_work_notice and delete vms * Optimize logical judgment * Optimize logical judgment * Optimize logical judgment * Optimize logical judgment * Optimize logical judgment * Optimize logical judgment Co-authored-by: panjiayao <44628544+Counterflowwind@users.noreply.github.com>
erda-bot · Nov 26, 2021 · 279633a · 279633a
1 parent 5c77588
commit 279633a
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 21 deletions.
diff --git a/cmd/monitor/monitor/main.go b/cmd/monitor/monitor/main.go
@@ -21,6 +21,7 @@ import (
 	"github.com/erda-project/erda/pkg/common"
 
 	// modules
+	_ "github.com/erda-project/erda-proto-go/core/services/notify/channel/client"
 	_ "github.com/erda-project/erda/modules/core/monitor/alert/alert-apis"
 	_ "github.com/erda-project/erda/modules/core/monitor/alert/details-apis"
 	_ "github.com/erda-project/erda/modules/core/monitor/dataview"

diff --git a/conf/monitor/monitor/i18n/alert.yml b/conf/monitor/monitor/i18n/alert.yml
@@ -175,7 +175,7 @@ zh:
     alert: 告警
     recover: 恢复
     # notify_target
-    dingding: 钉钉
+    dingding: 钉钉群
     email: 邮箱
     vms: 电话
     sms: 短信

diff --git a/conf/monitor/monitor/monitor.yaml b/conf/monitor/monitor/monitor.yaml
@@ -321,3 +321,7 @@ monitor-monitoring:
   usage_sync_interval:
     metric: ${MONITOR_MONITORING_METRIC_SYNC_INTERVAL:1h}
     log: ${MONITOR_MONITORING_LOG_SYNC_INTERVAL:30m}
+
+grpc-client@erda.core.services.notify.channel:
+  addr: "${CORE_SERVICES_GRPC_ADDR:core-services:9537}"
+erda.core.services.notify.channel-client:
diff --git a/modules/core-services/services/notify/channel/notify.chanel.service.go b/modules/core-services/services/notify/channel/notify.chanel.service.go
@@ -445,6 +445,10 @@ func (s *notifyChannelService) GetNotifyChannelsEnabled(ctx context.Context, req
 	if err != nil {
 		return nil, err
 	}
+	targetList := []string{"dingding", "webhook", "email", "mbox", "ticket"}
+	for _, v := range targetList {
+		result.Data[v] = true
+	}
 	return result, nil
 }
 

diff --git a/modules/core/monitor/alert/alert-apis/adapt/expression.go b/modules/core/monitor/alert/alert-apis/adapt/expression.go
@@ -77,6 +77,12 @@ const (
 	HostIP        = "host_ip"
 )
 
+const (
+	SMS                = "sms"
+	shortMessage       = "short_message"
+	dingtalkWorkNotice = "dingtalk_work_notice"
+)
+
 type (
 	// DisplayKey .
 	DisplayKey struct {
@@ -195,18 +201,11 @@ func (a *Adapt) AggregatorKeysSet() map[string]bool {
 }
 
 // NotifyTargetsKeys .
-func (a *Adapt) NotifyTargetsKeys(code i18n.LanguageCodes, orgId string) []*pb.DisplayKey {
+func (a *Adapt) NotifyTargetsKeys(code i18n.LanguageCodes, config map[string]bool) []*pb.DisplayKey {
 	var keys []*pb.DisplayKey
-	for _, item := range notifyTargets {
-
-		if item == "vms" || item == "sms" {
-			config, err := a.bdl.GetNotifyConfig(orgId, "")
-			if err != nil {
-				continue
-			}
-			if !config.Config.EnableMS {
-				continue
-			}
+	for item := range config {
+		if item == shortMessage {
+			keys = append(keys, &pb.DisplayKey{Key: SMS, Display: a.t.Text(code, SMS)})
 		}
 		keys = append(keys, &pb.DisplayKey{Key: item, Display: a.t.Text(code, item)})
 	}

diff --git a/modules/core/monitor/alert/alert-apis/alert.service.go b/modules/core/monitor/alert/alert-apis/alert.service.go
@@ -28,6 +28,7 @@ import (
 
 	"github.com/erda-project/erda-proto-go/core/monitor/alert/pb"
 	metricpb "github.com/erda-project/erda-proto-go/core/monitor/metric/pb"
+	channelpb "github.com/erda-project/erda-proto-go/core/services/notify/channel/pb"
 	"github.com/erda-project/erda/apistructs"
 	"github.com/erda-project/erda/modules/core/monitor/alert/alert-apis/adapt"
 	"github.com/erda-project/erda/modules/monitor/utils"
@@ -183,7 +184,12 @@ func (m *alertService) QueryCustomizeNotifyTarget(ctx context.Context, request *
 		Data: &pb.QueryCustomizeNotifyTargetData{},
 	}
 	lang := apis.Language(ctx)
-	data := m.p.a.NotifyTargetsKeys(lang, apis.GetOrgID(ctx))
+	context := utils.NewContextWithHeader(ctx)
+	config, err := m.p.NotifyChannel.GetNotifyChannelsEnabled(context, &channelpb.GetNotifyChannelsEnabledRequest{})
+	if err != nil {
+		return nil, errors.NewInternalServerError(err)
+	}
+	data := m.p.a.NotifyTargetsKeys(lang, config.Data)
 	result.Data.Targets = data
 	return result, nil
 }
@@ -193,8 +199,12 @@ func (m *alertService) QueryOrgCustomizeNotifyTarget(ctx context.Context, reques
 		Data: &pb.QueryCustomizeNotifyTargetData{},
 	}
 	lang := apis.Language(ctx)
-	orgID := apis.GetOrgID(ctx)
-	data := m.p.a.NotifyTargetsKeys(lang, orgID)
+	context := utils.NewContextWithHeader(ctx)
+	config, err := m.p.NotifyChannel.GetNotifyChannelsEnabled(context, &channelpb.GetNotifyChannelsEnabledRequest{})
+	if err != nil {
+		return nil, errors.NewInternalServerError(err)
+	}
+	data := m.p.a.NotifyTargetsKeys(lang, config.Data)
 	result.Data.Targets = data
 	return result, nil
 }

diff --git a/modules/core/monitor/alert/alert-apis/interfaces.go b/modules/core/monitor/alert/alert-apis/interfaces.go
@@ -133,8 +133,8 @@ func (p *provider) CustomizeMetrics(lang i18n.LanguageCodes, scope, scopeID stri
 	return p.a.CustomizeMetrics(lang, scope, scopeID, names)
 }
 
-func (p *provider) NotifyTargetsKeys(lang i18n.LanguageCodes, orgId string) []*pb.DisplayKey {
-	return p.a.NotifyTargetsKeys(lang, orgId)
+func (p *provider) NotifyTargetsKeys(lang i18n.LanguageCodes, config map[string]bool) []*pb.DisplayKey {
+	return p.a.NotifyTargetsKeys(lang, config)
 }
 
 func (p *provider) CustomizeAlerts(lang i18n.LanguageCodes, scope, scopeID string, pageNo, pageSize int) ([]*pb.CustomizeAlertOverview, int, error) {

diff --git a/modules/core/monitor/alert/alert-apis/provider.go b/modules/core/monitor/alert/alert-apis/provider.go
@@ -30,6 +30,7 @@ import (
 	"github.com/erda-project/erda-infra/providers/mysql"
 	"github.com/erda-project/erda-proto-go/core/monitor/alert/pb"
 	metricpb "github.com/erda-project/erda-proto-go/core/monitor/metric/pb"
+	channelpb "github.com/erda-project/erda-proto-go/core/services/notify/channel/pb"
 	"github.com/erda-project/erda/bundle"
 	"github.com/erda-project/erda/modules/core/monitor/alert/alert-apis/adapt"
 	"github.com/erda-project/erda/modules/core/monitor/alert/alert-apis/cql"
@@ -72,10 +73,11 @@ type provider struct {
 	microServiceOtherFilterTags map[string]bool
 	alertConditions             []*AlertConditions
 
-	Register     transport.Register           `autowired:"service-register" optional:"true"`
-	Metric       metricpb.MetricServiceServer `autowired:"erda.core.monitor.metric.MetricService"`
-	Perm         perm.Interface               `autowired:"permission"`
-	alertService *alertService
+	Register      transport.Register           `autowired:"service-register" optional:"true"`
+	Metric        metricpb.MetricServiceServer `autowired:"erda.core.monitor.metric.MetricService"`
+	Perm          perm.Interface               `autowired:"permission"`
+	alertService  *alertService
+	NotifyChannel channelpb.NotifyChannelServiceServer `autowired:"erda.core.services.notify.channel.NotifyChannelService"`
 }
 
 func (p *provider) Init(ctx servicehub.Context) error {