From 3f94a992febb0869399b3dd70b963ca09f918091 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 3 Apr 2026 17:41:24 +0200 Subject: [PATCH 1/2] ntfy-alertmanager: edit msg when alert resolve's --- .../grafana/docker_compose/ntfy-alertmanager-ccchh-critical.j2 | 2 +- .../grafana/docker_compose/ntfy-alertmanager-ccchh.j2 | 2 +- .../grafana/docker_compose/ntfy-alertmanager-fux-critical.j2 | 2 +- .../chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh-critical.j2 b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh-critical.j2 index b4afc90..7d70628 100644 --- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh-critical.j2 +++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh-critical.j2 @@ -28,7 +28,7 @@ labels { resolved { tags "white_check_mark,resolved" - priority 2 + updatenotification true } ntfy { diff --git a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2 b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2 index 66fd9ab..7ea1123 100644 --- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2 +++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2 @@ -28,7 +28,7 @@ labels { resolved { tags "white_check_mark,resolved" - priority 2 + updatenotification true } ntfy { diff --git a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux-critical.j2 b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux-critical.j2 index afb6cc8..f58dca9 100644 --- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux-critical.j2 +++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux-critical.j2 @@ -28,7 +28,7 @@ labels { resolved { tags "white_check_mark,resolved" - priority 2 + updatenotification true } ntfy { diff --git a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2 b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2 index 1e506a3..3d138e9 100644 --- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2 +++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2 @@ -28,7 +28,7 @@ labels { resolved { tags "white_check_mark,resolved" - priority 2 + updatenotification true } ntfy { From aa54ae5ae07245d7ef0ed74b17308e71d52b04d6 Mon Sep 17 00:00:00 2001 From: Renovate Date: Fri, 3 Apr 2026 15:46:09 +0000 Subject: [PATCH 2/2] Update docker.io/library/postgres Docker tag to v18 --- inventories/chaosknoten/host_vars/cloud.yaml | 2 +- resources/chaosknoten/lists/docker_compose/compose.yaml | 2 +- resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inventories/chaosknoten/host_vars/cloud.yaml b/inventories/chaosknoten/host_vars/cloud.yaml index 9c28d58..0a1d845 100644 --- a/inventories/chaosknoten/host_vars/cloud.yaml +++ b/inventories/chaosknoten/host_vars/cloud.yaml @@ -1,7 +1,7 @@ # renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud nextcloud__version: 32 # renovate: datasource=docker depName=docker.io/library/postgres -nextcloud__postgres_version: 15.17 +nextcloud__postgres_version: 18.3 nextcloud__fqdn: cloud.hamburg.ccc.de nextcloud__data_dir: /data/nextcloud nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}" diff --git a/resources/chaosknoten/lists/docker_compose/compose.yaml b/resources/chaosknoten/lists/docker_compose/compose.yaml index fb65594..65248bb 100644 --- a/resources/chaosknoten/lists/docker_compose/compose.yaml +++ b/resources/chaosknoten/lists/docker_compose/compose.yaml @@ -58,7 +58,7 @@ services: - POSTGRES_DB=mailmandb - POSTGRES_USER=mailman - POSTGRES_PASSWORD=wvQjbMRnwFuxGEPz - image: docker.io/library/postgres:12-alpine + image: docker.io/library/postgres:18-alpine volumes: - /opt/mailman/database:/var/lib/postgresql/data networks: diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 index 0bbfcb8..091bd44 100644 --- a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 @@ -3,7 +3,7 @@ services: database: - image: docker.io/library/postgres:15-alpine + image: docker.io/library/postgres:18-alpine environment: - "POSTGRES_USER=pretalx" - "POSTGRES_PASSWORD={{ secret__pretalx_db_password }}"