Merge lp:~rharding/charms/precise/juju-gui/update-nagios into lp:~juju-gui/charms/precise/juju-gui/trunk

[Richard Harding]

Update nagios check per IS. Remove spaces.

Update nagios per IS request

- add all good to the check
- remove spaces from nagios names
- add curl -s to quiet output

[Richard Harding (rharding)]

Self reviewing trivial. Tests pass.

review: Approve

=== modified file 'files/nrpe-external-master/check-app-access.sh'
--- files/nrpe-external-master/check-app-access.sh	2013-08-14 21:11:26 +0000
+++ files/nrpe-external-master/check-app-access.sh	2014-02-18 15:24:34 +0000
@@ -8,9 +8,11 @@
     exit 2
 fi
 
-match=$(curl -k $ADDRESS | grep "$LIFE_SIGN")
+match=$(curl -s -k $ADDRESS | grep "$LIFE_SIGN")
 
 if [[ -z $match ]]; then
     echo juju-gui did not return content indicating it was loading.
     exit 2
 fi
+
+echo "All Good"

=== modified file 'revision'
--- revision	2014-02-05 09:21:05 +0000
+++ revision	2014-02-18 15:24:34 +0000
@@ -1,1 +1,1 @@
-105
+106

=== modified file 'scripts/update-nrpe.py'
--- scripts/update-nrpe.py	2013-08-06 13:49:06 +0000
+++ scripts/update-nrpe.py	2014-02-18 15:24:34 +0000
@@ -5,7 +5,7 @@
 def update_nrpe_config():
     nrpe_compat = nrpe.NRPE()
     nrpe_compat.add_check(
-        'App is accessible', 'Check the app can be downloaded',
+        'app-is-accessible', 'Check_the_app_can_be_downloaded',
         'check-app-access.sh')
     nrpe_compat.write()