Fix grafana-cloud-missing-alert (#1111)

* Fix grafana-cloud-missing-alert * Update CHANGELOG.md
giantswarm · Apr 8, 2024 · 1290948 · 1290948
1 parent d989bac
commit 1290948
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fix `PrometheusMissingGrafanaCloud` alert for non-mimir installations.
 - Fix `IngressControllerDeploymentNotSatisfied` opsrecipe.
 
 ## [3.7.1] - 2024-04-08

diff --git a/helm/prometheus-rules/templates/alerting-rules/prometheus.rules.yml b/helm/prometheus-rules/templates/alerting-rules/prometheus.rules.yml
@@ -32,7 +32,11 @@ spec:
       annotations:
         description: 'Prometheus is not sending data to Grafana Cloud.'
         opsrecipe: tbd/
+      {{- if .Values.mimir.enabled }}
       expr: absent(prometheus_remote_storage_samples_total{remote_name="grafana-cloud", cluster_type="management_cluster", cluster_id="{{ .Values.managementCluster.name }}", installation="{{ .Values.managementCluster.name }}", provider="{{ .Values.managementCluster.provider.kind }}", pipeline="{{ .Values.managementCluster.pipeline }}"})
+      {{- else }}
+      expr: absent(prometheus_remote_storage_samples_total{remote_name="grafana-cloud"})
+      {{- end }}
       for: 1h
       labels:
         area: empowerment