mgr/zabbix: Fix typo in key name for PGs in backfill_wait state

Fixes: http://tracker.ceph.com/issues/39666
Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 0ec7bc491d1d53fb14c741fe63971c6e7a82660a)

Conflicts:
    PendingReleaseNotes
- rearranged so it makes sense

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 131801d14de753699596c81382dce27ffa4e9f3e..81e23e2e7789f8bb416d963d3920cc9863d22c57 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -1,4 +1,13 @@
->=14.2.2
+14.2.4
+------
+
+* In the Zabbix Mgr Module there was a typo in the key being send
+  to Zabbix for PGs in backfill_wait state. The key that was sent
+  was 'wait_backfill' and the correct name is 'backfill_wait'.
+  Update your Zabbix template accordingly so that it accepts the
+  new key being send to Zabbix.
+
+14.2.3
 --------
 
 * Nautilus-based librbd clients can now open images on Jewel clusters.

diff --git a/src/pybind/mgr/zabbix/module.py b/src/pybind/mgr/zabbix/module.py
index 6b428dc0acca57016f2b06b51ac1aea22ab0b241..cc63d7c57b7aca7e289c2cfb82858b2d40ae11ea 100644 (file)
--- a/src/pybind/mgr/zabbix/module.py
+++ b/src/pybind/mgr/zabbix/module.py
@@ -137,7 +137,7 @@ class Module(MgrModule):
 
         pg_states = ['active', 'peering', 'clean', 'scrubbing', 'undersized',
                      'backfilling', 'recovering', 'degraded', 'inconsistent',
-                     'remapped', 'backfill_toofull', 'wait_backfill',
+                     'remapped', 'backfill_toofull', 'backfill_wait',
                      'recovery_wait']
 
         for state in pg_states:

diff --git a/src/pybind/mgr/zabbix/zabbix_template.xml b/src/pybind/mgr/zabbix/zabbix_template.xml
index 1ce76605ac07ffaf2fce7eeac9995c76664d5e81..d75d912e959ff9119d1f79a02d9edf6fd2c750fc 100644 (file)
--- a/src/pybind/mgr/zabbix/zabbix_template.xml
+++ b/src/pybind/mgr/zabbix/zabbix_template.xml
@@ -755,12 +755,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Number of Placement Groups in wait_backfill state</name>
+                    <name>Number of Placement Groups in backfill_wait state</name>
                     <type>2</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ceph.num_pg_wait_backfill</key>
+                    <key>ceph.num_pg_backfill_wait</key>
                     <delay>0</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -787,7 +787,7 @@
                     <publickey/>
                     <privatekey/>
                     <port/>
-                    <description>Total number of Placement Groups in wait_backfill state</description>
+                    <description>Total number of Placement Groups in backfill_wait state</description>
                     <inventory_link>0</inventory_link>
                     <applications>
                         <application>