From 6ce1c1be1eb9c2bfe3df168adfee8517d3fe9759 Mon Sep 17 00:00:00 2001 From: Luca Bello Date: Wed, 5 Feb 2025 10:39:40 +0100 Subject: [PATCH] fix both libraries --- lib/charms/prometheus_k8s/v0/prometheus_scrape.py | 1 + lib/charms/prometheus_k8s/v1/prometheus_remote_write.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/charms/prometheus_k8s/v0/prometheus_scrape.py b/lib/charms/prometheus_k8s/v0/prometheus_scrape.py index e9623ccb..a59dfec5 100644 --- a/lib/charms/prometheus_k8s/v0/prometheus_scrape.py +++ b/lib/charms/prometheus_k8s/v0/prometheus_scrape.py @@ -1537,6 +1537,7 @@ def set_scrape_job_spec(self, _=None): if not self._disable_alerts: alert_rules.add_path(self._alert_rules_path, recursive=True) alert_rules_as_dict = alert_rules.as_dict() + logger.info(f"+++ alert_rules_as_dict: {alert_rules_as_dict}") # TODO: remove, debug for relation in self._charm.model.relations[self._relation_name]: relation.data[self._charm.app]["scrape_metadata"] = json.dumps(self._scrape_metadata) diff --git a/lib/charms/prometheus_k8s/v1/prometheus_remote_write.py b/lib/charms/prometheus_k8s/v1/prometheus_remote_write.py index a810cf56..849de77f 100644 --- a/lib/charms/prometheus_k8s/v1/prometheus_remote_write.py +++ b/lib/charms/prometheus_k8s/v1/prometheus_remote_write.py @@ -456,6 +456,9 @@ def __init__( self.framework.observe( self._charm.on.upgrade_charm, self._push_alerts_to_all_relation_databags ) + self.framework.observe( + self._charm.on.config_changed, self._push_alerts_to_all_relation_databags + ) def _on_relation_broken(self, event: RelationBrokenEvent) -> None: self.on.endpoints_changed.emit(relation_id=event.relation.id) @@ -492,7 +495,7 @@ def _push_alerts_to_relation_databag(self, relation: Relation) -> None: alert_rules_as_dict = alert_rules.as_dict() - if alert_rules_as_dict: + if alert_rules_as_dict or self._disable_alerts: relation.data[self._charm.app]["alert_rules"] = json.dumps(alert_rules_as_dict) def reload_alerts(self) -> None: