X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fgrafana%2Fsrc%2Fcharm.py;h=caa0277969c9ccc3f5cdecbe06dc032a1a025cd2;hb=ee303f97b9afe276076f56220d73c6382aa65c48;hp=28d28ae33e135ac2b4c54a7556d74092f5cd1bfd;hpb=3388212eac8fa6aff2f5d766e62e33962816501b;p=osm%2Fdevops.git diff --git a/installers/charm/grafana/src/charm.py b/installers/charm/grafana/src/charm.py index 28d28ae3..caa02779 100755 --- 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()