diff --git a/flake.lock b/flake.lock index 5186955..516967a 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1755201760, - "narHash": "sha256-kqvOIgJmO4WItR5VF/W2kn8PMpAum3XBd3RwFyDyQ/w=", + "lastModified": 1754472784, + "narHash": "sha256-b390kY06Sm+gzwGiaXrVzIg4mjxwt/oONlDu49260lM=", "owner": "rustsec", "repo": "advisory-db", - "rev": "9b3641d0aafcae14446bba35a41fef4f607d9c51", + "rev": "388a3128c3cda69c6f466de2015aadfae9f9bc75", "type": "github" }, "original": { @@ -147,11 +147,11 @@ ] }, "locked": { - "lastModified": 1754971456, - "narHash": "sha256-p04ZnIBGzerSyiY2dNGmookCldhldWAu03y0s3P8CB0=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "8246829f2e675a46919718f9a64b71afe3bfb22d", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -506,11 +506,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755078291, - "narHash": "sha256-Hu/gTDoi4uy6TAKISPHQusSMy8U6xUbLSDjKBYdhDIY=", + "lastModified": 1754689972, + "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3385ca0cd7e14c1a1eb80401fe011705ff012323", + "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", "type": "github" }, "original": { @@ -605,11 +605,11 @@ ] }, "locked": { - "lastModified": 1755139244, - "narHash": "sha256-SN1BFA00m+siVAQiGLtTwjv9LV9TH5n8tQcSziV6Nv4=", + "lastModified": 1754794262, + "narHash": "sha256-5SEz135CaJ0LfHILi+CzWMXQmcvD2QeIf4FKwXAxtxA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aeae248beb2a419e39d483dd9b7fec924aba8d4d", + "rev": "d754da7c068c6e122f84d84c3e6bcd353ee48635", "type": "github" }, "original": { @@ -629,11 +629,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1755110674, - "narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=", + "lastModified": 1747965231, + "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "f5936247dbdb8501221978562ab0b302dd75456c", + "rev": "53007af63fade28853408370c4c600a63dd97f41", "type": "gitlab" }, "original": { @@ -691,11 +691,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755029507, - "narHash": "sha256-dtLgSAkU6o3skigUB1U6CCdg9Uu+yu3OM3m+Zu2XnPk=", + "lastModified": 1754852587, + "narHash": "sha256-M+CDFvZ4ZuKK3mlbxv+37yAwL6X3tIklYgurqbhO7Q4=", "owner": "nix-community", "repo": "stylix", - "rev": "13e783747d8b90f27bc1e69e3302b5b5e18cf776", + "rev": "61ffae2453d00cb63a133b750232804b209db4d1", "type": "github" }, "original": { diff --git a/nix/modules/nixos/infrastructure/vault-prometheus-sender/default.nix b/nix/modules/nixos/infrastructure/vault-prometheus-sender/default.nix index 082d5d4..df89a7a 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 = "15s" + scrape_interval = "1m" 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 ea762b1..a2ff1d8 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 = "15s" + scrape_interval = "1m" // 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 af58ace..26d70aa 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 = "15s" + scrape_interval = "1m" 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 0828c4c..5b8b7dd 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 = "15s" + scrape_interval = "1m" 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 a0c6e88..bca404e 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 30 minutes" + summary: "Nginx VHost {{ $labels.vhost }} on {{ $labels.instance }} is generating many internal server errors over 1 hour" 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 6cf40f1..4baf538 100644 --- a/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/default.nix +++ b/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/default.nix @@ -161,10 +161,7 @@ in services.prometheus = { enable = true; listenAddress = "127.0.0.1"; - extraFlags = [ - "--web.enable-otlp-receiver" - "--storage.tsdb.retention.time=15d" - ]; + extraFlags = [ "--web.enable-otlp-receiver" ]; # alertmanager.enable = true; rules = [ '' @@ -227,7 +224,7 @@ in compactor = { retention_enabled = true; compaction_interval = "24h"; - retention_delete_delay = "15d"; + retention_delete_delay = "24h"; 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 b6b861e..dfb0e26 100644 --- a/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/zfs.nix +++ b/nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/zfs.nix @@ -1,6 +1,7 @@ { pkgs, lib, + config, ... }: {