4da146638bc3838270fa41c9f9fb91961f726c97 - osm/MON

commit	4da146638bc3838270fa41c9f9fb91961f726c97	[log] [tgz]
author	Benjamin Diaz <bdiaz@whitestack.com>	Wed Oct 17 14:44:36 2018 -0300
committer	Benjamin Diaz <bdiaz@whitestack.com>	Thu Oct 18 15:12:56 2018 -0300
tree	2968d1d64f54a4187e1c79286b61610f29fba81f
parent	2aec92e1eb52d5512c2acae9ce9878f2f3c8f782 [diff]

Adds use of CustomCollector in Prometheus exporter

Using a CustomCollector gives more control over the collection
process, which allows handling the removal of metrics when a NS
is deleted. Metrics now have a lifespan of a collection cycle, so
metrics of deleted vdus are now not visible in the exporter.

It also adds MonCollector class, which allows to abstract collection
logic and facilitates testing.

Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>
Change-Id: Idfdb86c1ee9facd07187e6582954ae4cab32a5b4

docker/scripts/runInstall.sh[diff]
osm_mon/cmd/mon_prometheus_exporter.py[Renamed from osm_mon/cmd/exporter.py - diff]
osm_mon/collector/__init__.py[Renamed from osm_mon/exporter/__init__.py - diff]
osm_mon/collector/collector.py[Added - diff]
osm_mon/collector/prometheus_exporter.py[Added - diff]
osm_mon/core/message_bus/common_consumer.py[diff]
osm_mon/core/settings.py[diff]
osm_mon/exporter/exporter.py[Deleted - diff]
osm_mon/plugins/OpenStack/Aodh/notifier.py[diff]
osm_mon/test/collector/__init__.py[Added - diff]
osm_mon/test/collector/test_collector.py[Added - diff]
osm_mon/test/core/test_common_consumer.py[diff]
osm_mon/test/plugins/CloudWatch/__init__.py[Renamed from osm_mon/test/functional/__init__.py - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/alarm_details/acknowledge_alarm.json[Renamed from osm_mon/test/CloudWatch/test_schemas/alarm_details/acknowledge_alarm.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_differentInstance.json[Renamed from osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_differentInstance.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_sameInstance.json[Renamed from osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_sameInstance.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_differentInstance.json[Renamed from osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_differentInstance.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_sameInstance.json[Renamed from osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_sameInstance.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/create_alarm/operation_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/create_alarm/operation_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/create_alarm/operation_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/create_alarm/operation_valid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/create_alarm/statistic_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/create_alarm/statistic_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/create_alarm/statistic_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/create_alarm/statistic_valid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/create_metrics/create_metric_req_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/create_metrics/create_metric_req_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_valid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/delete_alarm/name_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/delete_alarm/name_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/delete_alarm/name_valid_delete1.json[Renamed from osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete1.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/delete_alarm/name_valid_delete2.json[Renamed from osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete2.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/delete_alarm/name_valid_delete3.json[Renamed from osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete3.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/delete_alarm/name_valid_delete4.json[Renamed from osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete4.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/delete_metrics/delete_metric_req_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/delete_metrics/delete_metric_req_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_valid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/list_alarm/list_alarm_valid_no_arguments.json[Renamed from osm_mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_no_arguments.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/list_alarm/list_alarm_valid_one_argument.json[Renamed from osm_mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_one_argument.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/list_alarm/list_alarm_valid_two_arguments.json[Renamed from osm_mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_two_arguments.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/list_metrics/list_metric_req_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/list_metrics/list_metric_req_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_valid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_valid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_valid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/update_alarm/name_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/update_alarm/name_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/update_alarm/name_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/update_alarm/name_valid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/update_alarm/operation_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/update_alarm/operation_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/update_alarm/operation_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/update_alarm/operation_valid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/update_alarm/statistic_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/update_alarm/statistic_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/update_alarm/statistic_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/update_alarm/statistic_valid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/update_alarm/update_alarm_new_alarm.json[Renamed from osm_mon/test/CloudWatch/test_schemas/update_alarm/update_alarm_new_alarm.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/update_metrics/update_metric_req_invalid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_invalid.json - diff]
osm_mon/test/plugins/CloudWatch/test_schemas/update_metrics/update_metric_req_valid.json[Renamed from osm_mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_valid.json - diff]
osm_mon/test/plugins/CloudWatch/unit_tests_alarms.py[Renamed from osm_mon/test/CloudWatch/unit_tests_alarms.py - diff]
osm_mon/test/plugins/CloudWatch/unit_tests_metrics.py[Renamed from osm_mon/test/CloudWatch/unit_tests_metrics.py - diff]
osm_mon/test/plugins/OpenStack/__init__.py[Renamed from osm_mon/test/OpenStack/__init__.py - diff]
osm_mon/test/plugins/OpenStack/integration/__init__.py[Renamed from osm_mon/test/OpenStack/integration/__init__.py - diff]
osm_mon/test/plugins/OpenStack/integration/test_alarm_integration.py[Renamed from osm_mon/test/OpenStack/integration/test_alarm_integration.py - diff]
osm_mon/test/plugins/OpenStack/integration/test_metric_integration.py[Renamed from osm_mon/test/OpenStack/integration/test_metric_integration.py - diff]
osm_mon/test/plugins/OpenStack/integration/test_notify_alarm.py[Renamed from osm_mon/test/OpenStack/integration/test_notify_alarm.py - diff]
osm_mon/test/plugins/OpenStack/integration/test_vim_account.py[Renamed from osm_mon/test/OpenStack/integration/test_vim_account.py - diff]
osm_mon/test/plugins/OpenStack/unit/__init__.py[Renamed from osm_mon/test/OpenStack/unit/__init__.py - diff]
osm_mon/test/plugins/OpenStack/unit/test_alarm_req.py[Renamed from osm_mon/test/OpenStack/unit/test_alarm_req.py - diff]
osm_mon/test/plugins/OpenStack/unit/test_alarming.py[Renamed from osm_mon/test/OpenStack/unit/test_alarming.py - diff]
osm_mon/test/plugins/OpenStack/unit/test_common.py[Renamed from osm_mon/test/OpenStack/unit/test_common.py - diff]
osm_mon/test/plugins/OpenStack/unit/test_metric_calls.py[Renamed from osm_mon/test/OpenStack/unit/test_metric_calls.py - diff]
osm_mon/test/plugins/OpenStack/unit/test_metric_req.py[Renamed from osm_mon/test/OpenStack/unit/test_metric_req.py - diff]
osm_mon/test/plugins/OpenStack/unit/test_notifier.py[Renamed from osm_mon/test/OpenStack/unit/test_notifier.py - diff]
osm_mon/test/plugins/OpenStack/unit/test_responses.py[Renamed from osm_mon/test/OpenStack/unit/test_responses.py - diff]
osm_mon/test/plugins/OpenStack/unit/test_settings.py[Renamed from osm_mon/test/OpenStack/unit/test_settings.py - diff]
osm_mon/test/plugins/VMware/__init__.py[Renamed from osm_mon/test/VMware/__init__.py - diff]
osm_mon/test/plugins/VMware/test_mon_plugin_vrops.py[Renamed from osm_mon/test/VMware/test_mon_plugin_vrops.py - diff]
osm_mon/test/plugins/VMware/test_plugin_receiver.py[Renamed from osm_mon/test/VMware/test_plugin_receiver.py - diff]
osm_mon/test/plugins/__init__.py[Added - diff]
setup.py[diff]

72 files changed

tree: 2968d1d64f54a4187e1c79286b61610f29fba81f