diff --git a/modules/prometheus-exporters/default.nix b/modules/prometheus-exporters/default.nix index bdfe268..4d1a70e 100644 --- a/modules/prometheus-exporters/default.nix +++ b/modules/prometheus-exporters/default.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: let @@ -16,7 +15,6 @@ in "sisko" "picard" "kirk" - "pike" ] { enable = true; @@ -55,7 +53,6 @@ in "sisko" "picard" "kirk" - "pike" ] { enable = true; @@ -65,17 +62,13 @@ in [ "picard" "kirk" - "pike" ] { enable = true; }; - restic = mkFor [ "sisko" ] { - # https://github.com/ngosang/restic-exporter/issues/31 - enable = false; - repository = config.services.restic.backups.sisko.repository; - passwordFile = config.age.secrets.SISKO_RESTIC_PASSWORD.path; - }; + # restic = mkFor ["sisko"] { + # enable = true; + # }; postgres = mkFor [ "sisko" ] { enable = true; }; @@ -88,12 +81,9 @@ in "sisko" "picard" "kirk" - "pike" ] { enable = true; }; }; - - systemd.services.prometheus-restic-exporter.path = [ pkgs.openssh ]; } diff --git a/modules/prometheus/default.nix b/modules/prometheus/default.nix index 69f1ddf..5636fe6 100644 --- a/modules/prometheus/default.nix +++ b/modules/prometheus/default.nix @@ -27,14 +27,14 @@ in } ]; } - # { - # job_name = "pushgateway"; - # static_configs = [ - # { - # targets = [ cfg.pushgateway.web.listen-address ]; - # } - # ]; - # } + { + job_name = "pushgateway"; + static_configs = [ + { + targets = [ cfg.pushgateway.web.listen-address ]; + } + ]; + } { job_name = "node"; static_configs = [ @@ -43,7 +43,6 @@ in "sisko" "picard" "kirk" - "pike" ]; } ]; @@ -55,7 +54,6 @@ in targets = builtins.map (host: "${host}.wg.aciceri.dev:9586") [ "picard" "kirk" - "pike" ]; } ]; @@ -67,7 +65,6 @@ in targets = builtins.map (host: "${host}.wg.aciceri.dev:9134") [ "picard" "kirk" - "pike" ]; } ]; @@ -104,14 +101,12 @@ in "sisko" "kirk" "picard" - "pike" ]; } ]; } ]; }; - environment.persistence."/persist".directories = [ "/var/lib/${cfg.stateDir}" ]; diff --git a/secrets/home-planimetry.age b/secrets/home-planimetry.age index 9619054..2926aae 100644 Binary files a/secrets/home-planimetry.age and b/secrets/home-planimetry.age differ