From 1b980ef88c5f8f45b5b39b79c395a66233908266 Mon Sep 17 00:00:00 2001 From: James Cheng Date: Tue, 21 Jan 2020 21:52:29 +0800 Subject: [PATCH] monitoring: Fix pool capacity incorrect Signed-off-by: James Cheng --- monitoring/grafana/dashboards/pool-detail.json | 4 ++-- monitoring/prometheus/alerts/ceph_default_alerts.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/monitoring/grafana/dashboards/pool-detail.json b/monitoring/grafana/dashboards/pool-detail.json index 2144c4a9dd5..1f8da54fa8c 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 3f58aeeaeba..16fa4f2dc93 100644 --- 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: -- 2.39.5