import ceph 14.2.5

[ceph.git] / ceph / src / pybind / mgr / zabbix / module.py

diff --git a/ceph/src/pybind/mgr/zabbix/module.py b/ceph/src/pybind/mgr/zabbix/module.py
index 6b428dc0acca57016f2b06b51ac1aea22ab0b241..485e239b0011e4f73901904d9017e5b398af0640 100644 (file)
--- a/ceph/src/pybind/mgr/zabbix/module.py
+++ b/ceph/src/pybind/mgr/zabbix/module.py
@@ -37,7 +37,7 @@ class ZabbixSender(object):
         proc = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
 
         for key, value in data.items():
-            proc.stdin.write('{0} ceph.{1} {2}\n'.format(hostname, key, value))
+            proc.stdin.write('{0} ceph.{1} {2}\n'.format(hostname, key, value).encode('utf-8'))
 
         stdout, stderr = proc.communicate()
         if proc.returncode != 0:
@@ -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: