feat(notify): optimize content of message (#2192)

1. change alert time to local time 2. avoid using htlm escape charactors in message Co-authored-by: willzgli <[email protected]>
tkestack · Dec 1, 2022 · e836e99 · e836e99
1 parent ac90ab2
commit e836e99
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/cmd/tke-installer/app/installer/manifests/tke-notify-api/tke-notify-api.yaml b/cmd/tke-installer/app/installer/manifests/tke-notify-api/tke-notify-api.yaml
@@ -63,6 +63,8 @@ spec:
               mountPath: /app/certs
             - name: tke-notify-api-volume
               mountPath: /app/conf
+            - name: timezone
+              mountPath: /etc/localtime
           ports:
             - containerPort: 9457
           readinessProbe:
@@ -86,14 +88,17 @@ spec:
             requests:
               cpu: 50m
               memory: 128Mi
-
       volumes:
         - name: certs-volume
           configMap:
             name: certs
         - name: tke-notify-api-volume
           configMap:
             name: tke-notify-api
+        - name: timezone
+          hostPath:
+            path: /etc/localtime
+
 ---
 kind: ConfigMap
 apiVersion: v1

diff --git a/pkg/notify/apiserver/handler.go b/pkg/notify/apiserver/handler.go
@@ -231,7 +231,7 @@ func getVariables(alert Alert) map[string]string {
 
 	evaluateValue, ok := annotations[evaluateValueKey]
 	if ok {
-		summary = fmt.Sprintf("%s %s", summary, evaluateValue)
+		summary = fmt.Sprintf("%s %s%s", summary, evaluateValue, unitValue)
 	}
 
 	alarmPolicyNameValue, ok := labels["alarmPolicyName"]
@@ -313,5 +313,6 @@ func getVariables(alert Alert) map[string]string {
 }
 
 func processStartTime(t time.Time) string {
-	return t.Format("2006-01-02T15:04:05Z")
+	localTime := t.Local()
+	return localTime.Format(time.RFC3339)
 }
diff --git a/pkg/notify/controller/messagerequest/util/util.go b/pkg/notify/controller/messagerequest/util/util.go
@@ -23,7 +23,9 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
+	"html"
 	htmlTemplate "html/template"
+
 	"io/ioutil"
 	"net/http"
 	"time"
@@ -93,7 +95,7 @@ func ParseTemplate(name string, template string, variables map[string]string) (s
 	if err != nil {
 		return "", err
 	}
-	return buffer.String(), nil
+	return html.UnescapeString(buffer.String()), nil
 }
 
 // GetCurrentTime returns current timestamp