Merge lp:~mthaddon/charms/precise/memcached/basenode-and-nrpe-external into lp:charms/memcached

[Tom Haddon]

This adds support for pre-install hook structure, as supported in a number of other charms, which allows you to do things like set timezone, install custom apt repositories, etc.. It also adds support for the nrpe-external-master charm

[Matthew Wedgwood (mew)]

I see the interface for nrpe-external-master in config.yaml, but there's no implementation.

review: Needs Fixing

[lp:~mthaddon/charms/precise/memcached/basenode-and-nrpe-external]

55. By Tom Haddon on 2013-04-15

Add in a nagios check when we have a relation with nrpe-external-master

56. By Tom Haddon on 2013-04-15

Make the nrpe-external-master-relation-changed hook executable

57. By Tom Haddon on 2013-04-17

We need to export the variables for them to be recognisable to cheetah --env

[Tom Haddon (mthaddon)]

Ok, I think this should now fix the lack of nagios check on being joined to the nrpe-external-master charm.

[Matthew Wedgwood (mew)]

Looks like you're still missing a copy of the nrpe check, /usr/lib/nagios/plugins/check_memcache.py

review: Needs Fixing

[Tom Haddon (mthaddon)]

Still need to actually ship the /usr/lib/nagios/plugins/check_memcache.py file, and probably put it in /usr/local/lib/nagios/plugins so it's clear this is a custom plugin.

review: Needs Fixing

[lp:~mthaddon/charms/precise/memcached/basenode-and-nrpe-external]

58. By Tom Haddon on 2013-04-17

Ship the nagios plugin for checking memcache as well

59. By Tom Haddon on 2013-04-17

We need python-memcache for the nagios check in nrpe-external-master

[Matthew Wedgwood (mew)]

These changes do the trick.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2012-01-28 01:11:44 +0000
+++ config.yaml	2013-04-17 17:06:24 +0000
@@ -78,3 +78,13 @@
         description: memcached has many other options documented in its man page. You may pass them here as a string which will be appended to memcached's execution.
         type: string
         default: ""
+    nagios_context:
+        default: "juju"
+        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-memcached-0
+            If you're running multiple environments with the same services in them
+            this allows you to differentiate between them.

=== added directory 'files'
=== added directory 'files/nrpe-external-master'
=== added file 'files/nrpe-external-master/check_memcache.py'
--- files/nrpe-external-master/check_memcache.py	1970-01-01 00:00:00 +0000
+++ files/nrpe-external-master/check_memcache.py	2013-04-17 17:06:24 +0000
@@ -0,0 +1,74 @@
+#!/usr/bin/python
+
+#---------------------------------------------------
+# This file is Juju managed
+#---------------------------------------------------
+
+import memcache
+import nagios_plugin
+import sys
+from optparse import OptionParser
+
+
+def check_version(hosts_ports):
+    output, errors = [], []
+    mc = memcache.Client(hosts_ports)
+    for host in mc.servers:
+        host.connect()
+        try:
+            host.send_cmd("version")
+            output.append(host.readline())
+        except:
+            errors.append(str(host))
+    if errors:
+        raise nagios_plugin.CriticalError("Problems with: %s" % ", ".join(errors))
+    print ", ".join(output)
+
+
+def main():
+    usage = "%s [-H HOST] [-p PORT] -c check_type\n\n" \
+        "For options, run '%s --help'" % (sys.argv[0], sys.argv[0])
+    parser = OptionParser(usage)
+
+    parser.add_option(
+        '-H', '--hosts', type="string", nargs=1,
+        dest="hosts", help="Comma separated list of hosts to check - defaults to 'localhost'"
+    )
+    parser.add_option(
+        '-p', '--ports', type="string", nargs=1,
+        dest="ports", help="Comma separated list of ports to check - defaults to 11211"
+    )
+    parser.add_option(
+        '-c', '--check-type', type="string", nargs=1,
+        dest="check_type", help="The type of check - Mandatory!"
+    )
+
+    (options, args) = parser.parse_args()
+
+    if not options.hosts:
+        options.hosts = 'localhost'
+    if not options.ports:
+        options.ports = '11211'
+
+    hosts = options.hosts.split(",")
+    ports = options.ports.split(",")
+
+    if len(hosts) != len(ports):
+        parser.error("You haven't specified the same number of hosts and ports")
+    else:
+        hosts_ports = []
+        for num in range(len(hosts)):
+            hosts_ports.append('%s:%s' % (hosts[num], ports[num]))
+
+    if not options.check_type:
+        parser.error("You must specify a type of check to perform")
+    else:
+        if options.check_type == 'version':
+            nagios_plugin.try_check(check_version, hosts_ports)
+        else:
+            # Add to this list as other check types are implemented
+            parser.error("Check types currently accepted: version")
+
+
+if __name__ == "__main__":
+    main()

=== modified file 'hooks/install'
--- hooks/install	2011-12-05 22:55:46 +0000
+++ hooks/install	2013-04-17 17:06:24 +0000
@@ -1,8 +1,19 @@
 #!/bin/bash
 
 set -e
+if [[ -d exec.d ]]; then
+    shopt -s nullglob
+    for f in exec.d/*/charm-pre-install; do 
+        [[ -x "$f" ]] || continue
+        ${SHELL} -c "$f"|| {
+            ## bail out if anyone fails
+            juju-log -l ERROR "$f: returned exit_status=$? "
+            exit 1
+        }
+    done
+fi
 
-DEBIAN_FRONTEND=noninteractive apt-get -y install -qq memcached
+DEBIAN_FRONTEND=noninteractive apt-get -y install -qq memcached python-cheetah python-memcache
 
 cat > /etc/default/memcached <<EOF
 ENABLE_MEMCACHED=yes

=== added file 'hooks/nrpe-external-master-relation-changed'
--- hooks/nrpe-external-master-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/nrpe-external-master-relation-changed	2013-04-17 17:06:24 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -eux
+
+if [ ! -d /usr/local/lib/nagios/plugins ]; then
+    mkdir -p /usr/local/lib/nagios/plugins
+fi
+if [ ! -f /usr/local/lib/nagios/plugins/check_memcache.py ]; then
+    cp files/nrpe-external-master/check_memcache.py /usr/local/lib/nagios/plugins/check_memcache.py
+    chmod 555 /usr/local/lib/nagios/plugins/check_memcache.py
+fi
+
+export NAGIOS_HOSTNAME="$(config-get nagios_context)-${JUJU_UNIT_NAME//\//-}"
+export NAGIOS_SERVICEGROUP="$(config-get nagios-context)"
+export TCP_PORT="$(config-get tcp-port)"
+
+cheetah fill --env -p templates/nrpe_check_memcached.cfg.tmpl > /etc/nagios/nrpe.d/check_memcached.cfg
+cheetah fill --env -p templates/nrpe_export.cfg.tmpl > /var/lib/nagios/export/service__${NAGIOS_HOSTNAME}_check_memcached.cfg
+
+/etc/init.d/nagios-nrpe-server reload

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-05-22 22:30:52 +0000
+++ metadata.yaml	2013-04-17 17:06:24 +0000
@@ -20,3 +20,6 @@
     interface: memcache
   munin:
     interface: munin-node
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container

=== added directory 'templates'
=== added file 'templates/nrpe_check_memcached.cfg.tmpl'
--- templates/nrpe_check_memcached.cfg.tmpl	1970-01-01 00:00:00 +0000
+++ templates/nrpe_check_memcached.cfg.tmpl	2013-04-17 17:06:24 +0000
@@ -0,0 +1,4 @@
+#---------------------------------------------------
+# This file is Juju managed
+#---------------------------------------------------
+command[check_memcached]=/usr/local/lib/nagios/plugins/check_memcache.py -H 127.0.0.1 -p ${TCP_PORT} -c version

=== added file 'templates/nrpe_export.cfg.tmpl'
--- templates/nrpe_export.cfg.tmpl	1970-01-01 00:00:00 +0000
+++ templates/nrpe_export.cfg.tmpl	2013-04-17 17:06:24 +0000
@@ -0,0 +1,10 @@
+#---------------------------------------------------
+# This file is Juju managed
+#---------------------------------------------------
+define service {
+    use                             active-service
+    host_name                       ${NAGIOS_HOSTNAME}
+    service_description             ${NAGIOS_HOSTNAME} memcached
+    check_command                   check_nrpe!check_memcached
+    servicegroups                   ${NAGIOS_SERVICEGROUP}, 
+}