From 251379d6084849f26866226b4bd0391216a8ccec Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Sun, 23 Apr 2023 13:37:03 -0700
Subject: modules/monitoring: consolidate all monitoring services together

This will help to organize and structure monitoring modules a bit
better.
---
 hosts/carmel/services.nix |  2 +-
 hosts/tahoe/services.nix  | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'hosts')

diff --git a/hosts/carmel/services.nix b/hosts/carmel/services.nix
index e7f09dd..048a631 100644
--- a/hosts/carmel/services.nix
+++ b/hosts/carmel/services.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }: {
   my.services = {
-    metrics-exporter = { enable = true; };
+    monitoring.node-exporter.enable = true;
     avahi = {
       enable = true;
       withReflector = true;
diff --git a/hosts/tahoe/services.nix b/hosts/tahoe/services.nix
index 8783e8c..4f3ffdb 100644
--- a/hosts/tahoe/services.nix
+++ b/hosts/tahoe/services.nix
@@ -21,18 +21,21 @@ in
       enable = true;
       vhostName = "unifi.fcuny.xyz";
     };
-    prometheus = { enable = true; };
-    grafana = {
-      enable = true;
-      vhostName = "dash.fcuny.xyz";
-    };
 
-    loki = {
-      enable = true;
-      address = "192.168.6.40";
+    monitoring = {
+      prometheus.enable = true;
+      grafana = {
+        enable = true;
+        vhostName = "dash.fcuny.xyz";
+      };
+      loki = {
+        enable = true;
+        address = "192.168.6.40";
+      };
+      promtail.enable = true;
+      node-exporter.enable = true;
     };
 
-    metrics-exporter.promtail.enable = true;
     cgit = {
       enable = true;
     };
@@ -46,7 +49,6 @@ in
       enable = true;
       vhostName = "bt.fcuny.xyz";
     };
-    metrics-exporter = { enable = true; };
     syncthing.enable = true;
     backup = {
       enable = true;
-- 
cgit 1.4.1