From b5ec5e43c15efd5fd355d3049c2d5c0cd11985d0 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 21 Aug 2018 16:01:41 +0200 Subject: [PATCH] gnocchi: add ceilometer-high{,-rate} archive policies Change-Id: Id2fde1786fbec012781c1794f78c948fa4e8a24e --- .../publisher/data/gnocchi_resources.yaml | 23 +++++++++++++++++++ .../tests/unit/publisher/test_gnocchi.py | 2 ++ 2 files changed, 25 insertions(+) diff --git a/ceilometer/publisher/data/gnocchi_resources.yaml b/ceilometer/publisher/data/gnocchi_resources.yaml index fa007a9aa8..ea4ec92d0d 100644 --- a/ceilometer/publisher/data/gnocchi_resources.yaml +++ b/ceilometer/publisher/data/gnocchi_resources.yaml @@ -18,6 +18,29 @@ archive_policies: definition: - granularity: 5 minutes timespan: 30 days + - name: ceilometer-high + aggregation_methods: + - mean + back_window: 0 + definition: + - granularity: 1 second + timespan: 1 hour + - granularity: 1 minute + timespan: 1 day + - granularity: 1 hour + timespan: 365 days + - name: ceilometer-high-rate + aggregation_methods: + - mean + - rate:mean + back_window: 0 + definition: + - granularity: 1 second + timespan: 1 hour + - granularity: 1 minute + timespan: 1 day + - granularity: 1 hour + timespan: 365 days resources: - resource_type: identity diff --git a/ceilometer/tests/unit/publisher/test_gnocchi.py b/ceilometer/tests/unit/publisher/test_gnocchi.py index 821e8705af..187a6cdfba 100644 --- a/ceilometer/tests/unit/publisher/test_gnocchi.py +++ b/ceilometer/tests/unit/publisher/test_gnocchi.py @@ -534,6 +534,8 @@ class PublisherWorkflowTest(base.BaseTestCase, expected_calls = [ mock.call.archive_policy.get("ceilometer-low"), mock.call.archive_policy.get("ceilometer-low-rate"), + mock.call.archive_policy.get("ceilometer-high"), + mock.call.archive_policy.get("ceilometer-high-rate"), mock.call.metric.batch_resources_metrics_measures( {resource_id: {metric_name: self.metric_attributes}}, create_metrics=True)