~aieri/charm-nagios:bug/1864192-charmhelpers-sync

Branch merges

Propose for merging

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

Adam Dyess (community): Approve on 2020-07-13

Diff: 3592 lines (+2453/-213)

30 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/install (+1/-1)

api

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

Nagios Charm developers: Pending requested 2020-07-13

Diff: 3637 lines (+2461/-216)

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 (+5/-0)
hooks/install (+1/-1)
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

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

Charmhelpers sync

Install enum for python2 as this is needed by hookenv

d5b8a08... 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.

cd12528... by Adam Dyess on 2020-07-10

Merge branch 'master' of git+ssh://git.launchpad.net/charm-nagios into lp1841358_multiple_admin_emails

d22b86d... by Adam Dyess on 2020-07-09

when there is no admin-email defined, let the block state signal the user of an error, but let the rest of the config process.

4ebd2ca... by Adam Dyess on 2020-07-09

clear the status at the start, report any errors along the way

86596b5... by Adam Dyess on 2020-07-09

Create a safe directory for include directives from subordinate charms

bb21e63... by Adam Dyess on 2020-07-08

Add a new linter make target

af72936... by Adam Dyess on 2020-07-08

Add multiple admin email account configuration

be2b087... by Alvaro Uria on 2020-06-26

Merge branch 'bug/1864192'

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

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

Indentation cleanup