Merge lp:~hloeung/ubuntu-repository-cache/no-emphemeral-nagios-disk-checks into lp:ubuntu-repository-cache

[Haw Loeung]

Don't ship out nagios checks when no ephemeral devices are used

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

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

[Max Horlanchuk (mhorlanchuk)]

+1

review: Approve

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

Change successfully merged at revision 280

=== modified file 'lib/ubuntu_repository_cache/storage.py'
--- lib/ubuntu_repository_cache/storage.py	2020-05-07 05:26:37 +0000
+++ lib/ubuntu_repository_cache/storage.py	2020-07-13 00:10:36 +0000
@@ -205,8 +205,12 @@
 def update_checks(nrpe_config):
     '''Update nagios check for ephemeral storage space if present'''
 
+    config = hookenv.config()
+    if not config.get('ephemeral-devices'):
+        return
+
     try:
-        LOG('Adding check for ephemeral stoage {}'.format(
+        LOG('Adding check for ephemeral storage {}'.format(
             unitdata.kv().get('ephemeral-mounts')),
             hookenv.DEBUG)
     except KeyError: