Merge lp:~fginther/uci-engine/rabbit-worker-nrpe-2 into lp:uci-engine

[Francis Ginther]

Add support for rabbitmq-worker nagios checks and an example bsbuilder check.

Add support for rabbitmq-worker nagios checks and an example bsbuilder check.

Unmerged revisions

707. By Francis Ginther on 2014-07-24

Add support for rabbitmq-worker nagios checks and an example bsbuilder check.

=== added directory 'branch-source-builder/bin'
=== added file 'branch-source-builder/bin/check_bsbuilder.py'
--- branch-source-builder/bin/check_bsbuilder.py	1970-01-01 00:00:00 +0000
+++ branch-source-builder/bin/check_bsbuilder.py	2014-07-24 04:36:31 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+# Ubuntu CI Engine
+# Copyright 2014 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+from ci_utils.health_check import HealthCheck
+
+
+def check_bsbuilder():
+    return True, None
+
+
+def main():
+    with HealthCheck('bsbuilder') as check:
+        result, output = check_bsbuilder()
+        if result:
+            check.write_result_ok()
+        else:
+            check.write_result_failed(output)
+
+
+if __name__ == "__main__":
+    main()

=== modified file 'charms/precise/rabbitmq-worker/config.yaml'
--- charms/precise/rabbitmq-worker/config.yaml	2014-07-19 03:06:33 +0000
+++ charms/precise/rabbitmq-worker/config.yaml	2014-07-24 04:36:31 +0000
@@ -76,6 +76,28 @@
             install_keys: |
              - ""
              - ""
+
+  # Required by 'nrpe-external-master' interface.
+  nagios_context:
+    default: "rabbitmq-worker"
+    type: string
+    description: >
+        Used by the nrpe-external-master subordinate charm.
+        A string that will be prepended to instance name to set the host
+        name in nagios. So for instance the hostname would be something
+        like:
+            juju-postgresql-0
+        If you\'re running multiple environments with the same services in them
+        this allows you to differentiate between them.
+  nagios_check_http_params:
+     default: ""
+     type: string
+     description: The parameters to pass to the nrpe plugin check_http.
+  nagios_check_health_params:
+     default: ""
+     type: string
+     description: The parameters to pass to the nrpe plugin check_health.
+
   cron_cmd:
       type: string
       default: ""

=== modified file 'charms/precise/rabbitmq-worker/hooks/hooks.py'
--- charms/precise/rabbitmq-worker/hooks/hooks.py	2014-07-23 12:09:59 +0000
+++ charms/precise/rabbitmq-worker/hooks/hooks.py	2014-07-24 04:36:31 +0000
@@ -23,6 +23,8 @@
 import tempfile
 import textwrap
 
+from charmhelpers.contrib.charmsupport.nrpe import NRPE
+
 import charmhelpers.core.hookenv
 import charmhelpers.core.host
 import charmhelpers.fetch
@@ -207,8 +209,8 @@
         'schedule': config['cron_schedule'],
         'user': config['cron_user'],
         'logs_dir': _log_dir(),
-        'command': os.path.abspath(
-            os.path.join(_code_dir(), config['cron_cmd'])),
+        'code_dir': _code_dir(),
+        'command': config['cron_cmd'],
     }
     template = _get_template('cron.tmpl')
     with open(cron_path, 'w') as fp:
@@ -220,6 +222,29 @@
     juju_info('Cron configuration updated ({}).'.format(cron_path))
 
 
+def _update_nrpe_config():
+    nrpe_compat = NRPE()
+    config = charmhelpers.core.hookenv.config()
+    health_script_path = os.path.join(
+        _code_dir(config), 'bin', 'engine_health.py')
+    conf = nrpe_compat.config
+    check_http_params = conf.get('nagios_check_http_params')
+    if check_http_params:
+        nrpe_compat.add_check(
+            shortname='rabbitmq-worker',
+            description='Check RabbitMQ Service',
+            check_cmd='check_http %s' % check_http_params
+        )
+    check_health_params = conf.get('nagios_check_health_params')
+    if check_health_params:
+        nrpe_compat.add_check(
+            shortname='engine_health',
+            description='Check Engine Health',
+            check_cmd='%s %s' % (health_script_path, check_health_params)
+        )
+    nrpe_compat.write()
+
+
 @hooks.hook()
 def config_changed():
     charmhelpers.core.host.mkdir(_code_dir(''))
@@ -228,6 +253,7 @@
     _create_upstart()
     todelete = handle_code()
     _update_cron_config()
+    _update_nrpe_config()
 
     _restart_upstart()
 
@@ -345,5 +371,11 @@
     charmhelpers.core.hookenv.relation_set(None, {'status-url': url})
 
 
[e-mail]('nrpe-external-master-relation-changed')
[e-mail]()
+def nrpe_external_master_relation_joined():
+    _update_nrpe_config()
+
+
 if __name__ == '__main__':
     hooks.execute(sys.argv)

=== modified file 'juju-deployer/branch-source-builder.yaml.tmpl'
--- juju-deployer/branch-source-builder.yaml.tmpl	2014-07-23 13:49:58 +0000
+++ juju-deployer/branch-source-builder.yaml.tmpl	2014-07-24 04:36:31 +0000
@@ -14,9 +14,13 @@
                     - ${CI_PPA}
                 install_keys: |
                     - ""
-                cron_cmd:
-                cron_schedule: "0 * * * *"
+                cron_cmd: ./run-python ./branch-source-builder/bin/check_bsbuilder.py
+                cron_schedule: "* * * * *"
                 cron_user: root
+                nagios_context: ci-airline-staging
+                nagios_check_health_params: -t 120 /var/cache/bsbuilder.health
+                nagios_check_http_params: -H gatekeeper -I 127.0.0.1 -e '
+                    200 OK' --url='/api/v1/' -p 8080
         ci-airline-bsb-keys:
             charm: key-secret-subordinate
             options: