Fix Bug 2204 - Grafana Charm is failing to be deployed in Charmed OSM Master

[osm/devops.git] / installers / charm / grafana / src / charm.py

diff --git a/installers/charm/grafana/src/charm.py b/installers/charm/grafana/src/charm.py
index 28d28ae..caa0277 100755 (executable)
--- a/installers/charm/grafana/src/charm.py
+++ b/installers/charm/grafana/src/charm.py
@@ -209,6 +209,8 @@ class GrafanaCharm(CharmedOsmBase):
             {
                 "admin-password": admin_initial_password,
                 "mysql-url": mysql_config.mysql_uri or self.mysql_client.get_uri(),
+                "prometheus-user": self.prometheus_client.user,
+                "prometheus-password": self.prometheus_client.password,
             },
         )
 
@@ -245,7 +247,6 @@ class GrafanaCharm(CharmedOsmBase):
             "/etc/grafana/provisioning/datasources/",
             self._build_datasources_files(),
         )
-
         container_builder.add_envs(
             {
                 "GF_SERVER_HTTP_PORT": config.port,
@@ -258,6 +259,8 @@ class GrafanaCharm(CharmedOsmBase):
             envs={
                 "GF_SECURITY_ADMIN_PASSWORD": "admin-password",
                 "GF_DATABASE_URL": "mysql-url",
+                "PROMETHEUS_USER": "prometheus-user",
+                "PROMETHEUS_PASSWORD": "prometheus-password",
             },
         )
         container = container_builder.build()