Parse raw_values more carefully

m-lab · Jun 5, 2018 · e38554b · e38554b
1 parent b974321
commit e38554b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/nagios_exporter.py b/nagios_exporter.py
@@ -243,8 +243,11 @@ def parse_perf_data_fields(raw_perf_data):
     """
     fields = {}
     for raw_value in raw_perf_data:
-        name, values = raw_value.split('=')
-        values = values.split(';')
+        values = raw_value.split('=')
+        if len(values) <= 1:
+            continue
+        name = values[0]
+        values = values[1].split(';')
         fields[name] = values
     return fields
 

diff --git a/nagios_exporter_test.py b/nagios_exporter_test.py
@@ -314,6 +314,13 @@ def test_get_perf_data(self):
 
         self.assertItemsEqual(actual, expected)
 
+    def test_parse_perf_data_fields_with_good_values(self):
+        self.assertItemsEqual(
+                {'/': ['2400MB', '48356', '54400', '0', '60445']},
+                nagios_exporter.parse_perf_data_fields(
+                    ['/=2400MB;48356;54400;0;60445']))
+    def test_parse_perf_data_fields_with_bad_values(self):
+        self.assertItemsEqual({}, nagios_exporter.parse_perf_data_fields(['-6]']))
 
 if __name__ == "__main__":  # pragma: no cover
     unittest.main()