monitoring: Fix pool capacity incorrect

Signed-off-by: James Cheng <james59988@gmail.com>

diff --git a/monitoring/grafana/dashboards/pool-detail.json b/monitoring/grafana/dashboards/pool-detail.json
index 2144c4a9dd5d587358f99de1b15344a2a24b9ab2..1f8da54fa8c7d8ddf3ed1d634894568410f00218 100644 (file)
--- 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"

diff --git a/monitoring/prometheus/alerts/ceph_default_alerts.yml b/monitoring/prometheus/alerts/ceph_default_alerts.yml
index 3f58aeeaeba1fa036a877d42cedbbaceaf176820..16fa4f2dc939e4c0024b2b9e964607ce1452996a 100644 (file)
--- a/monitoring/prometheus/alerts/ceph_default_alerts.yml
+++ b/monitoring/prometheus/alerts/ceph_default_alerts.yml
@@ -222,7 +222,7 @@ groups:
     rules:
       - alert: pool full
         expr: |
-          ceph_pool_stored / ceph_pool_max_avail
+          ceph_pool_stored / (ceph_pool_stored + ceph_pool_max_avail)
           * on(pool_id) group_right ceph_pool_metadata * 100 > 90
         labels:
           severity: critical
@@ -235,7 +235,7 @@ groups:
         expr: |
           (
             (
-              (ceph_pool_max_avail - ceph_pool_stored) / deriv(ceph_pool_max_avail[2d])
+              ceph_pool_max_avail / deriv(ceph_pool_max_avail[2d])
             ) * on(pool_id) group_right ceph_pool_metadata <= 5
           ) > 0
         labels: