Merge ~xavpaice/charm-nagios:lp1827159 into ~nagios-charmers/charm-nagios:master

[Xav Paice]

Add custom disk monitor for nagios host

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

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

[James Hebden (ec0)]

Just one comment on the name of the service, but other than that, the technical aspects of the change make sense and LGTM.

review: Needs Fixing

Unmerged commits

ab6f588... by Xav Paice on 2019-05-01

Add custom disk monitor for nagios host

When monitoring the local Nagios host and it's not in a container, we
use check_all_disks which reports critical when any snap is installed.
This change adds a custom command to the local cfg such that squashfs is
excluded from the check.

diff --git a/hooks/templates/localhost_nagios2.cfg.tmpl b/hooks/templates/localhost_nagios2.cfg.tmpl
index 3cd69e1..b5a6153 100644
--- a/hooks/templates/localhost_nagios2.cfg.tmpl
+++ b/hooks/templates/localhost_nagios2.cfg.tmpl
@@ -20,6 +20,14 @@ define host{
         icon_image              base/ubuntu.png
         }
 
+
+
+# 'check_disks_custom' command definition
+define command{
+        command_name    check_disks_custom
+        command_line    /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -e -X squashfs
+        }
+
 # Define a service to check the disk space of the root partition
 # on the local machine.  Warning if < 20% free, critical if
 # < 10% free space on partition.
@@ -31,7 +39,7 @@ define service{
 {%- if is_container %}
         check_command                   check_disk!20%!10%!/
 {%- else %}
-        check_command                   check_all_disks!20%!10%
+        check_command                   check_disks_custom!20%!10%
 {%- endif %}
         }