From c06dda72059ecf66b47ea54f070e7b15cff4ad50 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Wed, 20 Dec 2023 22:56:25 +0100
Subject: [PATCH] chore: publish 1.0.0+v1.7.0 release

---
 abra.sh                                | 12 ++++++------
 compose.grafana.yml                    |  2 +-
 compose.loki.yml                       |  2 +-
 compose.prometheus.yml                 |  2 +-
 compose.promtail.yml                   |  2 +-
 compose.yml                            |  4 ++--
 release/{1.0.0+v1.6.0 => 1.0.0+v1.7.0} |  3 ++-
 7 files changed, 14 insertions(+), 13 deletions(-)
 rename release/{1.0.0+v1.6.0 => 1.0.0+v1.7.0} (50%)

diff --git a/abra.sh b/abra.sh
index 3da9e65..73d63ae 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,13 +1,13 @@
 export ENTRYPOINT_VERSION=v1
 export GRAFANA_DATASOURCES_YML_VERSION=v1
 export GRAFANA_DASHBOARDS_YML_VERSION=v1
-export GRAFANA_SWARM_DASHBOARD_JSON_VERSION=v1
-export GRAFANA_STACKS_DASHBOARD_JSON_VERSION=v1
-export GRAFANA_TRAEFIK_DASHBOARD_JSON_VERSION=v1
-export GRAFANA_CUSTOM_INI_VERSION=v3
-export PROMTAIL_YML_VERSION=v2
+export GRAFANA_SWARM_DASHBOARD_JSON_VERSION=v2
+export GRAFANA_STACKS_DASHBOARD_JSON_VERSION=v2
+export GRAFANA_TRAEFIK_DASHBOARD_JSON_VERSION=v2
+export GRAFANA_CUSTOM_INI_VERSION=v4
+export PROMTAIL_YML_VERSION=v3
 export LOKI_YML_VERSION=v2
-export PROMETHEUS_YML_VERSION=v1
+export PROMETHEUS_YML_VERSION=v2
 
 # creates a default prometheus scrape config for a given node
 add_node(){
diff --git a/compose.grafana.yml b/compose.grafana.yml
index e280775..3e3cdd2 100644
--- a/compose.grafana.yml
+++ b/compose.grafana.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   grafana:
-    image: grafana/grafana:10.0.2
+    image: grafana/grafana:10.2.3
     volumes:
       - grafana-data:/var/lib/grafana:rw
     secrets:
diff --git a/compose.loki.yml b/compose.loki.yml
index 40fbdf2..0514f77 100644
--- a/compose.loki.yml
+++ b/compose.loki.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   loki:
-    image: grafana/loki:2.8.2
+    image: grafana/loki:2.9.3
     command: -config.file=/etc/loki/local-config.yaml
     networks:
       - proxy
diff --git a/compose.prometheus.yml b/compose.prometheus.yml
index 4e676d1..2d29f3d 100644
--- a/compose.prometheus.yml
+++ b/compose.prometheus.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   prometheus:
-    image: prom/prometheus:v2.45.0
+    image: prom/prometheus:v2.48.1
     secrets:
       - basic_auth
     volumes:
diff --git a/compose.promtail.yml b/compose.promtail.yml
index 09986d6..cbbb120 100644
--- a/compose.promtail.yml
+++ b/compose.promtail.yml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   promtail:
-    image: grafana/promtail:2.8.2
+    image: grafana/promtail:2.9.3
     volumes:
       - /var/log:/var/log:ro
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/compose.yml b/compose.yml
index d79af55..7ca468d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: prom/node-exporter:v1.6.0
+    image: prom/node-exporter:v1.7.0
     user: root
     environment:
       - NODE_ID={{.Node.ID}}
@@ -37,7 +37,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}-node.tls=true"
         - "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=0.3.0+v1.6.0"
+        - "coop-cloud.${STACK_NAME}.version=1.0.0+v1.7.0"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 
   cadvisor:
diff --git a/release/1.0.0+v1.6.0 b/release/1.0.0+v1.7.0
similarity index 50%
rename from release/1.0.0+v1.6.0
rename to release/1.0.0+v1.7.0
index 42befbc..0302223 100644
--- a/release/1.0.0+v1.6.0
+++ b/release/1.0.0+v1.7.0
@@ -1,3 +1,4 @@
-Breakng change: secret `basic_auth_admin_password` was renamed to `basic_auth`. Insert the secret before upgrading.
+Breakng change: secret `basic_auth_admin_password` was renamed to `basic_auth`. Insert the secret before upgrading. And change the env BASIC_AUTH_ADMIN_PASSWORD to BASIC_AUTH
 
 abra app secret insert monitoring.example.com basic_auth v1 $(abra app run monitoring.example.com promtail cat /var/run/secrets/basic_auth_admin_password)
+sed -i ~/.abra/servers/example.com/monitoring.example.com.env -e 's/BASIC_AUTH_ADMIN_PASSWORD/BASIC_AUTH/'