From: Guillermo Calvino <guillermo.calvino@canonical.com>
Date: Fri, 18 Nov 2022 12:43:26 +0000 (+0100)
Subject: Bug 2193 - Grafana Charm does not get the Prometheus password if it is changed
X-Git-Tag: release-v13.0-start~9
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F12704%2F3;p=osm%2Fdevops.git

Bug 2193 - Grafana Charm does not get the Prometheus password if it is changed

Change-Id: I2d9a72c90a75f85ef10f5985223dda2995d7febd
Signed-off-by: Guillermo Calvino <guillermo.calvino@canonical.com>
---

diff --git a/installers/charm/grafana/src/charm.py b/installers/charm/grafana/src/charm.py
index 28d28ae3..dc4dfd90 100755
--- a/installers/charm/grafana/src/charm.py
+++ b/installers/charm/grafana/src/charm.py
@@ -245,7 +245,6 @@ class GrafanaCharm(CharmedOsmBase):
             "/etc/grafana/provisioning/datasources/",
             self._build_datasources_files(),
         )
-
         container_builder.add_envs(
             {
                 "GF_SERVER_HTTP_PORT": config.port,
@@ -258,6 +257,8 @@ class GrafanaCharm(CharmedOsmBase):
             envs={
                 "GF_SECURITY_ADMIN_PASSWORD": "admin-password",
                 "GF_DATABASE_URL": "mysql-url",
+                "PROMETHEUS_USER": self.prometheus_client.user,
+                "PROMETHEUS_PASSWORD": self.prometheus_client.password,
             },
         )
         container = container_builder.build()