From c0282d430cf0140df6cf6ea3b9ae2b66f9bf57bf Mon Sep 17 00:00:00 2001
From: "Ritchie, Frank (fr801x)" <fr801x@att.com>
Date: Tue, 8 Feb 2022 10:10:41 -0600
Subject: [PATCH] Rename prometheus metric

The metric ceph_pool_bytes_used has changed to ceph_pool_stored.

https: //tracker.ceph.com/issues/39932
Change-Id: Iab5cf2b318ce538e72b4592dedd8f0e489741797
---
 grafana/Chart.yaml                 | 2 +-
 grafana/values_overrides/ceph.yaml | 6 +++---
 releasenotes/notes/grafana.yaml    | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/grafana/Chart.yaml b/grafana/Chart.yaml
index 5a1d68703..46da6dfb2 100644
--- a/grafana/Chart.yaml
+++ b/grafana/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v7.4.5
 description: OpenStack-Helm Grafana
 name: grafana
-version: 0.1.12
+version: 0.1.13
 home: https://grafana.com/
 sources:
   - https://github.com/grafana/grafana
diff --git a/grafana/values_overrides/ceph.yaml b/grafana/values_overrides/ceph.yaml
index c349b63bd..87e53ccf6 100644
--- a/grafana/values_overrides/ceph.yaml
+++ b/grafana/values_overrides/ceph.yaml
@@ -2988,7 +2988,7 @@ conf:
                   "step": 60
                 },
                 {
-                  "expr": "ceph_pool_bytes_used{pool_id=~\"$pool\",application=\"ceph\",release_group=\"$ceph_cluster\"}",
+                  "expr": "ceph_pool_stored{pool_id=~\"$pool\",application=\"ceph\",release_group=\"$ceph_cluster\"}",
                   "interval": "$interval",
                   "intervalFactor": 1,
                   "legendFormat": "Used - {{ $pool }}",
@@ -2996,7 +2996,7 @@ conf:
                   "step": 60
                 },
                 {
-                  "expr": "ceph_pool_max_avail{pool_id=~\"$pool\",application=\"ceph\",release_group=\"$ceph_cluster\"} - ceph_pool_bytes_used{pool_id=~\"$pool\",application=\"ceph\",release_group=\"$ceph_cluster\"}",
+                  "expr": "ceph_pool_max_avail{pool_id=~\"$pool\",application=\"ceph\",release_group=\"$ceph_cluster\"} - ceph_pool_stored{pool_id=~\"$pool\",application=\"ceph\",release_group=\"$ceph_cluster\"}",
                   "interval": "$interval",
                   "intervalFactor": 1,
                   "legendFormat": "Available - {{ $pool }}",
@@ -3120,7 +3120,7 @@ conf:
               "tableColumn": "",
               "targets": [
                 {
-                  "expr": "(ceph_pool_bytes_used{pool_id=~\"$pool\",application=\"ceph\",release_group=\"$ceph_cluster\"} / ceph_pool_max_avail{pool_id=~\"$pool\",application=\"ceph\",release_group=\"$ceph_cluster\"})",
+                  "expr": "(ceph_pool_stored{pool_id=~\"$pool\",application=\"ceph\",release_group=\"$ceph_cluster\"} / ceph_pool_max_avail{pool_id=~\"$pool\",application=\"ceph\",release_group=\"$ceph_cluster\"})",
                   "format": "time_series",
                   "interval": "$interval",
                   "intervalFactor": 1,
diff --git a/releasenotes/notes/grafana.yaml b/releasenotes/notes/grafana.yaml
index 24a843549..702eed1e4 100644
--- a/releasenotes/notes/grafana.yaml
+++ b/releasenotes/notes/grafana.yaml
@@ -13,4 +13,5 @@ grafana:
   - 0.1.10 Helm 3 - Fix Job labels
   - 0.1.11 Update htk requirements
   - 0.1.12 Add iDRAC dashboard to Grafana
+  - 0.1.13 Update prometheus metric name
 ...