Landscape Charm

Merge lp://qastaging/~lihuiguo/landscape-charm/bug-1934816 into lp://qastaging/~landscape/landscape-charm/trunk

  1. bug-1934816
  2. Merge into trunk
Proposed by Linda Guo
Status: Merged
Approved by: Simon Poirier
Approved revision: 409
Merged at revision: 407
Proposed branch: lp://qastaging/~lihuiguo/landscape-charm/bug-1934816
Merge into: lp://qastaging/~landscape/landscape-charm/trunk
Diff against target: 3080 lines (+1978/-192)
29 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 (+16/-0)
hooks/nrpe-external-master-relation-changed (+9/-0)
hooks/nrpe-external-master-relation-joined (+9/-0)
lib/callbacks/nrpe.py (+51/-0)
lib/callbacks/tests/test_nrpe.py (+36/-0)
lib/services.py (+5/-1)
lib/tests/stubs.py (+24/-0)
lib/tests/test_services.py (+9/-2)
metadata.yaml (+3/-0)
To merge this branch: bzr merge lp://qastaging/~lihuiguo/landscape-charm/bug-1934816
Reviewer Review Type Date Requested Status
🤖 Landscape Builder test results Approve
Simon Poirier (community) Approve
James Troup (community) Approve
Review via email: mp+411583@code.qastaging.launchpad.net

Commit message

Sync charm-helpers
Add relation: nrpe-external-master
Add nrpe checks check_systemd for landscape services

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
Linda Guo (lihuiguo) wrote :

This merge proposal is to supersede this patch

https://code.launchpad.net/~stephanpampel/landscape-charm/systemd-monitoring/+merge/411083

Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 407
Branch: lp:~lihuiguo/landscape-charm/bug-1934816
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1452/

review: Needs Fixing (test results)
lp://qastaging/~lihuiguo/landscape-charm/bug-1934816 updated
408. By Linda Guo <email address hidden>

Add charmhelpers.contrib.charmsupport dependency
to charm-helpers.yaml to get nrpe.py

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 408
Branch: lp:~lihuiguo/landscape-charm/bug-1934816
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1453/

review: Approve (test results)
Revision history for this message
James Troup (elmo) wrote :

I didn't review the charmhelpers changes, and my only comments are nitpick of docstrings (see inline comments). Other than those, this LGTM.

review: Approve
Revision history for this message
Simon Poirier (simpoir) wrote :

+1 with inline comment

The test cases are a bit thin for my taste (only adding checks is covered, while the hooks handle add/remove/change)

review: Approve
lp://qastaging/~lihuiguo/landscape-charm/bug-1934816 updated
409. By Linda Guo <email address hidden>

Fixed docstring
Added unit test to check remove nrpe

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 409
Branch: lp:~lihuiguo/landscape-charm/bug-1934816
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1454/

review: Approve (test results)
Revision history for this message
Linda Guo (lihuiguo) wrote :

> +1 with inline comment
>
> The test cases are a bit thin for my taste (only adding checks is covered,
> while the hooks handle add/remove/change)

I have added more test cases to cover the nrpe check remove

Revision history for this message
Simon Poirier (simpoir) wrote :

Thanks for that extra test.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches