Fix kubernetes_state avoid tags collision

DataDog · Jul 18, 2019 · 3dca574 · 3dca574
1 parent caa8e83
commit 3dca574
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/kubernetes_state/datadog_checks/kubernetes_state/kubernetes_state.py b/kubernetes_state/datadog_checks/kubernetes_state/kubernetes_state.py
@@ -107,7 +107,7 @@ def _filter_metric(self, metric, scraper_config):
             for sample in metric.samples:
                 if "namespace" in sample[self.SAMPLE_LABELS]:
                     ns = sample[self.SAMPLE_LABELS]["namespace"]
-                    tags.append("kube_namespace:" + ns)
+                    tags.append("namespace:" + ns)
                     break
             self._send_telemetry_counter(
                 'collector.metrics.count', len(metric.samples), scraper_config, extra_tags=tags

diff --git a/kubernetes_state/tests/test_kubernetes_state.py b/kubernetes_state/tests/test_kubernetes_state.py
@@ -401,11 +401,9 @@ def test_telemetry(aggregator, instance):
     aggregator.assert_metric(NAMESPACE + '.telemetry.metrics.ignored.count', tags=['optional:tag1'], value=76.0)
     aggregator.assert_metric(
         NAMESPACE + '.telemetry.collector.metrics.count',
-        tags=['name:pod', 'kube_namespace:default', 'optional:tag1'],
+        tags=['name:pod', 'namespace:default', 'optional:tag1'],
         value=600.0,
     )
     aggregator.assert_metric(
-        NAMESPACE + '.telemetry.collector.metrics.count',
-        tags=['name:hpa', 'kube_namespace:ns1', 'optional:tag1'],
-        value=8.0,
+        NAMESPACE + '.telemetry.collector.metrics.count', tags=['name:hpa', 'namespace:ns1', 'optional:tag1'], value=8.0
     )