nagios-charmers team mailing list archive

[Andrea Ieri <andrea.ieri@xxxxxxxxxxxxx>]

Andrea Ieri has proposed merging ~aieri/charm-nagios:bug/1864192 into charm-nagios:master.

Requested reviews:
  Zachary Zehring (zzehring)
  Nagios Charm developers (nagios-charmers)

For more details, see:
https://code.launchpad.net/~aieri/charm-nagios/+git/nagios-charm/+merge/386291
-- 
Your team Nagios Charm developers is requested to review the proposed merge of ~aieri/charm-nagios:bug/1864192 into charm-nagios:master.

diff --git a/hooks/common.py b/hooks/common.py
index 65718f4..189df8e 100644
--- a/hooks/common.py
+++ b/hooks/common.py
@@ -43,11 +43,6 @@ def check_ip(n):
         except socket.error:
             return False
 
-def ingress_address(relation_data):
-    if 'ingress-address' in relation_data:
-        return relation_data['ingress-address']
-    return relation_data['private-address']
-
 
 def get_local_ingress_address(binding='website'):
     # using network-get to retrieve the address details if available.
diff --git a/hooks/monitors-relation-changed b/hooks/monitors-relation-changed
index c48cdbb..13cb96c 100755
--- a/hooks/monitors-relation-changed
+++ b/hooks/monitors-relation-changed
@@ -28,7 +28,7 @@ from common import (customize_service, get_pynag_host,
         get_pynag_service, refresh_hostgroups,
         get_valid_relations, get_valid_units,
         initialize_inprogress_config, flush_inprogress_config,
-        ingress_address)
+        get_local_ingress_address)
 
 
 def main(argv):
@@ -60,12 +60,12 @@ def main(argv):
                             or 'target-id' not in relation_settings):
                         continue
                     if ('target-id' in relation_settings and 'target-address' not in relation_settings):
-                            relation_settings['target-address'] = ingress_address(relation_settings)
+                            relation_settings['target-address'] = get_local_ingress_address('monitors')
 
                 else:
                     # Fake it for the more generic 'nagios' relation'
                     relation_settings['target-id'] = unit.replace('/','-')
-                    relation_settings['target-address'] = ingress_address(relation_settings)
+                    relation_settings['target-address'] = get_local_ingress_address('monitors')
                     relation_settings['monitors'] = {'monitors': {'remote': {} } }
 
                 if relid not in all_relations: