Merge lp:~gnuoy/charms/trusty/swift-storage/add-nrpe-checks-fix-rsyncd-conf into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[Liam Young]

Add nrpe support. Based on branch from bradm with a few tweaks

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

charm_lint_check #670 swift-storage-next for gnuoy mp246161
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/670/

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

charm_unit_test #699 swift-storage-next for gnuoy mp246161
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/699/

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

charm_amulet_test #855 swift-storage-next for gnuoy mp246161
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/855/

[Liam Young (gnuoy)]

<jamespage> gnuoy, as they are re-syncs + tweaks to the nrpe stuff in the charms, I'm happy to give a conditional +1 across the board based on osci checking things out OK
<gnuoy> jamespage, I'll take that! thanks
...
<gnuoy> jamespage, osci is still working through. But on the subject of those mps, does your +1 stand for branches with no amulet tests?
<jamespage> gnuoy, yes

review: Approve

=== modified file 'hooks/charmhelpers/contrib/charmsupport/nrpe.py'
--- hooks/charmhelpers/contrib/charmsupport/nrpe.py	2014-10-30 05:52:15 +0000
+++ hooks/charmhelpers/contrib/charmsupport/nrpe.py	2015-01-12 14:03:13 +0000
@@ -18,6 +18,7 @@
     log,
     relation_ids,
     relation_set,
+    relations_of_type,
 )
 
 from charmhelpers.core.host import service
@@ -54,6 +55,12 @@
 #            juju-myservice-0
 #        If you're running multiple environments with the same services in them
 #        this allows you to differentiate between them.
+#    nagios_servicegroups:
+#      default: ""
+#      type: string
+#      description: |
+#        A comma-separated list of nagios servicegroups.
+#        If left empty, the nagios_context will be used as the servicegroup
 #
 # 3. Add custom checks (Nagios plugins) to files/nrpe-external-master
 #
@@ -138,7 +145,7 @@
         log('Check command not found: {}'.format(parts[0]))
         return ''
 
-    def write(self, nagios_context, hostname):
+    def write(self, nagios_context, hostname, nagios_servicegroups=None):
         nrpe_check_file = '/etc/nagios/nrpe.d/{}.cfg'.format(
             self.command)
         with open(nrpe_check_file, 'w') as nrpe_check_config:
@@ -150,16 +157,21 @@
             log('Not writing service config as {} is not accessible'.format(
                 NRPE.nagios_exportdir))
         else:
-            self.write_service_config(nagios_context, hostname)
+            self.write_service_config(nagios_context, hostname,
+                                      nagios_servicegroups)
 
-    def write_service_config(self, nagios_context, hostname):
+    def write_service_config(self, nagios_context, hostname,
+                             nagios_servicegroups=None):
         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))
 
+        if not nagios_servicegroups:
+            nagios_servicegroups = nagios_context
+
         templ_vars = {
             'nagios_hostname': hostname,
-            'nagios_servicegroup': nagios_context,
+            'nagios_servicegroup': nagios_servicegroups,
             'description': self.description,
             'shortname': self.shortname,
             'command': self.command,
@@ -183,6 +195,10 @@
         super(NRPE, self).__init__()
         self.config = config()
         self.nagios_context = self.config['nagios_context']
+        if 'nagios_servicegroups' in self.config:
+            self.nagios_servicegroups = self.config['nagios_servicegroups']
+        else:
+            self.nagios_servicegroups = 'juju'
         self.unit_name = local_unit().replace('/', '-')
         if hostname:
             self.hostname = hostname
@@ -208,7 +224,8 @@
         nrpe_monitors = {}
         monitors = {"monitors": {"remote": {"nrpe": nrpe_monitors}}}
         for nrpecheck in self.checks:
-            nrpecheck.write(self.nagios_context, self.hostname)
+            nrpecheck.write(self.nagios_context, self.hostname,
+                            self.nagios_servicegroups)
             nrpe_monitors[nrpecheck.shortname] = {
                 "command": nrpecheck.command,
             }
@@ -217,3 +234,75 @@
 
         for rid in relation_ids("local-monitors"):
             relation_set(relation_id=rid, monitors=yaml.dump(monitors))
+
+
+def get_nagios_hostcontext(relation_name='nrpe-external-master'):
+    """
+    Query relation with nrpe subordinate, return the nagios_host_context
+
+    :param str relation_name: Name of relation nrpe sub joined to
+    """
+    for rel in relations_of_type(relation_name):
+        if 'nagios_hostname' in rel:
+            return rel['nagios_host_context']
+
+
+def get_nagios_hostname(relation_name='nrpe-external-master'):
+    """
+    Query relation with nrpe subordinate, return the nagios_hostname
+
+    :param str relation_name: Name of relation nrpe sub joined to
+    """
+    for rel in relations_of_type(relation_name):
+        if 'nagios_hostname' in rel:
+            return rel['nagios_hostname']
+
+
+def get_nagios_unit_name(relation_name='nrpe-external-master'):
+    """
+    Return the nagios unit name prepended with host_context if needed
+
+    :param str relation_name: Name of relation nrpe sub joined to
+    """
+    host_context = get_nagios_hostcontext(relation_name)
+    if host_context:
+        unit = "%s:%s" % (host_context, local_unit())
+    else:
+        unit = local_unit()
+    return unit
+
+
+def add_init_service_checks(nrpe, services, unit_name):
+    """
+    Add checks for each service in list
+
+    :param NRPE nrpe: NRPE object to add check to
+    :param list services: List of services to check
+    :param str unit_name: Unit name to use in check description
+    """
+    for svc in services:
+        upstart_init = '/etc/init/%s.conf' % svc
+        sysv_init = '/etc/init.d/%s' % svc
+        if os.path.exists(upstart_init):
+            nrpe.add_check(
+                shortname=svc,
+                description='process check {%s}' % unit_name,
+                check_cmd='check_upstart_job %s' % svc
+            )
+        elif os.path.exists(sysv_init):
+            cronpath = '/etc/cron.d/nagios-service-check-%s' % svc
+            cron_file = ('*/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' % (svc,
+                                                                     svc)
+                         )
+            f = open(cronpath, 'w')
+            f.write(cron_file)
+            f.close()
+            nrpe.add_check(
+                shortname=svc,
+                description='process check {%s}' % unit_name,
+                check_cmd='check_status_file.py -f '
+                          '/var/lib/nagios/service-check-%s.txt' % svc,
+            )

=== removed file 'hooks/charmhelpers/contrib/charmsupport/rsync.py'
--- hooks/charmhelpers/contrib/charmsupport/rsync.py	2014-11-06 07:38:43 +0000
+++ hooks/charmhelpers/contrib/charmsupport/rsync.py	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-"""
-Support for rsyncd.conf and using fragments dropped inside /etc/rsync-juju.d
-"""
-import os
-
-from charmhelpers.core.host import (
-    mkdir,
-)
-
-def setup_rsync():
-    '''
-    Ensure all directories required for rsync exist with correct permissions.
-    '''
-    root_dirs = [
-        '/etc/rsync-juju.d',
-    ]
-    [mkdir(d, owner='root', group='root') for d in root_dirs
-     if not os.path.isdir(d)]
-
-    rsyncd_base = """uid = nobody
-gid = nogroup
-pid file = /var/run/rsyncd.pid
-syslog facility = daemon
-socket options = SO_KEEPALIVE
-
-&include /etc/rsync-juju.d
-"""
-
-    f = open('/etc/rsyncd.conf','w')
-    f.write(rsyncd_base)
-    f.close()
-

=== modified file 'hooks/charmhelpers/contrib/charmsupport/volumes.py'
--- hooks/charmhelpers/contrib/charmsupport/volumes.py	2014-10-30 05:52:15 +0000
+++ hooks/charmhelpers/contrib/charmsupport/volumes.py	2015-01-12 14:03:13 +0000
@@ -2,7 +2,8 @@
 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:
+Configuration stanzas::
+
   volume-ephemeral:
     type: boolean
     default: true
@@ -20,7 +21,8 @@
       is 'true' and no volume-map value is set. Use 'juju set' to set a
       value and 'juju resolved' to complete configuration.
 
-Usage:
+Usage::
+
     from charmsupport.volumes import configure_volume, VolumeConfigurationError
     from charmsupport.hookenv import log, ERROR
     def post_mount_hook():
@@ -34,6 +36,7 @@
                              after_change=post_mount_hook)
         except VolumeConfigurationError:
             log('Storage could not be configured', ERROR)
+
 '''
 
 # XXX: Known limitations

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2014-12-15 09:35:34 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-01-12 14:03:13 +0000
@@ -491,6 +491,7 @@
             ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout')
 
         if config('prefer-ipv6'):
+            ctxt['ipv6'] = True
             ctxt['local_host'] = 'ip6-localhost'
             ctxt['haproxy_host'] = '::'
             ctxt['stat_port'] = ':::8888'

=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2014-12-10 20:28:59 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	2015-01-12 14:03:13 +0000
@@ -152,9 +152,15 @@
                                         database=config('neutron-database'),
                                         relation_prefix='neutron',
                                         ssl_dir=NEUTRON_CONF_DIR)],
-            'services': ['calico-compute', 'bird', 'neutron-dhcp-agent'],
+            'services': ['calico-felix',
+                         'bird',
+                         'neutron-dhcp-agent',
+                         'nova-api-metadata'],
             'packages': [[headers_package()] + determine_dkms_package(),
-                         ['calico-compute', 'bird', 'neutron-dhcp-agent']],
+                         ['calico-compute',
+                          'bird',
+                          'neutron-dhcp-agent',
+                          'nova-api-metadata']],
             'server_packages': ['neutron-server', 'calico-control'],
             'server_services': ['neutron-server']
         }

=== modified file 'hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg'
--- hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg	2014-12-10 20:28:59 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg	2015-01-12 14:03:13 +0000
@@ -38,7 +38,9 @@
 {% for service, ports in service_ports.items() -%}
 frontend tcp-in_{{ service }}
     bind *:{{ ports[0] }}
+    {% if ipv6 -%}
     bind :::{{ ports[0] }}
+    {% endif -%}
     {% for frontend in frontends -%}
     acl net_{{ frontend }} dst {{ frontends[frontend]['network'] }}
     use_backend {{ service }}_{{ frontend }} if net_{{ frontend }}

=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py	2014-12-10 20:28:59 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2015-01-12 14:03:13 +0000
@@ -53,6 +53,7 @@
     ('saucy', 'havana'),
     ('trusty', 'icehouse'),
     ('utopic', 'juno'),
+    ('vivid', 'kilo'),
 ])
 
 
@@ -64,6 +65,7 @@
     ('2013.2', 'havana'),
     ('2014.1', 'icehouse'),
     ('2014.2', 'juno'),
+    ('2015.1', 'kilo'),
 ])
 
 # The ugly duckling
@@ -84,6 +86,7 @@
     ('2.0.0', 'juno'),
     ('2.1.0', 'juno'),
     ('2.2.0', 'juno'),
+    ('2.2.1', 'kilo'),
 ])
 
 DEFAULT_LOOPBACK_SIZE = '5G'
@@ -289,6 +292,9 @@
             'juno': 'trusty-updates/juno',
             'juno/updates': 'trusty-updates/juno',
             'juno/proposed': 'trusty-proposed/juno',
+            'kilo': 'trusty-updates/kilo',
+            'kilo/updates': 'trusty-updates/kilo',
+            'kilo/proposed': 'trusty-proposed/kilo',
         }
 
         try:

=== modified file 'hooks/charmhelpers/fetch/__init__.py'
--- hooks/charmhelpers/fetch/__init__.py	2014-12-10 20:28:59 +0000
+++ hooks/charmhelpers/fetch/__init__.py	2015-01-12 14:03:13 +0000
@@ -64,9 +64,16 @@
     'trusty-juno/updates': 'trusty-updates/juno',
     'trusty-updates/juno': 'trusty-updates/juno',
     'juno/proposed': 'trusty-proposed/juno',
-    'juno/proposed': 'trusty-proposed/juno',
     'trusty-juno/proposed': 'trusty-proposed/juno',
     'trusty-proposed/juno': 'trusty-proposed/juno',
+    # Kilo
+    'kilo': 'trusty-updates/kilo',
+    'trusty-kilo': 'trusty-updates/kilo',
+    'trusty-kilo/updates': 'trusty-updates/kilo',
+    'trusty-updates/kilo': 'trusty-updates/kilo',
+    'kilo/proposed': 'trusty-proposed/kilo',
+    'trusty-kilo/proposed': 'trusty-proposed/kilo',
+    'trusty-proposed/kilo': 'trusty-proposed/kilo',
 }
 
 # The order of this list is very important. Handlers should be listed in from

=== modified file 'hooks/swift_storage_hooks.py'
--- hooks/swift_storage_hooks.py	2015-01-09 10:07:27 +0000
+++ hooks/swift_storage_hooks.py	2015-01-12 14:03:13 +0000
@@ -14,7 +14,8 @@
     register_configs,
     save_script_rc,
     setup_storage,
-    assert_charm_supports_ipv6
+    assert_charm_supports_ipv6,
+    setup_rsync,
 )
 
 from charmhelpers.core.hookenv import (
@@ -24,7 +25,6 @@
     relation_get,
     relation_set,
     relations_of_type,
-    local_unit,
 )
 
 from charmhelpers.fetch import (
@@ -42,9 +42,7 @@
 from charmhelpers.contrib.network.ip import (
     get_ipv6_addr
 )
-from charmhelpers.contrib.charmsupport.nrpe import NRPE
-
-from charmhelpers.contrib.charmsupport.rsync import setup_rsync
+from charmhelpers.contrib.charmsupport import nrpe
 
 from distutils.dir_util import mkpath
 
@@ -120,6 +118,8 @@
 @hooks.hook('nrpe-external-master-relation-joined')
 @hooks.hook('nrpe-external-master-relation-changed')
 def update_nrpe_config():
+    # python-dbus is used by check_upstart_job
+    apt_install('python-dbus')
     log('Refreshing nrpe checks')
     if not os.path.exists(NAGIOS_PLUGINS):
         mkpath(NAGIOS_PLUGINS)
@@ -132,37 +132,22 @@
     rsync(os.path.join(os.getenv('CHARM_DIR'), 'files', 'sudo',
                        'swift-storage'),
           os.path.join(SUDOERS_D, 'swift-storage'))
+
     # 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()
+    hostname = nrpe.get_nagios_hostname()
+    current_unit = nrpe.get_nagios_unit_name()
+    nrpe_setup = nrpe.NRPE(hostname=hostname)
 
     # check the rings and replication
-    nrpe.add_check(
+    nrpe_setup.add_check(
         shortname='swift_storage',
         description='Check swift storage ring hashes and replication'
                     ' {%s}' % current_unit,
         check_cmd='check_swift_storage.py {}'.format(
             config('nagios-check-params'))
     )
-    # check services are running
-    for service in SWIFT_SVCS:
-        nrpe.add_check(
-            shortname=service,
-            description='service {%s}' % current_unit,
-            check_cmd='check_swift_service %s' % service,
-            )
-    nrpe.write()
+    nrpe.add_init_service_checks(nrpe_setup, SWIFT_SVCS, current_unit)
+    nrpe_setup.write()
 
 
 def main():

=== modified file 'hooks/swift_storage_utils.py'
--- hooks/swift_storage_utils.py	2015-01-09 10:07:27 +0000
+++ hooks/swift_storage_utils.py	2015-01-12 14:03:13 +0000
@@ -293,3 +293,27 @@
             rsyncd_conf += fragment.read()
     with open('/etc/rsyncd.conf', 'w') as f:
         f.write(rsyncd_conf)
+
+
+def setup_rsync():
+    '''
+    Ensure all directories required for rsync exist with correct permissions.
+    '''
+    root_dirs = [
+        '/etc/rsync-juju.d',
+    ]
+    [mkdir(d, owner='root', group='root') for d in root_dirs
+     if not os.path.isdir(d)]
+
+    rsyncd_base = """uid = nobody
+gid = nogroup
+pid file = /var/run/rsyncd.pid
+syslog facility = daemon
+socket options = SO_KEEPALIVE
+
+&include /etc/rsync-juju.d
+"""
+
+    f = open('/etc/rsyncd.conf', 'w')
+    f.write(rsyncd_base)
+    f.close()