feat(grafana): refactoring contact points

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
portefaix · Nov 13, 2024 · 11cc575 · 11cc575
1 parent e6c1f23
commit 11cc575
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/gitops/argocd/charts/observability/grafana-operator/templates/contactpoint.yaml b/gitops/argocd/charts/observability/grafana-operator/templates/contactpoint.yaml
@@ -53,9 +53,22 @@ spec:
   instanceSelector:
     matchLabels:
       {{- toYaml $.Values.grafanaOperator.matchLabels | nindent 6 }}
-  title: {{ $contactPoint.title | quote }}
-  slack:
+  name: slack-{{ $contactPoint.name }}
+  type: "slack"
+  settings:
     url: {{ $contactPoint.url | quote }}
+  # valuesFrom:
+  # - targetPath: channel
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: grafana-contactpoint-slack-{{ $contactPoint.name }}
+  #       key: channel
+  # - targetPath: text
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: grafana-contactpoint-slack-{{ $contactPoint.name }}
+  #       key: text
+    channel: {{ $contactPoint.channel | quote }}
     text: |
       {{ len .Alerts.Firing }} alerts are firing!
 
@@ -69,5 +82,4 @@ spec:
         • *{{ "{{" }} .Name {{ "}}" }}:* {{ "{{" }} .Value {{ "}}" }}
       {{ "{{" }} end {{ "}}" }}
       {{ "{{" }} end {{ "}}" }}
-    |
 {{ end }}
diff --git a/gitops/argocd/charts/observability/grafana-operator/values-talos-homelab.yaml b/gitops/argocd/charts/observability/grafana-operator/values-talos-homelab.yaml
@@ -187,6 +187,10 @@ grafanaOperator:
     emails:
     - name: default
       subject: "[grafana/core] Alerting"
+    slack: []
+    # - name: default
+    #   url: https://slack.com/xx/xx
+    #   channel: "#alerting-test"
   notificationPolicies:
     enabled: false
     name: core