[varnish] allow tags in varnish 3 xml style parsing

checks.d/varnish.py

@@ -35,13 +35,13 @@ def _reset(self):
     def _start_element(self, name, attrs):
         self._current_element = name
 
-    def _end_element(self, name):
+    def _end_element(self, name, tags):
         if name == "stat":
             m_name = self.normalize(self._current_metric)
             if self._current_type in ("a", "c"):
-                self.rate(m_name, long(self._current_value))
+                self.rate(m_name, long(self._current_value), tags=tags)
             elif self._current_type in ("i", "g"):
-                self.gauge(m_name, long(self._current_value))
+                self.gauge(m_name, long(self._current_value), tags=tags)
             else:
                 # Unsupported data type, ignore
                 self._reset()
@@ -182,7 +182,8 @@ def _parse_varnishstat(self, output, use_xml, tags=None):
         if use_xml:
             p = xml.parsers.expat.ParserCreate()
             p.StartElementHandler = self._start_element
-            p.EndElementHandler = self._end_element
+            end_handler = lambda name: self._end_element(name, tags)
+            p.EndElementHandler = end_handler
             p.CharacterDataHandler = self._char_data
             self._reset()
             p.Parse(output, True)

tests/checks/integration/test_varnish.py

@@ -103,7 +103,7 @@ def test_check(self):
         config = {
             'instances': [{
                 'varnishstat': varnishstat_path,
-                'tags': 'cluster:webs'
+                'tags': ['cluster:webs']
             }]
         }
 
@@ -117,6 +117,6 @@ def test_check(self):
             to_check.extend(METRICS_4_X)
 
         for mname in to_check:
-            self.assertMetric(mname, count=1)
+            self.assertMetric(mname, count=1, tags=['cluster:webs', 'varnish_name:default'])
 
         self.coverage_report()