Merge ~aluria/charm-openstack-service-checks/+git/charm-openstack-service-checks:bug/1825860 into ~canonical-bootstack/charm-openstack-service-checks:master

[Alvaro Uria]

Support checks removal

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

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

[Alvaro Uria (aluria)]

This change is waiting on https://github.com/juju/charm-helpers/issues/312

[David O Neill (dmzoneill)]

review: Approve

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

Change successfully merged at revision 248082420e89f6f693bd8ab70e1605f73f495980

diff --git a/lib/lib_openstack_service_checks.py b/lib/lib_openstack_service_checks.py
index 2c99366..0ce2ac6 100644
--- a/lib/lib_openstack_service_checks.py
+++ b/lib/lib_openstack_service_checks.py
@@ -203,9 +203,9 @@ class OSCHelper():
                     skip_service.add(service_name)
                     break
 
+            check_url = urlparse(endpoint.url)
             if self.charm_config.get('check_{}_urls'.format(endpoint.interface)):
                 cmd_params = ['/usr/lib/nagios/plugins/check_http']
-                check_url = urlparse(endpoint.url)
                 host, port = check_url.netloc.split(':')
                 cmd_params.append('-H {} -p {}'.format(host, port))
                 cmd_params.append('-u {}'.format(endpoint.healthcheck_url))
@@ -214,17 +214,22 @@ class OSCHelper():
                 if check_url.scheme == 'https':
                     cmd_params.append('-S')
                     # Add an extra check for TLS cert expiry
-                    cmd_params.append('-C {},{}'.format(self.charm_config['tls_warn_days'] or 30,
-                                                        self.charm_config['tls_crit_days'] or 14))
+                    cmd_params_cert = cmd_params.copy()
+                    cmd_params_cert.append('-C {},{}'.format(self.charm_config['tls_warn_days'] or 30,
+                                                             self.charm_config['tls_crit_days'] or 14))
                     nrpe.add_check(shortname='{}_{}_cert'.format(service_name, endpoint.interface),
                                    description='Certificate expiry check for {} {}'.format(service_name,
                                                                                            endpoint.interface),
-                                   check_cmd=' '.join(cmd_params))
+                                   check_cmd=' '.join(cmd_params_cert))
 
                 # Add the actual health check for the URL
                 nrpe.add_check(shortname='{}_{}'.format(service_name, endpoint.interface),
                                description='Endpoint url check for {} {}'.format(service_name, endpoint.interface),
                                check_cmd=' '.join(cmd_params))
+            else:
+                nrpe.remove_check(shortname='{}_{}'.format(service_name, endpoint.interface))
+                if check_url.scheme == 'https':
+                    nrpe.remove_check(shortname='{}_{}_cert'.format(service_name, endpoint.interface))
         nrpe.write()
 
     def get_keystone_client(self, creds):
diff --git a/reactive/openstack_service_checks.py b/reactive/openstack_service_checks.py
index c122bf1..846466f 100644
--- a/reactive/openstack_service_checks.py
+++ b/reactive/openstack_service_checks.py
@@ -19,7 +19,7 @@ import base64
 import subprocess
 
 from charmhelpers.core import hookenv, host, unitdata
-from charms.reactive import clear_flag, set_flag, when, when_not
+from charms.reactive import any_flags_set, clear_flag, is_flag_set, set_flag, when, when_not
 
 from lib_openstack_service_checks import (
     OSCHelper,
@@ -204,11 +204,16 @@ def do_restart():
     set_flag('openstack-service-checks.started')
 
 
-@when('config.changed.os-credentials')
 @when('nrpe-external-master.available')
 def do_reconfigure_nrpe():
-    clear_flag('openstack-service-checks.configured')
-    clear_flag('openstack-service-checks.endpoints.configured')
+    os_credentials_flag = 'config.changed.os-credentials'
+    flags = ['config.changed.check_{}_urls'.format(interface) for interface in ['admin', 'internal', 'public']]
+    flags.extend(os_credentials_flag)
+
+    if any_flags_set(*flags):
+        if is_flag_set(os_credentials_flag):
+            clear_flag('openstack-service-checks.configured')
+        clear_flag('openstack-service-checks.endpoints.configured')
 
 
 @when_not('nrpe-external-master.available')