From 77fd991ed17dca7f2f853e148f549c8204edb3df Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Tue, 28 May 2024 12:26:46 -0700
Subject: [PATCH] feat(monitoring): add to utsuho

---
 modules/nixos/monitoring/source/prometheus.nix | 1 -
 modules/nixos/monitoring/source/promtail.nix   | 4 ++--
 nixos/base/monitoring.nix                      | 6 ++++++
 nixos/monitoring.nix                           | 7 +++++++
 systems/utsuho/default.nix                     | 5 +++++
 systems/utsuho/nixos.nix                       | 1 +
 6 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 nixos/base/monitoring.nix
 create mode 100644 nixos/monitoring.nix

diff --git a/modules/nixos/monitoring/source/prometheus.nix b/modules/nixos/monitoring/source/prometheus.nix
index 3dbe6350..6eb2d754 100644
--- a/modules/nixos/monitoring/source/prometheus.nix
+++ b/modules/nixos/monitoring/source/prometheus.nix
@@ -29,7 +29,6 @@ in {
         {
           enabledCollectors = [
             "arp"
-            "boottime"
             "cpu"
             "cpufreq"
             "diskstats"
diff --git a/modules/nixos/monitoring/source/promtail.nix b/modules/nixos/monitoring/source/promtail.nix
index 556f368f..b4062ea9 100644
--- a/modules/nixos/monitoring/source/promtail.nix
+++ b/modules/nixos/monitoring/source/promtail.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (builtins) toJSON;
+  inherit (builtins) toJSON toString;
   inherit (lib.options) mkOption;
   inherit (lib.types) port;
   cfg = config.services.promtail;
@@ -17,7 +17,7 @@ in {
   };
   config.services.promtail = {
     extraFlags = [
-      "--server.http-listen-port=${cfg.settings.httpListenPort}"
+      "--server.http-listen-port=${toString cfg.settings.httpListenPort}"
     ];
   };
 }
diff --git a/nixos/base/monitoring.nix b/nixos/base/monitoring.nix
new file mode 100644
index 00000000..bf37f86b
--- /dev/null
+++ b/nixos/base/monitoring.nix
@@ -0,0 +1,6 @@
+_: {
+    services = {
+        prometheus.exporters.node.enable = true;
+        promtail.enable = true;
+    };
+}
diff --git a/nixos/monitoring.nix b/nixos/monitoring.nix
new file mode 100644
index 00000000..fb96c452
--- /dev/null
+++ b/nixos/monitoring.nix
@@ -0,0 +1,7 @@
+_: {
+    services = {
+        grafana.enable = true;
+        loki.enable = true;
+        prometheus.enable = true;
+    };
+}
\ No newline at end of file
diff --git a/systems/utsuho/default.nix b/systems/utsuho/default.nix
index 82f39361..65328fa2 100644
--- a/systems/utsuho/default.nix
+++ b/systems/utsuho/default.nix
@@ -17,6 +17,11 @@ _: {
       unifi.enable = true;
       mosquitto.enable = true;
       dnsmasq.enable = true;
+      grafana.enable = true;
+      loki.enable = true;
+      prometheus.enable = true;
+      prometheus-exporters-node.enable = true;
+      promtail.enable = true;
     };
   };
 }
diff --git a/systems/utsuho/nixos.nix b/systems/utsuho/nixos.nix
index 51e30567..7065c970 100644
--- a/systems/utsuho/nixos.nix
+++ b/systems/utsuho/nixos.nix
@@ -19,6 +19,7 @@ in {
     nixos.unifi
     nixos.dnsmasq
     nixos.mosquitto
+    nixos.monitoring
   ];
 
   services.cloudflared = let