Compare commits

..

6 commits

Author SHA1 Message Date
402c9da2c0 flake.lock: Update
Some checks failed
EVAL x86_64-linux.picard
BUILD x86_64-linux.picard
UPLOAD x86_64-linux.picard
DOWNLOAD x86_64-linux.picard
CACHIX x86_64-linux.picard
ATTIC x86_64-linux.picard
/ test (push) Successful in 43m5s
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/2a6d6d064e33d65dc660b65c28ce17195e539db6' (2025-04-28)
  → 'github:nix-community/emacs-overlay/769f426eb3f6bc6d26f03106ac5772b98595a7b8' (2025-04-30)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b' (2025-04-24)
  → 'github:NixOS/nixpkgs/46e634be05ce9dc6d4db8e664515ba10b78151ae' (2025-04-29)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/26245db0cb552047418cfcef9a25da91b222d6c7' (2025-04-27)
  → 'github:NixOS/nixpkgs/b000159bba69b0106a42f65e52dbf27f77aca9d3' (2025-04-29)
• Updated input 'homeManager':
    'github:nix-community/home-manager/be7cf1709b469a2a2c62169172a167d1fed3509f' (2025-04-28)
  → 'github:nix-community/home-manager/d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e' (2025-04-30)
• Updated input 'lix':
    'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=dad17a54f7cf2bae24274dc2b9a535c1938e6eb0' (2025-04-27)
  → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=a66c91e1018f9e556574f60f8e4cb14544e0e875' (2025-04-30)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1' (2025-04-24)
  → 'github:NixOS/nixos-hardware/72081c9fbbef63765ae82bff9727ea79cc86bd5b' (2025-04-29)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b' (2025-04-24)
  → 'github:NixOS/nixpkgs/46e634be05ce9dc6d4db8e664515ba10b78151ae' (2025-04-29)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/d1863f30d9ca67f679f9c2583d7adf674b5d9b8a' (2025-04-28)
  → 'github:numtide/treefmt-nix/82bf32e541b30080d94e46af13d46da0708609ea' (2025-04-29)
2025-04-30 15:01:05 +00:00
2e20dabf06
Add (disabled) restic Prometheus exporter
All checks were successful
EVAL x86_64-linux.picard
BUILD x86_64-linux.picard
UPLOAD x86_64-linux.picard
DOWNLOAD x86_64-linux.picard
CACHIX x86_64-linux.picard
ATTIC x86_64-linux.picard
/ test (push) Successful in 48s
2025-04-29 20:56:07 +02:00
baac8eed23
Scaps Prometheus exporters from pike 2025-04-29 20:55:25 +02:00
b2bb18f583
Disable pushgateway 2025-04-29 20:54:53 +02:00
3b9e5cf5c6
Enable prometheus exporters on pike 2025-04-29 20:54:36 +02:00
4f293981f8
Update planimetry 2025-04-29 20:53:11 +02:00
4 changed files with 48 additions and 33 deletions

44
flake.lock generated
View file

@ -122,11 +122,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1745921824, "lastModified": 1746001439,
"narHash": "sha256-8FFSHBE0HgW0HGrTULbaUVH29aeVP31Clf2HDtDfqaE=", "narHash": "sha256-MQplzhcXXrAlfDIfklvYxXtnxv5akmeLaeGIvouYYUI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "841c18a6fe787b669ea362e3e14f54a5bd12a63c", "rev": "769f426eb3f6bc6d26f03106ac5772b98595a7b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,11 +387,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745894335, "lastModified": 1745987135,
"narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=", "narHash": "sha256-8Up4QPuMZEJBU0eefAY+nUe7DYKQQzvaHnMpNdwRgKA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa", "rev": "d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -464,11 +464,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1745775537, "lastModified": 1745994134,
"narHash": "sha256-X/mfPstVkj3hhIIBU/tGAuOraiYpm3i/A3BiBg1VH4s=", "narHash": "sha256-rYMXlL9qSv+Syz0udsOJxKeLRQ9FdGmHz6j+YzDi5uE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "dad17a54f7cf2bae24274dc2b9a535c1938e6eb0", "rev": "a66c91e1018f9e556574f60f8e4cb14544e0e875",
"revCount": 17805, "revCount": 17809,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -569,11 +569,11 @@
}, },
"nixosHardware": { "nixosHardware": {
"locked": { "locked": {
"lastModified": 1745907084, "lastModified": 1745955289,
"narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=", "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f1e52a018166e1a324f832de913e12c0e55792d0", "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -647,11 +647,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1745742390, "lastModified": 1745921652,
"narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "26245db0cb552047418cfcef9a25da91b222d6c7", "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -711,11 +711,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1745794561, "lastModified": 1745930157,
"narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -742,11 +742,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1745794561, "lastModified": 1745930157,
"narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,6 +1,7 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: }:
let let
@ -15,6 +16,7 @@ in
"sisko" "sisko"
"picard" "picard"
"kirk" "kirk"
"pike"
] ]
{ {
enable = true; enable = true;
@ -53,6 +55,7 @@ in
"sisko" "sisko"
"picard" "picard"
"kirk" "kirk"
"pike"
] ]
{ {
enable = true; enable = true;
@ -62,13 +65,17 @@ in
[ [
"picard" "picard"
"kirk" "kirk"
"pike"
] ]
{ {
enable = true; enable = true;
}; };
# restic = mkFor ["sisko"] { restic = mkFor [ "sisko" ] {
# enable = true; # 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" ] { postgres = mkFor [ "sisko" ] {
enable = true; enable = true;
}; };
@ -81,9 +88,12 @@ in
"sisko" "sisko"
"picard" "picard"
"kirk" "kirk"
"pike"
] ]
{ {
enable = true; enable = true;
}; };
}; };
systemd.services.prometheus-restic-exporter.path = [ pkgs.openssh ];
} }

View file

@ -27,14 +27,14 @@ in
} }
]; ];
} }
{ # {
job_name = "pushgateway"; # job_name = "pushgateway";
static_configs = [ # static_configs = [
{ # {
targets = [ cfg.pushgateway.web.listen-address ]; # targets = [ cfg.pushgateway.web.listen-address ];
} # }
]; # ];
} # }
{ {
job_name = "node"; job_name = "node";
static_configs = [ static_configs = [
@ -43,6 +43,7 @@ in
"sisko" "sisko"
"picard" "picard"
"kirk" "kirk"
"pike"
]; ];
} }
]; ];
@ -54,6 +55,7 @@ in
targets = builtins.map (host: "${host}.wg.aciceri.dev:9586") [ targets = builtins.map (host: "${host}.wg.aciceri.dev:9586") [
"picard" "picard"
"kirk" "kirk"
"pike"
]; ];
} }
]; ];
@ -65,6 +67,7 @@ in
targets = builtins.map (host: "${host}.wg.aciceri.dev:9134") [ targets = builtins.map (host: "${host}.wg.aciceri.dev:9134") [
"picard" "picard"
"kirk" "kirk"
"pike"
]; ];
} }
]; ];
@ -101,12 +104,14 @@ in
"sisko" "sisko"
"kirk" "kirk"
"picard" "picard"
"pike"
]; ];
} }
]; ];
} }
]; ];
}; };
environment.persistence."/persist".directories = [ environment.persistence."/persist".directories = [
"/var/lib/${cfg.stateDir}" "/var/lib/${cfg.stateDir}"
]; ];

Binary file not shown.