Merge lp://qastaging/~stephanpampel/landscape-charm/systemd-monitoring into lp://qastaging/~landscape/landscape-charm/trunk
Status: | Rejected |
---|---|
Rejected by: | Simon Poirier |
Proposed branch: | lp://qastaging/~stephanpampel/landscape-charm/systemd-monitoring |
Merge into: | lp://qastaging/~landscape/landscape-charm/trunk |
Diff against target: |
2957 lines (+1912/-189) 26 files modified
charm-helpers.yaml (+1/-0) charmhelpers/__init__.py (+6/-4) charmhelpers/contrib/charmsupport/__init__.py (+13/-0) charmhelpers/contrib/charmsupport/nrpe.py (+522/-0) charmhelpers/contrib/hahelpers/apache.py (+5/-1) charmhelpers/contrib/hahelpers/cluster.py (+47/-2) charmhelpers/core/decorators.py (+38/-0) charmhelpers/core/hookenv.py (+184/-35) charmhelpers/core/host.py (+262/-60) charmhelpers/core/host_factory/ubuntu.py (+13/-5) charmhelpers/core/services/base.py (+7/-2) charmhelpers/core/strutils.py (+7/-4) charmhelpers/core/sysctl.py (+12/-2) charmhelpers/core/unitdata.py (+3/-3) charmhelpers/fetch/__init__.py (+7/-2) charmhelpers/fetch/python/packages.py (+6/-4) charmhelpers/fetch/snap.py (+3/-3) charmhelpers/fetch/ubuntu.py (+341/-59) charmhelpers/fetch/ubuntu_apt_pkg.py (+312/-0) charmhelpers/osplatform.py (+27/-3) config.yaml (+20/-0) hooks/nrpe-external-master-relation-changed (+9/-0) hooks/nrpe-external-master-relation-joined (+9/-0) lib/callbacks/nrpe.py (+53/-0) lib/services.py (+2/-0) metadata.yaml (+3/-0) |
To merge this branch: | bzr merge lp://qastaging/~stephanpampel/landscape-charm/systemd-monitoring |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
🤖 Landscape Builder | test results | Needs Fixing | |
Jeremy Lounder (community) | Needs Information | ||
Simon Poirier | Pending | ||
Review via email:
|
Commit message
Add charmhelpers.
Sync charm-helpers
Add relation: nrpe-external-
Add nrpe checks check_systemd for landscape services
Description of the change
To extend the monitoring for landscape servers I added systemd service checks for the landscape units the work when a 'nrpe-external-
Example bundle: https:/
Unmerged revisions
- 408. By Stephan Pampel
-
Add config flag 'enable_monitoring' to disable NRPE checks by default
- 407. By Stephan Pampel
-
Add charmhelpers.
contrib. charmsupport dependency to charm-helpers.yaml to get nrpe.py
Sync charm-helpers
Add relation: nrpe-external-master
Add nrpe checks check_systemd for landscape services
Unit tests are currently failing: https:/ /pastebin. canonical. com/p/yZKXH64pP G/
But the charm works well locally.
@simpoir Could this be caused by the charm-helpers sync? Or do maybe you have another idea why they are failing?