Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kubelet] Check for metrics exclusion based on pod annotations #17251

Closed
wants to merge 5 commits into from
Closed

[kubelet] Check for metrics exclusion based on pod annotations #17251

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb23f2e
Pass pod annotations to is excluded in kubelet check
jennchenn Mar 21, 2024
750fe35
Move annotation fetching to util and add tests
jennchenn Mar 21, 2024
4cb4f7d
Add annotation to c_is_excluded call in ecs check
jennchenn Mar 21, 2024
7d88cb0
Format code
jennchenn Mar 21, 2024
705a7b0
Add changelog entry
jennchenn Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Format code
  • Loading branch information
@jennchenn
jennchenn committed Mar 21, 2024
commit 7d88cb0cee93c124129a9c812a6f407748f958c3
1 change: 0 additions & 1 deletion kubelet/datadog_checks/kubelet/kubelet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Licensed under Simplified BSD License (see LICENSE)
from __future__ import division

import json
import re
import sys
from collections import defaultdict
Expand Down
2 changes: 0 additions & 2 deletions kubelet/tests/fixtures/pods_exclude_annotation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,9 +460,7 @@
"generateName": "fluentd-gcp-v2.0.10-",
"creationTimestamp": "2018-02-13T14:57:17Z",
"annotations": {
"scheduler.alpha.kubernetes.io/critical-pod": "",
"kubernetes.io/config.source": "api",
"kubernetes.io/config.seen": "2018-02-13T16:10:19.509264637Z",
"ad.datadoghq.com/fluentd-gcp.exclude_metrics": "true"
},
"selfLink": "/api/v1/namespaces/kube-system/pods/fluentd-gcp-v2.0.10-9q9t4",
Expand Down
27 changes: 23 additions & 4 deletions kubelet/tests/test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ def test_is_namespace_excluded(monkeypatch):
c_is_excluded.assert_called_once()
c_is_excluded.assert_called_with('', '', '', 'a_non_excluded_namespace')


def test_is_annotation_excluded(monkeypatch):
c_is_excluded = mock.Mock(return_value=False)
monkeypatch.setattr('datadog_checks.kubelet.common.c_is_excluded', c_is_excluded)
Expand All @@ -166,16 +167,34 @@ def test_is_annotation_excluded(monkeypatch):
# Test excluded container
c_is_excluded.reset_mock()
c_is_excluded.return_value = True
assert pod_list_utils.is_excluded("docker://6941ed2471c0e458b6b95db40ba05d1a5ee168256638a0264f08703e48d76561", "2edfd4d9-10ce-11e8-bd5a-42010af00137") is True
assert (
pod_list_utils.is_excluded(
"docker://6941ed2471c0e458b6b95db40ba05d1a5ee168256638a0264f08703e48d76561",
"2edfd4d9-10ce-11e8-bd5a-42010af00137",
)
is True
)
c_is_excluded.assert_called_once()
c_is_excluded.assert_called_with('{"scheduler.alpha.kubernetes.io/critical-pod": "", "kubernetes.io/config.source": "api", "kubernetes.io/config.seen": "2018-02-13T16:10:19.509264637Z", "ad.datadoghq.com/fluentd-gcp.exclude_metrics": "true"}', "fluentd-gcp", "asia.gcr.io/google-containers/fluentd-gcp:2.0.10", "kube-system")
c_is_excluded.assert_called_with(
'{"kubernetes.io/config.source": "api", "ad.datadoghq.com/fluentd-gcp.exclude_metrics": "true"}',
"fluentd-gcp",
"asia.gcr.io/google-containers/fluentd-gcp:2.0.10",
"kube-system",
)

# Test non-excluded container
c_is_excluded.reset_mock()
c_is_excluded.return_value = False
assert pod_list_utils.is_excluded("docker://f69aa93ce78ee11e78e7c75dc71f535567961740a308422dafebdb4030b04903", "dbf813d6-e9e1-11e8-b4ce-42010a840233") is False
assert (
pod_list_utils.is_excluded(
"docker://f69aa93ce78ee11e78e7c75dc71f535567961740a308422dafebdb4030b04903",
"dbf813d6-e9e1-11e8-b4ce-42010a840233",
)
is False
)
c_is_excluded.assert_called_once()
c_is_excluded.assert_called_with("", "pi", "perl:latest", "default")
c_is_excluded.assert_called_with("{}", "pi", "perl:latest", "default")


def test_pod_by_uid():
podlist = json.loads(mock_from_file('pods.json'))
Expand Down
Loading