Merge lp://staging/~tealeg/landscape-client/monitoring-plugins-scoped-resynch into lp://staging/~landscape/landscape-client/trunk
Proposed by
Geoff Teale
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~tealeg/landscape-client/monitoring-plugins-scoped-resynch |
Merge into: | lp://staging/~landscape/landscape-client/trunk |
Diff against target: |
771 lines (+252/-79) 32 files modified
landscape/broker/exchange.py (+13/-6) landscape/broker/registration.py (+2/-1) landscape/broker/tests/test_exchange.py (+37/-7) landscape/broker/tests/test_registration.py (+6/-3) landscape/broker/tests/test_server.py (+4/-4) landscape/message_schemas.py (+2/-1) landscape/monitor/aptpreferences.py (+1/-0) landscape/monitor/cephusage.py (+1/-0) landscape/monitor/computerinfo.py (+1/-0) landscape/monitor/computeruptime.py (+1/-0) landscape/monitor/cpuusage.py (+1/-0) landscape/monitor/loadaverage.py (+1/-0) landscape/monitor/memoryinfo.py (+1/-0) landscape/monitor/mountinfo.py (+1/-0) landscape/monitor/networkactivity.py (+1/-0) landscape/monitor/networkdevice.py (+1/-0) landscape/monitor/plugin.py (+4/-2) landscape/monitor/processorinfo.py (+1/-0) landscape/monitor/rebootrequired.py (+1/-0) landscape/monitor/swiftdeviceinfo.py (+1/-0) landscape/monitor/temperature.py (+1/-0) landscape/monitor/tests/test_aptpreferences.py (+2/-1) landscape/monitor/tests/test_computerinfo.py (+2/-1) landscape/monitor/tests/test_mountinfo.py (+2/-1) landscape/monitor/tests/test_plugin.py (+46/-1) landscape/monitor/tests/test_processorinfo.py (+2/-1) landscape/monitor/tests/test_rebootrequired.py (+2/-1) landscape/monitor/tests/test_swiftdeviceinfo.py (+2/-1) landscape/monitor/tests/test_updatemanager.py (+2/-1) landscape/monitor/tests/test_usermonitor.py (+104/-44) landscape/monitor/updatemanager.py (+1/-0) landscape/monitor/usermonitor.py (+5/-3) |
To merge this branch: | bzr merge lp://staging/~tealeg/landscape-client/monitoring-plugins-scoped-resynch |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Landscape | Pending | ||
Review via email: mp+173206@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2013-07-05.
Description of the change
This branch adds a scope attribute to the MonitorPlugin class and checks incoming resynchronize-
To post a comment you must log in.