Merge lp:~thomir-deactivatedaccount/charms/trusty/tanuki-spec-manager/trunk-decompose-nagios into lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk

[Thomi Richards]

Decompose the /nagios check into /nagios/rabbitmq and /nagios/postgres.

Decompose the /nagios check into /nagios/rabbitmq and /nagios/postgres.

Must land together with https://code.launchpad.net/~thomir/tanuki-spec-manager/trunk-decompose-nagios/+merge/269704

[Celso Providelo (cprov)]

Looks good, thanks.

The only problem is that it has to land with https://code.launchpad.net/~thomir/tanuki-spec-manager/trunk-decompose-nagios/+merge/269704

I should have done this in stages, preserving /nagios implementation and nrpe check first, then drop the check and later drop the implementation ... however we can coordinate to avoid alerts going off this time.

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-08-14 14:25:07 +0000
+++ hooks/actions.py	2015-09-01 03:15:52 +0000
@@ -281,9 +281,14 @@
     nrpe_compat = nrpe.NRPE()
 
     nrpe_compat.add_check(
-        shortname="check_app_http",
-        description="Check app http",
-        check_cmd="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 8000 -e ' 200 OK' -u '/nagios'",
-        )
+        shortname="check_app_http_rabbit",
+        description="Application and app rabbitmq connection.",
+        check_cmd="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 8000 -e ' 200 OK' -u '/nagios/rabbitmq'",
+    )
+    nrpe_compat.add_check(
+        shortname="check_app_http_postgres",
+        description="Application and app postgres connection.",
+        check_cmd="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 8000 -e ' 200 OK' -u '/nagios/postgres'",
+    )
 
     nrpe_compat.write()