From: James Cheng <james59988@gmail.com>
Date: Tue, 21 Jan 2020 13:52:29 +0000 (+0800)
Subject: monitoring: Fix pool capacity incorrect
X-Git-Tag: v15.2.2~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e6e6373b30e384d2ef00a17c7a6cf2630ad64e7;p=ceph.git

monitoring: Fix pool capacity incorrect

Signed-off-by: James Cheng <james59988@gmail.com>
(cherry picked from commit 1b980ef88c5f8f45b5b39b79c395a66233908266)
---

diff --git a/monitoring/grafana/dashboards/pool-detail.json b/monitoring/grafana/dashboards/pool-detail.json
index 14e468a5274e..f7e90da7e28d 100644
--- a/monitoring/grafana/dashboards/pool-detail.json
+++ b/monitoring/grafana/dashboards/pool-detail.json
@@ -101,7 +101,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "(ceph_pool_stored / ceph_pool_max_avail) * on(pool_id) group_left(instance,name) ceph_pool_metadata{name=~\"$pool_name\"}",
+          "expr": "(ceph_pool_stored / (ceph_pool_stored + ceph_pool_max_avail)) * on(pool_id) group_left(instance,name) ceph_pool_metadata{name=~\"$pool_name\"}",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"
@@ -182,7 +182,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "((ceph_pool_max_avail - ceph_pool_stored) / deriv(ceph_pool_stored[6h])) * on(pool_id) group_left(instance,name) ceph_pool_metadata{name=~\"$pool_name\"} > 0",
+          "expr": "(ceph_pool_max_avail / deriv(ceph_pool_stored[6h])) * on(pool_id) group_left(instance,name) ceph_pool_metadata{name=~\"$pool_name\"} > 0",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"