Remove grafana

5 files changed, 4 insertions, 72 deletions

diff --git a/modules/config.nix b/modules/config.nix
index e314a7d..2bd3267 100644
--- a/modules/config.nix
+++ b/modules/config.nix
@@ -8,7 +8,7 @@
     ./dashboard
     ./storage
     ./notifications
-    ./monitoring
+    # ./monitoring
     ./rss
     ./packages.nix
   ];
diff --git a/modules/dashboard/default.nix b/modules/dashboard/default.nix
index f3c55ff..4dd3ef0 100644
--- a/modules/dashboard/default.nix
+++ b/modules/dashboard/default.nix
@@ -2,7 +2,7 @@
 with lib;
 let
   links = import ./links.nix { inherit settings; };
-  isKeysUnique =
+  areKeysUnique =
     let linkKeys = map (l: l.key) (filter (hasAttr "key") links);
     in length linkKeys == length (lib.unique linkKeys);
 in
@@ -10,7 +10,7 @@ in
   imports = [ ../../services/bacchus-dashboard/bacchus-dashboard.service.nix ];
 
   assertions = [
-    { assertion = isKeysUnique; message = "The dashboard link 'key' property must be unique"; }
+    { assertion = areKeysUnique; message = "The dashboard link 'key' property must be unique"; }
   ];
 
   services.bacchus-dashboard = {
@@ -18,7 +18,7 @@ in
     openFirewall = true;
     port = settings.network.ports.dashboard;
     title = "Bacchus Dashboard";
-    embedLink = settings.grafana.dashboardEmbedLink;
+    # embedLink = settings.grafana.dashboardEmbedLink;
     links = links;
   };
 }
diff --git a/modules/monitoring/default.nix b/modules/monitoring/default.nix
deleted file mode 100644
index d93681b..0000000
--- a/modules/monitoring/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./grafana.nix
-    ./prometheus.nix
-  ];
-}
diff --git a/modules/monitoring/grafana.nix b/modules/monitoring/grafana.nix
deleted file mode 100644
index ae262d6..0000000
--- a/modules/monitoring/grafana.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ settings, ... }:
-let
-  ports = settings.network.ports;
-in
-{
-  services.grafana = {
-    enable = true;
-    settings = {
-      server = {
-        protocol = "http";
-        http_addr = "0.0.0.0";
-        http_port = ports.grafana;
-        domain = "grafana.local";
-        serve_from_sub_path = true;
-      };
-      security = {
-        secret_key = settings.grafana.secretKey;
-        allow_sign_up = false;
-        disable_initial_admin_creation = false;
-        disable_gravatar = true;
-        admin_user = settings.grafana.adminUser;
-        admin_email = settings.grafana.adminEmail;
-        admin_password = settings.grafana.adminPassword;
-        allow_embedding = true;
-      };
-    };
-  };
-}
diff --git a/modules/monitoring/prometheus.nix b/modules/monitoring/prometheus.nix
deleted file mode 100644
index adb5baa..0000000
--- a/modules/monitoring/prometheus.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ settings, ... }:
-let
-  ports = settings.network.ports;
-in
-{
-  services.prometheus = {
-    enable = true;
-    port = ports.prometheus;
-
-    exporters.node = {
-      enable = true;
-      port = ports.prometheusNodeExporter;
-      enabledCollectors = [ "systemd" ];
-      extraFlags = [
-        "--collector.ethtool"
-        "--collector.softirqs"
-        "--collector.tcpstat"
-        "--collector.wifi"
-      ];
-    };
-
-    scrapeConfigs = [
-      {
-        job_name = "system";
-        scrape_interval = "10s";
-        static_configs = [{
-          targets = [ "127.0.0.1:${toString ports.prometheusNodeExporter}" ];
-        }];
-      }
-    ];
-  };
-}
-