Merge lp:~gnuoy/charm-helpers/add-default-nagios-servicegroup into lp:charm-helpers

[Liam Young]

Syncing charm-helpers into the rabbitmq-server charm currently causes the config-changed hook to explode with http://paste.ubuntu.com/9249679/.

This is because r246 of charmhelpers makes the nagios_servicegroups parameter compulsory. I think the longer term fix is to add a nagios_servicegroups option to the config.yaml of any affected charm but in the meantime I think it's more graceful to restore the previous behaviour of defaulting to a 'juju' servicegroup if one hasn't been explicitly set.

[lp:~gnuoy/charm-helpers/add-default-nagios-servicegroup]

262. By Liam Young on 2014-11-26

Fix copy pasta error in docstring

[Tom Haddon (mthaddon)]

Looks good, will merge

review: Approve

=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
--- charmhelpers/contrib/charmsupport/nrpe.py	2014-11-05 15:32:23 +0000
+++ charmhelpers/contrib/charmsupport/nrpe.py	2014-11-26 14:18:38 +0000
@@ -194,7 +194,10 @@
         super(NRPE, self).__init__()
         self.config = config()
         self.nagios_context = self.config['nagios_context']
-        self.nagios_servicegroups = self.config['nagios_servicegroups']
+        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

=== modified file 'tests/contrib/charmsupport/test_nrpe.py'
--- tests/contrib/charmsupport/test_nrpe.py	2014-08-29 13:48:24 +0000
+++ tests/contrib/charmsupport/test_nrpe.py	2014-11-26 14:18:38 +0000
@@ -71,6 +71,12 @@
         checker = nrpe.NRPE(hostname=hostname)
         self.assertEqual(checker.hostname, hostname)
 
+    def test_default_servicegroup(self):
+        """Test that nagios_servicegroups gets set to the default if omitted"""
+        self.patched['config'].return_value = {'nagios_context': 'testctx'}
+        checker = nrpe.NRPE()
+        self.assertEqual(checker.nagios_servicegroups, 'juju')
+
     def test_no_nagios_installed_bails(self):
         self.patched['config'].return_value = {'nagios_context': 'test',
                                                'nagios_servicegroups': ''}