update grafana admin password

alertmanager/alertmanager-config.yaml

@@ -1,57 +0,0 @@
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: altermanager-email-credentials
-  namespace: freeleaps-prod
-data:
-  password: cHducGNya3d0aXp5Z2RoZQ==
----
-apiVersion: monitoring.coreos.com/v1alpha1
-kind: AlertmanagerConfig
-metadata:
-  name: alertmanager-config
-  namespace: freeleaps-prod
-spec:
-  receivers:
-    # - msteamsConfigs:
-    #     - sendResolved: true
-    #       text: '{{ template "msteams.default.text" . }}'
-    #       title: >-
-    #         {{ if eq .Status "firing" }}🚨 [FIRING] 🔥{{- else -}}🙌 [RESOLVED]
-    #         🍻{{- end -}}
-    #       webhookUrl:
-    #         key: webhook-url
-    #         name: freeleaps-teams-webhook
-    #   name: ms-teams
-    - emailConfigs:
-        - to: "1535145760@qq.com,icecheng@mathmast.com"
-          from: "1535145760@qq.com"
-          smarthost: "smtp.qq.com:465"
-          authUsername: "1535145760@qq.com"
-          authPassword:
-            name: "altermanager-email-credentials"
-            key: "password"
-          authIdentity: "1535145760@qq.com"
-          requireTLS: false
-          sendResolved: true
-          headers:
-            - key: Subject
-              value: '{{ if eq .Status "firing" }}🚨 Freeleaps Alert: {{ .CommonAnnotations.summary }}{{ else }}✅ Freeleaps Resolved: {{ .CommonAnnotations.summary }}{{ end }}'
-          html: |-
-            <h3><strong>{{ if eq .Status "firing" }}🚨 Alert: {{ .CommonAnnotations.summary }}{{ else }}✅ Resolved: {{ .CommonAnnotations.summary }}{{ end }}</strong></h3>
-            <p><strong>📝 AlertName:</strong> {{ .CommonLabels.alertname }}</p>
-            <p><strong>🔧 Service:</strong> {{ .CommonLabels.service }}</p>
-            <p><strong>🔧 Pod:</strong> {{ .CommonLabels.pod }}({{ .CommonLabels.instance }})</p>
-            <p><strong>🏷️ Severity:</strong> {{ .CommonLabels.severity }}</p>
-            <p><strong>{{ if eq .Status "firing" }}🔴 Status:{{ else }}🟢 Status:{{ end }}</strong> {{ .Status | toUpper }}</p>
-            <p>📝 Description: {{ .CommonAnnotations.description }}</p>
-            <p>📖 Runbook: <a href="{{ .CommonAnnotations.runbook_url }}">{{ .CommonAnnotations.runbook_url }}</a></p>
-      name: email
-  route:
-    groupBy:
-      - severity
-    groupInterval: 5m
-    receiver: email
-    groupWait: 5m
-    repeatInterval: 6h

alertmanager/ms-team-altermanager.yaml.back

@@ -1,38 +0,0 @@
-apiVersion: monitoring.coreos.com/v1alpha1
-kind: AlertmanagerConfig
-metadata:
-  annotations:
-    kubectl.kubernetes.io/last-applied-configuration: >
-      {"apiVersion":"monitoring.coreos.com/v1alpha1","kind":"AlertmanagerConfig","metadata":{"annotations":{},"name":"alertmanager-config","namespace":"freeleaps-monitoring-system"},"spec":{"receivers":[{"msteamsConfigs":[{"sendResolved":true,"text":"{{
-      template \"msteams.default.text\" . }}","title":"{{ if eq .Status
-      \"firing\" }}🚨 [FIRING] 🔥{{- else -}}🙌 [RESOLVED] 🍻{{- end
-      -}}","webhookUrl":{"key":"webhook-url","name":"freeleaps-teams-webhook"}}],"name":"ms-teams"}],"route":{"groupBy":["severity","namespace"],"groupInterval":"5m","groupWait":"30s","receiver":"ms-teams","repeatInterval":"12h"}}}
-  creationTimestamp: '2025-01-13T12:26:29Z'
-  generation: 5
-  labels:
-    k8slens-edit-resource-version: v1alpha1
-  name: alertmanager-config
-  namespace: freeleaps-monitoring-system
-  resourceVersion: '134986306'
-  uid: d97e574f-e781-4747-9f3a-1b25e02c7670
-  selfLink: >-
-    /apis/monitoring.coreos.com/v1alpha1/namespaces/freeleaps-monitoring-system/alertmanagerconfigs/alertmanager-config
-spec:
-  receivers:
-    - msteamsConfigs:
-        - sendResolved: true
-          text: '{{ template "msteams.default.text" . }}'
-          title: >-
-            {{ if eq .Status "firing" }}🚨 [FIRING] 🔥{{- else -}}🙌 [RESOLVED]
-            🍻{{- end -}}
-          webhookUrl:
-            key: webhook-url
-            name: freeleaps-teams-webhook
-      name: ms-teams
-  route:
-    groupBy:
-      - severity
-    groupInterval: 1s
-    groupWait: 1s
-    receiver: ms-teams
-    repeatInterval: 12h

cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/alertmanager-config.back.yaml

@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: freeleaps-teams-webhook
+  namespace: freeleaps-monitoring-system
+data:
+  webhook-url: aHR0cHM6Ly9uZXRvcmdmdDEwODk4NTE0LndlYmhvb2sub2ZmaWNlLmNvbS93ZWJob29rYjIvMzAyNTU2ZTUtYzIxMS00ZjM4LWI0ODItMjA2MmQxMDRjNjc5QGNmMTUxZWU4LTVjMmMtNGZlNy1hMWM0LTgwOWJhNDNjOWYyNC9JbmNvbWluZ1dlYmhvb2svNDI1N2IzNzM5OTA0NGYwZDhiMWFkNDE2NTNiMGM0MTUvZjgyMTkyMGItMTY1OS00MGMyLWE0YjQtNDczMDA4OWI3MTM0
+---
+apiVersion: monitoring.coreos.com/v1alpha1
+kind: AlertmanagerConfig
+metadata:
+  name: alertmanager-config
+  namespace: freeleaps-monitoring-system
+spec:
+  route:
+    groupBy:
+    - severity
+    - namespace
+    groupInterval: 5m
+    groupWait: 30s
+    receiver: 'ms-teams'
+    repeatInterval: 12h
+  receivers:
+  - name: 'ms-teams'
+    msteamsConfigs:
+    - sendResolved: true
+      webhookUrl: 
+        key: 'webhook-url'
+        name: 'freeleaps-teams-webhook'
+      title: '{{ if eq .Status "firing" }}🚨 [FIRING] 🔥{{- else -}}🙌 [RESOLVED] 🍻{{- end -}}'
+      text: '{{ template "msteams.default.text" . }}'
+

cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/alertmanager-config.yaml

@@ -2,32 +2,56 @@ apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
-  name: freeleaps-teams-webhook
+  name: altermanager-email-credentials
-  namespace: freeleaps-monitoring-system
+  namespace: freeleaps-prod
 data:
-  webhook-url: aHR0cHM6Ly9uZXRvcmdmdDEwODk4NTE0LndlYmhvb2sub2ZmaWNlLmNvbS93ZWJob29rYjIvMzAyNTU2ZTUtYzIxMS00ZjM4LWI0ODItMjA2MmQxMDRjNjc5QGNmMTUxZWU4LTVjMmMtNGZlNy1hMWM0LTgwOWJhNDNjOWYyNC9JbmNvbWluZ1dlYmhvb2svNDI1N2IzNzM5OTA0NGYwZDhiMWFkNDE2NTNiMGM0MTUvZjgyMTkyMGItMTY1OS00MGMyLWE0YjQtNDczMDA4OWI3MTM0
+  password: cHducGNya3d0aXp5Z2RoZQ==
 ---
 apiVersion: monitoring.coreos.com/v1alpha1
 kind: AlertmanagerConfig
 metadata:
   name: alertmanager-config
-  namespace: freeleaps-monitoring-system
+  namespace: freeleaps-prod
 spec:
+  receivers:
+    # - msteamsConfigs:
+    #     - sendResolved: true
+    #       text: '{{ template "msteams.default.text" . }}'
+    #       title: >-
+    #         {{ if eq .Status "firing" }}🚨 [FIRING] 🔥{{- else -}}🙌 [RESOLVED]
+    #         🍻{{- end -}}
+    #       webhookUrl:
+    #         key: webhook-url
+    #         name: freeleaps-teams-webhook
+    #   name: ms-teams
+    - emailConfigs:
+        - to: "1535145760@qq.com,icecheng@mathmast.com"
+          from: "1535145760@qq.com"
+          smarthost: "smtp.qq.com:465"
+          authUsername: "1535145760@qq.com"
+          authPassword:
+            name: "altermanager-email-credentials"
+            key: "password"
+          authIdentity: "1535145760@qq.com"
+          requireTLS: false
+          sendResolved: true
+          headers:
+            - key: Subject
+              value: '{{ if eq .Status "firing" }}🚨 Freeleaps Alert: {{ .CommonAnnotations.summary }}{{ else }}✅ Freeleaps Resolved: {{ .CommonAnnotations.summary }}{{ end }}'
+          html: |-
+            <h3><strong>{{ if eq .Status "firing" }}🚨 Alert: {{ .CommonAnnotations.summary }}{{ else }}✅ Resolved: {{ .CommonAnnotations.summary }}{{ end }}</strong></h3>
+            <p><strong>📝 AlertName:</strong> {{ .CommonLabels.alertname }}</p>
+            <p><strong>🔧 Service:</strong> {{ .CommonLabels.service }}</p>
+            <p><strong>🔧 Pod:</strong> {{ .CommonLabels.pod }}({{ .CommonLabels.instance }})</p>
+            <p><strong>🏷️ Severity:</strong> {{ .CommonLabels.severity }}</p>
+            <p><strong>{{ if eq .Status "firing" }}🔴 Status:{{ else }}🟢 Status:{{ end }}</strong> {{ .Status | toUpper }}</p>
+            <p>📝 Description: {{ .CommonAnnotations.description }}</p>
+            <p>📖 Runbook: <a href="{{ .CommonAnnotations.runbook_url }}">{{ .CommonAnnotations.runbook_url }}</a></p>
+      name: email
   route:
     groupBy:
       - severity
-    - namespace
     groupInterval: 5m
-    groupWait: 30s
+    receiver: email
-    receiver: 'ms-teams'
+    groupWait: 5m
-    repeatInterval: 12h
+    repeatInterval: 6h
-  receivers:
-  - name: 'ms-teams'
-    msteamsConfigs:
-    - sendResolved: true
-      webhookUrl: 
-        key: 'webhook-url'
-        name: 'freeleaps-teams-webhook'
-      title: '{{ if eq .Status "firing" }}🚨 [FIRING] 🔥{{- else -}}🙌 [RESOLVED] 🍻{{- end -}}'
-      text: '{{ template "msteams.default.text" . }}'
-

cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml

@@ -1026,7 +1026,7 @@ grafana:
   ##
   defaultDashboardsEditable: true
 
-  adminPassword: r6Y@QTb*7BQN@hDGsN
+  adminPassword: YDufJ9b6xSFrR8Tm37j7QSdvlpE=
 
   rbac:
     ## If true, Grafana PSPs will be created