Add renovate.json

.env.sample

@@ -2,7 +2,7 @@ TYPE=monitoring-ng
 LETS_ENCRYPT_ENV=production
 COMPOSE_FILE=compose.yml
 DOMAIN=monitoring.example.com
-TIMEOUT=120
+#TIMEOUT=120
 ENABLE_BACKUPS=true
 
 ## Enable this secret for Promtail / Prometheus

compose.yml

@@ -40,7 +40,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}-node.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}-node.middlewares=basicauth@file"
         - "coop-cloud.${STACK_NAME}.version=1.6.0+v1.8.1"
-        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
+        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
 
   cadvisor:
     image: gcr.io/cadvisor/cadvisor:v0.49.2

grafana-alerts.json.tmpl

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

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}