From 0ec7bc491d1d53fb14c741fe63971c6e7a82660a Mon Sep 17 00:00:00 2001
From: Wido den Hollander <wido@42on.com>
Date: Fri, 10 May 2019 10:50:40 +0200
Subject: [PATCH] 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>
---
 PendingReleaseNotes                       | 6 ++++++
 src/pybind/mgr/zabbix/module.py           | 2 +-
 src/pybind/mgr/zabbix/zabbix_template.xml | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 9ff276873263..6941d48843b4 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -59,3 +59,9 @@
   bucket reshard in earlier versions of RGW. One subcommand lists such
   objects and the other deletes them. Read the troubleshooting section
   of the dynamic resharding docs for details.
+
+* 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.
diff --git a/src/pybind/mgr/zabbix/module.py b/src/pybind/mgr/zabbix/module.py
index 8f30233d7d6b..531018188726 100644
--- a/src/pybind/mgr/zabbix/module.py
+++ b/src/pybind/mgr/zabbix/module.py
@@ -153,7 +153,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 40627eb86b0a..e2a8344ec81f 100644
--- 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>
-- 
2.47.3