ceph_latency_plugin: suport yet another rados bench format. This is a

fast hack, should be fixed to be not ugly later.
grinapo · Nov 25, 2016 · 5024baa · 5024baa · Kallio · Nov 28, 2016
1 parent f0527c3
commit 5024baa
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/plugins/ceph_latency_plugin.py b/plugins/ceph_latency_plugin.py
@@ -67,8 +67,13 @@ def get_stats(self):
         results = regex_match.findall(output)
 
         if len(results) == 0:
-            collectd.error('ceph-latency: failed to run rados bench :: output unrecognized %s' % output)
-            return
+            # this is a fast hack, should put regexps into an array and try 'em all
+            regex_match = re.compile('^([a-zA-Z]+) [lL]atency: +(\w+.?\w+)', re.MULTILINE)
+            results = regex_match.findall(output)
+            if len(results) == 0:
+                # hopeless
+                collectd.error('ceph-latency: failed to run rados bench :: output unrecognized %s' % output)
+                return
 
         data[ceph_cluster]['cluster'] = {}
         for key, value in results: