7 files changed, 23 insertions, 12 deletions
diff --git a/modules/services/grafana/dashboards/node-exporter.json b/modules/services/monitoring/dashboards/node-exporter.json
index 44356fa..44356fa 100644
--- a/modules/services/grafana/dashboards/node-exporter.json
+++ b/modules/services/monitoring/dashboards/node-exporter.json
diff --git a/modules/services/monitoring/default.nix b/modules/services/monitoring/default.nix
new file mode 100644
index 0000000..d8c9790
--- /dev/null
+++ b/modules/services/monitoring/default.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.services.loki;
+in
+{
+  imports = [
+    ./grafana.nix
+    ./loki.nix
+    ./node-exporter.nix
+    ./prometheus.nix
+    ./promtail.nix
+  ];
+}
diff --git a/modules/services/grafana/default.nix b/modules/services/monitoring/grafana.nix
index ded6930..44b0447 100644
--- a/modules/services/grafana/default.nix
+++ b/modules/services/monitoring/grafana.nix
@@ -1,10 +1,10 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.my.services.grafana;
+  cfg = config.my.services.monitoring.grafana;
   secrets = config.age.secrets;
 in
 {
-  options.my.services.grafana = with lib; {
+  options.my.services.monitoring.grafana = with lib; {
     enable = mkEnableOption "grafana observability stack";
     vhostName = mkOption {
       type = types.str;
diff --git a/modules/services/loki/default.nix b/modules/services/monitoring/loki.nix
index 89c2645..8092100 100644
--- a/modules/services/loki/default.nix
+++ b/modules/services/monitoring/loki.nix
@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.my.services.loki;
+  cfg = config.my.services.monitoring.loki;
 in
 {
-  options.my.services.loki = with lib; {
+  options.my.services.monitoring.loki = with lib; {
     enable = mkEnableOption "loki observability stack";
     address = mkOption {
       type = types.str;
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/prometheus/default.nix b/modules/services/monitoring/prometheus.nix
index cf9af06..59cccb6 100644
--- a/modules/services/prometheus/default.nix
+++ b/modules/services/monitoring/prometheus.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 let
-  cfg = config.my.services.prometheus;
+  cfg = config.my.services.monitoring.prometheus;
   blackboxConfig = {
     modules = {
       https_2xx = {
@@ -41,7 +41,7 @@ let
   ];
 in
 {
-  options.my.services.prometheus = with lib; {
+  options.my.services.monitoring.prometheus = with lib; {
     enable = mkEnableOption "Prometheus monitoring solution";
   };
 
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";
   };