Merge pull request #235 from wanjunlei/master

add receiver name to the notifications

helm/templates/_helpers.tpl

@@ -0,0 +1,8 @@
+{{/*namespace*/}}
+{{- define "nm.namespaceOverride" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}

helm/templates/clusterrolebindings.yaml

@@ -9,7 +9,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: notification-manager-sa
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "nm.namespaceOverride" . }}
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -23,7 +23,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: notification-manager-sa
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "nm.namespaceOverride" . }}
 
 {{- if .Values.kubesphere.enabled }}
 {{- if or (eq .Values.kubesphere.version "v3.1.0")  (eq .Values.kubesphere.version "v3.2.0") }}
@@ -39,6 +39,6 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: notification-manager-sa
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "nm.namespaceOverride" . }}
 {{- end}}
 {{- end}}

helm/templates/notificationmanagers.yaml

@@ -38,11 +38,19 @@ spec:
   {{- if .Values.kubesphere.enabled }}
   sidecars:
     tenant:
+  {{- if .Values.kubesphere.image }}
+      image: {{ .Values.kubesphere.image }}
+  {{- else }}
       image: kubesphere/notification-tenant-sidecar:{{ .Values.kubesphere.version }}
+  {{- end }}
       name: tenant
       type: kubesphere
   {{- end }}
   template:
     {{- toYaml .Values.notificationmanager.template | nindent 4 }}
   groupLabels:
-    {{- toYaml .Values.notificationmanager.groupLabels | nindent 4 }}
+    {{- toYaml .Values.notificationmanager.groupLabels | nindent 4 }}
+  annotations:
+    {{- toYaml .Values.notificationmanager.annotations | nindent 4 }}
+  labels:
+    {{- toYaml .Values.notificationmanager.labels | nindent 4 }}

helm/templates/operator.yaml

@@ -4,6 +4,7 @@ metadata:
   labels:
     control-plane: controller-manager
   name: notification-manager-operator
+  namespace: {{ include "nm.namespaceOverride" . }}
 spec:
   replicas: 1
   selector:

helm/templates/rolebindings.yaml

@@ -2,12 +2,13 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: notification-manager-leader-election-rolebinding
+  namespace: {{ include "nm.namespaceOverride" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: notification-manager-leader-election-role
 subjects:
 - kind: ServiceAccount
   name: notification-manager-sa
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "nm.namespaceOverride" . }}
 

helm/templates/roles.yaml

@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: notification-manager-leader-election-role
+  namespace: {{ include "nm.namespaceOverride" . }}
 rules:
 - apiGroups:
   - ""

helm/templates/serviceaccount.yaml

@@ -2,4 +2,5 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: notification-manager-sa
+  namespace: {{ include "nm.namespaceOverride" . }}
 

helm/templates/services.yaml

@@ -4,6 +4,7 @@ metadata:
   labels:
     control-plane: controller-manager
   name: notification-manager-controller-metrics
+  namespace: {{ include "nm.namespaceOverride" . }}
 spec:
   ports:
   - name: https
@@ -19,6 +20,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: notification-manager-webhook
+  namespace: {{ include "nm.namespaceOverride" . }}
 spec:
   ports:
     - port: 443

helm/templates/template.yaml

@@ -155,3 +155,5 @@ data:
 kind: ConfigMap
 metadata:
   name: notification-manager-template
+  namespace: {{ include "nm.namespaceOverride" . }}
+

helm/templates/validating.yaml

@@ -1,5 +1,6 @@
+{{- $name := include "nm.namespaceOverride" . }}
 {{- $ca := genCA "webhook-ca" 36500 -}}
-{{- $dns := cat "notification-manager-webhook." .Release.Namespace ".svc" | nospace -}}
+{{- $dns := cat "notification-manager-webhook." $name ".svc" | nospace -}}
 {{- $cert := genSignedCert "notification-manager-webhook" (list) (list $dns) 36500 $ca -}}
 apiVersion: v1
 data:
@@ -8,6 +9,7 @@ data:
 kind: Secret
 metadata:
   name: notification-manager-webhook-server-cert
+  namespace: {{ include "nm.namespaceOverride" . }}
 type: kubernetes.io/tls
 
 ---
@@ -22,7 +24,7 @@ webhooks:
     caBundle: {{ $ca.Cert  | b64enc  }}
     service:
       name: notification-manager-webhook
-      namespace: {{ .Release.Namespace }}
+      namespace: {{ include "nm.namespaceOverride" . }}
       path: /validate-notification-kubesphere-io-v2beta2-config
   failurePolicy: Fail
   name: vconfig.notification.kubesphere.io
@@ -43,7 +45,7 @@ webhooks:
     caBundle: {{ $ca.Cert  | b64enc  }}
     service:
       name: notification-manager-webhook
-      namespace: {{ .Release.Namespace }}
+      namespace: {{ include "nm.namespaceOverride" . }}
       path: /validate-notification-kubesphere-io-v2beta2-receiver
   failurePolicy: Fail
   name: vreceiver.notification.kubesphere.io
@@ -64,7 +66,7 @@ webhooks:
     caBundle: {{ $ca.Cert  | b64enc  }}
     service:
       name: notification-manager-webhook
-      namespace: {{ .Release.Namespace }}
+      namespace: {{ include "nm.namespaceOverride" . }}
       path: /validate-notification-kubesphere-io-v2beta2-router
   failurePolicy: Fail
   name: vrouter.notification.kubesphere.io
@@ -85,7 +87,7 @@ webhooks:
     caBundle: {{ $ca.Cert  | b64enc  }}
     service:
       name: notification-manager-webhook
-      namespace: {{ .Release.Namespace }}
+      namespace: {{ include "nm.namespaceOverride" . }}
       path: /validate-notification-kubesphere-io-v2beta2-silence
   failurePolicy: Fail
   name: vsilence.notification.kubesphere.io

helm/templates/zh-cn.yaml

@@ -0,0 +1,40 @@
+apiVersion: v1
+data:
+  zh-cn: |
+    - name: zh-cn
+      dictionary:
+        alert: "告警"
+        alerts: "告警" 
+        firing: "触发中"
+        resolved: "已解决"
+        alertname: "告警名称"
+        alerttype: "告警类型"
+        cluster: "集群"
+        namespace: "项目"
+        severity: "告警级别"
+        container: "容器"
+        pod: "容器组"
+        service: "服务"
+        deployment: "部署"
+        job: "任务"
+        daemonset: "守护进程集"
+        statefulset: "有状态副本集"
+        instance: "实例"
+        resource: "资源"
+        user: "用户"
+        verb: "操作"
+        group: "用户组"
+        requestReceivedTimestamp: "请求接收时间"
+        role: "角色"
+        host_ip: "主机IP"
+        node: "节点"
+        rule_id: "告警规则"
+        owner_kind: "目标类型"
+        workload: "工作负载"
+        rule_group: "规则组"
+        rule_level: "规则级别"
+        name: "名称"
+kind: ConfigMap
+metadata:
+  name: zh-cn
+  namespace: {{ include "nm.namespaceOverride" . }}

helm/values.yaml

@@ -1,5 +1,7 @@
+namespaceOverride: ""
+
 kubesphere:
-  enabled: fase
+  enabled: false
   # supported version: v3.1.0, v3.2.0
   version: v3.2.0
 
@@ -78,8 +80,13 @@ notificationmanager:
     - alertname
     - namespace
   template:
+    language: English
+    languagePack:
+      - name: zh-cn
+        namespace: kubesphere-monitoring-system
     text:
       name: notification-manager-template
+      namespace: kubesphere-monitoring-system
   env:
     - name: TZ
       value: Asia/Shanghai

pkg/constants/constants.go

@@ -38,6 +38,8 @@ const (
 	AlertSummary   = "summary"
 	AlertSummaryCN = "summaryCn"
 
+	ReceiverName = "receiver"
+
 	Verify       = "verify"
 	Notification = "notification"
 

pkg/notify/notify.go

@@ -98,6 +98,7 @@ func (s *notifyStage) Exec(ctx context.Context, l log.Logger, data interface{})
 	for k, v := range input {
 		receiver := k
 		ds := v
+		s.addExtensionLabels(receiver, ds)
 		nf, err := factories[receiver.GetType()](l, receiver, s.notifierCtl)
 		if err != nil {
 			e := err
@@ -118,3 +119,11 @@ func (s *notifyStage) Exec(ctx context.Context, l log.Logger, data interface{})
 
 	return ctx, alertMap, group.Wait()
 }
+
+func (s *notifyStage) addExtensionLabels(receiver internal.Receiver, data []*template.Data) {
+	for _, d := range data {
+		for _, alert := range d.Alerts {
+			alert.Labels[constants.ReceiverName] = receiver.GetName()
+		}
+	}
+}