From 0476a72375805c6ec689c0baab1c445ccab9ffa3 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge@redhat.com>
Date: Wed, 27 May 2020 20:02:51 +0200
Subject: [PATCH] Add volume.manage to metrics.

This allows to monitor cinder managed ceph volumes
to be monitored.
The second addition here allows the same for snapshots.

Change-Id: I7f045fa618e78351e05ad69bc9580e98487f0c29
(cherry picked from commit 7df749884b21ea760ff3ce07f4b257d2f4a89318)
(cherry picked from commit fd41c23d1c4fb9e00a8b36827c899ab7e095c68c)
---
 ceilometer/data/meters.d/meters.yaml             | 2 ++
 ceilometer/publisher/data/gnocchi_resources.yaml | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ceilometer/data/meters.d/meters.yaml b/ceilometer/data/meters.d/meters.yaml
index 68ab4e00e0..f06aa9d854 100644
--- a/ceilometer/data/meters.d/meters.yaml
+++ b/ceilometer/data/meters.d/meters.yaml
@@ -120,6 +120,7 @@ metric:
       - 'volume.attach.*'
       - 'volume.detach.*'
       - 'volume.update.*'
+      - 'volume.manage.*'
     type: 'gauge'
     unit: 'GB'
     volume: $.payload.size
@@ -137,6 +138,7 @@ metric:
       - 'snapshot.exists'
       - 'snapshot.create.*'
       - 'snapshot.delete.*'
+      - 'snapshot.manage.*'
     type: 'gauge'
     unit: 'GB'
     volume: $.payload.volume_size
diff --git a/ceilometer/publisher/data/gnocchi_resources.yaml b/ceilometer/publisher/data/gnocchi_resources.yaml
index 656e0c8268..e3aafe3b5b 100644
--- a/ceilometer/publisher/data/gnocchi_resources.yaml
+++ b/ceilometer/publisher/data/gnocchi_resources.yaml
@@ -238,6 +238,10 @@ resources:
       volume.snapshot.size:
       volume.backup.size:
       backup.size:
+      volume.manage_existing.start:
+      volume.manage_existing.end:
+      volume.manage_existing_snapshot.start:
+      volume.manage_existing_snapshot.end:
     attributes:
       display_name: resource_metadata.(display_name|name)
       volume_type: resource_metadata.volume_type
@@ -406,4 +410,5 @@ resources:
       network.services.lb.health_monitor:
       network.services.lb.loadbalancer:
       network.services.lb.total.connections:
-      network.services.lb.active.connections:
\ No newline at end of file
+      network.services.lb.active.connections:
+