From 2b98dffba136cc7393b1f00e738cc1f0fccf3460 Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Tue, 5 Sep 2023 19:39:28 +0200 Subject: [PATCH] chore(grafana): configure solar_toolkit source via configmap --- deploy/dev/grafana-datasources.yaml | 9 +++++++++ deploy/prod/grafana-datasources.yaml | 7 ------- deploy/prod/kustomization.yaml | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 deploy/prod/grafana-datasources.yaml diff --git a/deploy/dev/grafana-datasources.yaml b/deploy/dev/grafana-datasources.yaml index 578e352..b5e7218 100644 --- a/deploy/dev/grafana-datasources.yaml +++ b/deploy/dev/grafana-datasources.yaml @@ -4,3 +4,12 @@ datasources: name: Prometheus type: prometheus url: http://dev-prometheus-server +- name: PostgreSQL (solar_toolkit) + type: postgres + url: dev-db:5432 + user: solar_toolkit_reader + jsonData: + database: solar_toolkit + sslmode: disable + secureJsonData: + password: postgres diff --git a/deploy/prod/grafana-datasources.yaml b/deploy/prod/grafana-datasources.yaml deleted file mode 100644 index 10c1260..0000000 --- a/deploy/prod/grafana-datasources.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: 1 -datasources: -- isDefault: true - name: Prometheus - type: prometheus - url: http://prod-prometheus-server - diff --git a/deploy/prod/kustomization.yaml b/deploy/prod/kustomization.yaml index 7aca8a2..ff34c29 100644 --- a/deploy/prod/kustomization.yaml +++ b/deploy/prod/kustomization.yaml @@ -26,7 +26,7 @@ configMapGenerator: behavior: merge files: - grafana.ini=secrets/grafana-config.ini - - datasources.yaml=grafana-datasources.yaml + - datasources.yaml=secrets/grafana-datasources.yaml - name: invidious-config files: - config.yml=invidious-config.yaml