Merge lp://qastaging/~brad-marshall/charms/trusty/folder-swift-sync/add-nagios-check into lp://qastaging/~canonical-bootstack/charms/trusty/folder-swift-sync/trunk
Proposed by
Brad Marshall
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~brad-marshall/charms/trusty/folder-swift-sync/add-nagios-check |
| Merge into: | lp://qastaging/~canonical-bootstack/charms/trusty/folder-swift-sync/trunk |
| Diff against target: |
9940 lines (+5082/-2143) 120 files modified
Makefile (+7/-1) bin/charm_helpers_sync.py (+252/-0) charm-helpers.yaml (+1/-0) config.yaml (+12/-1) files/nagios_check_swift_backups.py (+89/-0) files/nagios_check_swift_backups.sh (+5/-0) hooks/hooks (+45/-2) lib/charmhelpers/__init__.py (+36/-0) lib/charmhelpers/contrib/__init__.py (+11/-13) lib/charmhelpers/contrib/amulet/__init__.py (+11/-13) lib/charmhelpers/contrib/amulet/deployment.py (+18/-16) lib/charmhelpers/contrib/amulet/utils.py (+25/-33) lib/charmhelpers/contrib/ansible/__init__.py (+11/-13) lib/charmhelpers/contrib/benchmark/__init__.py (+11/-13) lib/charmhelpers/contrib/charmhelpers/__init__.py (+11/-16) lib/charmhelpers/contrib/charmsupport/__init__.py (+11/-13) lib/charmhelpers/contrib/charmsupport/nrpe.py (+66/-32) lib/charmhelpers/contrib/charmsupport/volumes.py (+11/-13) lib/charmhelpers/contrib/database/__init__.py (+11/-0) lib/charmhelpers/contrib/database/mysql.py (+78/-17) lib/charmhelpers/contrib/hahelpers/__init__.py (+11/-13) lib/charmhelpers/contrib/hahelpers/apache.py (+30/-17) lib/charmhelpers/contrib/hahelpers/cluster.py (+70/-23) lib/charmhelpers/contrib/hardening/__init__.py (+11/-13) lib/charmhelpers/contrib/hardening/apache/__init__.py (+11/-13) lib/charmhelpers/contrib/hardening/apache/checks/__init__.py (+11/-13) lib/charmhelpers/contrib/hardening/apache/checks/config.py (+17/-17) lib/charmhelpers/contrib/hardening/audits/__init__.py (+13/-22) lib/charmhelpers/contrib/hardening/audits/apache.py (+11/-13) lib/charmhelpers/contrib/hardening/audits/apt.py (+11/-13) lib/charmhelpers/contrib/hardening/audits/file.py (+11/-13) lib/charmhelpers/contrib/hardening/harden.py (+11/-13) lib/charmhelpers/contrib/hardening/host/__init__.py (+11/-13) lib/charmhelpers/contrib/hardening/host/checks/__init__.py (+11/-13) lib/charmhelpers/contrib/hardening/host/checks/apt.py (+11/-13) lib/charmhelpers/contrib/hardening/host/checks/limits.py (+11/-13) lib/charmhelpers/contrib/hardening/host/checks/login.py (+11/-13) lib/charmhelpers/contrib/hardening/host/checks/minimize_access.py (+11/-13) lib/charmhelpers/contrib/hardening/host/checks/pam.py (+11/-13) lib/charmhelpers/contrib/hardening/host/checks/profile.py (+19/-15) lib/charmhelpers/contrib/hardening/host/checks/securetty.py (+11/-13) lib/charmhelpers/contrib/hardening/host/checks/suid_sgid.py (+11/-13) lib/charmhelpers/contrib/hardening/host/checks/sysctl.py (+11/-13) lib/charmhelpers/contrib/hardening/mysql/__init__.py (+11/-13) lib/charmhelpers/contrib/hardening/mysql/checks/__init__.py (+11/-13) lib/charmhelpers/contrib/hardening/mysql/checks/config.py (+11/-13) lib/charmhelpers/contrib/hardening/ssh/__init__.py (+11/-13) lib/charmhelpers/contrib/hardening/ssh/checks/__init__.py (+11/-13) lib/charmhelpers/contrib/hardening/ssh/checks/config.py (+61/-20) lib/charmhelpers/contrib/hardening/templating.py (+16/-14) lib/charmhelpers/contrib/hardening/utils.py (+11/-13) lib/charmhelpers/contrib/mellanox/__init__.py (+13/-0) lib/charmhelpers/contrib/mellanox/infiniband.py (+17/-15) lib/charmhelpers/contrib/network/__init__.py (+11/-13) lib/charmhelpers/contrib/network/ip.py (+147/-45) lib/charmhelpers/contrib/network/ovs/__init__.py (+77/-14) lib/charmhelpers/contrib/network/ufw.py (+11/-13) lib/charmhelpers/contrib/openstack/__init__.py (+11/-13) lib/charmhelpers/contrib/openstack/alternatives.py (+11/-13) lib/charmhelpers/contrib/openstack/amulet/__init__.py (+11/-13) lib/charmhelpers/contrib/openstack/amulet/deployment.py (+98/-74) lib/charmhelpers/contrib/openstack/amulet/utils.py (+310/-42) lib/charmhelpers/contrib/openstack/context.py (+183/-122) lib/charmhelpers/contrib/openstack/exceptions.py (+21/-0) lib/charmhelpers/contrib/openstack/files/__init__.py (+11/-13) lib/charmhelpers/contrib/openstack/ha/__init__.py (+13/-0) lib/charmhelpers/contrib/openstack/ha/utils.py (+139/-0) lib/charmhelpers/contrib/openstack/ip.py (+26/-19) lib/charmhelpers/contrib/openstack/keystone.py (+178/-0) lib/charmhelpers/contrib/openstack/neutron.py (+30/-19) lib/charmhelpers/contrib/openstack/templates/__init__.py (+11/-13) lib/charmhelpers/contrib/openstack/templating.py (+19/-15) lib/charmhelpers/contrib/openstack/utils.py (+486/-46) lib/charmhelpers/contrib/peerstorage/__init__.py (+11/-13) lib/charmhelpers/contrib/python/__init__.py (+11/-13) lib/charmhelpers/contrib/python/debug.py (+11/-13) lib/charmhelpers/contrib/python/packages.py (+25/-16) lib/charmhelpers/contrib/python/rpdb.py (+11/-13) lib/charmhelpers/contrib/python/version.py (+11/-13) lib/charmhelpers/contrib/saltstack/__init__.py (+11/-13) lib/charmhelpers/contrib/ssl/__init__.py (+11/-13) lib/charmhelpers/contrib/ssl/service.py (+11/-13) lib/charmhelpers/contrib/storage/__init__.py (+11/-13) lib/charmhelpers/contrib/storage/linux/__init__.py (+11/-13) lib/charmhelpers/contrib/storage/linux/ceph.py (+209/-62) lib/charmhelpers/contrib/storage/linux/loopback.py (+11/-13) lib/charmhelpers/contrib/storage/linux/lvm.py (+11/-13) lib/charmhelpers/contrib/storage/linux/utils.py (+11/-13) lib/charmhelpers/contrib/templating/__init__.py (+11/-13) lib/charmhelpers/contrib/templating/contexts.py (+11/-13) lib/charmhelpers/contrib/templating/jinja.py (+11/-13) lib/charmhelpers/contrib/templating/pyformat.py (+11/-13) lib/charmhelpers/contrib/unison/__init__.py (+11/-13) lib/charmhelpers/core/__init__.py (+11/-13) lib/charmhelpers/core/decorators.py (+11/-13) lib/charmhelpers/core/files.py (+11/-13) lib/charmhelpers/core/fstab.py (+11/-13) lib/charmhelpers/core/hookenv.py (+73/-14) lib/charmhelpers/core/host.py (+333/-128) lib/charmhelpers/core/host_factory/centos.py (+72/-0) lib/charmhelpers/core/host_factory/ubuntu.py (+88/-0) lib/charmhelpers/core/hugepage.py (+11/-13) lib/charmhelpers/core/kernel.py (+34/-30) lib/charmhelpers/core/kernel_factory/centos.py (+17/-0) lib/charmhelpers/core/kernel_factory/ubuntu.py (+13/-0) lib/charmhelpers/core/services/__init__.py (+11/-13) lib/charmhelpers/core/services/base.py (+11/-13) lib/charmhelpers/core/services/helpers.py (+11/-13) lib/charmhelpers/core/strutils.py (+64/-13) lib/charmhelpers/core/sysctl.py (+11/-13) lib/charmhelpers/core/templating.py (+19/-16) lib/charmhelpers/core/unitdata.py (+11/-14) lib/charmhelpers/fetch/__init__.py (+42/-309) lib/charmhelpers/fetch/archiveurl.py (+11/-13) lib/charmhelpers/fetch/bzrurl.py (+31/-23) lib/charmhelpers/fetch/centos.py (+171/-0) lib/charmhelpers/fetch/giturl.py (+15/-16) lib/charmhelpers/fetch/snap.py (+122/-0) lib/charmhelpers/fetch/ubuntu.py (+364/-0) lib/charmhelpers/osplatform.py (+25/-0) |
| To merge this branch: | bzr merge lp://qastaging/~brad-marshall/charms/trusty/folder-swift-sync/add-nagios-check |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Hebden (community) | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
Add nagios checks for folder sync to swift.
To post a comment you must log in.
Revision history for this message
| James Hebden (ec0) | # |
Unmerged revisions
- 11. By Brad Marshall
-
[bradm] Fixed filenames on nagios checks, updated wrong hook names for n-e-m,
fixed config for nagios_context, permission fixes, fixed n-e-m charm code. - 10. By Brad Marshall
-
[bradm] Added charmhelpers sync to makefile
- 9. By Brad Marshall
-
[bradm] Updated charm helpers
- 8. By Brad Marshall
-
[bradm] Add nagios checks
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Just a few inline comments