Fix Windows hosts perfdata parse

graphios.py

@@ -43,6 +43,7 @@
 import os
 import os.path
 import re
+import shlex
 import sys
 import time
 
@@ -360,21 +361,36 @@ def process_log(file_name):
         variables = line.split('\t')
         mobj = get_mobj(variables)
         if mobj:
-            # break out the metric object into one object per perfdata metric
-            # log.debug('perfdata:%s' % mobj.PERFDATA)
-            for metric in mobj.PERFDATA.split():
-                try:
-                    nobj = copy.copy(mobj)
-                    (nobj.LABEL, d) = metric.split('=')
-                    v = d.split(';')[0]
-                    u = v
-                    nobj.VALUE = re.sub("[a-zA-Z%]", "", v)
-                    nobj.UOM = re.sub("[^a-zA-Z]+", "", u)
-                    processed_objects.append(nobj)
-                except:
-                    log.critical("failed to parse label: '%s' part of perf"
-                                 "string '%s'" % (metric, nobj.PERFDATA))
-                    continue
+            #log.debug('perfdata:%s' % mobj.PERFDATA)
+            try:
+                metric_array = shlex.split(mobj.PERFDATA)
+                if not '=' in metric_array[0]:
+                    if not '=' in metric_array[0]:
+                    perf = ''
+                    aux_metric_array = []
+                    for value in metric_array:
+                        perf += value
+                        if '=' in value:
+                            aux_metric_array.append(perf)
+                            perf = ''
+                    metric_array = aux_metric_array
+            except:
+                log.critical("failed to parse perfdata: %s" % (mobj.PERFDATA))
+                continue
+            for metric in metric_array:
+                if '=' in metric:
+                    try:
+                        nobj = copy.copy(mobj)
+                        (nobj.LABEL, d) = metric.split('=')
+                        v = d.split(';')[0]
+                        u = v
+                        nobj.VALUE = re.sub("[a-zA-Z%]", "", v)
+                        nobj.UOM = re.sub("[^a-zA-Z]+", "", u)
+                        processed_objects.append(nobj)
+                    except:
+                        log.critical("failed to parse label: '%s' part of perf"
+                                     "string '%s'" % (metric, nobj.PERFDATA))
+                        continue
     return processed_objects
 
 

init/rhel/graphios

@@ -33,7 +33,7 @@ start () {
 
 stop () {
         echo -n "Stopping $prog"
-        killproc graphios.py
+        killproc graphios
         RETVAL=$?
         [ $RETVAL -eq 0 ] && success || failure
         echo

setup.py

@@ -155,7 +155,7 @@ def run(self):
 # print data_files
 setup(
     name='graphios',
-    version='2.0.0b3',
+    version='2.0.0',
     description='Emit Nagios metrics to Graphite, Statsd, and Librato',
     author='Shawn Sterling',
     author_email='[email protected]',