X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fmon%2Fsrc%2Fcharm.py;h=85d1fa4ecacaaa97ba40356dd0ad217bcd1b1f84;hb=c537fa671e5763cf58f9a05ff7e51e5acc184934;hp=917b54a903de48c4ef191cf45a95e4ef85457109;hpb=540d93716ee0a4c4ffd070120779c1c40f6f353c;p=osm%2Fdevops.git diff --git a/installers/charm/mon/src/charm.py b/installers/charm/mon/src/charm.py index 917b54a9..85d1fa4e 100755 --- a/installers/charm/mon/src/charm.py +++ b/installers/charm/mon/src/charm.py @@ -157,7 +157,10 @@ class MonCharm(CharmedOsmBase): def _check_missing_dependencies(self, config: ConfigModel): missing_relations = [] - if self.kafka_client.is_missing_data_in_unit(): + if ( + self.kafka_client.is_missing_data_in_unit() + and self.kafka_client.is_missing_data_in_app() + ): missing_relations.append("kafka") if not config.mongodb_uri and self.mongodb_client.is_missing_data_in_unit(): missing_relations.append("mongodb") @@ -260,6 +263,15 @@ class MonCharm(CharmedOsmBase): "OSMMON_PROMETHEUS_URL": f"http://{self.prometheus_client.hostname}:{self.prometheus_client.port}", } ) + prometheus_user = self.prometheus_client.user + prometheus_password = self.prometheus_client.password + if prometheus_user and prometheus_password: + container_builder.add_envs( + { + "OSMMON_PROMETHEUS_USER": prometheus_user, + "OSMMON_PROMETHEUS_PASSWORD": prometheus_password, + } + ) container_builder.add_secret_envs( secret_name=mongodb_secret_name, envs={