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 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" 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'';