diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-03 07:11:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-03 07:11:23 +0000 |
| commit | 7609ab2cb589c5abf9bcb234ca9ca9b91f9330ac (patch) | |
| tree | 71cdb0e2190edc67b022c0440ad6ebde69480258 | |
| parent | 3afec06e33d181cf14c86b8f55c1f0059afb3eeb (diff) | |
| parent | 9203a8d1735b7fc3af1daabfa714ef6f5b1d3869 (diff) | |
| download | ceilometer-7609ab2cb589c5abf9bcb234ca9ca9b91f9330ac.tar.gz | |
Merge "Fixing evaluation of gnocchi aggregation-by-metric" into stable/liberty
| -rw-r--r-- | ceilometer/alarm/evaluator/gnocchi.py | 2 | ||||
| -rw-r--r-- | ceilometer/tests/unit/alarm/evaluator/test_gnocchi.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ceilometer/alarm/evaluator/gnocchi.py b/ceilometer/alarm/evaluator/gnocchi.py index 809cb4f0..55a1908a 100644 --- a/ceilometer/alarm/evaluator/gnocchi.py +++ b/ceilometer/alarm/evaluator/gnocchi.py @@ -97,7 +97,7 @@ class GnocchiThresholdEvaluator(evaluator.Evaluator): elif alarm.type == 'gnocchi_aggregation_by_metrics_threshold': req['url'] += "/aggregation/metric" - req['params']['metric[]'] = alarm.rule['metrics'] + req['params']['metric'] = alarm.rule['metrics'] elif alarm.type == 'gnocchi_resources_threshold': req['url'] += "/resource/%s/%s/metric/%s/measures" % ( diff --git a/ceilometer/tests/unit/alarm/evaluator/test_gnocchi.py b/ceilometer/tests/unit/alarm/evaluator/test_gnocchi.py index ea60b6a9..4db66a65 100644 --- a/ceilometer/tests/unit/alarm/evaluator/test_gnocchi.py +++ b/ceilometer/tests/unit/alarm/evaluator/test_gnocchi.py @@ -224,7 +224,7 @@ class TestGnocchiThresholdEvaluate(base.TestEvaluatorBase): mock.call(url='http://localhost:8041/v1/aggregation/metric', params={'aggregation': 'max', 'start': start_alarm2, 'end': end, - 'metric[]': [ + 'metric': [ '0bb1604d-1193-4c0a-b4b8-74b170e35e83', '9ddc209f-42f8-41e1-b8f1-8804f59c4053']}, headers=expected_headers)], |