Merge lp:~cprov/charms/trusty/tanuki-result-enum-worker/servicegroups into lp:~tanuki/charms/trusty/tanuki-result-enum-worker/trunk

Proposed by Celso Providelo
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: 32
Merged at revision: 33
Proposed branch: lp:~cprov/charms/trusty/tanuki-result-enum-worker/servicegroups
Merge into: lp:~tanuki/charms/trusty/tanuki-result-enum-worker/trunk
Diff against target: 13 lines (+6/-0)
1 file modified
config.yaml (+6/-0)
To merge this branch: bzr merge lp:~cprov/charms/trusty/tanuki-result-enum-worker/servicegroups
Reviewer Review Type Date Requested Status
Guillermo Gonzalez Approve
Review via email: mp+267811@code.launchpad.net

Commit message

Supporting nagios_servicegroups.

Description of the change

Supporting nagios_servicegroups.

To post a comment you must log in.
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2015-08-11 19:31:50 +0000
3+++ config.yaml 2015-08-12 13:23:21 +0000
4@@ -16,3 +16,9 @@
5 default: ""
6 description: |
7 Used by the nrpe subordinate charms.
8+ nagios_servicegroups:
9+ default: ""
10+ type: string
11+ description: |
12+ A comma-separated list of nagios servicegroups.
13+ If left empty, the nagios_context will be used as the servicegroup

Subscribers

People subscribed via source and target branches

to all changes: