Merge lp:~hloeung/ubuntu-repository-cache/nagios-checks-only-when-nrpe-related into lp:ubuntu-repository-cache

[Haw Loeung]

Only ship out the nagios checks when nrpe related

By default, checks are configured and updated even if nrpe relation isn't available (or service related to nrpe). This fixes that and also adds extra logging as to when function to update checks and restart/reload nrpe fires.

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

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

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

[Paul Collins (pjdc)]

review: Approve (lgtm)

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

Change successfully merged at revision 283

=== modified file 'reactive/ubuntu-repository-cache.py'
--- reactive/ubuntu-repository-cache.py	2020-08-11 03:22:00 +0000
+++ reactive/ubuntu-repository-cache.py	2020-08-11 05:05:41 +0000
@@ -37,13 +37,13 @@
 
     LOG('Config changed for %s' % SERVICE)
     reactive.clear_flag('ubuntu-repository-cache.configured')
+    reactive.clear_flag('nagios-nrpe.configured')
 
 
 @reactive.when('ubuntu-repository-cache.installed')
 @reactive.when_not('ubuntu-repository-cache.configured')
 def configure_services():
     service.render_configs()
-    service.update_checks()
 
     # We should always do this anyway, but currently,
     # due to LP#1626318, following a reboot, the ephemeral
@@ -62,6 +62,7 @@
 
     LOG('Upgrading %s' % SERVICE)
     reactive.clear_flag('ubuntu-repository-cache.configured')
+    reactive.clear_flag('nagios-nrpe.configured')
 
 
 @reactive.hook('start')
@@ -173,9 +174,17 @@
 @reactive.hook('nrpe-external-master-relation-changed')
 @reactive.hook('local-monitors-relation-changed')
 def update_checks():
+    reactive.clear_flag('nagios-nrpe.configured')
+
+
[e-mail]('ubuntu-repository-cache.configured')
[e-mail]('nrpe-external-master.available')
[e-mail]_not('nagios-nrpe.configured')
+def configure_nagios():
     '''Update Nagios checks for all services'''
 
     service.update_checks()
+    reactive.set_flag('nagios-nrpe.configured')
 
 
 @reactive.hook('leader-elected')