Merge lp:~pedronis/charms/trusty/tanuki-spec-manager/nrpe-support into lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk

[Samuele Pedroni]

nagios (nrpe) support

nagios (nrpe) support

followed what the cassandra charm does as an example of service manager charm with nrpe support

[Celso Providelo (cprov)]

Samuele,

Very nice!

I presume NRPE() uses config['nagios_context'] internally, correct ?

Thanks for working on this.

review: Approve

[Guillermo Gonzalez (verterok)]

+1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-07-16 20:06:47 +0000
+++ config.yaml	2015-08-04 14:31:44 +0000
@@ -23,3 +23,8 @@
     default: "specmgr_app,appserver"
     description: |
       comma separated list of roles for the appserver/common DB user
+  nagios_context:
+    type: string
+    default: ""
+    description: |
+      Used by the nrpe subordinate charms.

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-07-20 16:26:03 +0000
+++ hooks/actions.py	2015-08-04 14:31:44 +0000
@@ -12,6 +12,7 @@
 from charmhelpers.core.services import helpers
 from charmhelpers.payload import (archive, execd)
 
+from charmhelpers.contrib.charmsupport import nrpe
 
 REQUIRED_PACKAGES = [
     'python-virtualenv', 'python3-dev', 'libpq5'
@@ -202,3 +203,15 @@
     def _unit_in(self, units):
         return hookenv.local_unit() in units
 
+
+def nrpe_external_master_relation(service_name):
+    ''' Configure the nrpe-external-master relation '''
+    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 '/'",
+        )
+
+    nrpe_compat.write()

=== added symlink 'hooks/nrpe-external-master-relation-changed'
=== target is u'hooks.py'
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-07-16 20:06:47 +0000
+++ hooks/services.py	2015-08-04 14:31:44 +0000
@@ -29,6 +29,7 @@
                     target='/etc/init/spec-manager.conf'),
                 actions.write_db_config,
                 actions.log_start,
+                actions.nrpe_external_master_relation,
             ],
         },
     ])

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-07-16 20:06:47 +0000
+++ metadata.yaml	2015-08-04 14:31:44 +0000
@@ -7,6 +7,9 @@
   website:
     interface: http
     optional: true
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container
 
 requires:
   db: