From 56ecf7ff18be1c31e5c258ad9fd8d76b5ba5cde8 Mon Sep 17 00:00:00 2001
From: chris <c6ristian@christian.moe>
Date: Tue, 20 Oct 2026 20:52:10 +0200
Subject: [PATCH 1/2] grafana: remove ccchh opnsense for scrape jobs

---
 .../chaosknoten/grafana/docker_compose/prometheus.yml    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/resources/chaosknoten/grafana/docker_compose/prometheus.yml b/resources/chaosknoten/grafana/docker_compose/prometheus.yml
index 7f94ab04..c631ad06 100644
--- a/resources/chaosknoten/grafana/docker_compose/prometheus.yml
+++ b/resources/chaosknoten/grafana/docker_compose/prometheus.yml
@@ -44,15 +44,6 @@ scrape_configs:
           - mumble.hamburg.ccc.de:443
         labels:
           org: ccchh
-  - job_name: opnsense-ccchh
-    honor_timestamps: true
-    metrics_path: /metrics
-    scheme: http
-    static_configs:
-      - targets:
-          - 185.161.129.132:9100
-        labels:
-          org: ccchh
   - job_name: jitsi
     honor_timestamps: true
     scrape_interval: 5s

From 13a981a25b3598b5c4fc0769fd6f4712f6434d08 Mon Sep 17 00:00:00 2001
From: Renovate <no-reply@git.hamburg.ccc.de>
Date: Tue, 20 Oct 2026 20:17:54 +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.j2   | 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 8f299b2d..c4164a77 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: 34
 # renovate: datasource=docker depName=docker.io/library/postgres
-nextcloud__postgres_version: 15.18
+nextcloud__postgres_version: 18.6
 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.j2 b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
index 7a109e8c..fc1cb194 100644
--- a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
@@ -62,7 +62,7 @@ services:
       - POSTGRES_DB=mailmandb
       - POSTGRES_USER=mailman
       - "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}"
-    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 6b1683cc..f52bfef0 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 }}"