fix backup missing alert & bump Not successful alert to 60m

.env.sample

@@ -50,7 +50,6 @@ ENABLE_BACKUPS=true
 #GRAFANA_DOMAIN=grafana.example.com
 #
 ## Single-Sign-On with OIDC
-# COMPOSE_FILE="$COMPOSE_FILE:compose.grafana-oidc.yml"
 # OIDC_ENABLED=1
 # SECRET_GRAFANA_OIDC_CLIENT_SECRET_VERSION=v1
 # OIDC_CLIENT_ID=grafana
@@ -63,7 +62,6 @@ ENABLE_BACKUPS=true
 # GF_INSTALL_PLUGINS=grafana-piechart-panel
 #
 ## grafana SMTP configuration (optional)
-# COMPOSE_FILE="$COMPOSE_FILE:compose.grafana-smtp.yml"
 # GF_SMTP_HOST=changeme
 # GF_SMTP_USER=changme
 # GF_SMTP_ENABLED=true

compose.grafana-oidc.yml

@@ -1,16 +0,0 @@
-version: '3.8'
-
-services:
-  grafana:
-      - grafana_oidc_client_secret
-    environment:
-      - OIDC_API_URL
-      - OIDC_AUTH_URL
-      - OIDC_CLIENT_ID
-      - OIDC_ENABLED
-      - OIDC_TOKEN_URL
-
-secrets:
-  grafana_oidc_client_secret:
-    external: true
-    name: ${STACK_NAME}_grafana_oidc_client_secret_${SECRET_GRAFANA_OIDC_CLIENT_SECRET_VERSION}

compose.grafana-smtp.yml

@@ -1,18 +0,0 @@
-version: '3.8'
-
-services:
-  grafana:
-    secrets:
-      - grafana_smtp_password
-    environment:
-      - GF_SMTP_HOST
-      - GF_SMTP_USER
-      - GF_SMTP_PASSWORD__FILE=/run/secrets/grafana_smtp_password
-      - GF_SMTP_ENABLED
-      - GF_SMTP_FROM_ADDRESS
-      - GF_SMTP_SKIP_VERIFY
-
-secrets:
-  grafana_smtp_password:
-    external: true
-    name: ${STACK_NAME}_grafana_smtp_password_${SECRET_GRAFANA_SMTP_PASSWORD_VERSION}

compose.grafana.yml

@@ -7,6 +7,8 @@ services:
       - grafana-data:/var/lib/grafana:rw
     secrets:
       - grafana_admin_password
+      - grafana_oidc_client_secret
+      - grafana_smtp_password
     configs:
       - source: grafana_custom_ini
         target: /etc/grafana/grafana.ini
@@ -30,8 +32,19 @@ services:
     environment:
       - GF_SERVER_ROOT_URL
       - GF_SECURITY_ADMIN_PASSWORD__FILE=/run/secrets/grafana_admin_password
+      - GF_SMTP_HOST
+      - GF_SMTP_USER
+      - GF_SMTP_PASSWORD__FILE=/run/secrets/grafana_smtp_password
+      - GF_SMTP_ENABLED
+      - GF_SMTP_FROM_ADDRESS
+      - GF_SMTP_SKIP_VERIFY
       - GF_SECURITY_ALLOW_EMBEDDING
       - GF_INSTALL_PLUGINS
+      - OIDC_API_URL
+      - OIDC_AUTH_URL
+      - OIDC_CLIENT_ID
+      - OIDC_ENABLED
+      - OIDC_TOKEN_URL
     deploy:
       labels:
         - "traefik.enable=true"
@@ -84,3 +97,9 @@ secrets:
   grafana_admin_password:
     external: true
     name: ${STACK_NAME}_grafana_admin_password_${SECRET_GRAFANA_ADMIN_PASSWORD_VERSION}
+  grafana_oidc_client_secret:
+    external: true
+    name: ${STACK_NAME}_grafana_oidc_client_secret_${SECRET_GRAFANA_OIDC_CLIENT_SECRET_VERSION}
+  grafana_smtp_password:
+    external: true
+    name: ${STACK_NAME}_grafana_smtp_password_${SECRET_GRAFANA_SMTP_PASSWORD_VERSION}

grafana-alerts.json.tmpl

@@ -69,12 +69,15 @@
           "data": [
             {
                 "refId": "A",
-              "relativeTimeRange": { "from": 600, "to": 0 },
+                "relativeTimeRange": {
+                    "from": 28800,
+                    "to": 0
+                },
                 "datasourceUid": "PBFA97CFB590B2093",
                 "model": {
                     "disableTextWrap": false,
-                "editorMode": "builder",
-                "expr": "rate(backup[24h])",
+                    "editorMode": "code",
+                    "expr": "rate(backup[25h]) == 0",
                     "fullMetaSearch": false,
                     "includeNullMetadata": true,
                     "instant": true,
@@ -88,20 +91,41 @@
             },
             {
                 "refId": "B",
-              "relativeTimeRange": { "from": 600, "to": 0 },
+                "relativeTimeRange": {
+                    "from": 28800,
+                    "to": 0
+                },
                 "datasourceUid": "__expr__",
                 "model": {
                     "conditions": [
                         {
-                    "evaluator": { "params": [0, 0], "type": "within_range" },
-                    "operator": { "type": "and" },
-                    "query": { "params": ["C"] },
-                    "reducer": { "params": [], "type": "last" },
+                            "evaluator": {
+                                "params": [
+                                    -1,
+                                    0
+                                ],
+                                "type": "gt"
+                            },
+                            "operator": {
+                                "type": "and"
+                            },
+                            "query": {
+                                "params": []
+                            },
+                            "reducer": {
+                                "params": [],
+                                "type": "avg"
+                            },
                             "type": "query"
                         }
                     ],
-                "datasource": { "type": "__expr__", "uid": "__expr__" },
+                    "datasource": {
+                        "name": "Expression",
+                        "type": "__expr__",
+                        "uid": "__expr__"
+                    },
                     "expression": "A",
+                    "hide": false,
                     "intervalMs": 1000,
                     "maxDataPoints": 43200,
                     "refId": "B",
@@ -112,6 +136,8 @@
           "noDataState": "NoData",
           "execErrState": "Error",
           "for": "5m",
+          "annotations": {},
+          "labels": {},
           "isPaused": false
         },
         {{ end }}
@@ -188,9 +214,9 @@
             ],
             "noDataState": "NoData",
             "execErrState": "Error",
-            "for": "20m",
+            "for": "60m",
             "annotations": {
-                "summary": "Backup did not finish within 20 minutes"
+                "summary": "Backup did not finish within 60 minutes"
             },
             "labels": {},
             "isPaused": false

release/next

@@ -1,7 +0,0 @@
-1. OIDC was moved into a seperate compose file. If you have oidc configured you need to add the following line to you .env file:
-
-COMPOSE_FILE="$COMPOSE_FILE:compose.grafana-oidc.yml"
-
-2. SMTP was moved into a seperate compose file. If you have smtp configured you need to add the following line to you .env file:
-
-COMPOSE_FILE="$COMPOSE_FILE:compose.grafana-smtp.yml"