Skip to content

Commit

Permalink
[kubernetes_state] rm six.iterkeys (#5904)
Browse files Browse the repository at this point in the history
* rm iterkeys

* fix telemetry test
  • Loading branch information
celenechang authored Feb 27, 2020
1 parent 1ea360d commit 8071050
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions kubernetes_state/tests/test_kubernetes_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down

0 comments on commit 8071050

Please sign in to comment.