From 667c5999c97f0b4543ffed1a077ba556ea6b1a56 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 8 Jul 2024 17:26:53 +0300 Subject: [PATCH] Report all PG states --- mon/prometheus.js | 20 +++++++++++++++++++- mon/stats.js | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/mon/prometheus.js b/mon/prometheus.js index 5883366c..c4558054 100644 --- a/mon/prometheus.js +++ b/mon/prometheus.js @@ -167,7 +167,25 @@ function export_prometheus_metrics(st) // PG states and pool up/down status const real_pg_count = (Object.keys(((st.config.pgs||{}).items||{})[pool_id]||{}).length) || (0|pool_cfg.pg_count); - const per_state = {}; + const per_state = { + active: 0, + starting: 0, + peering: 0, + incomplete: 0, + repeering: 0, + stopping: 0, + offline: 0, + degraded: 0, + has_inconsistent: 0, + has_corrupted: 0, + has_incomplete: 0, + has_degraded: 0, + has_misplaced: 0, + has_unclean: 0, + has_invalid: 0, + left_on_dead: 0, + scrubbing: 0, + }; const pool_pg_states = st.pg.state[pool_id] || {}; for (let i = 1; i <= real_pg_count; i++) { diff --git a/mon/stats.js b/mon/stats.js index 5e777d85..eccc1921 100644 --- a/mon/stats.js +++ b/mon/stats.js @@ -74,7 +74,7 @@ function sum_op_stats(all_osd, prev_stats) ); prev_stats.osd_stats[osd] = cur; } - const sum_diff = { op_stats: {}, subop_stats: {}, recovery_stats: {} }; + const sum_diff = { op_stats: {}, subop_stats: {}, recovery_stats: { degraded: {}, misplaced: {} } }; // Sum derived values instead of deriving summed for (const osd in all_osd.state) {