Merge lp:~brad-marshall/charms/trusty/swift-proxy/add-nrpe-checks into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/trunk

[Brad Marshall]

Adds nrpe-external-master interface and adds basic nrpe checks.

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #822 trusty-swift-proxy for brad-marshall mp241484
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/swift_hooks 190 190 0% 3-388
  hooks/swift_utils 189 189 0% 1-393
  TOTAL 464 464 0%
  Ran 5 tests in 0.179s
  OK

Full unit test output: http://paste.ubuntu.com/8955706/
Build: http://10.98.191.181:8080/job/charm_unit_test/822/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #987 trusty-swift-proxy for brad-marshall mp241484
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
  hooks/swift_hooks.py:357:80: E501 line too long (92 > 79 characters)
  hooks/swift_hooks.py:378:18: E251 unexpected spaces around keyword / parameter equals
  hooks/swift_hooks.py:378:20: E251 unexpected spaces around keyword / parameter equals
  hooks/swift_hooks.py:379:9: E123 closing bracket does not match indentation of opening bracket's line
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/8955707/
Build: http://10.98.191.181:8080/job/charm_lint_check/987/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #367 trusty-swift-proxy for brad-marshall mp241484
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Tearing down osci-sv05 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/8955846/
Build: http://10.98.191.181:8080/job/charm_amulet_test/367/

[lp:~brad-marshall/charms/trusty/swift-proxy/add-nrpe-checks]

72. By Brad Marshall on 2014-11-17

[bradm] Added sysvinit daemon monitoring, use services() instead of hard coded daemon list, pep8 fixes

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_lint_check #1084 trusty-swift-proxy for brad-marshall mp241484
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
INFO:root:command: make -f Makefile lint
ERROR:root:Make target returned non-zero.
  hooks/swift_hooks.py:387:17: E123 closing bracket does not match indentation of opening bracket's line
  hooks/swift_hooks.py:404:17: E123 closing bracket does not match indentation of opening bracket's line
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9052124/
Build: http://10.98.191.181:8080/job/charm_lint_check/1084/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_unit_test #918 trusty-swift-proxy for brad-marshall mp241484
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/swift_hooks 203 203 0% 3-413
  hooks/swift_utils 194 194 0% 1-401
  TOTAL 482 482 0%
  Ran 5 tests in 0.190s
  OK

Full unit test output: http://paste.ubuntu.com/9052125/
Build: http://10.98.191.181:8080/job/charm_unit_test/918/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_amulet_test #426 trusty-swift-proxy for brad-marshall mp241484
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Tearing down osci-sv07 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/9052216/
Build: http://10.98.191.181:8080/job/charm_amulet_test/426/

[lp:~brad-marshall/charms/trusty/swift-proxy/add-nrpe-checks]

73. By Brad Marshall on 2014-11-17

[bradm] Removed puppet header from nagios_plugin module

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_lint_check #1096 trusty-swift-proxy for brad-marshall mp241484
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
INFO:root:command: make -f Makefile lint
ERROR:root:Make target returned non-zero.
  hooks/swift_hooks.py:387:17: E123 closing bracket does not match indentation of opening bracket's line
  hooks/swift_hooks.py:404:17: E123 closing bracket does not match indentation of opening bracket's line
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9052966/
Build: http://10.98.191.181:8080/job/charm_lint_check/1096/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_unit_test #930 trusty-swift-proxy for brad-marshall mp241484
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/swift_hooks 203 203 0% 3-413
  hooks/swift_utils 194 194 0% 1-401
  TOTAL 482 482 0%
  Ran 5 tests in 0.224s
  OK

Full unit test output: http://paste.ubuntu.com/9052969/
Build: http://10.98.191.181:8080/job/charm_unit_test/930/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_amulet_test #438 trusty-swift-proxy for brad-marshall mp241484
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/9053031/
Build: http://10.98.191.181:8080/job/charm_amulet_test/438/

[lp:~brad-marshall/charms/trusty/swift-proxy/add-nrpe-checks]

74. By Brad Marshall on 2014-11-18

[bradm] Removed nagios check files that were moved to nrpe-external-master charm

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_lint_check #1112 trusty-swift-proxy for brad-marshall mp241484
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
ERROR:root:Make target returned non-zero.
  hooks/swift_hooks.py:387:17: E123 closing bracket does not match indentation of opening bracket's line
  hooks/swift_hooks.py:390:13: F841 local variable 'checkpath' is assigned to but never used
  hooks/swift_hooks.py:404:17: E123 closing bracket does not match indentation of opening bracket's line
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9063845/
Build: http://10.98.191.181:8080/job/charm_lint_check/1112/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_unit_test #946 trusty-swift-proxy for brad-marshall mp241484
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/swift_hooks 203 203 0% 3-413
  hooks/swift_utils 194 194 0% 1-401
  TOTAL 482 482 0%
  Ran 5 tests in 0.200s
  OK

Full unit test output: http://paste.ubuntu.com/9063846/
Build: http://10.98.191.181:8080/job/charm_unit_test/946/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_amulet_test #454 trusty-swift-proxy for brad-marshall mp241484
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/9063932/
Build: http://10.98.191.181:8080/job/charm_amulet_test/454/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_lint_check #1242 trusty-swift-proxy for brad-marshall mp241484
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
ERROR:root:Make target returned non-zero.
  hooks/swift_hooks.py:387:17: E123 closing bracket does not match indentation of opening bracket's line
  hooks/swift_hooks.py:390:13: F841 local variable 'checkpath' is assigned to but never used
  hooks/swift_hooks.py:404:17: E123 closing bracket does not match indentation of opening bracket's line
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9281256/
Build: http://10.98.191.181:8080/job/charm_lint_check/1242/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_unit_test #1076 trusty-swift-proxy for brad-marshall mp241484
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/swift_hooks 203 203 0% 3-413
  hooks/swift_utils 194 194 0% 1-401
  TOTAL 482 482 0%
  Ran 5 tests in 0.160s
  OK

Full unit test output: http://paste.ubuntu.com/9281257/
Build: http://10.98.191.181:8080/job/charm_unit_test/1076/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_amulet_test #545 trusty-swift-proxy for brad-marshall mp241484
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  WARNING cannot delete security group "juju-osci-sv11". Used by another environment?
  WARNING cannot delete security group "juju-osci-sv11-0". Used by another environment?
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/9281343/
Build: http://10.98.191.181:8080/job/charm_amulet_test/545/

[Liam Young (gnuoy)]

Thanks for this branch. I've taken it and fixed up a few minor bits and proposed it against the 'next' branch. It has now landed into 'next' and will promulgate to staging at the end of the month as part of the 15.01 openstack charm release.

review: Disapprove

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2014-10-02 09:28:13 +0000
+++ charm-helpers-hooks.yaml	2014-11-18 01:29:44 +0000
@@ -11,3 +11,4 @@
     - payload.execd
     - contrib.network.ip
     - contrib.peerstorage
+    - contrib.charmsupport

=== modified file 'config.yaml'
--- config.yaml	2014-10-02 20:31:24 +0000
+++ config.yaml	2014-11-18 01:29:44 +0000
@@ -177,3 +177,14 @@
       order for this charm to function correctly, the privacy extension must be
       disabled and a non-temporary address must be configured/available on
       your network interface.
+  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-myservice-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 'hooks/charmhelpers/contrib/charmsupport'
=== added file 'hooks/charmhelpers/contrib/charmsupport/__init__.py'
=== added file 'hooks/charmhelpers/contrib/charmsupport/nrpe.py'
--- hooks/charmhelpers/contrib/charmsupport/nrpe.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/contrib/charmsupport/nrpe.py	2014-11-18 01:29:44 +0000
@@ -0,0 +1,222 @@
+"""Compatibility with the nrpe-external-master charm"""
+# Copyright 2012 Canonical Ltd.
+#
+# Authors:
+#  Matthew Wedgwood <[e-mail]>
+
+import subprocess
+import pwd
+import grp
+import os
+import re
+import shlex
+import yaml
+
+from charmhelpers.core.hookenv import (
+    config,
+    local_unit,
+    log,
+    relation_ids,
+    relation_set,
+)
+
+from charmhelpers.core.host import service
+
+# This module adds compatibility with the nrpe-external-master and plain nrpe
+# subordinate charms. To use it in your charm:
+#
+# 1. Update metadata.yaml
+#
+#   provides:
+#     (...)
+#     nrpe-external-master:
+#       interface: nrpe-external-master
+#       scope: container
+#
+#   and/or
+#
+#   provides:
+#     (...)
+#     local-monitors:
+#       interface: local-monitors
+#       scope: container
+
+#
+# 2. Add the following to config.yaml
+#
+#    nagios_context:
+#      default: "juju"
+#      type: string
+#      description: |
+#        Used by the nrpe subordinate charms.
+#        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-myservice-0
+#        If you're running multiple environments with the same services in them
+#        this allows you to differentiate between them.
+#
+# 3. Add custom checks (Nagios plugins) to files/nrpe-external-master
+#
+# 4. Update your hooks.py with something like this:
+#
+#    from charmsupport.nrpe import NRPE
+#    (...)
+#    def update_nrpe_config():
+#        nrpe_compat = NRPE()
+#        nrpe_compat.add_check(
+#            shortname = "myservice",
+#            description = "Check MyService",
+#            check_cmd = "check_http -w 2 -c 10 http://localhost"
+#            )
+#        nrpe_compat.add_check(
+#            "myservice_other",
+#            "Check for widget failures",
+#            check_cmd = "/srv/myapp/scripts/widget_check"
+#            )
+#        nrpe_compat.write()
+#
+#    def config_changed():
+#        (...)
+#        update_nrpe_config()
+#
+#    def nrpe_external_master_relation_changed():
+#        update_nrpe_config()
+#
+#    def local_monitors_relation_changed():
+#        update_nrpe_config()
+#
+# 5. ln -s hooks.py nrpe-external-master-relation-changed
+#    ln -s hooks.py local-monitors-relation-changed
+
+
+class CheckException(Exception):
+    pass
+
+
+class Check(object):
+    shortname_re = '[A-Za-z0-9-_]+$'
+    service_template = ("""
+#---------------------------------------------------
+# This file is Juju managed
+#---------------------------------------------------
+define service {{
+    use                             active-service
+    host_name                       {nagios_hostname}
+    service_description             {nagios_hostname}[{shortname}] """
+                        """{description}
+    check_command                   check_nrpe!{command}
+    servicegroups                   {nagios_servicegroup}
+}}
+""")
+
+    def __init__(self, shortname, description, check_cmd):
+        super(Check, self).__init__()
+        # XXX: could be better to calculate this from the service name
+        if not re.match(self.shortname_re, shortname):
+            raise CheckException("shortname must match {}".format(
+                Check.shortname_re))
+        self.shortname = shortname
+        self.command = "check_{}".format(shortname)
+        # Note: a set of invalid characters is defined by the
+        # Nagios server config
+        # The default is: illegal_object_name_chars=`~!$%^&*"|'<>?,()=
+        self.description = description
+        self.check_cmd = self._locate_cmd(check_cmd)
+
+    def _locate_cmd(self, check_cmd):
+        search_path = (
+            '/',
+            os.path.join(os.environ['CHARM_DIR'],
+                         'files/nrpe-external-master'),
+            '/usr/lib/nagios/plugins',
+            '/usr/local/lib/nagios/plugins',
+        )
+        parts = shlex.split(check_cmd)
+        for path in search_path:
+            if os.path.exists(os.path.join(path, parts[0])):
+                command = os.path.join(path, parts[0])
+                if len(parts) > 1:
+                    command += " " + " ".join(parts[1:])
+                return command
+        log('Check command not found: {}'.format(parts[0]))
+        return ''
+
+    def write(self, nagios_context, hostname):
+        nrpe_check_file = '/etc/nagios/nrpe.d/{}.cfg'.format(
+            self.command)
+        with open(nrpe_check_file, 'w') as nrpe_check_config:
+            nrpe_check_config.write("# check {}\n".format(self.shortname))
+            nrpe_check_config.write("command[{}]={}\n".format(
+                self.command, self.check_cmd))
+
+        if not os.path.exists(NRPE.nagios_exportdir):
+            log('Not writing service config as {} is not accessible'.format(
+                NRPE.nagios_exportdir))
+        else:
+            self.write_service_config(nagios_context, hostname)
+
+    def write_service_config(self, nagios_context, hostname):
+        for f in os.listdir(NRPE.nagios_exportdir):
+            if re.search('.*{}.cfg'.format(self.command), f):
+                os.remove(os.path.join(NRPE.nagios_exportdir, f))
+
+        templ_vars = {
+            'nagios_hostname': hostname,
+            'nagios_servicegroup': nagios_context,
+            'description': self.description,
+            'shortname': self.shortname,
+            'command': self.command,
+        }
+        nrpe_service_text = Check.service_template.format(**templ_vars)
+        nrpe_service_file = '{}/service__{}_{}.cfg'.format(
+            NRPE.nagios_exportdir, hostname, self.command)
+        with open(nrpe_service_file, 'w') as nrpe_service_config:
+            nrpe_service_config.write(str(nrpe_service_text))
+
+    def run(self):
+        subprocess.call(self.check_cmd)
+
+
+class NRPE(object):
+    nagios_logdir = '/var/log/nagios'
+    nagios_exportdir = '/var/lib/nagios/export'
+    nrpe_confdir = '/etc/nagios/nrpe.d'
+
+    def __init__(self, hostname=None):
+        super(NRPE, self).__init__()
+        self.config = config()
+        self.nagios_context = self.config['nagios_context']
+        self.unit_name = local_unit().replace('/', '-')
+        if hostname:
+            self.hostname = hostname
+        else:
+            self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
+        self.checks = []
+
+    def add_check(self, *args, **kwargs):
+        self.checks.append(Check(*args, **kwargs))
+
+    def write(self):
+        try:
+            nagios_uid = pwd.getpwnam('nagios').pw_uid
+            nagios_gid = grp.getgrnam('nagios').gr_gid
+        except:
+            log("Nagios user not set up, nrpe checks not updated")
+            return
+
+        if not os.path.exists(NRPE.nagios_logdir):
+            os.mkdir(NRPE.nagios_logdir)
+            os.chown(NRPE.nagios_logdir, nagios_uid, nagios_gid)
+
+        nrpe_monitors = {}
+        monitors = {"monitors": {"remote": {"nrpe": nrpe_monitors}}}
+        for nrpecheck in self.checks:
+            nrpecheck.write(self.nagios_context, self.hostname)
+            nrpe_monitors[nrpecheck.shortname] = {
+                "command": nrpecheck.command,
+            }
+
+        service('restart', 'nagios-nrpe-server')
+
+        for rid in relation_ids("local-monitors"):
+            relation_set(relation_id=rid, monitors=yaml.dump(monitors))

=== added file 'hooks/charmhelpers/contrib/charmsupport/volumes.py'
--- hooks/charmhelpers/contrib/charmsupport/volumes.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/contrib/charmsupport/volumes.py	2014-11-18 01:29:44 +0000
@@ -0,0 +1,156 @@
+'''
+Functions for managing volumes in juju units. One volume is supported per unit.
+Subordinates may have their own storage, provided it is on its own partition.
+
+Configuration stanzas:
+  volume-ephemeral:
+    type: boolean
+    default: true
+    description: >
+      If false, a volume is mounted as sepecified in "volume-map"
+      If true, ephemeral storage will be used, meaning that log data
+         will only exist as long as the machine. YOU HAVE BEEN WARNED.
+  volume-map:
+    type: string
+    default: {}
+    description: >
+      YAML map of units to device names, e.g:
+        "{ rsyslog/0: /dev/vdb, rsyslog/1: /dev/vdb }"
+      Service units will raise a configure-error if volume-ephemeral
+      is 'true' and no volume-map value is set. Use 'juju set' to set a
+      value and 'juju resolved' to complete configuration.
+
+Usage:
+    from charmsupport.volumes import configure_volume, VolumeConfigurationError
+    from charmsupport.hookenv import log, ERROR
+    def post_mount_hook():
+        stop_service('myservice')
+    def post_mount_hook():
+        start_service('myservice')
+
+    if __name__ == '__main__':
+        try:
+            configure_volume(before_change=pre_mount_hook,
+                             after_change=post_mount_hook)
+        except VolumeConfigurationError:
+            log('Storage could not be configured', ERROR)
+'''
+
+# XXX: Known limitations
+# - fstab is neither consulted nor updated
+
+import os
+from charmhelpers.core import hookenv
+from charmhelpers.core import host
+import yaml
+
+
+MOUNT_BASE = '/srv/juju/volumes'
+
+
+class VolumeConfigurationError(Exception):
+    '''Volume configuration data is missing or invalid'''
+    pass
+
+
+def get_config():
+    '''Gather and sanity-check volume configuration data'''
+    volume_config = {}
+    config = hookenv.config()
+
+    errors = False
+
+    if config.get('volume-ephemeral') in (True, 'True', 'true', 'Yes', 'yes'):
+        volume_config['ephemeral'] = True
+    else:
+        volume_config['ephemeral'] = False
+
+    try:
+        volume_map = yaml.safe_load(config.get('volume-map', '{}'))
+    except yaml.YAMLError as e:
+        hookenv.log("Error parsing YAML volume-map: {}".format(e),
+                    hookenv.ERROR)
+        errors = True
+    if volume_map is None:
+        # probably an empty string
+        volume_map = {}
+    elif not isinstance(volume_map, dict):
+        hookenv.log("Volume-map should be a dictionary, not {}".format(
+            type(volume_map)))
+        errors = True
+
+    volume_config['device'] = volume_map.get(os.environ['JUJU_UNIT_NAME'])
+    if volume_config['device'] and volume_config['ephemeral']:
+        # asked for ephemeral storage but also defined a volume ID
+        hookenv.log('A volume is defined for this unit, but ephemeral '
+                    'storage was requested', hookenv.ERROR)
+        errors = True
+    elif not volume_config['device'] and not volume_config['ephemeral']:
+        # asked for permanent storage but did not define volume ID
+        hookenv.log('Ephemeral storage was requested, but there is no volume '
+                    'defined for this unit.', hookenv.ERROR)
+        errors = True
+
+    unit_mount_name = hookenv.local_unit().replace('/', '-')
+    volume_config['mountpoint'] = os.path.join(MOUNT_BASE, unit_mount_name)
+
+    if errors:
+        return None
+    return volume_config
+
+
+def mount_volume(config):
+    if os.path.exists(config['mountpoint']):
+        if not os.path.isdir(config['mountpoint']):
+            hookenv.log('Not a directory: {}'.format(config['mountpoint']))
+            raise VolumeConfigurationError()
+    else:
+        host.mkdir(config['mountpoint'])
+    if os.path.ismount(config['mountpoint']):
+        unmount_volume(config)
+    if not host.mount(config['device'], config['mountpoint'], persist=True):
+        raise VolumeConfigurationError()
+
+
+def unmount_volume(config):
+    if os.path.ismount(config['mountpoint']):
+        if not host.umount(config['mountpoint'], persist=True):
+            raise VolumeConfigurationError()
+
+
+def managed_mounts():
+    '''List of all mounted managed volumes'''
+    return filter(lambda mount: mount[0].startswith(MOUNT_BASE), host.mounts())
+
+
+def configure_volume(before_change=lambda: None, after_change=lambda: None):
+    '''Set up storage (or don't) according to the charm's volume configuration.
+       Returns the mount point or "ephemeral". before_change and after_change
+       are optional functions to be called if the volume configuration changes.
+    '''
+
+    config = get_config()
+    if not config:
+        hookenv.log('Failed to read volume configuration', hookenv.CRITICAL)
+        raise VolumeConfigurationError()
+
+    if config['ephemeral']:
+        if os.path.ismount(config['mountpoint']):
+            before_change()
+            unmount_volume(config)
+            after_change()
+        return 'ephemeral'
+    else:
+        # persistent storage
+        if os.path.ismount(config['mountpoint']):
+            mounts = dict(managed_mounts())
+            if mounts.get(config['mountpoint']) != config['device']:
+                before_change()
+                unmount_volume(config)
+                mount_volume(config)
+                after_change()
+        else:
+            before_change()
+            mount_volume(config)
+            after_change()
+        return config['mountpoint']

=== added symlink 'hooks/nrpe-external-master-relation-changed'
=== target is u'swift_hooks.py'
=== added symlink 'hooks/nrpe-external-master-relation-joined'
=== target is u'swift_hooks.py'
=== modified file 'hooks/swift_hooks.py'
--- hooks/swift_hooks.py	2014-10-23 16:17:57 +0000
+++ hooks/swift_hooks.py	2014-11-18 01:29:44 +0000
@@ -11,6 +11,7 @@
 from swift_utils import (
     register_configs,
     restart_map,
+    services,
     determine_packages,
     ensure_swift_dir,
     SWIFT_RINGS, get_www_dir,
@@ -35,10 +36,16 @@
     relation_set,
     relation_ids,
     relation_get,
+<<<<<<< TREE
     log,
     INFO,
     WARNING,
     ERROR,
+=======
+    relations_of_type,
+    local_unit,
+    log, ERROR,
+>>>>>>> MERGE-SOURCE
     Hooks, UnregisteredHookError,
     open_port
 )
@@ -69,6 +76,8 @@
 
 from charmhelpers.contrib.openstack.context import ADDRESS_TYPES
 
+from charmhelpers.contrib.charmsupport.nrpe import NRPE
+
 extra_pkgs = [
     "haproxy",
     "python-jinja2"
@@ -275,6 +284,7 @@
 
     configure_https()
     open_port(config('bind-port'))
+    update_nrpe_config()
     # Determine whether or not we should do an upgrade, based on the
     # the version offered in keyston-release.
     if (openstack.openstack_upgrade_available('python-swift')):
@@ -454,6 +464,57 @@
     write_rc_script()
 
 
[e-mail]('nrpe-external-master-relation-joined',
+            'nrpe-external-master-relation-changed')
+def update_nrpe_config():
+    apt_install('python-dbus')
+    # Find out if nrpe set nagios_hostname
+    hostname = None
+    host_context = None
+    for rel in relations_of_type('nrpe-external-master'):
+        if 'nagios_hostname' in rel:
+            hostname = rel['nagios_hostname']
+            host_context = rel['nagios_host_context']
+            break
+    nrpe = NRPE(hostname=hostname)
+
+    if host_context:
+        current_unit = "%s:%s" % (host_context, local_unit())
+    else:
+        current_unit = local_unit()
+
+    services_to_monitor = services()
+    for service in services_to_monitor:
+        upstart_init = '/etc/init/%s.conf' % service
+        sysv_init = '/etc/init.d/%s' % service
+
+        if os.path.exists(upstart_init):
+            nrpe.add_check(
+                shortname=service,
+                description='process check {%s}' % current_unit,
+                check_cmd='check_upstart_job %s' % service,
+                )
+        elif os.path.exists(sysv_init):
+            cronpath = '/etc/cron.d/nagios-service-check-%s' % service
+            checkpath = os.path.join(os.environ['CHARM_DIR'],
+                                     'files/nrpe-external-master',
+                                     'check_exit_status.pl'),
+            cron_template = '*/5 * * * * root \
+/usr/local/lib/nagios/plugins/check_exit_status.pl -s /etc/init.d/%s \
+status > /var/lib/nagios/service-check-%s.txt\n' % (service, service)
+            f = open(cronpath, 'w')
+            f.write(cron_template)
+            f.close()
+            nrpe.add_check(
+                shortname=service,
+                description='process check {%s}' % current_unit,
+                check_cmd='check_status_file.py -f \
+/var/lib/nagios/service-check-%s.txt' % service,
+                )
+
+    nrpe.write()
+
+
 def main():
     try:
         hooks.execute(sys.argv)

=== modified file 'hooks/swift_utils.py'
--- hooks/swift_utils.py	2014-10-21 08:32:52 +0000
+++ hooks/swift_utils.py	2014-11-18 01:29:44 +0000
@@ -166,6 +166,14 @@
     return OrderedDict(_map)
 
 
+def services():
+    ''' Returns a list of services associate with this charm '''
+    _services = []
+    for v in restart_map().values():
+        _services = _services + v
+    return list(set(_services))
+
+
 def swift_user(username='swift'):
     user = pwd.getpwnam(username)
     return (user.pw_uid, user.pw_gid)

=== modified file 'metadata.yaml'
--- metadata.yaml	2013-07-11 19:18:37 +0000
+++ metadata.yaml	2014-11-18 01:29:44 +0000
@@ -7,6 +7,9 @@
 categories:
     - cache-proxy
 provides:
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container
   object-store:
     interface: swift-proxy
 requires: