openstack
/
aodh
Code Issues Proposed changes

Add granularity value to Gnocchi evaluators 

Add missing granularity value which should
be sent to Gnocchi.

Change-Id: I246763514a98d17f3f2ea53cec2b5cc8a25fc9cb
Related-Bug: #1719931
(cherry picked from commit 442a435c04)
This commit is contained in:
Paweł Suder 2017-09-27 17:21:31 +02:00 committed by Pawel Suder
parent 0ddd49bb41
commit efa09fafb1
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aodh/evaluator/gnocchi.py
View File

@ -58,6 +58,7 @@ class GnocchiResourceThresholdEvaluator(GnocchiBase):
try:
return self._gnocchi_client.metric.get_measures(
metric=rule['metric'],
granularity=rule['granularity'],
start=start, stop=end,
resource_id=rule['resource_id'],
aggregation=rule['aggregation_method'])
@ -80,6 +81,7 @@ class GnocchiAggregationMetricsThresholdEvaluator(GnocchiBase):
# https://bugs.launchpad.net/gnocchi/+bug/1479429
return self._gnocchi_client.metric.aggregation(
metrics=rule['metrics'],
granularity=rule['granularity'],
start=start, stop=end,
aggregation=rule['aggregation_method'],
needed_overlap=0)
@ -101,6 +103,7 @@ class GnocchiAggregationResourcesThresholdEvaluator(GnocchiBase):
try:
return self._gnocchi_client.metric.aggregation(
metrics=rule['metric'],
granularity=rule['granularity'],
query=jsonutils.loads(rule['query']),
resource_type=rule["resource_type"],
start=start, stop=end,

3
aodh/tests/unit/evaluator/test_gnocchi.py
View File

@ -186,6 +186,7 @@ class TestGnocchiResourceThresholdEvaluate(TestGnocchiEvaluatorBase):
self.assertEqual(
[mock.call.get_measures(aggregation='mean', metric='cpu_util',
granularity=60,
resource_id='my_instance',
start=start_alarm, stop=end)],
self.client.metric.mock_calls)
@ -326,6 +327,7 @@ class TestGnocchiAggregationMetricsThresholdEvaluate(TestGnocchiEvaluatorBase):
metrics=[
'0bb1604d-1193-4c0a-b4b8-74b170e35e83',
'9ddc209f-42f8-41e1-b8f1-8804f59c4053'],
granularity=300,
needed_overlap=0,
start=start_alarm, stop=end)],
self.client.metric.mock_calls)
@ -443,6 +445,7 @@ class TestGnocchiAggregationResourcesThresholdEvaluate(
end = "2015-01-26T12:57:00"
self.assertEqual(
[mock.call.aggregation(aggregation='mean', metrics='cpu_util',
granularity=50,
needed_overlap=0,
query={"=": {"server_group":
"my_autoscaling_group"}},