From 452e76e173e77dee07339fc2dc4c5234d4d26261 Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Thu, 30 May 2024 13:27:20 -0700
Subject: [PATCH] fix(monitoring): enumerate exporters properly

---
 modules/nixos/monitoring/ingest/prometheus.nix | 14 +++++++-------
 systems/extern-test/default.nix                |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/nixos/monitoring/ingest/prometheus.nix b/modules/nixos/monitoring/ingest/prometheus.nix
index a8eb1b90..6092433a 100644
--- a/modules/nixos/monitoring/ingest/prometheus.nix
+++ b/modules/nixos/monitoring/ingest/prometheus.nix
@@ -5,25 +5,25 @@
   ...
 }: let
   inherit (gensokyo-zone) systems;
-  inherit (lib.attrsets) filterAttrs mapAttrsToList attrNames;
+  inherit (lib.attrsets) filterAttrs mapAttrsToList;
   nodeExporterSystems =
     filterAttrs (
       _: system:
-        system.config.exporters.prometheus-exporters-node.enable or false
+        system.config.access.online.enable &&
+        system.config.exports.services.prometheus-exporters-node.enable
     )
     systems;
 in {
   services.prometheus = {
-    #enable = true;
     port = 9090;
     scrapeConfigs =
-      mapAttrsToList (system: systemConfig: {
+      mapAttrsToList (_: system: {
         job_name = "${system.config.name}-node-exporter";
-        static_configs = {
+        static_configs = [ {
           targets = [
-            "${access.getAddressFor system.config.name "local"}:${system.config.exporters.prometheus-exporters-node.port}"
+            "${access.getAddressFor system.config.name "local"}:${toString system.config.exports.services.prometheus-exporters-node.ports.default.port}"
           ];
-        };
+        } ];
       })
       nodeExporterSystems;
   };
diff --git a/systems/extern-test/default.nix b/systems/extern-test/default.nix
index 8772ced1..a55714af 100644
--- a/systems/extern-test/default.nix
+++ b/systems/extern-test/default.nix
@@ -7,6 +7,8 @@
 in {
   arch = "x86_64";
   type = "NixOS";
+  access.online.enable = false;
+  exports.defaultServices = false;
   modules = mkForce [
     ./nixos.nix
   ];