From 1eb89006241dc3bc3940c6ab2b67792ef6224993 Mon Sep 17 00:00:00 2001
From: p4u1 <p4u1_f4u1@riseup.net>
Date: Tue, 13 Oct 2026 09:18:08 +0200
Subject: [PATCH] resolve merge conflicts

---
 README.md           |  5 +----
 abra.sh             |  4 ----
 compose.grafana.yml | 18 ------------------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 5deb15e..902a131 100644
--- a/README.md
+++ b/README.md
@@ -174,7 +174,7 @@ It is possible to enable the following alerts, by uncommenting the corresponding
 
 - node disk space: `ALERT_NODE_DISK_SPACE_LEFT`
 - node memory usage: `ALERT_NODE_MEMORY_USAGE`
-<<<<<<< Updated upstream
+- traefik apdex: `ALERT_TRAEFIK_APDEX`
 
 ## smart monitoring
 
@@ -183,6 +183,3 @@ To be able monitor hard drive health data, you need to configure
 `collect-smartctl-json.sh` script provided here (via cronjob or as
 a `smartd` hook).  This is a limitation on Docker Swarm, which prevents
 the `smartctl_exporter` from running on privileged mode.
-=======
-- traefik apdex: `ALERT_TRAEFIK_APDEX`
->>>>>>> Stashed changes
diff --git a/abra.sh b/abra.sh
index 62659df..87eab31 100644
--- a/abra.sh
+++ b/abra.sh
@@ -10,11 +10,7 @@ export PROMETHEUS_YML_VERSION=v2
 export MATRIX_ALERTMANAGER_CONFIG_VERSION=v1
 export MATRIX_ALERTMANAGER_ENTRYPOINT_VERSION=v1
 export GF_ALERTS_NODE_VERSION=v3
-<<<<<<< Updated upstream
-=======
-export GF_ALERTS_LOKI_VERSION=v5
 export GF_ALERTS_TRAEFIK_VERSION=v1
->>>>>>> Stashed changes
 export CONFIG_ALLOY_VERSION=v3
 
 # migrates secrets from old names to new names by reading values from the
diff --git a/compose.grafana.yml b/compose.grafana.yml
index cb4aba0..6a95197 100644
--- a/compose.grafana.yml
+++ b/compose.grafana.yml
@@ -24,13 +24,8 @@ services:
         target: /var/lib/grafana/dashboards/backup.json
       - source: gf_alerts_node
         target: /etc/grafana/provisioning/alerting/node.yml
-<<<<<<< Updated upstream
-=======
-      - source: gf_alerts_loki
-        target: /etc/grafana/provisioning/alerting/loki.yml
       - source: gf_alerts_traefik
         target: /etc/grafana/provisioning/alerting/traefik.yml
->>>>>>> Stashed changes
     networks:
       - proxy
       - internal
@@ -41,13 +36,7 @@ services:
       - GF_INSTALL_PLUGINS
       - ALERT_NODE_DISK_SPACE_LEFT
       - ALERT_NODE_MEMORY_USAGE
-<<<<<<< Updated upstream
-=======
-      - ALERT_LOKI_INGESTION_STALLED
-      - ALERT_LOKI_WRITE_ERRORS
-      - ALERT_LOKI_WAL_DISK_USAGE
       - ALERT_TRAEFIK_APDEX
->>>>>>> Stashed changes
     deploy:
       labels:
         - "traefik.enable=true"
@@ -91,17 +80,10 @@ configs:
     template_driver: golang
     name: ${STACK_NAME}_gf_alerts_node_${GF_ALERTS_NODE_VERSION}
     file: alerts/node.yml.tmpl
-<<<<<<< Updated upstream
-=======
-  gf_alerts_loki:
-    template_driver: golang
-    name: ${STACK_NAME}_gf_alerts_loki_${GF_ALERTS_LOKI_VERSION}
-    file: alerts/loki.yml.tmpl
   gf_alerts_traefik:
     template_driver: golang
     name: ${STACK_NAME}_gf_alerts_traefik_${GF_ALERTS_TRAEFIK_VERSION}
     file: alerts/traefik.yml.tmpl
->>>>>>> Stashed changes
 
 volumes:
   grafana-data: