~paulgear/charm-nrpe/+git/nrpe-charm:master

Branch merges

Propose for merging

Merged into ~nrpe-charmers/charm-nrpe:master at revision 21bae804d176dafb207417aea7d468c1bb7268fb

Laurent Sesquès: Approve on 2017-10-25

Diff: 16 lines (+5/-1)

1 file modified

hooks/nrpe_utils.py (+5/-1)

api

Merged into ~nrpe-charmers/charm-nrpe:master at revision 10198d38461b550b406ca945947533318fd71c8b

Stuart Bishop (community): Approve on 2017-05-31

William Grant: Approve on 2017-05-10

Diff: 87 lines (+30/-9)

2 files modified

hooks/nrpe_utils.py (+28/-2)
hooks/services.py (+2/-7)

api

Merged into ~nrpe-charmers/charm-nrpe:master at revision 59d13d70d78ce2e9b2392ad51929de0f91811781

Haw Loeung: Approve on 2017-05-01

Diff: 52 lines (+16/-6)

2 files modified

files/plugins/check_conntrack.sh (+10/-2)
hooks/nrpe_helpers.py (+6/-4)

api

Merged into ~nrpe-charmers/charm-nrpe:master at revision dd0091a424ccca6f713c063f584eb818a2deb769

Haw Loeung: Approve on 2017-04-06

Diff: 150 lines (+103/-0)

4 files modified

hooks/charmhelpers/core/host.py (+2/-0)
hooks/charmhelpers/core/host_factory/centos.py (+16/-0)
hooks/charmhelpers/core/host_factory/ubuntu.py (+32/-0)
hooks/charmhelpers/core/strutils.py (+53/-0)

api

Merged into ~nrpe-charmers/charm-nrpe:master at revision 7076d061945a26772739264dffe1a936ccf00559

Barry Price: Approve on 2016-12-07

Diff: 32 lines (+0/-10)

2 files modified

hooks/nrpe_utils.py (+0/-7)
hooks/services.py (+0/-3)

api

Merged into ~nrpe-charmers/charm-nrpe:master at revision cda2b9373db718258b7f5cb7fd495840e05b57d3

Haw Loeung: Approve on 2016-11-02

Diff: 216 lines (+101/-12)

6 files modified

README.md (+1/-1)
config.yaml (+4/-0)
files/plugins/check_conntrack.sh (+66/-0)
hooks/nrpe_helpers.py (+10/-5)
hooks/nrpe_utils.py (+1/-1)
tests/10-tests (+19/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

f95b8f9... by Paul Gear on 2017-10-25

Don't clean up non-existent files

3750567... by Paul Gear on 2017-10-25

[mthaddon] Remove nrpe.d files before rendering

In case we've changed sub_postfix or are no longer generating a check
due to empty command parameters. Fixes lp:1629127, lp:1687348

07d1aa8... by Paul Gear on 2017-10-19

[hloeung] Don't append '_sub' to checks by default

This seems to have mostly been added to avoid the nagios nrpe charm
stomping on checks shipped out by the nagios charm (on the same unit).
This changes the default to not append _sub to checks and detect if this
nrpe subordinate charm is also running on a nagios unit.

a07b751... by Xav Paice on 2017-10-10

[xavpaice] added machine_id to monitors relation data

628c991... by Tom Haddon on 2017-09-28

Clean up unused import

8bc64c6... by Tom Haddon on 2017-09-28

Pass matching filenames to the check context so we can delete them at the relevant point

0c4023f... by Tom Haddon on 2017-09-28

Only remove individual checks before we create them to avoid removing checks created by relations with primary charms

553278f... by Tom Haddon on 2017-09-27

Remove nrpe.d files each time before rendering them to ensure we have a clean directory lp#1629127

e6bf2b8... by Haw Loeung on 2017-09-17

[trivial] Minor code cleanup.

974307a... by Haw Loeung on 2017-09-10

Reworked to use existing hookenv functions instead of requiring a new.