Merge lp:~cjwatson/charm-haproxy/listener-address-localhost into lp:charm-haproxy

[Colin Watson]

Set statistics listener-address to 127.0.0.1.

If `listener-address` isn't set on the relation, the telegraf charm defaults to using the unit's `private-address`; but `monitoring_allowed_cidr` defaults to `127.0.0.1/32`, so if telegraf tries to talk to haproxy on the unit's private address then it will get a 403 error unless `monitoring_allowed_cidr` has been specifically configured to allow the unit's private address. Doing that is inconvenient in bundles that are to be deployed in multiple network environments.

The statistics relation has `scope: container`, so the other end of it is always going to be on the same machine, and it makes sense to just advertise 127.0.0.1. This matches the behaviour of the content-cache charm.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Arturo Enrique Seijas Fernández (arturo-seijas)]

LGTM

review: Approve

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 162

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2023-08-09 07:20:52 +0000
+++ hooks/hooks.py	2023-08-23 11:47:55 +0000
@@ -1454,15 +1454,13 @@
     monitoring_password = get_monitoring_password()
     monitoring_username = config['monitoring_username']
     for relid in get_relation_ids('statistics'):
-        if not enable_monitoring:
-            relation_set(relation_id=relid,
-                         enabled=enable_monitoring)
-        else:
-            relation_set(relation_id=relid,
-                         enabled=enable_monitoring,
-                         port=monitoring_port,
-                         password=monitoring_password,
-                         user=monitoring_username)
+        relation_settings = {'enabled': enable_monitoring}
+        if enable_monitoring:
+            relation_settings['listener-address'] = '127.0.0.1'
+            relation_settings['port'] = monitoring_port
+            relation_settings['password'] = monitoring_password
+            relation_settings['user'] = monitoring_username
+        relation_set(relation_id=relid, relation_settings=relation_settings)
 
 
 def configure_logrotate(logrotate_config):

=== modified file 'hooks/tests/test_statistics_hooks.py'
--- hooks/tests/test_statistics_hooks.py	2016-03-03 20:14:22 +0000
+++ hooks/tests/test_statistics_hooks.py	2023-08-23 11:47:55 +0000
@@ -37,10 +37,13 @@
         self.get_relation_ids.assert_called_once_with('statistics')
         self.relation_set.assert_called_once_with(
             relation_id=self.get_relation_ids()[0],
-            enabled=True,
-            port=10001,
-            password="this-is-a-secret",
-            user="mon_user")
+            relation_settings={
+                'enabled': True,
+                'listener-address': '127.0.0.1',
+                'port': 10001,
+                'password': "this-is-a-secret",
+                'user': "mon_user",
+            })
 
     def test_relation_joined_monitoring_disabled(self):
         self.config_get.return_value['enable_monitoring'] = False
@@ -48,13 +51,15 @@
         self.get_relation_ids.assert_called_once_with('statistics')
         self.relation_set.assert_called_once_with(
             relation_id=self.get_relation_ids()[0],
-            enabled=False)
+            relation_settings={'enabled': False})
 
     def test_called_on_config_change(self):
         config_changed = self.patch_hook('config_changed')
         update_nrpe_config = self.patch_hook('update_nrpe_config')
         statistics_interface = self.patch_hook('statistics_interface')
+        assess_status = self.patch_hook('assess_status')
         hooks.main('config-changed')
         config_changed.assert_called_once_with()
         update_nrpe_config.assert_called_once_with()
         statistics_interface.assert_called_once_with()
+        assess_status.assert_called_once_with()