X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fosm-mon%2Fsrc%2Fcharm.py;h=e07d607297c57f5a25e285618ae9f0a29b4a3fd0;hb=refs%2Fchanges%2F52%2F14052%2F2;hp=00444f8a0adaf02c2a808a8d8243813e18b65af1;hpb=8ea1f3734719ae55538a22eebe9c9e372ea29baa;p=osm%2Fdevops.git

diff --git a/installers/charm/osm-mon/src/charm.py b/installers/charm/osm-mon/src/charm.py
index 00444f8a..e07d6072 100755
--- a/installers/charm/osm-mon/src/charm.py
+++ b/installers/charm/osm-mon/src/charm.py
@@ -116,8 +116,8 @@ class OsmMonCharm(CharmBase):
             # Check if the container is ready.
             # Eventually it will become ready after the first pebble-ready event.
             check_container_ready(self.container)
-
-            self._configure_service(self.container)
+            if not self.debug_mode.started:
+                self._configure_service(self.container)
             # Update charm status
             self._on_update_status()
         except CharmError as e:
@@ -154,7 +154,10 @@ class OsmMonCharm(CharmBase):
             event.fail("debug-mode has not started. Hint: juju config mon debug-mode=true")
             return
 
-        debug_info = {"command": self.debug_mode.command, "password": self.debug_mode.password}
+        debug_info = {
+            "command": self.debug_mode.command,
+            "password": self.debug_mode.password,
+        }
         event.set_results(debug_info)
 
     # ---------------------------------------------------------------------------
@@ -229,6 +232,7 @@ class OsmMonCharm(CharmBase):
             "OSMMON_GLOBAL_REQUEST_TIMEOUT": self.config["global-request-timeout"],
             "OSMMON_COLLECTOR_INTERVAL": self.config["collector-interval"],
             "OSMMON_EVALUATOR_INTERVAL": self.config["evaluator-interval"],
+            "OSMMON_COLLECTOR_VM_INFRA_METRICS": self.config["vm-infra-metrics"],
             # Kafka configuration
             "OSMMON_MESSAGE_DRIVER": "kafka",
             "OSMMON_MESSAGE_HOST": self.kafka.host,
@@ -239,15 +243,25 @@ class OsmMonCharm(CharmBase):
             "OSMMON_DATABASE_COMMONKEY": self.config["database-commonkey"],
             # Prometheus/grafana configuration
             "OSMMON_PROMETHEUS_URL": f"http://{self.prometheus_client.hostname}:{self.prometheus_client.port}",
+            "OSMMON_PROMETHEUS_USER": self.prometheus_client.user,
+            "OSMMON_PROMETHEUS_PASSWORD": self.prometheus_client.password,
             "OSMMON_GRAFANA_URL": self.config["grafana-url"],
             "OSMMON_GRAFANA_USER": self.config["grafana-user"],
             "OSMMON_GRAFANA_PASSWORD": self.config["grafana-password"],
+            "OSMMON_KEYSTONE_ENABLED": self.config["keystone-enabled"],
+            "OSMMON_KEYSTONE_URL": self.keystone_client.host,
+            "OSMMON_KEYSTONE_DOMAIN_NAME": self.keystone_client.user_domain_name,
+            "OSMMON_KEYSTONE_SERVICE_PROJECT": self.keystone_client.service,
+            "OSMMON_KEYSTONE_SERVICE_USER": self.keystone_client.username,
+            "OSMMON_KEYSTONE_SERVICE_PASSWORD": self.keystone_client.password,
+            "OSMMON_KEYSTONE_SERVICE_PROJECT_DOMAIN_NAME": self.keystone_client.project_domain_name,
         }
+        logger.info(f"{environment}")
         if self.vca.data:
             environment["OSMMON_VCA_HOST"] = self.vca.data.endpoints
-            environment["OSMMON_VCA_SECRET"] = self.vca.secret
-            environment["OSMMON_VCA_USER"] = self.vca.user
-            environment["OSMMON_VCA_CACERT"] = self.vca.cacert
+            environment["OSMMON_VCA_SECRET"] = self.vca.data.secret
+            environment["OSMMON_VCA_USER"] = self.vca.data.user
+            environment["OSMMON_VCA_CACERT"] = self.vca.data.cacert
         return {
             "summary": "mon layer",
             "description": "pebble config layer for mon",