From cc3e220ac2beb8f0b13266adfb9ee7d5a4025e94 Mon Sep 17 00:00:00 2001 From: Celene Date: Thu, 27 Feb 2020 11:44:24 -0500 Subject: [PATCH] [kubernetes_state] rm six.iterkeys (#5904) * rm iterkeys * fix telemetry test --- .../datadog_checks/kubernetes_state/kubernetes_state.py | 4 ++-- kubernetes_state/tests/test_kubernetes_state.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kubernetes_state/datadog_checks/kubernetes_state/kubernetes_state.py b/kubernetes_state/datadog_checks/kubernetes_state/kubernetes_state.py index 10e48be549010..39982a152c06b 100644 --- a/kubernetes_state/datadog_checks/kubernetes_state/kubernetes_state.py +++ b/kubernetes_state/datadog_checks/kubernetes_state/kubernetes_state.py @@ -7,7 +7,7 @@ from collections import Counter, defaultdict from copy import deepcopy -from six import iteritems, iterkeys +from six import iteritems from datadog_checks.checks.openmetrics import OpenMetricsBaseCheck from datadog_checks.config import is_affirmative @@ -356,7 +356,7 @@ def _create_kubernetes_state_prometheus_instance(self, instance): if experimental_metrics: ksm_instance['metrics'].append(experimental_metrics_mapping) else: - ksm_instance['ignore_metrics'].append(iterkeys(experimental_metrics_mapping)) + ksm_instance['ignore_metrics'].extend(experimental_metrics_mapping.keys()) ksm_instance['prometheus_url'] = endpoint ksm_instance['label_joins'].update(extra_labels) diff --git a/kubernetes_state/tests/test_kubernetes_state.py b/kubernetes_state/tests/test_kubernetes_state.py index c838fe7aabbde..b12374e6d2f1b 100644 --- a/kubernetes_state/tests/test_kubernetes_state.py +++ b/kubernetes_state/tests/test_kubernetes_state.py @@ -588,6 +588,7 @@ def test_experimental_labels(aggregator, instance): def test_telemetry(aggregator, instance): instance['telemetry'] = True + instance['experimental_metrics'] = True check = KubernetesState(CHECK_NAME, {}, {}, [instance]) check.poll = mock.MagicMock(return_value=MockResponse(mock_from_file("prometheus.txt"), 'text/plain'))