feat(matrix): show more information in matrix alerts

abra.sh

@@ -7,9 +7,9 @@ export GF_BACKUP_DASH_VERSION=v1
 export GF_CUSTOM_INI_VERSION=v4
 export LOKI_YML_VERSION=v3
 export PROMETHEUS_YML_VERSION=v2
-export MATRIX_ALERTMANAGER_CONFIG_VERSION=v1
+export MATRIX_ALERTMANAGER_CONFIG_VERSION=v2
 export MATRIX_ALERTMANAGER_ENTRYPOINT_VERSION=v1
-export GF_ALERTS_NODE_VERSION=v4
+export GF_ALERTS_NODE_VERSION=v3
 export CONFIG_ALLOY_VERSION=v3
 
 # migrates secrets from old names to new names by reading values from the

alertmanager-matrix-config.yml.tmpl

@@ -54,21 +54,35 @@ templating:
       {{ else if .Alert.Labels.alertname }}
         {{ .Alert.Labels.alertname }}
       {{ end }}
+      {{ if .Alert.Labels.rulename }}
+        &rarr; <strong>{{ .Alert.Labels.rulename }}</strong>
+      {{ end }}
+      {{ if .Alert.Labels.grafana_folder }}
+        <em>({{ .Alert.Labels.grafana_folder }})</em>
+      {{ end }}
       >>
       {{ if .Alert.Labels.severity }}
-        {{ .Alert.Labels.severity | ToUpper }}: 
+        {{ .Alert.Labels.severity | ToUpper }}:
       {{ end }}
       {{ if .Alert.Annotations.description }}
         {{ .Alert.Annotations.description }}
       {{ else if .Alert.Annotations.summary }}
         {{ .Alert.Annotations.summary }}
+      {{ else if .Alert.Labels.rulename }}
+        Query {{ .Alert.Labels.ref_id }} returned no data (datasource {{ .Alert.Labels.datasource_uid }})
+      {{ end }}
+      {{ if .Alert.Labels.instance }}
+        on {{ .Alert.Labels.instance }}
       {{ end }}
       >>
       {{ if .Alert.Annotations.runbook }}
-        <a href="{{ .Alert.Annotations.runbook }}">Runbook</a> | 
+        <a href="{{ .Alert.Annotations.runbook }}">Runbook</a> |
       {{ end }}
       {{ if .Alert.Annotations.dashboard }}
-        <a href="{{ .Alert.Annotations.dashboard }}">Dashboard</a> | 
+        <a href="{{ .Alert.Annotations.dashboard }}">Dashboard</a> |
+      {{ end }}
+      {{ if .GeneratorURL }}
+        <a href="{{ .GeneratorURL }}">Rule</a> |
       {{ end }}
       <a href="{{ .SilenceURL }}">Silence</a>
     </p>`}}'

alerts/node.yml.tmpl

@@ -87,7 +87,7 @@ groups:
           datasourceUid: PBFA97CFB590B2093
           model:
             editorMode: code
-            expr: 100 - ((node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100)
+            expr: (node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100
             instant: true
             intervalMs: 1000
             legendFormat: __auto

compose.docker-events.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   docker-events:
-    image: docker:29.9.1-cli
+    image: docker:29.8.1-cli
     command: >
       docker events
       --format '{{json .}}'

compose.grafana.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   grafana:
-    image: grafana/grafana:13.2.3
+    image: grafana/grafana:13.0.6
     volumes:
       - grafana-data:/var/lib/grafana:rw
     secrets:

compose.prometheus.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   prometheus:
-    image: prom/prometheus:v3.15.0
+    image: prom/prometheus:v3.12.0
     secrets:
       - basic_auth
     volumes:

compose.smartctl.yml

@@ -2,7 +2,7 @@
 version: "3.8"
 services:
   smartctl:
-    image: "prometheuscommunity/smartctl-exporter:v0.15.0"
+    image: "prometheuscommunity/smartctl-exporter:v0.14.0"
     volumes:
     - "/var/lib/smartmontools/json:/debug"
     command:

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: grafana/alloy:v1.20.1
+    image: grafana/alloy:v1.18.1
     hostname: "${DOMAIN}"
     configs:
       - source: config_alloy
@@ -53,7 +53,7 @@ services:
         condition: on-failure
       labels:
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
-        - "coop-cloud.${STACK_NAME}.version=2.3.0+v1.20.1"
+        - "coop-cloud.${STACK_NAME}.version=2.2.0+v1.18.1"
 configs:
   config_alloy:
     template_driver: golang