roles/server/grafana.nix

@@ -14,7 +14,7 @@ in {
       owner = "grafana";
       group = "grafana";
     };
-    grafanaAdminPassword = {
+    grafanaAdminPassword= {
       file = hostSecrets + "grafana/admin_password.age";
       owner = "grafana";
       group = "grafana";
@@ -23,16 +23,7 @@ in {
   services = {
     grafana = {
       enable = true;
-
-      provision = {
-        enable = true;
-        datasources.settings = {
-          apiVersion = 1;
-        };
-      };
-
       settings = {
-        analytics.reporting_enabled = false;
         security = {
           admin_user = "$__file{${config.age.secrets.grafanaAdminName.path}}";
           admin_password = "$__file{${config.age.secrets.grafanaAdminPassword.path}}";

roles/server/prometheus.nix

@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   services.prometheus = {
     enable = true;
     enableReload = true;
@@ -21,11 +21,4 @@
       }
     ];
   };
-  services.grafana.provision = {
-    datasources.settings.datasources = [{
-      name = "Prometheus";
-      type = "prometheus";
-      url = "http://127.0.0.1:${builtins.toString config.services.prometheus.port}";
-    }];
-  };
 }