Merge ~corey.bryant/ubuntu/+source/ceilometer/+git/liberty-1:upstream into ~ubuntu-server-dev/ubuntu/+source/ceilometer:upstream

AUTHORS (+10/-0)
ChangeLog (+137/-0)
MAINTAINERS (+13/-0)
PKG-INFO (+1/-1)
ceilometer.egg-info/PKG-INFO (+1/-1)
ceilometer.egg-info/SOURCES.txt (+40/-20)
ceilometer.egg-info/entry_points.txt (+26/-29)
ceilometer.egg-info/pbr.json (+1/-1)
ceilometer.egg-info/requires.txt (+28/-29)
ceilometer/agent/base.py (+9/-8)
ceilometer/agent/discovery/endpoint.py (+1/-1)
ceilometer/agent/discovery/tenant.py (+1/-1)
ceilometer/agent/manager.py (+1/-1)
ceilometer/agent/plugin_base.py (+5/-20)
ceilometer/alarm/evaluator/__init__.py (+1/-1)
ceilometer/alarm/evaluator/combination.py (+10/-4)
ceilometer/alarm/evaluator/gnocchi.py (+1/-1)
ceilometer/alarm/evaluator/threshold.py (+2/-2)
ceilometer/alarm/notifier/log.py (+2/-1)
ceilometer/alarm/notifier/rest.py (+4/-4)
ceilometer/alarm/rpc.py (+1/-34)
ceilometer/alarm/service.py (+2/-75)
ceilometer/alarm/storage/base.py (+13/-2)
ceilometer/alarm/storage/impl_db2.py (+1/-1)
ceilometer/alarm/storage/impl_hbase.py (+3/-4)
ceilometer/alarm/storage/impl_log.py (+15/-2)
ceilometer/alarm/storage/impl_mongodb.py (+22/-6)
ceilometer/alarm/storage/impl_sqlalchemy.py (+25/-9)
ceilometer/alarm/storage/pymongo_base.py (+9/-8)
ceilometer/api/app.py (+2/-7)
ceilometer/api/controllers/v2/alarms.py (+25/-5)
ceilometer/api/controllers/v2/capabilities.py (+4/-8)
ceilometer/api/controllers/v2/events.py (+2/-2)
ceilometer/api/controllers/v2/meters.py (+2/-5)
ceilometer/api/controllers/v2/query.py (+17/-19)
ceilometer/api/controllers/v2/resources.py (+2/-1)
ceilometer/api/hooks.py (+26/-4)
ceilometer/api/middleware.py (+27/-14)
ceilometer/cmd/__init__.py (+0/-22)
ceilometer/cmd/eventlet/__init__.py (+22/-0)
ceilometer/cmd/eventlet/agent_notification.py (+25/-0)
ceilometer/cmd/eventlet/alarm.py (+29/-0)
ceilometer/cmd/eventlet/collector.py (+25/-0)
ceilometer/cmd/eventlet/polling.py (+94/-0)
ceilometer/cmd/eventlet/sample.py (+98/-0)
ceilometer/cmd/eventlet/storage.py (+64/-0)
ceilometer/collector.py (+5/-29)
ceilometer/compute/notifications/__init__.py (+3/-3)
ceilometer/compute/notifications/cpu.py (+2/-1)
ceilometer/compute/pollsters/cpu.py (+3/-1)
ceilometer/compute/pollsters/disk.py (+2/-2)
ceilometer/compute/pollsters/memory.py (+3/-1)
ceilometer/compute/pollsters/net.py (+1/-1)
ceilometer/compute/virt/hyperv/inspector.py (+2/-2)
ceilometer/compute/virt/hyperv/utilsv2.py (+5/-5)
ceilometer/compute/virt/inspector.py (+1/-1)
ceilometer/compute/virt/libvirt/inspector.py (+1/-1)
ceilometer/compute/virt/vmware/inspector.py (+15/-3)
ceilometer/compute/virt/xenapi/inspector.py (+1/-1)
ceilometer/coordination.py (+1/-1)
ceilometer/data_processing/notifications.py (+3/-3)
ceilometer/dispatcher/__init__.py (+1/-1)
ceilometer/dispatcher/database.py (+29/-8)
ceilometer/dispatcher/file.py (+2/-3)
ceilometer/dispatcher/gnocchi.py (+394/-0)
ceilometer/dispatcher/http.py (+5/-5)
ceilometer/dispatcher/resources/__init__.py (+0/-0)
ceilometer/dispatcher/resources/base.py (+40/-0)
ceilometer/dispatcher/resources/ceph_account.py (+31/-0)
ceilometer/dispatcher/resources/identity.py (+44/-0)
ceilometer/dispatcher/resources/image.py (+30/-0)
ceilometer/dispatcher/resources/instance.py (+54/-0)
ceilometer/dispatcher/resources/ipmi.py (+30/-0)
ceilometer/dispatcher/resources/network.py (+41/-0)
ceilometer/dispatcher/resources/orchestration.py (+30/-0)
ceilometer/dispatcher/resources/swift_account.py (+33/-0)
ceilometer/dispatcher/resources/volume.py (+38/-0)
ceilometer/energy/kwapi.py (+1/-1)
ceilometer/event/converter.py (+1/-1)
ceilometer/event/endpoint.py (+9/-22)
ceilometer/event/storage/impl_db2.py (+5/-0)
ceilometer/event/storage/impl_elasticsearch.py (+14/-6)
ceilometer/event/storage/impl_hbase.py (+8/-11)
ceilometer/event/storage/impl_log.py (+2/-1)
ceilometer/event/storage/impl_mongodb.py (+1/-1)
ceilometer/event/storage/impl_sqlalchemy.py (+28/-39)
ceilometer/event/storage/models.py (+4/-1)
ceilometer/event/storage/pymongo_base.py (+8/-15)
ceilometer/hardware/discovery.py (+1/-1)
ceilometer/hardware/inspector/snmp.py (+18/-2)
ceilometer/hardware/plugin.py (+1/-1)
ceilometer/hardware/pollsters/memory.py (+8/-0)
ceilometer/identity/notifications.py (+4/-4)
ceilometer/image/notifications.py (+3/-3)
ceilometer/ipmi/notifications/ironic.py (+2/-2)
ceilometer/ipmi/platform/intel_node_manager.py (+3/-0)
ceilometer/ipmi/pollsters/node.py (+1/-1)
ceilometer/ipmi/pollsters/sensor.py (+1/-1)
ceilometer/key_value_storage/notifications.py (+3/-3)
ceilometer/locale/ceilometer-log-error.pot (+28/-9)
ceilometer/locale/ceilometer-log-info.pot (+32/-3)
ceilometer/locale/ceilometer-log-warning.pot (+8/-3)
ceilometer/locale/ceilometer.pot (+102/-242)
ceilometer/locale/de/LC_MESSAGES/ceilometer-log-info.po (+63/-0)
ceilometer/locale/en_AU/LC_MESSAGES/ceilometer-log-info.po (+58/-0)
ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-error.po (+47/-0)
ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-info.po (+23/-56)
ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-warning.po (+37/-0)
ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po (+415/-1083)
ceilometer/locale/es/LC_MESSAGES/ceilometer-log-info.po (+62/-0)
ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-error.po (+42/-0)
ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-info.po (+35/-53)
ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-warning.po (+38/-0)
ceilometer/locale/it/LC_MESSAGES/ceilometer-log-info.po (+63/-0)
ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-info.po (+62/-0)
ceilometer/locale/pt_BR/LC_MESSAGES/ceilometer-log-info.po (+65/-0)
ceilometer/locale/te_IN/LC_MESSAGES/ceilometer-log-info.po (+58/-0)
ceilometer/locale/vi_VN/LC_MESSAGES/ceilometer-log-info.po (+63/-0)
ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-error.po (+33/-35)
ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-info.po (+52/-53)
ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-warning.po (+34/-47)
ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po (+519/-1014)
ceilometer/messaging.py (+21/-28)
ceilometer/middleware.py (+3/-3)
ceilometer/network/floatingip.py (+1/-1)
ceilometer/network/notifications.py (+5/-5)
ceilometer/network/services/base.py (+2/-1)
ceilometer/network/services/fwaas.py (+3/-2)
ceilometer/network/services/lbaas.py (+2/-2)
ceilometer/network/services/vpnaas.py (+4/-3)
ceilometer/network/statistics/opencontrail/client.py (+1/-1)
ceilometer/network/statistics/opendaylight/client.py (+1/-1)
ceilometer/network/statistics/opendaylight/driver.py (+2/-1)
ceilometer/neutron_client.py (+1/-2)
ceilometer/notification.py (+25/-21)
ceilometer/notifier.py (+1/-1)
ceilometer/nova_client.py (+1/-2)
ceilometer/objectstore/notifications.py (+3/-3)
ceilometer/objectstore/rgw.py (+7/-3)
ceilometer/objectstore/swift.py (+1/-1)
ceilometer/openstack/common/_i18n.py (+2/-2)
ceilometer/openstack/common/eventlet_backdoor.py (+3/-3)
ceilometer/openstack/common/fileutils.py (+1/-1)
ceilometer/openstack/common/loopingcall.py (+3/-3)
ceilometer/openstack/common/service.py (+23/-19)
ceilometer/openstack/common/threadgroup.py (+7/-6)
ceilometer/opts.py (+3/-10)
ceilometer/orchestration/notifications.py (+3/-3)
ceilometer/pipeline.py (+57/-5)
ceilometer/profiler/notifications.py (+3/-3)
ceilometer/publisher/file.py (+1/-1)
ceilometer/publisher/kafka_broker.py (+1/-1)
ceilometer/publisher/messaging.py (+4/-4)
ceilometer/publisher/udp.py (+1/-1)
ceilometer/publisher/utils.py (+5/-1)
ceilometer/service.py (+6/-6)
ceilometer/storage/__init__.py (+13/-2)
ceilometer/storage/base.py (+6/-35)
ceilometer/storage/hbase/base.py (+1/-1)
ceilometer/storage/hbase/inmemory.py (+1/-1)
ceilometer/storage/hbase/utils.py (+1/-1)
ceilometer/storage/impl_db2.py (+9/-7)
ceilometer/storage/impl_hbase.py (+3/-11)
ceilometer/storage/impl_log.py (+4/-5)
ceilometer/storage/impl_mongodb.py (+2/-80)
ceilometer/storage/impl_sqlalchemy.py (+13/-21)
ceilometer/storage/mongo/utils.py (+18/-15)
ceilometer/storage/pymongo_base.py (+1/-6)
ceilometer/storage/sqlalchemy/migrate_repo/versions/001_add_meter_table.py (+1/-1)
ceilometer/storage/sqlalchemy/migrate_repo/versions/020_add_metadata_tables.py (+1/-1)
ceilometer/storage/sqlalchemy/migrate_repo/versions/043_reduce_uuid_data_types.py (+37/-0)
ceilometer/storage/sqlalchemy/models.py (+19/-19)
ceilometer/storage/sqlalchemy/utils.py (+10/-10)
ceilometer/tests/agent/agentbase.py (+3/-2)
ceilometer/tests/agent/test_discovery.py (+55/-0)
ceilometer/tests/agent/test_manager.py (+17/-4)
ceilometer/tests/alarm/evaluator/test_combination.py (+24/-0)
ceilometer/tests/alarm/evaluator/test_threshold.py (+4/-4)
ceilometer/tests/alarm/test_rpc.py (+0/-77)
ceilometer/tests/api/test_app.py (+2/-0)
ceilometer/tests/api/v2/test_acl_scenarios.py (+10/-4)
ceilometer/tests/api/v2/test_alarm_scenarios.py (+122/-30)
ceilometer/tests/api/v2/test_app.py (+9/-2)
ceilometer/tests/api/v2/test_complex_query.py (+3/-3)
ceilometer/tests/api/v2/test_complex_query_scenarios.py (+12/-11)
ceilometer/tests/api/v2/test_event_scenarios.py (+3/-3)
ceilometer/tests/api/v2/test_list_meters_scenarios.py (+14/-10)
ceilometer/tests/api/v2/test_list_resources_scenarios.py (+4/-1)
ceilometer/tests/api/v2/test_post_samples_scenarios.py (+1/-1)
ceilometer/tests/api/v2/test_query.py (+5/-5)
ceilometer/tests/api/v2/test_statistics_scenarios.py (+2/-2)
ceilometer/tests/base.py (+2/-2)
ceilometer/tests/compute/notifications/test_cpu.py (+8/-8)
ceilometer/tests/compute/pollsters/test_diskio.py (+44/-44)
ceilometer/tests/compute/pollsters/test_net.py (+32/-32)
ceilometer/tests/compute/virt/hyperv/test_inspector.py (+1/-1)
ceilometer/tests/compute/virt/hyperv/test_utilsv2.py (+1/-1)
ceilometer/tests/compute/virt/libvirt/test_inspector.py (+103/-90)
ceilometer/tests/data_processing/test_notifications.py (+2/-1)
ceilometer/tests/db.py (+14/-4)
ceilometer/tests/dispatcher/test_db.py (+1/-1)
ceilometer/tests/dispatcher/test_file.py (+2/-2)
ceilometer/tests/dispatcher/test_gnocchi.py (+352/-0)
ceilometer/tests/dispatcher/test_http.py (+3/-3)
ceilometer/tests/event/test_converter.py (+13/-23)
ceilometer/tests/event/test_endpoint.py (+2/-2)
ceilometer/tests/functional/__init__.py (+0/-0)
ceilometer/tests/functional/hooks/post_test_hook.sh (+47/-0)
ceilometer/tests/functional/test_empty.py (+23/-0)
ceilometer/tests/gabbi/fixtures.py (+15/-14)
ceilometer/tests/gabbi/gabbits/alarms.yaml (+0/-6)
ceilometer/tests/gabbi/gabbits/capabilities.yaml (+0/-1)
ceilometer/tests/gabbi/gabbits/meters.yaml (+6/-6)
ceilometer/tests/gabbi/gabbits/samples.yaml (+5/-5)
ceilometer/tests/hardware/pollsters/base.py (+2/-0)
ceilometer/tests/hardware/pollsters/test_memory.py (+10/-0)
ceilometer/tests/network/services/test_lbaas.py (+8/-8)
ceilometer/tests/network/test_notifications.py (+30/-0)
ceilometer/tests/objectstore/test_rgw.py (+2/-0)
ceilometer/tests/objectstore/test_swift.py (+2/-1)
ceilometer/tests/orchestration/test_notifications.py (+2/-1)
ceilometer/tests/pipeline_base.py (+5/-1)
ceilometer/tests/publisher/test_messaging_publisher.py (+13/-13)
ceilometer/tests/publisher/test_udp.py (+9/-4)
ceilometer/tests/storage/test_get_connection.py (+8/-1)
ceilometer/tests/storage/test_impl_db2.py (+4/-8)
ceilometer/tests/storage/test_impl_hbase.py (+11/-8)
ceilometer/tests/storage/test_impl_mongodb.py (+11/-70)
ceilometer/tests/storage/test_impl_sqlalchemy.py (+7/-28)
ceilometer/tests/storage/test_storage_scenarios.py (+72/-138)
ceilometer/tests/test_bin.py (+135/-80)
ceilometer/tests/test_collector.py (+12/-14)
ceilometer/tests/test_messaging.py (+3/-3)
ceilometer/tests/test_neutronclient.py (+8/-8)
ceilometer/tests/test_notification.py (+41/-5)
ceilometer/tests/volume/test_notifications.py (+0/-24)
ceilometer/transformer/__init__.py (+1/-0)
ceilometer/transformer/arithmetic.py (+2/-2)
ceilometer/transformer/conversions.py (+2/-2)
ceilometer/volume/notifications.py (+2/-3)
dev/null (+0/-79)
doc/source/architecture.rst (+4/-4)
doc/source/conf.py (+2/-3)
doc/source/install/development.rst (+7/-7)
doc/source/install/manual.rst (+12/-3)
doc/source/install/mod_wsgi.rst (+16/-18)
doc/source/measurements.rst (+1/-1)
doc/source/overview.rst (+3/-3)
doc/source/plugins.rst (+3/-3)
doc/source/webapi/v2.rst (+1/-1)
etc/apache2/ceilometer (+20/-12)
etc/ceilometer/api_paste.ini (+1/-1)
etc/ceilometer/event_definitions.yaml (+30/-0)
etc/ceilometer/gnocchi_archive_policy_map.yaml (+7/-0)
openstack-common.conf (+0/-2)
requirements.txt (+28/-29)
run-functional-tests.sh (+12/-0)
setup-test-env-es.sh (+41/-0)
setup-test-env-mysql.sh (+1/-1)
setup.cfg (+26/-28)
setup.py (+0/-0)
test-requirements-py3.txt (+8/-3)
test-requirements.txt (+8/-6)
tools/make_test_data.py (+0/-2)
tools/make_test_event_data.py (+0/-2)
tools/pretty_tox.sh (+16/-0)
tools/send_test_data.py (+2/-1)
tools/show_data.py (+0/-2)
tox.ini (+68/-12)