From 879f642f40c33785c250daf0faa841f9124b33ae Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 9 Apr 2023 23:06:38 +0200
Subject: [PATCH] service/prometheus: move datasource config from grafana

---
 modules/services/grafana/default.nix    | 14 +------------
 modules/services/prometheus/default.nix | 26 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/services/grafana/default.nix b/modules/services/grafana/default.nix
index 9364ddc..d6ae70c 100644
--- a/modules/services/grafana/default.nix
+++ b/modules/services/grafana/default.nix
@@ -47,19 +47,7 @@ in
         };
       };
 
-      provision = {
-        enable = true;
-        datasources.settings.datasources = [
-          (lib.optionalAttrs config.services.prometheus.enable {
-            name = "Prometheus";
-            type = "prometheus";
-            url = "http://127.0.0.1:${toString config.services.prometheus.port}";
-            jsonData = {
-              timeInterval = config.services.prometheus.globalConfig.scrape_interval;
-            };
-          })
-        ];
-      };
+      provision.enable = true;
     };
 
     my.services.nginx.virtualHosts = [
diff --git a/modules/services/prometheus/default.nix b/modules/services/prometheus/default.nix
index 27979ca..67b92e6 100644
--- a/modules/services/prometheus/default.nix
+++ b/modules/services/prometheus/default.nix
@@ -61,13 +61,25 @@ in
       ];
     };
 
-    services.grafana.provision.dashboards.settings.providers = [
-      {
-        name = "Node Exporter";
-        options.path = pkgs.node-exporter-dashboard;
-        disableDeletion = true;
-      }
-    ];
+    services.grafana.provision = {
+      datasources.settings.datasources = [
+        {
+          name = "Prometheus";
+          type = "prometheus";
+          url = "http://127.0.0.1:${toString config.services.prometheus.port}";
+          jsonData = {
+            timeInterval = config.services.prometheus.globalConfig.scrape_interval;
+          };
+        }
+      ];
+      dashboards.settings.providers = [
+        {
+          name = "Node Exporter";
+          options.path = pkgs.node-exporter-dashboard;
+          disableDeletion = true;
+        }
+      ];
+    };
 
     my.services.nginx.virtualHosts = [
       {