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

[Brad Marshall]

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

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #996 trusty-nova-compute for brad-marshall mp241488
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
  hooks/nova_compute_hooks.py:291:18: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_compute_hooks.py:291:20: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_compute_hooks.py:296:18: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_compute_hooks.py:296:20: E251 unexpected spaces around keyword / parameter equals
  make: *** [lint] Error 1

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

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #831 trusty-nova-compute for brad-marshall mp241488
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  nova_compute_utils 228 110 52% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 380-381, 385-386, 405-426, 443-453, 467-468, 473-474
  TOTAL 583 206 65%
  Ran 56 tests in 2.909s
  FAILED (SKIP=5, errors=5)
  make: *** [unit_test] Error 1

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

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #376 trusty-nova-compute for brad-marshall mp241488
    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/8955983/
Build: http://10.98.191.181:8080/job/charm_amulet_test/376/

[lp:~brad-marshall/charms/trusty/nova-compute/add-nrpe-checks]

91. 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 #1087 trusty-nova-compute for brad-marshall mp241488
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

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

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

UOSCI bot says:
charm_unit_test #921 trusty-nova-compute for brad-marshall mp241488
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  nova_compute_utils 228 110 52% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 380-381, 385-386, 405-426, 443-453, 467-468, 473-474
  TOTAL 596 218 63%
  Ran 56 tests in 3.173s
  FAILED (SKIP=5, errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #429 trusty-nova-compute for brad-marshall mp241488
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv02"
  WARNING cannot delete security group "juju-osci-sv02-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/9052236/
Build: http://10.98.191.181:8080/job/charm_amulet_test/429/

[lp:~brad-marshall/charms/trusty/nova-compute/add-nrpe-checks]

92. 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 #1099 trusty-nova-compute for brad-marshall mp241488
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

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

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

UOSCI bot says:
charm_unit_test #933 trusty-nova-compute for brad-marshall mp241488
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  nova_compute_utils 228 110 52% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 380-381, 385-386, 405-426, 443-453, 467-468, 473-474
  TOTAL 596 218 63%
  Ran 56 tests in 3.357s
  FAILED (SKIP=5, errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #441 trusty-nova-compute for brad-marshall mp241488
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv02"
  WARNING cannot delete security group "juju-osci-sv02-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/9053033/
Build: http://10.98.191.181:8080/job/charm_amulet_test/441/

[lp:~brad-marshall/charms/trusty/nova-compute/add-nrpe-checks]

93. 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 #1115 trusty-nova-compute for brad-marshall mp241488
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

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

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

UOSCI bot says:
charm_unit_test #949 trusty-nova-compute for brad-marshall mp241488
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  nova_compute_utils 228 110 52% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 380-381, 385-386, 405-426, 443-453, 467-468, 473-474
  TOTAL 595 217 64%
  Ran 56 tests in 3.232s
  FAILED (SKIP=5, errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #457 trusty-nova-compute for brad-marshall mp241488
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv04"
  WARNING cannot delete security group "juju-osci-sv04-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/9063967/
Build: http://10.98.191.181:8080/job/charm_amulet_test/457/

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

UOSCI bot says:
charm_lint_check #1249 trusty-nova-compute for brad-marshall mp241488
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

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

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

UOSCI bot says:
charm_unit_test #1083 trusty-nova-compute for brad-marshall mp241488
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  nova_compute_utils 228 110 52% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 380-381, 385-386, 405-426, 443-453, 467-468, 473-474
  TOTAL 595 217 64%
  Ran 56 tests in 3.575s
  FAILED (SKIP=5, errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #552 trusty-nova-compute for brad-marshall mp241488
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv11"
  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/9281402/
Build: http://10.98.191.181:8080/job/charm_amulet_test/552/

[Liam Young (gnuoy)]

Thank for the mp. The new nrpe support is very gratefully received !

I've taken this branch and centralised the common code between this and the other nrpe branches and moved it to charm-helpers. To land it I created a new branch from this one which has now been merged into the 'next' charm. The 'next' charms will overwrite the stable ones in a couple of weeks.

review: Disapprove

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2014-09-23 10:21:54 +0000
+++ charm-helpers-hooks.yaml	2014-11-18 01:23:09 +0000
@@ -10,3 +10,4 @@
         - cluster
     - contrib.network
     - payload.execd
+    - contrib.charmsupport

=== 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:23:09 +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:23:09 +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/compute-peer-relation-joined'
=== target is u'nova_compute_hooks.py'
=== added symlink 'hooks/neutron-plugin-relation-changed'
=== target is u'nova_compute_hooks.py'
=== added symlink 'hooks/neutron-plugin-relation-departed'
=== target is u'nova_compute_hooks.py'
=== added symlink 'hooks/neutron-plugin-relation-joined'
=== target is u'nova_compute_hooks.py'
=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2014-09-30 07:40:06 +0000
+++ hooks/nova_compute_hooks.py	2014-11-18 01:23:09 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import sys
+import os
 
 from charmhelpers.core.hookenv import (
     Hooks,
@@ -11,8 +12,10 @@
     relation_ids,
     relation_get,
     relation_set,
+    relations_of_type,
     service_name,
     unit_get,
+    local_unit,
     UnregisteredHookError,
 )
 from charmhelpers.core.host import (
@@ -44,6 +47,7 @@
     do_openstack_upgrade,
     public_ssh_key,
     restart_map,
+    services,
     register_configs,
     NOVA_CONF,
     QUANTUM_CONF, NEUTRON_CONF,
@@ -57,6 +61,8 @@
     get_ipv6_addr
 )
 
+from charmhelpers.contrib.charmsupport.nrpe import NRPE
+
 from nova_compute_context import CEPH_SECRET_UUID
 from socket import gethostname
 
@@ -99,6 +105,8 @@
 
     [compute_joined(rid) for rid in relation_ids('cloud-compute')]
 
+    update_nrpe_config()
+
     CONFIGS.write_all()
 
 
@@ -253,6 +261,7 @@
 def upgrade_charm():
     for r_id in relation_ids('amqp'):
         amqp_joined(relation_id=r_id)
+    update_nrpe_config()
 
 
 @hooks.hook('nova-ceilometer-relation-changed')
@@ -261,6 +270,55 @@
     CONFIGS.write_all()
 
 
[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
+            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)

=== added symlink 'hooks/nrpe-external-master-relation-changed'
=== target is u'nova_compute_hooks.py'
=== added symlink 'hooks/start'
=== target is u'nova_compute_hooks.py'
=== added symlink 'hooks/stop'
=== target is u'nova_compute_hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2014-10-29 09:58:51 +0000
+++ metadata.yaml	2014-11-18 01:23:09 +0000
@@ -30,6 +30,13 @@
   neutron-plugin:
     interface: neutron-plugin
     scope: container
-peers:
-  compute-peer:
-    interface: nova
+<<<<<<< TREE
+peers:
+  compute-peer:
+    interface: nova
+=======
+peers:
+  compute-peer:
+    interface: nova
+
+>>>>>>> MERGE-SOURCE