From 41d8f18563319318dc238caedd49a32887d9c03a Mon Sep 17 00:00:00 2001 From: Kaare Hoff Skovgaard Date: Thu, 14 Aug 2025 22:47:55 +0200 Subject: [PATCH 1/2] Update flake inputs --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 516967a..5186955 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1754472784, - "narHash": "sha256-b390kY06Sm+gzwGiaXrVzIg4mjxwt/oONlDu49260lM=", + "lastModified": 1755201760, + "narHash": "sha256-kqvOIgJmO4WItR5VF/W2kn8PMpAum3XBd3RwFyDyQ/w=", "owner": "rustsec", "repo": "advisory-db", - "rev": "388a3128c3cda69c6f466de2015aadfae9f9bc75", + "rev": "9b3641d0aafcae14446bba35a41fef4f607d9c51", "type": "github" }, "original": { @@ -147,11 +147,11 @@ ] }, "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", + "lastModified": 1754971456, + "narHash": "sha256-p04ZnIBGzerSyiY2dNGmookCldhldWAu03y0s3P8CB0=", "owner": "nix-community", "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", + "rev": "8246829f2e675a46919718f9a64b71afe3bfb22d", "type": "github" }, "original": { @@ -506,11 +506,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", + "lastModified": 1755078291, + "narHash": "sha256-Hu/gTDoi4uy6TAKISPHQusSMy8U6xUbLSDjKBYdhDIY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", + "rev": "3385ca0cd7e14c1a1eb80401fe011705ff012323", "type": "github" }, "original": { @@ -605,11 +605,11 @@ ] }, "locked": { - "lastModified": 1754794262, - "narHash": "sha256-5SEz135CaJ0LfHILi+CzWMXQmcvD2QeIf4FKwXAxtxA=", + "lastModified": 1755139244, + "narHash": "sha256-SN1BFA00m+siVAQiGLtTwjv9LV9TH5n8tQcSziV6Nv4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d754da7c068c6e122f84d84c3e6bcd353ee48635", + "rev": "aeae248beb2a419e39d483dd9b7fec924aba8d4d", "type": "github" }, "original": { @@ -629,11 +629,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1747965231, - "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", + "lastModified": 1755110674, + "narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "53007af63fade28853408370c4c600a63dd97f41", + "rev": "f5936247dbdb8501221978562ab0b302dd75456c", "type": "gitlab" }, "original": { @@ -691,11 +691,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1754852587, - "narHash": "sha256-M+CDFvZ4ZuKK3mlbxv+37yAwL6X3tIklYgurqbhO7Q4=", + "lastModified": 1755029507, + "narHash": "sha256-dtLgSAkU6o3skigUB1U6CCdg9Uu+yu3OM3m+Zu2XnPk=", "owner": "nix-community", "repo": "stylix", - "rev": "61ffae2453d00cb63a133b750232804b209db4d1", + "rev": "13e783747d8b90f27bc1e69e3302b5b5e18cf776", "type": "github" }, "original": { From b9e7228520f292fa5ff4ef6f1b36231927356d3b Mon Sep 17 00:00:00 2001 From: Kaare Hoff Skovgaard Date: Thu, 14 Aug 2025 22:48:14 +0200 Subject: [PATCH 2/2] Update scrape intervals --- .../infrastructure/vault-prometheus-sender/default.nix | 2 +- .../vault-prometheus-sender/prometheus.alloy | 2 +- nix/systems/aarch64-linux/kas.codes/forgejo/default.nix | 2 +- .../mx.kaareskovgaard.net/mailserver/prometheus.nix | 2 +- .../monitoring.kaareskovgaard.net/alerts/http.yaml | 2 +- .../x86_64-linux/monitoring.kaareskovgaard.net/default.nix | 7 +++++-- .../x86_64-linux/monitoring.kaareskovgaard.net/zfs.nix | 1 - 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/nix/modules/nixos/infrastructure/vault-prometheus-sender/default.nix b/nix/modules/nixos/infrastructure/vault-prometheus-sender/default.nix index df89a7a..082d5d4 100644 --- a/nix/modules/nixos/infrastructure/vault-prometheus-sender/default.nix +++ b/nix/modules/nixos/infrastructure/vault-prometheus-sender/default.nix @@ -109,7 +109,7 @@ in {"__address__" = "127.0.0.1:${toString value.port}", "instance" = constants.hostname, "job" = "${name}"}, ] - scrape_interval = "1m" + scrape_interval = "15s" forward_to = [otelcol.receiver.prometheus.default.receiver] } diff --git a/nix/modules/nixos/infrastructure/vault-prometheus-sender/prometheus.alloy b/nix/modules/nixos/infrastructure/vault-prometheus-sender/prometheus.alloy index a2ff1d8..ea762b1 100644 --- a/nix/modules/nixos/infrastructure/vault-prometheus-sender/prometheus.alloy +++ b/nix/modules/nixos/infrastructure/vault-prometheus-sender/prometheus.alloy @@ -50,7 +50,7 @@ prometheus.exporter.unix "integrations_node_exporter" { // Define how to scrape metrics from the node_exporter prometheus.scrape "integrations_node_exporter" { - scrape_interval = "1m" + scrape_interval = "15s" // Use the targets with labels from the discovery.relabel component targets = discovery.relabel.integrations_node_exporter.output // Send the scraped metrics to the relabeling component diff --git a/nix/systems/aarch64-linux/kas.codes/forgejo/default.nix b/nix/systems/aarch64-linux/kas.codes/forgejo/default.nix index 26d70aa..af58ace 100644 --- a/nix/systems/aarch64-linux/kas.codes/forgejo/default.nix +++ b/nix/systems/aarch64-linux/kas.codes/forgejo/default.nix @@ -185,7 +185,7 @@ in environment.etc."alloy/forgejo_prometheus.alloy" = { text = '' prometheus.scrape "forgejo_exporter" { - scrape_interval = "1m" + scrape_interval = "15s" targets = [ { "__address__" = "127.0.0.1:${toString config.services.forgejo.settings.server.HTTP_PORT}", diff --git a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/prometheus.nix b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/prometheus.nix index 5b8b7dd..0828c4c 100644 --- a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/prometheus.nix +++ b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/prometheus.nix @@ -91,7 +91,7 @@ in environment.etc."alloy/dovecot_prometheus.alloy" = { text = '' prometheus.scrape "dovecot_exporter" { - scrape_interval = "1m" + scrape_interval = "15s" targets = [ { "__address__" = "127.0.0.1:${toString dovecotPromPort}", diff --git a/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/alerts/http.yaml b/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/alerts/http.yaml index bca404e..a0c6e88 100644 --- a/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/alerts/http.yaml +++ b/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/alerts/http.yaml @@ -17,4 +17,4 @@ labels: severity: critical annotations: - summary: "Nginx VHost {{ $labels.vhost }} on {{ $labels.instance }} is generating many internal server errors over 1 hour" + summary: "Nginx VHost {{ $labels.vhost }} on {{ $labels.instance }} is generating many internal server errors over 30 minutes" diff --git a/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/default.nix b/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/default.nix index 4baf538..6cf40f1 100644 --- a/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/default.nix +++ b/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/default.nix @@ -161,7 +161,10 @@ in services.prometheus = { enable = true; listenAddress = "127.0.0.1"; - extraFlags = [ "--web.enable-otlp-receiver" ]; + extraFlags = [ + "--web.enable-otlp-receiver" + "--storage.tsdb.retention.time=15d" + ]; # alertmanager.enable = true; rules = [ '' @@ -224,7 +227,7 @@ in compactor = { retention_enabled = true; compaction_interval = "24h"; - retention_delete_delay = "24h"; + retention_delete_delay = "15d"; delete_request_store = "filesystem"; working_directory = "${config.services.loki.dataDir}/retention"; }; diff --git a/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/zfs.nix b/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/zfs.nix index dfb0e26..b6b861e 100644 --- a/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/zfs.nix +++ b/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/zfs.nix @@ -1,7 +1,6 @@ { pkgs, lib, - config, ... }: {