Merge ~peter-sabaini/charm-nagios:robustify-install into ~nagios-charmers/charm-nagios:master

[Peter Sabaini]

Make install more robust

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

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

[Stuart Bishop (stub)]

LTGM

review: Approve

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

Change successfully merged at revision fa015564e63c77d88357e81d8be4d121297ec9a3

diff --git a/hooks/install b/hooks/install
index db3e40f..4d1ff11 100755
--- a/hooks/install
+++ b/hooks/install
@@ -35,9 +35,9 @@ if [ -f $CHARM_DIR/files/hostgroups_nagios2.cfg ]; then
     # Write the new hostgroups_nagios2.cfg file to prevent servers being classified as Debian.
     cp -v $CHARM_DIR/files/hostgroups_nagios2.cfg /etc/nagios3/conf.d/hostgroups_nagios2.cfg
     # Remove the services configuration file to eliminiate the need for ssh and localhost groups.
-    rm -v /etc/nagios3/conf.d/services_nagios2.cfg
+    rm -vf /etc/nagios3/conf.d/services_nagios2.cfg
     # Remove the ext file to eliminate the need for ssh and localhost groups.
-    rm -v /etc/nagios3/conf.d/extinfo_nagios2.cfg
+    rm -vf /etc/nagios3/conf.d/extinfo_nagios2.cfg
 fi
 
 enable_livestatus=$(config-get enable_livestatus)
diff --git a/hooks/templates/localhost_nagios2.cfg.tmpl b/hooks/templates/localhost_nagios2.cfg.tmpl
index 85c756f..d70b915 100644
--- a/hooks/templates/localhost_nagios2.cfg.tmpl
+++ b/hooks/templates/localhost_nagios2.cfg.tmpl
@@ -53,7 +53,7 @@ define service{
         use                             generic-service         ; Name of service template to use
         host_name                       {{ nagios_hostname }}
         service_description             Total Processes
-        check_command                   check_procs!250!400
+        check_command                   check_procs!600!900
         }