From b9f63a1ae268562d4ae619f42ae2f1abfdc33fdd Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Wed, 24 Feb 2021 13:53:11 +0100
Subject: [PATCH] Set force_granularity: 300 in metrics.yml

It appears that the default metrics.yml needs force_granularity: 300
otherwise cloudkitty-processor will fail to process metrics from
Gnocchi. As this is what at least I (in Debian) ship in packages, it
would be nice to have a working default.

Change-Id: I28b43d6131182252c0576d9323bbcdbfb1dbbd0a
Story: 2008598
Task: 41771
---
 etc/cloudkitty/metrics.yml                                 | 2 ++
 .../new-forcegranularity-default-b8aaf7d7823aef3b.yaml     | 7 +++++++
 2 files changed, 9 insertions(+)
 create mode 100644 releasenotes/notes/new-forcegranularity-default-b8aaf7d7823aef3b.yaml

diff --git a/etc/cloudkitty/metrics.yml b/etc/cloudkitty/metrics.yml
index 9b94f01b..ba1657fc 100644
--- a/etc/cloudkitty/metrics.yml
+++ b/etc/cloudkitty/metrics.yml
@@ -14,6 +14,7 @@ metrics:
     extra_args:
       aggregation_method: mean
       resource_type: instance
+      force_granularity: 300
 
   image.size:
     unit: MiB
@@ -40,6 +41,7 @@ metrics:
     extra_args:
       aggregation_method: mean
       resource_type: volume
+      force_granularity: 300
 
   network.outgoing.bytes.rate:
     unit: MB
diff --git a/releasenotes/notes/new-forcegranularity-default-b8aaf7d7823aef3b.yaml b/releasenotes/notes/new-forcegranularity-default-b8aaf7d7823aef3b.yaml
new file mode 100644
index 00000000..6df0daf0
--- /dev/null
+++ b/releasenotes/notes/new-forcegranularity-default-b8aaf7d7823aef3b.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    A new directive ``force_granularity: 300`` was added to the default
+    ``metrics.yml`` file for ``cpu`` and ``volume.size``, to match the defaults
+    of ceilometer and avoid logging errors in ``cloudkitty-processor`` with the
+    default setup.