From: James Cheng Date: Tue, 21 Jan 2020 13:52:29 +0000 (+0800) Subject: monitoring: Fix pool capacity incorrect X-Git-Tag: v14.2.10~79^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58ee08425e1504af64b78f8329f4c1f2fc6c276e;p=ceph.git monitoring: Fix pool capacity incorrect Signed-off-by: James Cheng (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" diff --git a/monitoring/prometheus/alerts/ceph_default_alerts.yml b/monitoring/prometheus/alerts/ceph_default_alerts.yml index 4c37d7f9c9b0..5eb31e909874 100644 --- a/monitoring/prometheus/alerts/ceph_default_alerts.yml +++ b/monitoring/prometheus/alerts/ceph_default_alerts.yml @@ -203,7 +203,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