summaryrefslogtreecommitdiff
path: root/setup.cfg
diff options
context:
space:
mode:
authorMehdi Abaakouk <mehdi.abaakouk@enovance.com>2015-03-12 17:53:46 +0100
committerMehdi Abaakouk <mehdi.abaakouk@enovance.com>2015-03-26 08:28:45 +0100
commit58da530504023ab5ab6f4d67b9c4d94612fdd768 (patch)
treeffb6bb9938b7e3c5708023eff398f2704413c445 /setup.cfg
parent348ecb0861637da5575b094f8fa3fab1e3770928 (diff)
downloadceilometer-58da530504023ab5ab6f4d67b9c4d94612fdd768.tar.gz
alarm: Use new gnocchi aggregation API
Since https://review.openstack.org/#/c/163462/ and https://review.openstack.org/#/c/162649/4 in gnocchi, all kind of aggregations have been moved in the same URI namespace (/v1/aggregation/...) and we can use complex query to make aggregation across multiples metrics. This change sync the ceilometer alarm API and Rules to match these changes. Change-Id: I015af585595e6880b527161fe5c8b34eeb7bfe29
Diffstat (limited to 'setup.cfg')
-rw-r--r--setup.cfg8
1 files changed, 5 insertions, 3 deletions
diff --git a/setup.cfg b/setup.cfg
index 215da091..01857f61 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -298,14 +298,16 @@ ceilometer.event.publisher =
ceilometer.alarm.rule =
threshold = ceilometer.api.controllers.v2.alarm_rules.threshold:AlarmThresholdRule
combination = ceilometer.api.controllers.v2.alarm_rules.combination:AlarmCombinationRule
- gnocchi_resources_threshold = ceilometer.api.controllers.v2.alarm_rules.gnocchi:AlarmGnocchiMetricOfResourcesThresholdRule
- gnocchi_metrics_threshold = ceilometer.api.controllers.v2.alarm_rules.gnocchi:AlarmGnocchiMetricsThresholdRule
+ gnocchi_resources_threshold = ceilometer.api.controllers.v2.alarm_rules.gnocchi:MetricOfResourceRule
+ gnocchi_aggregation_by_metrics_threshold = ceilometer.api.controllers.v2.alarm_rules.gnocchi:AggregationMetricsByIdLookupRule
+ gnocchi_aggregation_by_resources_threshold = ceilometer.api.controllers.v2.alarm_rules.gnocchi:AggregationMetricByResourcesLookupRule
ceilometer.alarm.evaluator =
threshold = ceilometer.alarm.evaluator.threshold:ThresholdEvaluator
combination = ceilometer.alarm.evaluator.combination:CombinationEvaluator
gnocchi_resources_threshold = ceilometer.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator
- gnocchi_metrics_threshold = ceilometer.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator
+ gnocchi_aggregation_by_metrics_threshold = ceilometer.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator
+ gnocchi_aggregation_by_resources_threshold = ceilometer.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator
ceilometer.alarm.evaluator_service =
default = ceilometer.alarm.service:AlarmEvaluationService