Charm Helpers

Merge lp:~brad-marshall/charm-helpers/fix-nagios-servicegroups into lp:charm-helpers

  1. fix-nagios-servicegroups
  2. Merge into devel
Proposed by Brad Marshall
Status: Merged
Merged at revision: 317
Proposed branch: lp:~brad-marshall/charm-helpers/fix-nagios-servicegroups
Merge into: lp:charm-helpers
Diff against target: 12 lines (+1/-1)
1 file modified
charmhelpers/contrib/charmsupport/nrpe.py (+1/-1)
To merge this branch: bzr merge lp:~brad-marshall/charm-helpers/fix-nagios-servicegroups
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+250268@code.launchpad.net

Description of the change

Fix the case of the empty nagios_servicegroup meaning we end up with a check with an empty service group.

To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
2--- charmhelpers/contrib/charmsupport/nrpe.py 2015-02-18 08:07:05 +0000
3+++ charmhelpers/contrib/charmsupport/nrpe.py 2015-02-19 07:54:03 +0000
4@@ -210,7 +210,7 @@
5 super(NRPE, self).__init__()
6 self.config = config()
7 self.nagios_context = self.config['nagios_context']
8- if 'nagios_servicegroups' in self.config:
9+ if 'nagios_servicegroups' in self.config and self.config['nagios_servicegroups']:
10 self.nagios_servicegroups = self.config['nagios_servicegroups']
11 else:
12 self.nagios_servicegroups = self.nagios_context

Subscribers

People subscribed via source and target branches