From 3d4deae65a7f41baf2fa137beb3e1dbdcd43b24d Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 10 Jan 2025 10:10:47 +0100 Subject: [PATCH 1/2] Server/grafana: disable telemetry --- roles/server/grafana.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/server/grafana.nix b/roles/server/grafana.nix index 030fddb..336b23d 100644 --- a/roles/server/grafana.nix +++ b/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"; @@ -24,6 +24,7 @@ in { grafana = { enable = true; settings = { + analytics.reporting_enabled = false; security = { admin_user = "$__file{${config.age.secrets.grafanaAdminName.path}}"; admin_password = "$__file{${config.age.secrets.grafanaAdminPassword.path}}"; From d65b4380e77bfe7fe5175f1e8e808a6d45389eaf Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 10 Jan 2025 10:45:40 +0100 Subject: [PATCH 2/2] Server/grafana: provision prometheus datasource --- roles/server/grafana.nix | 8 ++++++++ roles/server/prometheus.nix | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/roles/server/grafana.nix b/roles/server/grafana.nix index 336b23d..a09ff0e 100644 --- a/roles/server/grafana.nix +++ b/roles/server/grafana.nix @@ -23,6 +23,14 @@ in { services = { grafana = { enable = true; + + provision = { + enable = true; + datasources.settings = { + apiVersion = 1; + }; + }; + settings = { analytics.reporting_enabled = false; security = { diff --git a/roles/server/prometheus.nix b/roles/server/prometheus.nix index 9512e29..999d9c6 100644 --- a/roles/server/prometheus.nix +++ b/roles/server/prometheus.nix @@ -1,4 +1,4 @@ -{...}: { +{config, ...}: { services.prometheus = { enable = true; enableReload = true; @@ -21,4 +21,11 @@ } ]; }; + services.grafana.provision = { + datasources.settings.datasources = [{ + name = "Prometheus"; + type = "prometheus"; + url = "http://127.0.0.1:${builtins.toString config.services.prometheus.port}"; + }]; + }; }