diff --git a/modules/prometheus-exporters/default.nix b/modules/prometheus-exporters/default.nix index 4d1a70e..bdfe268 100644 --- a/modules/prometheus-exporters/default.nix +++ b/modules/prometheus-exporters/default.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let @@ -15,6 +16,7 @@ in "sisko" "picard" "kirk" + "pike" ] { enable = true; @@ -53,6 +55,7 @@ in "sisko" "picard" "kirk" + "pike" ] { enable = true; @@ -62,13 +65,17 @@ in [ "picard" "kirk" + "pike" ] { enable = true; }; - # restic = mkFor ["sisko"] { - # 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; + }; postgres = mkFor [ "sisko" ] { enable = true; }; @@ -81,9 +88,12 @@ 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 5636fe6..69f1ddf 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,6 +43,7 @@ in "sisko" "picard" "kirk" + "pike" ]; } ]; @@ -54,6 +55,7 @@ in targets = builtins.map (host: "${host}.wg.aciceri.dev:9586") [ "picard" "kirk" + "pike" ]; } ]; @@ -65,6 +67,7 @@ in targets = builtins.map (host: "${host}.wg.aciceri.dev:9134") [ "picard" "kirk" + "pike" ]; } ]; @@ -101,12 +104,14 @@ 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 2926aae..9619054 100644 Binary files a/secrets/home-planimetry.age and b/secrets/home-planimetry.age differ