X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fosm-mon%2Fsrc%2Fcharm.py;h=12c5dcdaa781d06c978f3a2a1960a5dfdc4a8404;hb=refs%2Fheads%2Fmaster;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..12c5dcda 100755 --- a/installers/charm/osm-mon/src/charm.py +++ b/installers/charm/osm-mon/src/charm.py @@ -22,7 +22,7 @@ # # Learn more at: https://juju.is/docs/sdk -"""OSM NBI charm. +"""OSM MON charm. See more: https://charmhub.io/osm """ @@ -30,6 +30,7 @@ See more: https://charmhub.io/osm import logging from typing import Any, Dict +from charms.data_platform_libs.v0.data_interfaces import DatabaseRequires from charms.kafka_k8s.v0.kafka import KafkaRequires, _KafkaAvailableEvent from charms.observability_libs.v1.kubernetes_service_patch import KubernetesServicePatch from charms.osm_libs.v0.utils import ( @@ -46,7 +47,7 @@ from ops.framework import EventSource, StoredState from ops.main import main from ops.model import ActiveStatus, Container -from legacy_interfaces import KeystoneClient, MongoClient, PrometheusClient +from legacy_interfaces import KeystoneClient, PrometheusClient HOSTPATHS = [ HostPath( @@ -85,7 +86,7 @@ class OsmMonCharm(CharmBase): def __init__(self, *args): super().__init__(*args) self.kafka = KafkaRequires(self) - self.mongodb_client = MongoClient(self, "mongodb") + self.mongodb_client = DatabaseRequires(self, "mongodb", database_name="osm") self.prometheus_client = PrometheusClient(self, "prometheus") self.keystone_client = KeystoneClient(self, "keystone") self.vca = VcaRequires(self) @@ -116,8 +117,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 +155,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) # --------------------------------------------------------------------------- @@ -171,16 +175,24 @@ class OsmMonCharm(CharmBase): self.on.vca_data_changed: self._on_config_changed, self.on.kafka_available: self._on_config_changed, self.on["kafka"].relation_broken: self._on_required_relation_broken, + self.mongodb_client.on.database_created: self._on_config_changed, + self.on["mongodb"].relation_broken: self._on_required_relation_broken, # Action events self.on.get_debug_mode_information_action: self._on_get_debug_mode_information_action, } - for relation in [self.on[rel_name] for rel_name in ["mongodb", "prometheus", "keystone"]]: + for relation in [self.on[rel_name] for rel_name in ["prometheus", "keystone"]]: event_handler_mapping[relation.relation_changed] = self._on_config_changed event_handler_mapping[relation.relation_broken] = self._on_required_relation_broken for event, handler in event_handler_mapping.items(): self.framework.observe(event, handler) + def _is_database_available(self) -> bool: + try: + return self.mongodb_client.is_resource_created() + except KeyError: + return False + def _validate_config(self) -> None: """Validate charm configuration. @@ -200,7 +212,7 @@ class OsmMonCharm(CharmBase): if not self.kafka.host or not self.kafka.port: missing_relations.append("kafka") - if self.mongodb_client.is_missing_data_in_unit(): + if not self._is_database_available(): missing_relations.append("mongodb") if self.prometheus_client.is_missing_data_in_app(): missing_relations.append("prometheus") @@ -229,25 +241,36 @@ 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, "OSMMON_MESSAGE_PORT": self.kafka.port, # Database configuration "OSMMON_DATABASE_DRIVER": "mongo", - "OSMMON_DATABASE_URI": self.mongodb_client.connection_string, + "OSMMON_DATABASE_URI": self._get_mongodb_uri(), "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", @@ -255,15 +278,19 @@ class OsmMonCharm(CharmBase): self.service_name: { "override": "replace", "summary": "mon service", - "command": "/bin/bash scripts/start.sh", + "command": "/bin/bash -c 'cd /app/osm_mon/ && /bin/bash start.sh'", "startup": "enabled", "user": "appuser", "group": "appuser", + "working-dir": "/app/osm_mon", # This parameter has no effect in Juju 2.9.x "environment": environment, } }, } + def _get_mongodb_uri(self): + return list(self.mongodb_client.fetch_relation_data().values())[0]["uris"] + def _patch_k8s_service(self) -> None: port = ServicePort(SERVICE_PORT, name=f"{self.app.name}") self.service_patcher = KubernetesServicePatch(self, [port])