Merge pull request #50 from wanjunlei/master

add cluster label to the notifications
kubesphere · Nov 27, 2020 · 4f23c94 · 4f23c94
2 parents ec19614 + 011525b
commit 4f23c94
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 21 deletions.
diff --git a/config/bundle.yaml b/config/bundle.yaml
@@ -1274,6 +1274,10 @@ spec:
                       type: object
                     global:
                       properties:
+                        cluster:
+                          description: The name of the cluster in which the notification
+                            manager is deployed.
+                          type: string
                         template:
                           description: The name of the template to generate message.
                             If the receiver dose not setup template, it will use this.

diff --git a/config/crd/bases/notification.kubesphere.io_notificationmanagers.yaml b/config/crd/bases/notification.kubesphere.io_notificationmanagers.yaml
@@ -828,6 +828,10 @@ spec:
                       type: object
                     global:
                       properties:
+                        cluster:
+                          description: The name of the cluster in which the notification
+                            manager is deployed.
+                          type: string
                         template:
                           description: The name of the template to generate message.
                             If the receiver dose not setup template, it will use this.

diff --git a/docs/images/architecture.png b/docs/images/architecture.png
diff --git a/helm/crds/notificationmanagers.yaml b/helm/crds/notificationmanagers.yaml
@@ -825,6 +825,10 @@ spec:
                       type: object
                     global:
                       properties:
+                        cluster:
+                          description: The name of the cluster in which the notification
+                            manager is deployed.
+                          type: string
                         template:
                           description: The name of the template to generate message.
                             If the receiver dose not setup template, it will use this.

diff --git a/pkg/apis/v1alpha1/notificationmanager_types.go b/pkg/apis/v1alpha1/notificationmanager_types.go
@@ -87,6 +87,8 @@ type GlobalOptions struct {
 	// The name of the template to generate message.
 	// If the receiver dose not setup template, it will use this.
 	Template string `json:"template,omitempty"`
+	// The name of the cluster in which the notification manager is deployed.
+	Cluster string `json:"cluster,omitempty"`
 }
 
 type EmailOptions struct {

diff --git a/pkg/notify/config/config.go b/pkg/notify/config/config.go
@@ -475,9 +475,7 @@ func (c *Config) nmChange(p *param) {
 		c.defaultConfigSelector = p.defaultConfigSelector
 		c.tenantReceiverSelector = p.tenantReceiverSelector
 		c.globalReceiverSelector = p.globalReceiverSelector
-		if p.ReceiverOpts != nil {
-			c.ReceiverOpts = p.ReceiverOpts
-		}
+		c.ReceiverOpts = p.ReceiverOpts
 		c.nmNamespaces = p.nmNamespaces
 		c.nmAdd = true
 	} else if p.op == opDel {
@@ -612,13 +610,13 @@ func (c *Config) updateReloadtimestamp() {
 		var objs []runtime.Object
 		receivers, err := getObjects(f.newReceiverObjectListFunc())
 		if err != nil {
-			_ = level.Error(c.logger).Log("msg", "Failed to list %s receiver", key, "err", err)
+			_ = level.Error(c.logger).Log("msg", "Failed to list receiver", "type", key, "err", err)
 		}
 		objs = append(objs, receivers...)
 
 		configs, err := getObjects(f.newConfigObjectListFunc())
 		if err != nil {
-			_ = level.Error(c.logger).Log("msg", "Failed to list %s config", key, "err", err)
+			_ = level.Error(c.logger).Log("msg", "Failed to list config", "type", key, "err", err)
 		}
 		objs = append(objs, configs...)
 
@@ -635,7 +633,7 @@ func (c *Config) updateReloadtimestamp() {
 
 			err = c.client.Update(c.ctx, obj)
 			if err != nil {
-				_ = level.Error(c.logger).Log("msg", "update %s error", key, "err", err)
+				_ = level.Error(c.logger).Log("msg", "update error", "type", key, "name", accessor.GetName(), "namespace", accessor.GetNamespace(), "err", err)
 				continue
 			}
 		}

diff --git a/pkg/notify/notifier/webhook/webhook.go b/pkg/notify/notifier/webhook/webhook.go
@@ -116,26 +116,28 @@ func (n *Notifier) Notify(ctx context.Context, data template.Data) []error {
 		}
 		request.Header.Set("Content-Type", "application/json")
 
-		if w.WebhookConfig.HttpConfig.BearerToken != nil {
-			bearer, err := n.notifierCfg.GetSecretData(w.GetNamespace(), w.WebhookConfig.HttpConfig.BearerToken)
-			if err != nil {
-				_ = level.Error(n.logger).Log("msg", "WebhookNotifier: get bearer token error", "error", err.Error())
-				return err
-			}
-
-			request.Header.Set("Authorization", bearer)
-		} else if w.WebhookConfig.HttpConfig.BasicAuth != nil {
-			pass := ""
-			if w.WebhookConfig.HttpConfig.BasicAuth.Password != nil {
-				p, err := n.notifierCfg.GetSecretData(w.GetNamespace(), w.WebhookConfig.HttpConfig.BasicAuth.Password)
+		if w.WebhookConfig.HttpConfig != nil {
+			if w.WebhookConfig.HttpConfig.BearerToken != nil {
+				bearer, err := n.notifierCfg.GetSecretData(w.GetNamespace(), w.WebhookConfig.HttpConfig.BearerToken)
 				if err != nil {
-					_ = level.Error(n.logger).Log("msg", "WebhookNotifier: get password error", "error", err.Error())
+					_ = level.Error(n.logger).Log("msg", "WebhookNotifier: get bearer token error", "error", err.Error())
 					return err
 				}
 
-				pass = p
+				request.Header.Set("Authorization", bearer)
+			} else if w.WebhookConfig.HttpConfig.BasicAuth != nil {
+				pass := ""
+				if w.WebhookConfig.HttpConfig.BasicAuth.Password != nil {
+					p, err := n.notifierCfg.GetSecretData(w.GetNamespace(), w.WebhookConfig.HttpConfig.BasicAuth.Password)
+					if err != nil {
+						_ = level.Error(n.logger).Log("msg", "WebhookNotifier: get password error", "error", err.Error())
+						return err
+					}
+
+					pass = p
+				}
+				request.SetBasicAuth(w.WebhookConfig.HttpConfig.BasicAuth.Username, pass)
 			}
-			request.SetBasicAuth(w.WebhookConfig.HttpConfig.BasicAuth.Username, pass)
 		}
 
 		transport, err := n.getTransport(w)

diff --git a/pkg/webhook/v1/handler.go b/pkg/webhook/v1/handler.go
@@ -74,6 +74,17 @@ func (h *HttpHandler) CreateNotificationfromAlerts(w http.ResponseWriter, r *htt
 		go func() {
 			defer close(wkrCh)
 
+			cluster := "default"
+			if h.notifierCfg != nil && h.notifierCfg.ReceiverOpts != nil && h.notifierCfg.ReceiverOpts.Global != nil {
+				if h.notifierCfg.ReceiverOpts.Global.Cluster != "" {
+					cluster = h.notifierCfg.ReceiverOpts.Global.Cluster
+				}
+			}
+
+			for _, alert := range data.Alerts {
+				alert.Labels["cluster"] = cluster
+			}
+
 			dm := make(map[string]template.Data)
 			ns, ok := wkload.CommonLabels["namespace"]
 			if ok {