modules/monitoring: consolidate all monitoring services together

This will help to organize and structure monitoring modules a bit
better.

2 files changed, 4 insertions, 6 deletions

diff --git a/modules/services/metrics-exporter/default.nix b/modules/services/monitoring/node-exporter.nix
index c3c471c..a205bba 100644
--- a/modules/services/metrics-exporter/default.nix
+++ b/modules/services/monitoring/node-exporter.nix
@@ -1,10 +1,8 @@
 { config, pkgs, lib, ... }:
-let cfg = config.my.services.metrics-exporter;
+let cfg = config.my.services.monitoring.node-exporter;
 in
 {
-  imports = [ ./promtail.nix ];
-
-  options.my.services.metrics-exporter = with lib; {
+  options.my.services.monitoring.node-exporter = with lib; {
     enable = mkEnableOption "Prometheus metrics exporter";
   };
 
diff --git a/modules/services/metrics-exporter/promtail.nix b/modules/services/monitoring/promtail.nix
index eb574d0..5fec760 100644
--- a/modules/services/metrics-exporter/promtail.nix
+++ b/modules/services/monitoring/promtail.nix
@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.my.services.metrics-exporter.promtail;
+  cfg = config.my.services.monitoring.promtail;
 in
 {
-  options.my.services.metrics-exporter.promtail = with lib; {
+  options.my.services.monitoring.promtail = with lib; {
     enable = mkEnableOption "promtail logs exporter";
   };