X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=installers%2Fcharm%2Fmon%2Fsrc%2Fcharm.py;h=9ad49ada7f74efaf05a0b3b64b3db6c252478d23;hb=fe67909cdef35dbf4357abad97f7710c8e83f584;hp=7833deb00f444687d2f9e861bf0f73929aa4a016;hpb=cafe31e388357499765ddc3360b865800b612d7a;p=osm%2Fdevops.git

diff --git a/installers/charm/mon/src/charm.py b/installers/charm/mon/src/charm.py
index 7833deb0..9ad49ada 100755
--- a/installers/charm/mon/src/charm.py
+++ b/installers/charm/mon/src/charm.py
@@ -28,9 +28,9 @@ import logging
 from typing import NoReturn, Optional
 
 
+from charms.kafka_k8s.v0.kafka import KafkaEvents, KafkaRequires
 from ops.main import main
 from opslib.osm.charm import CharmedOsmBase, RelationsMissing
-from opslib.osm.interfaces.kafka import KafkaClient
 from opslib.osm.interfaces.keystone import KeystoneClient
 from opslib.osm.interfaces.mongo import MongoClient
 from opslib.osm.interfaces.prometheus import PrometheusClient
@@ -80,6 +80,7 @@ class ConfigModel(ModelValidator):
     openstack_default_granularity: int
     global_request_timeout: int
     collector_interval: int
+    vm_infra_metrics: bool
     evaluator_interval: int
     grafana_url: str
     grafana_user: str
@@ -125,6 +126,8 @@ class ConfigModel(ModelValidator):
 
 
 class MonCharm(CharmedOsmBase):
+    on = KafkaEvents()
+
     def __init__(self, *args) -> NoReturn:
         super().__init__(
             *args,
@@ -149,9 +152,9 @@ class MonCharm(CharmedOsmBase):
                     },
                 },
             )
-        self.kafka_client = KafkaClient(self, "kafka")
-        self.framework.observe(self.on["kafka"].relation_changed, self.configure_pod)
-        self.framework.observe(self.on["kafka"].relation_broken, self.configure_pod)
+        self.kafka = KafkaRequires(self)
+        self.framework.observe(self.on.kafka_available, self.configure_pod)
+        self.framework.observe(self.on.kafka_broken, self.configure_pod)
 
         self.mongodb_client = MongoClient(self, "mongodb")
         self.framework.observe(self.on["mongodb"].relation_changed, self.configure_pod)
@@ -172,10 +175,7 @@ class MonCharm(CharmedOsmBase):
     def _check_missing_dependencies(self, config: ConfigModel):
         missing_relations = []
 
-        if (
-            self.kafka_client.is_missing_data_in_unit()
-            and self.kafka_client.is_missing_data_in_app()
-        ):
+        if not self.kafka.host or not self.kafka.port:
             missing_relations.append("kafka")
         if not config.mongodb_uri and self.mongodb_client.is_missing_data_in_unit():
             missing_relations.append("mongodb")
@@ -267,11 +267,12 @@ class MonCharm(CharmedOsmBase):
                 "OSMMON_GLOBAL_REQUEST_TIMEOUT": config.global_request_timeout,
                 "OSMMON_GLOBAL_LOGLEVEL": config.log_level,
                 "OSMMON_COLLECTOR_INTERVAL": config.collector_interval,
+                "OSMMON_COLLECTOR_VM_INFRA_METRICS": config.vm_infra_metrics,
                 "OSMMON_EVALUATOR_INTERVAL": config.evaluator_interval,
                 # Kafka configuration
                 "OSMMON_MESSAGE_DRIVER": "kafka",
-                "OSMMON_MESSAGE_HOST": self.kafka_client.host,
-                "OSMMON_MESSAGE_PORT": self.kafka_client.port,
+                "OSMMON_MESSAGE_HOST": self.kafka.host,
+                "OSMMON_MESSAGE_PORT": self.kafka.port,
                 # Database configuration
                 "OSMMON_DATABASE_DRIVER": "mongo",
                 # Prometheus configuration