From e7af757f6c8d9090b830e374eb6f742a03a9b013 Mon Sep 17 00:00:00 2001
From: Kirill Fedoseev <k.fedoseev@innopolis.university>
Date: Tue, 5 Apr 2022 14:13:27 +0400
Subject: [PATCH] Fix prometheus credentials provisioning

---
 .env.example                                |  2 ++
 docker-compose.prod.yml                     |  9 +++++++++
 grafana/provisioning/datasources/config.yml | 12 +++++++-----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.env.example b/.env.example
index 41865ed..398f319 100644
--- a/.env.example
+++ b/.env.example
@@ -5,3 +5,5 @@ GRAFANA_HOST_DOMAIN=grafana.example.com
 MONITOR_HOST_DOMAIN=monitor.example.com
 
 INFURA_PROJECT_KEY=
+
+PROM_PASSWORD=
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 7ea179c..2541bde 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -40,6 +40,15 @@ services:
       - ./grafana/provisioning:/etc/grafana/provisioning
       - ./grafana/dashboards:/etc/grafana/dashboards
       - grafana-storage:/var/lib/grafana
+    environment:
+      PG_HOST: 'postgres:5432'
+      PG_USER: 'postgres'
+      PG_PASSWORD: 'pass'
+      PG_DB: 'db'
+      PROM_USER: 'admin'
+      PROM_HOST: 'http://prometheus:9090'
+    env_file:
+      - .env
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.grafana.rule=Host(`${GRAFANA_HOST_DOMAIN}`)"
diff --git a/grafana/provisioning/datasources/config.yml b/grafana/provisioning/datasources/config.yml
index 9abbe7b..8a1acdb 100644
--- a/grafana/provisioning/datasources/config.yml
+++ b/grafana/provisioning/datasources/config.yml
@@ -8,10 +8,10 @@ datasources:
   typeName: PostgreSQL
   typeLogoUrl: public/app/plugins/datasource/postgres/img/postgresql_logo.svg
   access: proxy
-  url: 'postgres:5432'
-  password: 'pass'
-  user: postgres
-  database: db
+  url: ${PG_HOST}
+  password: ${PG_PASSWORD}
+  user: ${PG_USER}
+  database: ${PG_DB}
   basicAuth: false
   isDefault: true
   jsonData:
@@ -30,11 +30,13 @@ datasources:
   typeName: Prometheus
   typeLogoUrl: public/app/plugins/datasource/prometheus/img/prometheus_logo.svg
   access: proxy
-  url: 'http://prometheus:9090'
+  url: ${PROM_HOST}
   password: ''
   user: ''
   database: ''
   basicAuth: true
+  basicAuthUser: ${PROM_USER}
+  basicAuthPassword: ${PROM_PASSWORD}
   isDefault: false
   jsonData:
     httpMethod: POST