From 40338d9b8569ce68eb110fcf1d86b15b97577ded Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sat, 9 Aug 2025 11:41:34 +0200
Subject: [PATCH 1/4] hosts/monitoring-3: Monitor alertmanager

---
 hosts/monitoring-3/prometheus.nix | 17 ++++++++++++++++-
 hosts/monitoring-3/rules.yml      |  7 +++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/hosts/monitoring-3/prometheus.nix b/hosts/monitoring-3/prometheus.nix
index e305e88..72392f7 100644
--- a/hosts/monitoring-3/prometheus.nix
+++ b/hosts/monitoring-3/prometheus.nix
@@ -104,6 +104,21 @@ in {
           relabelAddressToInstance
         ];
       }
+      {
+        job_name = "alertmanager";
+        scrape_interval = "20s";
+        scheme = "http";
+        static_configs = [
+          {
+            targets = [
+              "monitoring-3.mon.clerie.de:9093"
+            ];
+          }
+        ];
+        relabel_configs = [
+          relabelAddressToInstance
+        ];
+      }
       {
         job_name = "node-exporter";
         scrape_interval = "20s";
@@ -526,7 +541,7 @@ in {
       {
         static_configs = [ {
           targets = [
-            "[::1]:9093"
+            "monitoring-3.mon.clerie.de:9093"
           ];
         } ];
       }
diff --git a/hosts/monitoring-3/rules.yml b/hosts/monitoring-3/rules.yml
index bb0f5c9..7cb9d07 100644
--- a/hosts/monitoring-3/rules.yml
+++ b/hosts/monitoring-3/rules.yml
@@ -95,3 +95,10 @@ groups:
     annotations:
       summary: "blog.nadja.top unreachable via IPv4"
       description: "blog.nadja.top unreachable IPv4, but reachable via IPv6"
+  - alert: AlertmanagerNotificationRequestsFailed
+    expr: rate(alertmanager_notification_requests_failed_total[5m]) > 0
+    labels:
+      severity: critical
+    annotations:
+      summary: "Too many notification requests failed"
+      description: "Too many notification requests to Alertmanager integration {{ $labels.integration }} failed"

From 7c3a97a90a29fff79562e2d861b91c8dd399783f Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sat, 9 Aug 2025 11:42:04 +0200
Subject: [PATCH 2/4] hosts/web-2: Update legal.clerie.de

---
 hosts/web-2/legal.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hosts/web-2/legal.nix b/hosts/web-2/legal.nix
index 07c25f4..f4bf95a 100644
--- a/hosts/web-2/legal.nix
+++ b/hosts/web-2/legal.nix
@@ -7,8 +7,8 @@
       forceSSL = true;
       root = pkgs.fetchgit {
         url = "https://git.clerie.de/clerie/legal.clerie.de.git";
-        rev = "c6900226e3107a2e370a32759d83db472ab5450d";
-        sha256 = "sha256-lOjbHqYc/85rjotwQ5Oj+MSWnDIfLx2w5mpiJkChbXU=";
+        rev = "b271b9729f4545c340ce9d16ecbca136031da409";
+        sha256 = "sha256-uw69o7LxK+JF1AojSyusU1urshBc63Bgva5lRBgQdKc=";
       };
       locations."/impressum" = {
         return = ''301 https://legal.clerie.de/#impressum'';

From 13b8ccd0879fe98f4e8c8c364f8ade537dce8520 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sat, 9 Aug 2025 14:59:03 +0200
Subject: [PATCH 3/4] hosts/krypton: don't use onlyoffice anymore

---
 hosts/krypton/programs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/krypton/programs.nix b/hosts/krypton/programs.nix
index 491f6eb..f6c6a75 100644
--- a/hosts/krypton/programs.nix
+++ b/hosts/krypton/programs.nix
@@ -14,7 +14,7 @@
 
     tio
     xournalpp
-    onlyoffice-bin
+    libreoffice
 
     krita
     inkscape

From 6e814d97cb599ee2b9c65e39816a06abb63987f7 Mon Sep 17 00:00:00 2001
From: Flake Update Bot <flake-update-bot@clerie.de>
Date: Sun, 10 Aug 2025 03:03:08 +0200
Subject: [PATCH 4/4] Update nixpkgs 2025-08-10-01-03

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index ba0c6b0..f60dd33 100644
--- a/flake.lock
+++ b/flake.lock
@@ -646,11 +646,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1753549186,
-        "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=",
+        "lastModified": 1754498491,
+        "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "17f6bd177404d6d43017595c5264756764444ab8",
+        "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134",
         "type": "github"
       },
       "original": {