X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fosm-mon%2Fsrc%2Fcharm.py;h=e07d607297c57f5a25e285618ae9f0a29b4a3fd0;hb=366ed71248f46f8a3754cb5189e39b9ea53a22b7;hp=f666bd5a15f6f2a9a0483cb4a2f8c4dba34f4f7b;hpb=230f564de508f1820e40d0bab100763954255595;p=osm%2Fdevops.git diff --git a/installers/charm/osm-mon/src/charm.py b/installers/charm/osm-mon/src/charm.py index f666bd5a..e07d6072 100755 --- a/installers/charm/osm-mon/src/charm.py +++ b/installers/charm/osm-mon/src/charm.py @@ -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, @@ -248,7 +252,7 @@ class OsmMonCharm(CharmBase): "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_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, }