Merge lp:~chad.smith/charms/trusty/nrpe/trunk into lp:charms/trusty/nrpe

[Chad Smith]

This fixes lp:1532281.

When setting nagions_host_type = "host" on nrpe, all related principals need to write the proper hostname in their service files.

Principals related via nrpe-external-master already look in the nrpe-external-master relation for nagios_hostname and nagios_host_context before writing services__ files via calls to charmhelpers/contrib/charmsupport/nrpe:get_nagios_hostname and get_nagios_context.

This branch publishes these two values: nagios_hostname and nagios_host_context as expected by charmhelpers utility functions.

Principals calling get_nagios_hostname will properly write a the host_name in their nagios service__ files matching the host_name definition created by nrpe. This way principals and subordinate nrpe stay synchronized.

to test:
juju deploy local
./tests/14-basic-nrpe-external-master

[lp:~chad.smith/charms/trusty/nrpe/trunk]

45. By Chad Smith on 2016-02-03

add comment referencing charmhelpers

[Stuart Bishop (stub)]

All looks good to me, and tests are fine. Thanks for fixing the unrelated tests too (for Juju 1.25 compatibility).

review: Approve

[Stuart Bishop (stub)]

There is still a test failing, unless run against a freshly bootstrapped environment, due to a hard coded unit number. This is still landable, as *all* the tests currently fail on trunk unless run against a freshly bootstrapped environment.

$ tests/10-tests
2016-02-04 11:20:37 Starting deployment of local
2016-02-04 11:20:37 Deploying services...
2016-02-04 11:20:37 Deploying service mysql using cs:trusty/mysql-33
2016-02-04 11:20:40 Deploying service nrpe using /tmp/charmqWiN9t/trusty/trunk
2016-02-04 11:21:48 Config specifies num units for subordinate: nrpe
2016-02-04 11:22:14 Adding relations...
2016-02-04 11:22:14 Adding relation nrpe:monitors <-> nagios:monitors
2016-02-04 11:22:14 Adding relation nrpe:local-monitors <-> mysql:local-monitors
2016-02-04 11:23:19 Exposing service 'nagios'
2016-02-04 11:23:19 Deployment complete in 162.00 seconds
.............E..
======================================================================
ERROR: test_nagios_host_context (__main__.TestDeployment)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/10-tests", line 227, in test_nagios_host_context
    self.check_nrpe_setting(**test_config)
  File "tests/10-tests", line 42, in check_nrpe_setting
    nrpe_contents = self.nrpe_sentry.file_contents(filename)
  File "/usr/lib/python2.7/dist-packages/amulet/sentry.py", line 92, in file_contents
    raise IOError(output)
IOError: cat: /var/lib/nagios/export/host__bob-mysql-0.cfg: No such file or directory

----------------------------------------------------------------------
Ran 16 tests in 755.998s

[Chad Smith (chad.smith)]

review: Abstain

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/2451/

review: Needs Fixing (automated testing)

=== modified file 'hooks/nrpe_helpers.py'
--- hooks/nrpe_helpers.py	2015-04-21 18:28:48 +0000
+++ hooks/nrpe_helpers.py	2016-02-03 22:51:16 +0000
@@ -155,6 +155,13 @@
         if 'monitors' in self[self.name][0]:
             return yaml.load(self[self.name][0]['monitors'])
 
+    def provide_data(self):
+        # Provide this data to principals because get_nagios_hostname expects
+        # them in charmhelpers/contrib/charmsupport/nrpe when writing principal
+        # service__* files
+        return {'nagios_hostname': self.nagios_hostname(),
+                'nagios_host_context':  hookenv.config('nagios_host_context')}
+
 
 class NagiosInfo(dict):
     def __init__(self):

=== modified file 'hooks/nrpe_utils.py'
--- hooks/nrpe_utils.py	2015-07-13 13:02:56 +0000
+++ hooks/nrpe_utils.py	2016-02-03 22:51:16 +0000
@@ -120,6 +120,19 @@
                 )
 
 
+def update_nrpe_external_master_relation(service_name):
+    """
+    Send updated nagsios_hostname to charms attached to nrpe_external_master
+    relation.
+    """
+    principle_relation = nrpe_helpers.PrincipleRelation()
+    for rid in hookenv.relation_ids('nrpe-external-master'):
+        hookenv.relation_set(
+            relation_id=rid,
+            relation_settings=principle_relation.provide_data()
+        )
+
+
 def update_monitor_relation(service_name):
     """ Send updated monitor yaml to charms attached to monitor relation """
     monitor_relation = nrpe_helpers.MonitorsRelation()

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-07-08 23:43:42 +0000
+++ hooks/services.py	2016-02-03 22:51:16 +0000
@@ -26,6 +26,7 @@
                 nrpe_helpers.NagiosInfo(),
             ],
             'data_ready': [
+                nrpe_utils.update_nrpe_external_master_relation,
                 nrpe_utils.update_monitor_relation,
                 nrpe_utils.render_nrped_files,
                 helpers.render_template(

=== modified file 'tests/10-tests'
--- tests/10-tests	2015-03-23 09:45:10 +0000
+++ tests/10-tests	2016-02-03 22:51:16 +0000
@@ -35,7 +35,7 @@
 
     def check_nrpe_setting(self, filename, expected_settings, juju_kv,
                            filedelim=None):
-        self.nrpe_sentry = self.deployment.sentry.unit['nrpe/0']
+        self.nrpe_sentry = self.deployment.sentry['nrpe'][0]
         if juju_kv:
             self.deployment.configure('nrpe', juju_kv)
             time.sleep(PAUSE_TIME)
@@ -56,7 +56,7 @@
         """ Check default monitor definitions are passed to Nagios """
         self.deployment.configure('nrpe', {'monitors': ''})
         time.sleep(PAUSE_TIME)
-        self.nrpe_sentry = self.deployment.sentry.unit['nrpe/0']
+        self.nrpe_sentry = self.deployment.sentry['nrpe'][0]
         relation_data = self.nrpe_sentry.relation(
             'monitors',
             'nagios:monitors',
@@ -76,7 +76,7 @@
 
     def test_monitors_relation_principle_monitors(self):
         """ Check monitor definitions from principle are passed to Nagios """
-        self.nrpe_sentry = self.deployment.sentry.unit['nrpe/0']
+        self.nrpe_sentry = self.deployment.sentry['nrpe'][0]
         relation_data = self.nrpe_sentry.relation(
             'monitors',
             'nagios:monitors',
@@ -134,7 +134,7 @@
             'nrpe', {'monitors': yaml.dump(user_monitors)}
         )
         time.sleep(PAUSE_TIME)
-        self.nrpe_sentry = self.deployment.sentry.unit['nrpe/0']
+        self.nrpe_sentry = self.deployment.sentry['nrpe'][0]
         relation_data = self.nrpe_sentry.relation(
             'monitors',
             'nagios:monitors',
@@ -155,8 +155,8 @@
 
     def test_services(self):
         """ Test basic services are running """
-        self.nagios_sentry = self.deployment.sentry.unit['nagios/0']
-        self.nrpe_sentry = self.deployment.sentry.unit['nrpe/0']
+        self.nagios_sentry = self.deployment.sentry['nagios'][0]
+        self.nrpe_sentry = self.deployment.sentry['nrpe'][0]
         commands = {
             self.nrpe_sentry:  ['service nagios-nrpe-server status'],
             self.nagios_sentry:  ['service nagios3 status'],
@@ -166,7 +166,7 @@
             amulet.raise_status(amulet.FAIL, msg=ret)
 
     def test_config_nagios_master(self):
-        unit = self.deployment.sentry.unit['nagios/0']
+        unit = self.deployment.sentry['nagios'][0]
         nagios_relation = unit.relation('monitors', 'nrpe:monitors')
         ipaddr = nagios_relation['private-address']
         test_config = {
@@ -227,7 +227,7 @@
         self.check_nrpe_setting(**test_config)
 
     def test_nagios_hostname_type(self):
-        sentry = self.deployment.sentry.unit['nrpe/0']
+        sentry = self.deployment.sentry['nrpe'][0]
         hostname = sentry.run('hostname')[0]
         test_config = {
             'filename': '/var/lib/nagios/export/host__%s.cfg' % (hostname),

=== modified file 'tests/11-monitors-configurations'
--- tests/11-monitors-configurations	2015-04-22 17:40:54 +0000
+++ tests/11-monitors-configurations	2016-02-03 22:51:16 +0000
@@ -29,8 +29,8 @@
 ##
 # Set relationship aliases
 ##
-mysql_unit = d.sentry.unit['mysql/0']
-nagios_unit = d.sentry.unit['nagios/0']
+mysql_unit = d.sentry['mysql'][0]
+nagios_unit = d.sentry['nagios'][0]
 
 
 def test_nrpe_monitors_config():

=== modified file 'tests/13-monitors-config'
--- tests/13-monitors-config	2015-04-22 17:40:54 +0000
+++ tests/13-monitors-config	2016-02-03 22:51:16 +0000
@@ -41,8 +41,8 @@
 ##
 # Set relationship aliases
 ##
-mysql_unit = d.sentry.unit['mysql/0']
-nagios_unit = d.sentry.unit['nagios/0']
+mysql_unit = d.sentry['mysql'][0]
+nagios_unit = d.sentry['nagios'][0]
 
 
 def test_nrpe_monitors_config():

=== added file 'tests/14-basic-nrpe-external-master'
--- tests/14-basic-nrpe-external-master	1970-01-01 00:00:00 +0000
+++ tests/14-basic-nrpe-external-master	2016-02-03 22:51:16 +0000
@@ -0,0 +1,74 @@
+#!/usr/bin/python
+
+import amulet
+import re
+import unittest
+from charmhelpers.contrib.amulet.utils import (
+    AmuletUtils,
+)
+autils = AmuletUtils()
+
+
+class TestBasicNRPEExternalMasterDeployment(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.deployment = amulet.Deployment(series='trusty')
+        cls.deployment.add('mysql')
+        cls.deployment.add('nrpe')
+        cls.deployment.configure('nrpe', {'nagios_hostname_type': 'unit',
+                                          'nagios_host_context': 'mygroup'})
+        cls.deployment.configure('mysql', {'dataset-size': '10%'})
+        cls.deployment.relate('nrpe:nrpe-external-master',
+                              'mysql:nrpe-external-master')
+        try:
+            cls.deployment.setup(timeout=900)
+            cls.deployment.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            msg = "Environment wasn't stood up in time"
+            amulet.raise_status(amulet.SKIP, msg=msg)
+        except:
+            raise
+
+    def test_nrpe_external_master_relation(self):
+        """
+        Check nagios_hostname and nagions_host_context are passed to principals
+        """
+        nrpe_sentry = self.deployment.sentry['nrpe'][0]
+        mysql = self.deployment.sentry['mysql'][0]
+        relation = [
+            'nrpe-external-master',
+            'mysql:nrpe-external-master']
+        nagios_hostname = "mygroup-{}".format(
+            mysql.info["unit_name"].replace('/', '-'))
+        expected = {
+            'private-address': autils.valid_ip,
+            'nagios_hostname': nagios_hostname,
+            'nagios_host_context': 'mygroup'}
+        ret = autils.validate_relation_data(nrpe_sentry, relation, expected)
+        if ret:
+            message = autils.relation_error("nrpe to mysql principal", ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_exported_nagiosconfig_nrpe_external_master_principal(self):
+        """
+        The hostname defined in exported nagios service files matches
+        nagios_hostname from the nrpe-external-master relation.
+        """
+        mysql = self.deployment.sentry['mysql'][0]
+        nagios_hostname = "mygroup-{}".format(
+           mysql.info["unit_name"].replace('/', '-'))
+        mysql_service_file = "service__mygroup-{}_check_mysql.cfg".format(
+            mysql.info["unit_name"].replace('/', '-'))
+        content = mysql.file_contents("/var/lib/nagios/export/{}".format(
+            mysql_service_file))
+        for line in content.split('\n'):
+           host_match = re.match('.*host_name\s+([-\w]+)',line)
+           if host_match:
+               service_hostname = host_match.groups()[0]
+               if service_hostname != nagios_hostname:
+                   message = 'Invalid host_name {} in {}. Expected {}'.format(
+                       service_hostname, mysql_service_file, nagios_hostname)
+                   amulet.raise_status(amulet.FAIL, msg=message)
+
+if __name__ == '__main__':
+    unittest.main()