From 3750e754397f3f7c3141ef6fd33cf52971532af2 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Tue, 16 Apr 2024 16:45:42 +0200
Subject: [PATCH] chore: publish 1.1.0+v1.7.0 release

---
 .env.sample            | 10 +++++-----
 compose.grafana.yml    |  2 +-
 compose.loki.yml       |  2 +-
 compose.prometheus.yml |  2 +-
 compose.promtail.yml   |  2 +-
 compose.yml            |  4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.env.sample b/.env.sample
index aac777a..f0902ee 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,7 +1,7 @@
 TYPE=monitoring-ng
 LETS_ENCRYPT_ENV=production
 COMPOSE_FILE=compose.yml
-DOMAIN=monitoring-ng.example.com
+DOMAIN=monitoring.example.com
 TIMEOUT=120
 
 ## Enable this secret for Promtail / Prometheus
@@ -36,16 +36,16 @@ TIMEOUT=120
 ## Grafana
 #
 # COMPOSE_FILE="$COMPOSE_FILE:compose.grafana.yml"
-# GF_SERVER_ROOT_URL=https://${DOMAIN}
+# GF_SERVER_ROOT_URL=https://monitoring.example.com
 # SECRET_GRAFANA_ADMIN_PASSWORD_VERSION=v1
 #
 ## Single-Sign-On with OIDC
 # OIDC_ENABLED=1
 # SECRET_GRAFANA_OIDC_CLIENT_SECRET_VERSION=v1
 # OIDC_CLIENT_ID=grafana
-# OIDC_AUTH_URL="https://sso.example.com/auth/realms/autonomic/protocol/openid-connect/auth"
-# OIDC_API_URL="https://sso.example.com/auth/realms/autonomic/protocol/openid-connect/userinfo"
-# OIDC_TOKEN_URL="https://sso.example.com/auth/realms/autonomic/protocol/openid-connect/token"
+# OIDC_AUTH_URL="https://authentik.example.com/application/o/authorize/"
+# OIDC_API_URL="https://authentik.example.com/application/o/userinfo/"
+# OIDC_TOKEN_URL="https://authentik.example.com/application/o/token/"
 #
 ## Additional grafana settings (unlikely to require editing)
 # GF_SECURITY_ALLOW_EMBEDDING=1
diff --git a/compose.grafana.yml b/compose.grafana.yml
index 3e3cdd2..cbcfe24 100644
--- a/compose.grafana.yml
+++ b/compose.grafana.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   grafana:
-    image: grafana/grafana:10.2.3
+    image: grafana/grafana:10.4.2
     volumes:
       - grafana-data:/var/lib/grafana:rw
     secrets:
diff --git a/compose.loki.yml b/compose.loki.yml
index 0514f77..f4a6884 100644
--- a/compose.loki.yml
+++ b/compose.loki.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   loki:
-    image: grafana/loki:2.9.3
+    image: grafana/loki:2.9.7
     command: -config.file=/etc/loki/local-config.yaml
     networks:
       - proxy
diff --git a/compose.prometheus.yml b/compose.prometheus.yml
index 2d29f3d..a342671 100644
--- a/compose.prometheus.yml
+++ b/compose.prometheus.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   prometheus:
-    image: prom/prometheus:v2.48.1
+    image: prom/prometheus:v2.51.2
     secrets:
       - basic_auth
     volumes:
diff --git a/compose.promtail.yml b/compose.promtail.yml
index cbbb120..d35ef6f 100644
--- a/compose.promtail.yml
+++ b/compose.promtail.yml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   promtail:
-    image: grafana/promtail:2.9.3
+    image: grafana/promtail:2.9.7
     volumes:
       - /var/log:/var/log:ro
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/compose.yml b/compose.yml
index 7ca468d..d261144 100644
--- a/compose.yml
+++ b/compose.yml
@@ -37,11 +37,11 @@ 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=1.0.0+v1.7.0"
+        - "coop-cloud.${STACK_NAME}.version=1.1.0+v1.7.0"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 
   cadvisor:
-    image: gcr.io/cadvisor/cadvisor:v0.47.2
+    image: gcr.io/cadvisor/cadvisor:v0.49.1
     command:
       - "-logtostderr"
       - "--enable_metrics=cpu,cpuLoad,disk,diskIO,process,memory,network"