Merge lp:~facundo/charms/trusty/tanuki-result-enum-worker/add-nagios-support into lp:~tanuki/charms/trusty/tanuki-result-enum-worker/trunk

[Facundo Batista]

Added nagios support.

Added nagios support.

[Celso Providelo (cprov)]

Facundo,

Thanks for working on this, can you try to address my inline comment for proper check_file_age configuration and description.

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

The spec change landed already, which means that I've spent about half a day trying to figure out why I can't get the spec to work... turns out it's because the charm doesn't support 'nagios_context' yet.

I could rollback the spec, or land this. I'm choosing to land this, since Celso's comment isn't serious, and can be done in a separate branch. I'll create a trello card, assign it to Facundo, and point to this comment.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-07-20 15:03:35 +0000
+++ config.yaml	2015-08-11 19:33:08 +0000
@@ -11,3 +11,8 @@
     type: boolean
     default: true
     description: "Whether the service is active or not."
+  nagios_context:
+    type: string
+    default: ""
+    description: |
+      Used by the nrpe subordinate charms.

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-07-23 17:04:16 +0000
+++ hooks/actions.py	2015-08-11 19:33:08 +0000
@@ -4,11 +4,8 @@
 import subprocess
 
 from charmhelpers import fetch
-from charmhelpers.core import (
-    hookenv,
-    host,
-)
-
+from charmhelpers.contrib.charmsupport import nrpe
+from charmhelpers.core import hookenv, host
 from charmhelpers.payload import archive, execd
 
 
@@ -21,6 +18,8 @@
 BASE_DIR = '/srv/result-enum-worker/{}'.format(config['environment'])
 SERVICE_DIR = os.path.join(BASE_DIR, 'result-enum-worker')
 LOG_DIR = os.path.join(BASE_DIR, 'logs')
+VARS_DIR = os.path.join(BASE_DIR, 'var')
+NAGIOS_CONTROL_FILEPATH = os.path.join(VARS_DIR, 'nagios.txt')
 
 
 def log_start(service_name):
@@ -29,6 +28,7 @@
 
 def ensure_directories(service_name):
     host.mkdir(BASE_DIR, owner='root', group='ubuntu')
+    host.mkdir(VARS_DIR, owner='root', group='ubuntu')
 
 
 def basenode(service_name):
@@ -68,6 +68,7 @@
         mongo_addresses.append(mongo_address)
     assert mongo_addresses != []
     parser['mongodb']['server'] = ','.join(mongo_addresses)
+    parser['nagios_check']['filename'] = NAGIOS_CONTROL_FILEPATH
     with open(config_path, 'w') as f:
         parser.write(f)
 
@@ -106,3 +107,15 @@
 
     subprocess.check_call(['%s/bin/pip' % env_dir,
                            'install', '--no-deps', '-e', SERVICE_DIR])
+
+
+def nrpe_external_master_relation(service_name):
+    """Configure the nrpe-external-master relation."""
+    nrpe_compat = nrpe.NRPE()
+
+    nrpe_compat.add_check(
+        shortname='fileage',
+        description='Check file age',
+        check_cmd='check_file_age %s' % NAGIOS_CONTROL_FILEPATH
+    )
+    nrpe_compat.write()

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-08-10 15:47:08 +0000
+++ hooks/services.py	2015-08-11 19:33:08 +0000
@@ -29,6 +29,7 @@
                     source='upstart.conf',
                     target='/etc/init/result-enum-worker.conf'),
                 actions.log_start,
+                actions.nrpe_external_master_relation,
             ],
         },
     ])

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-07-17 03:23:32 +0000
+++ metadata.yaml	2015-08-11 19:33:08 +0000
@@ -5,4 +5,7 @@
   Runs result-enum-worker service.
 requires:
   mongodb:
-    interface: mongodb
\ No newline at end of file
+    interface: mongodb
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container