fix Alertmanager settings to use proper scheme (#291)

* fix Alertmanager settings to use proper scheme * update grafana_source lib
canonical · Jul 26, 2023 · efb4261 · efb4261
1 parent 5a826f1
commit efb4261
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/charm.py b/src/charm.py
@@ -379,13 +379,13 @@ def _alerting_config(self) -> str:
             to send notifications to.
         """
         alerting_config = ""
-        alertmanagers = self.alertmanager_consumer.get_cluster_info()
+        alertmanagers = self.alertmanager_consumer.get_cluster_info_with_scheme()
 
         if not alertmanagers:
             logger.debug("No alertmanagers available")
             return alerting_config
 
-        return ",".join([f"http://{am}" for am in alertmanagers])
+        return ",".join(alertmanagers)
 
     def _running_config(self) -> Dict[str, Any]:
         """Get the on-disk Loki config."""

diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
@@ -127,14 +127,14 @@ def setUp(self, *_):
 
     def test__alerting_config(self):
         self.harness.charm.alertmanager_consumer = Mock()
-        self.harness.charm.alertmanager_consumer.get_cluster_info.return_value = [
-            "10.1.2.52",
-            "10.1.3.52",
+        self.harness.charm.alertmanager_consumer.get_cluster_info_with_scheme.return_value = [
+            "http://10.1.2.52",
+            "http://10.1.3.52",
         ]
         expected_value = "http://10.1.2.52,http://10.1.3.52"
         self.assertEqual(self.harness.charm._alerting_config(), expected_value)
 
-        self.harness.charm.alertmanager_consumer.get_cluster_info.return_value = []
+        self.harness.charm.alertmanager_consumer.get_cluster_info_with_scheme.return_value = []
         expected_value = ""
         self.assertEqual(self.harness.charm._alerting_config(), expected_value)