Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master into ~livepatch-charmers/charm-canonical-livepatch:master

[Barry Price]

Don't generate nagios checks or cron spam in containers (or on unsupported architectures)

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

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

[Haw Loeung (hloeung)]

LGTM, +1

review: Approve

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

Change successfully merged at revision 257535a699d5d13f53dda4d78b286268da611227

diff --git a/files/check_canonical-livepatch.cron b/files/check_canonical-livepatch.cron
index 6457c12..05d4515 100644
--- a/files/check_canonical-livepatch.cron
+++ b/files/check_canonical-livepatch.cron
@@ -1,2 +1,2 @@
 # check_canonical-livepatch
-17,47 * * * * root /snap/bin/canonical-livepatch status > /var/lib/nagios/canonical-livepatch-status.txt
+17,47 * * * * root [ -x /snap/bin/canonical-livepatch ] && /snap/bin/canonical-livepatch status > /var/lib/nagios/canonical-livepatch-status.txt
diff --git a/reactive/canonical_livepatch.py b/reactive/canonical_livepatch.py
index 3f30019..533e5a7 100644
--- a/reactive/canonical_livepatch.py
+++ b/reactive/canonical_livepatch.py
@@ -248,6 +248,7 @@ def change_channel():
 # Set up Nagios checks when the nrpe-external-master subordinate is related
 @when('nrpe-external-master.available')
 @when_not('canonical-livepatch.nagios-setup.complete')
+@when('canonical-livepatch.supported')
 def configure_nagios(nagios):
     if hookenv.hook_name() == 'update-status':
         return