feat: Provide environment variables for Grafana datasource configurat…

…ion (#5)
appuio · Jan 31, 2024 · 7cf82c4 · 7cf82c4
1 parent f63f2bb
commit 7cf82c4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -6,6 +6,9 @@ parameters:
     grafana_username: ""
     grafana_password: ""
     grafana_url: http://vshn-appuio-grafana/
+    grafana_datasource_url: "http://vshn-appuio-mimir-nginx.vshn-appuio-mimir.svc.cluster.local/prometheus"
+    grafana_datasource_username: ?{vaultkv:__shared__/__shared__/metrics-receive-appuio-net-remote-write/username}
+    grafana_datasource_password: ?{vaultkv:__shared__/__shared__/metrics-receive-appuio-net-remote-write/password}
     keycloak_client_id: admin-cli
     keycloak_realm: vshn-realm
     keycloak_url: https://id.vshn.net

diff --git a/component/main.jsonnet b/component/main.jsonnet
@@ -16,6 +16,9 @@ local secret = kube.Secret('grafana-organizations-operator') + namespace_meta {
     GRAFANA_URL: params.grafana_url,
     GRAFANA_USERNAME: params.grafana_username,
     GRAFANA_PASSWORD: params.grafana_password,
+    GRAFANA_DATASOURCE_URL: params.grafana_datasource_url,
+    GRAFANA_DATASOURCE_USERNAME: params.grafana_datasource_username,
+    GRAFANA_DATASOURCE_PASSWORD: params.grafana_datasource_password,
     KEYCLOAK_USERNAME: params.keycloak_username,
     KEYCLOAK_PASSWORD: params.keycloak_password,
     KEYCLOAK_CLIENT_ID: params.keycloak_client_id,

diff --git a/...s/golden/defaults/grafana-organizations-operator/grafana-organizations-operator/main.yaml b/...s/golden/defaults/grafana-organizations-operator/grafana-organizations-operator/main.yaml
@@ -8,6 +8,9 @@ metadata:
   name: grafana-organizations-operator
   namespace: vshn-appuio-grafana
 stringData:
+  GRAFANA_DATASOURCE_PASSWORD: __shared__/__shared__/metrics-receive-appuio-net-remote-write/password
+  GRAFANA_DATASOURCE_URL: http://vshn-appuio-mimir-nginx.vshn-appuio-mimir.svc.cluster.local/prometheus
+  GRAFANA_DATASOURCE_USERNAME: __shared__/__shared__/metrics-receive-appuio-net-remote-write/username
   GRAFANA_PASSWORD: ''
   GRAFANA_URL: http://vshn-appuio-grafana/
   GRAFANA_USERNAME: ''