~aieri/charm-nagios:bug/1864192

Branch merges

Propose for merging

Superseded for merging into ~nagios-charmers/charm-nagios:master

Peter Sabaini: Pending requested 2020-07-13

Adam Dyess: Pending requested 2020-07-13

Chris Sanders: Pending requested 2020-07-13

Diff: 3760 lines (+2529/-266)

32 files modified

Makefile (+1/-2)
bin/charm_helpers_sync.py (+20/-11)
charm-helpers.yaml (+2/-1)
hooks/charmhelpers/__init__.py (+4/-4)
hooks/charmhelpers/contrib/charmsupport/__init__.py (+13/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+500/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+173/-0)
hooks/charmhelpers/core/hookenv.py (+525/-56)
hooks/charmhelpers/core/host.py (+166/-10)
hooks/charmhelpers/core/host_factory/ubuntu.py (+28/-1)
hooks/charmhelpers/core/kernel.py (+2/-2)
hooks/charmhelpers/core/services/base.py (+18/-7)
hooks/charmhelpers/core/strutils.py (+11/-5)
hooks/charmhelpers/core/sysctl.py (+32/-11)
hooks/charmhelpers/core/templating.py (+18/-9)
hooks/charmhelpers/core/unitdata.py (+8/-1)
hooks/charmhelpers/fetch/__init__.py (+4/-0)
hooks/charmhelpers/fetch/archiveurl.py (+1/-1)
hooks/charmhelpers/fetch/bzrurl.py (+2/-2)
hooks/charmhelpers/fetch/giturl.py (+2/-2)
hooks/charmhelpers/fetch/python/__init__.py (+13/-0)
hooks/charmhelpers/fetch/python/debug.py (+54/-0)
hooks/charmhelpers/fetch/python/packages.py (+154/-0)
hooks/charmhelpers/fetch/python/rpdb.py (+56/-0)
hooks/charmhelpers/fetch/python/version.py (+32/-0)
hooks/charmhelpers/fetch/snap.py (+17/-1)
hooks/charmhelpers/fetch/ubuntu.py (+305/-83)
hooks/charmhelpers/fetch/ubuntu_apt_pkg.py (+267/-0)
hooks/charmhelpers/osplatform.py (+24/-3)
hooks/common.py (+6/-15)
hooks/install (+1/-1)
hooks/monitors-relation-changed (+70/-38)

api

Merged into ~nagios-charmers/charm-nagios:master at revision be2b08792e0d5b4d3d2912c8c30189e2303a8dc3

Alvaro Uria (community): Approve on 2020-06-26

Zachary Zehring (community): Approve on 2020-06-24

BootStack Reviewers: Pending requested 2020-06-26

Diff: 187 lines (+25/-30)

2 files modified

hooks/common.py (+22/-27)
hooks/monitors-relation-changed (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

e4bb62e... by Andrea Ieri on 2020-06-26

Gracefully handle incorrect relation data sent over the nagios relation

Closes-Bug: 1864192

cc67cb4... by Andrea Ieri on 2020-06-26

Charmhelpers sync

Install enum for python2 as this is needed by hookenv

3a6dc7c... by Andrea Ieri on 2020-06-26

Revert "Fully switch to the network-get primitives"

This reverts commit 66b8e0577d7f7f5761da4ff7dd50a0d01e04029c.
The fix was completely wrong, because network-get can only retrieve
local data; learning the ingress-address of a remote unit must be done
via relation-get.

110e2ac... by Andrea Ieri on 2020-06-26

Indentation cleanup

72e6b85... by Andrea Ieri on 2020-06-26

Remove unused imports

83ed16e... by Andrea Ieri on 2020-06-26

Remove old python2-isms

8367ae6... by Andrea Ieri on 2020-06-26

Fix obtaining private-address in pre-Juju 2.x environments

66b8e05... by Andrea Ieri on 2020-06-23

Fully switch to the network-get primitives

Function get_local_ingress_address was introduced in commit
6f4b86e8d94d03a634282ade3db685f1b2379d23, but was only being used in
*-relation-joined hooks; this commit makes monitors-relation-changed use
it as well, and retires its older counterpart

Closes-Bug: 1864192

73961bb... by Alvaro Uria on 2020-05-01

Merge remote-tracking branch 'sandor/bug/1864968'

Reviewed-on: https://code.launchpad.net/~szeestraten/charm-nagios/+git/nagios-charm/+merge/379943
Reviewed-by: Alvaro Uria <email address hidden>
Signed-off-by: Alvaro Uria <email address hidden>

0a9f9c8... by Sandor Zeestraten on 2020-03-02

Add config options for default contact definition

Add the following config options for the default contact definition:
* service_notification_period
* host_notification_period
* service_notification_options
* host_notification_options
* service_notification_commands
* host_notification_commands

LP: 1864968