Merge pull request #126 from appuio/dependencies/update-upstream-alerts

Update upstream alerts
appuio · Apr 2, 2024 · 84b2501 · 84b2501
2 parents a05925d + 6acd800
commit 84b2501
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/component/extracted_alerts/master/lokistack_prometheus_alerts.yaml b/component/extracted_alerts/master/lokistack_prometheus_alerts.yaml
@@ -178,10 +178,16 @@ groups:
   - alert: LokistackSchemaUpgradesRequired
     annotations:
       message: |-
-        Object storage schema needs upgrade.
-      summary: "The applied storage schema config is old and should be upgraded."
+        The LokiStack "{{ $labels.stack_name }}" in namespace "{{ $labels.stack_namespace }}" is using a storage schema
+        configuration that does not contain the latest schema version. It is recommended to update the schema
+        configuration to update the schema version to the latest version in the future.
+      summary: "One or more of the deployed LokiStacks contains an outdated storage schema configuration."
       runbook_url: "[[ .RunbookURL ]]#Lokistack-Schema-Upgrades-Required"
-    expr: sum by(stack_id) (lokistack_warnings_count) > 0
+    expr: |
+      sum (
+        lokistack_status_condition{reason="StorageNeedsSchemaUpdate",status="true"}
+      ) by (stack_namespace, stack_name)
+      > 0
+    for: 1m
     labels:
       severity: warning
-      resource: '{{ $labels.stack_id}}'
diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/60_lokistack_alerts.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/60_lokistack_alerts.yaml
@@ -206,12 +206,20 @@ spec:
             syn_component: openshift4-logging
         - alert: SYN_LokistackSchemaUpgradesRequired
           annotations:
-            message: Object storage schema needs upgrade.
+            message: |-
+              The LokiStack "{{ $labels.stack_name }}" in namespace "{{ $labels.stack_namespace }}" is using a storage schema
+              configuration that does not contain the latest schema version. It is recommended to update the schema
+              configuration to update the schema version to the latest version in the future.
             runbook_url: https://github.com/grafana/loki/blob/main/operator/docs/lokistack/sop.md#Lokistack-Schema-Upgrades-Required
-            summary: The applied storage schema config is old and should be upgraded.
-          expr: sum by(stack_id) (lokistack_warnings_count) > 0
+            summary: One or more of the deployed LokiStacks contains an outdated storage
+              schema configuration.
+          expr: |
+            sum (
+              lokistack_status_condition{reason="StorageNeedsSchemaUpdate",status="true"}
+            ) by (stack_namespace, stack_name)
+            > 0
+          for: 1m
           labels:
-            resource: '{{ $labels.stack_id}}'
             severity: warning
             syn: 'true'
             syn_component: openshift4-logging