From df5557698fad694f1a4908b9373aac2321f18353 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 12 Oct 2025 06:05:29 +0200 Subject: [PATCH] ildkule: scrape the nixos-flake exporters --- flake.lock | 30 +++++++++---------- .../monitoring/prometheus/machines.nix | 25 ++++++++-------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 9f382ff..54dd72a 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1758386174, - "narHash": "sha256-iNDxHSDdb/LlqDbqP9BcZd1QEmks4iYiyN34UhUizZ8=", + "lastModified": 1758919016, + "narHash": "sha256-TSJMOWq9dO7P1iQB4httzWwAtpM1veacLcaS7FAyTpo=", "ref": "refs/heads/main", - "rev": "a21fdfe56743afc7de1fb14597711fbd97ddef76", - "revCount": 50, + "rev": "c87263b784954d20485d108e70934c9316935d75", + "revCount": 51, "type": "git", "url": "https://git.pvv.ntnu.no/Grzegorz/greg-ng.git" }, @@ -159,11 +159,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758363343, - "narHash": "sha256-TWem5ajoX0vD7j1v/cg3XU7GHWW10HRUQbZL++QNXLk=", - "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", + "lastModified": 1760181981, + "narHash": "sha256-xDZe6SFMbTcnDIdcYixiDgAEuk95qamQqSQN2AHwH3A=", + "rev": "848c3a9fbba628987c98256fa34c6e2927ee1bde", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.810175.b2a3852bd078/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.811127.848c3a9fbba6/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -172,11 +172,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758361324, - "narHash": "sha256-uCqhgJlmxP3UmyCNZ21ucc5Ic0I2le3rA7+Q61UH1YA=", - "rev": "0f3383ef02bc092d2f82afa4e556743c6e6b74d6", + "lastModified": 1760170014, + "narHash": "sha256-oP2fv8Vl0sYauPVmIFwMnNl0Nw8+ZJ2Cm1vaeS9t1to=", + "rev": "e18d8ec6fafaed55561b7a1b54eb1c1ce3ffa2c5", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre864278.0f3383ef02bc/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre875961.e18d8ec6fafa/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -268,11 +268,11 @@ ] }, "locked": { - "lastModified": 1758007585, - "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", + "lastModified": 1760240450, + "narHash": "sha256-sa9bS9jSyc4vH0jSWrUsPGdqtMvDwmkLg971ntWOo2U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", + "rev": "41fd1f7570c89f645ee0ada0be4e2d3c4b169549", "type": "github" }, "original": { diff --git a/hosts/ildkule/services/monitoring/prometheus/machines.nix b/hosts/ildkule/services/monitoring/prometheus/machines.nix index c51a12d..6ca8f73 100644 --- a/hosts/ildkule/services/monitoring/prometheus/machines.nix +++ b/hosts/ildkule/services/monitoring/prometheus/machines.nix @@ -8,25 +8,26 @@ defaultNodeExporterPort = 9100; defaultSystemdExporterPort = 9101; + defaultNixosExporterPort = 9102; in { services.prometheus.scrapeConfigs = [{ job_name = "base_info"; static_configs = [ - (mkHostScrapeConfig "ildkule" [ cfg.exporters.node.port cfg.exporters.systemd.port ]) + (mkHostScrapeConfig "ildkule" [ cfg.exporters.node.port cfg.exporters.systemd.port defaultNixosExporterPort ]) - (mkHostScrapeConfig "bekkalokk" [ defaultNodeExporterPort defaultSystemdExporterPort ]) - (mkHostScrapeConfig "bicep" [ defaultNodeExporterPort defaultSystemdExporterPort ]) - (mkHostScrapeConfig "brzeczyszczykiewicz" [ defaultNodeExporterPort defaultSystemdExporterPort ]) - (mkHostScrapeConfig "georg" [ defaultNodeExporterPort defaultSystemdExporterPort ]) - (mkHostScrapeConfig "kommode" [ defaultNodeExporterPort defaultSystemdExporterPort ]) - (mkHostScrapeConfig "ustetind" [ defaultNodeExporterPort defaultSystemdExporterPort ]) - (mkHostScrapeConfig "wenche" [ defaultNodeExporterPort defaultSystemdExporterPort ]) + (mkHostScrapeConfig "bekkalokk" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) + (mkHostScrapeConfig "bicep" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) + (mkHostScrapeConfig "brzeczyszczykiewicz" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) + (mkHostScrapeConfig "georg" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) + (mkHostScrapeConfig "kommode" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) + (mkHostScrapeConfig "ustetind" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) + (mkHostScrapeConfig "wenche" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) - (mkHostScrapeConfig "lupine-1" [ defaultNodeExporterPort defaultSystemdExporterPort ]) + (mkHostScrapeConfig "lupine-1" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) # (mkHostScrapeConfig "lupine-2" [ defaultNodeExporterPort defaultSystemdExporterPort ]) - (mkHostScrapeConfig "lupine-3" [ defaultNodeExporterPort defaultSystemdExporterPort ]) - (mkHostScrapeConfig "lupine-4" [ defaultNodeExporterPort defaultSystemdExporterPort ]) - (mkHostScrapeConfig "lupine-5" [ defaultNodeExporterPort defaultSystemdExporterPort ]) + (mkHostScrapeConfig "lupine-3" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) + (mkHostScrapeConfig "lupine-4" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) + (mkHostScrapeConfig "lupine-5" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) (mkHostScrapeConfig "hildring" [ defaultNodeExporterPort ]) (mkHostScrapeConfig "isvegg" [ defaultNodeExporterPort ])