From 16b2152fdb538e568fc746d29b25ee4c40f021fd Mon Sep 17 00:00:00 2001
From: Matt Layher <mdlayher@gmail.com>
Date: Sat, 30 Mar 2024 10:53:46 -0400
Subject: [PATCH] nixos/servnerr-3: monitoring update

---
 nixos/servnerr-4/configuration.nix | 21 ---------------------
 nixos/servnerr-4/prometheus.nix    |  8 ++------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/nixos/servnerr-4/configuration.nix b/nixos/servnerr-4/configuration.nix
index eaab955..710ed86 100644
--- a/nixos/servnerr-4/configuration.nix
+++ b/nixos/servnerr-4/configuration.nix
@@ -74,27 +74,6 @@ in {
       '';
     };
 
-    # Deploy CoreRAD monitor mode on all interfaces.
-    corerad = {
-      enable = true;
-
-      # Enable as necessary to get development builds of CoreRAD.
-      # package = unstable.corerad;
-
-      settings = {
-        debug = {
-          address = ":9430";
-          prometheus = true;
-          pprof = true;
-        };
-
-        interfaces = [{
-          names = [ "mgmt0" "br0" ];
-          monitor = true;
-        }];
-      };
-    };
-
     grafana = {
       enable = true;
       # Bind to all interfaces.
diff --git a/nixos/servnerr-4/prometheus.nix b/nixos/servnerr-4/prometheus.nix
index 5bbb074..d88f742 100644
--- a/nixos/servnerr-4/prometheus.nix
+++ b/nixos/servnerr-4/prometheus.nix
@@ -115,15 +115,14 @@ in {
       (staticScrape "apcupsd" [ "nerr-4:9162" "servnerr-4:9162" ])
       (staticScrape "consrv" [ "monitnerr-1:9288" ])
       (staticScrape "coredns" [ "routnerr-3:9153" ])
-      (staticScrape "corerad" [ "routnerr-3:9430" "servnerr-4:9430" ])
+      (staticScrape "corerad" [ "routnerr-3:9430" ])
       (staticScrape "node" [
         "monitnerr-1:9100"
         "nerr-4:9100"
         "routnerr-3:9100"
         "servnerr-4:9100"
       ])
-      (staticScrape "obs" [ "nerr-4:9407" ])
-      (staticScrape "windows" [ "theatnerr-2:9182" ])
+      (staticScrape "windows" [ "theatnerr-2.ipv4.lan.servnerr.com:9182" ])
       (staticScrape "zrepl" [ "servnerr-4:9811" ])
 
       # Home Assistant requires a more custom configuration.
@@ -163,9 +162,6 @@ in {
           relabel_configs = relabelTarget "servnerr-4:9116";
         }
       ])
-
-      # Lab-only jobs must be prefixed with lab- to avoid alerting.
-      (staticScrape "lab-corerad" [ "routnerr-3:9431" ])
     ];
 
     rules = [ (builtins.toJSON (import ./prometheus-alerts.nix)) ];