Skip to content

[nr-k8s-otel-collector] drop cadvisor metrics from intermediate levels of cgroup hierarchy #2130

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

Open
jamescripter wants to merge 4 commits into
base: master
Choose a base branch
from
+60 −29
Open

[nr-k8s-otel-collector] drop cadvisor metrics from intermediate levels of cgroup hierarchy #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53dbf28
drop cadvisor metrics from intermediate levels of cgroup hierarchy
jamescripter Feb 18, 2026
a4972a5
make generate-examples
jamescripter Feb 18, 2026
b79a3b4
bump chart version
jamescripter Feb 18, 2026
b77af9d
change container runtime to containerd for e2e tests
jamescripter Feb 18, 2026
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
1 change: 1 addition & 0 deletions .github/workflows/nr-k8s-otel-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
kubernetes version: ${{ env.LATEST_K8S_VERSION }}
# default driver doesn't support 'eval $$(minikube docker-env)'.
driver: docker
container runtime: containerd
github token: ${{ secrets.GITHUB_TOKEN }}
- name: Run e2e-test
uses: newrelic/newrelic-integration-e2e-action@v1
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.10.7
version: 0.10.8


dependencies:
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s-with-atp/rendered/clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
rules:
- apiGroups:
- ""
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s-with-atp/rendered/clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
subjects:
- kind: ServiceAccount
name: nr-k8s-otel-collector
Expand Down
14 changes: 12 additions & 2 deletions charts/nr-k8s-otel-collector/examples/k8s-with-atp/rendered/daemonset-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
data:
daemonset-config.yaml: |
receivers:
Expand Down Expand Up @@ -119,6 +119,16 @@ data:
- source_labels: [__meta_kubernetes_node_name]
regex: ${KUBE_NODE_NAME}
action: keep
metric_relabel_configs:
- source_labels: [container]
regex: '^$'
action: drop
- source_labels: [image]
regex: '^$'
action: drop
- source_labels: [name]
regex: '^$'
action: drop
scheme: https
tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
Expand Down Expand Up @@ -637,7 +647,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.10.7
value: 0.10.8
- key: newrelic.entity.type
action: upsert
value: "k8s"
Expand Down
4 changes: 2 additions & 2 deletions charts/nr-k8s-otel-collector/examples/k8s-with-atp/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
spec:
selector:
matchLabels:
Expand All @@ -24,7 +24,7 @@ spec:
app.kubernetes.io/name: nr-k8s-otel-collector
component: daemonset
annotations:
checksum/config: 1f1cff8b904a341d199e201ae3307759fc4369cffb15eeffb0e66e94484777d3
checksum/config: ad49f389fe742fa5084b5408b8f1eb923ff7beffefc1976bbcd7041751800337
spec:
serviceAccountName: nr-k8s-otel-collector
initContainers:
Expand Down
6 changes: 3 additions & 3 deletions charts/nr-k8s-otel-collector/examples/k8s-with-atp/rendered/deployment-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
data:
deployment-config.yaml: |
receivers:
Expand Down Expand Up @@ -516,7 +516,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.10.7
value: 0.10.8
- key: newrelic.entity.type
action: upsert
value: "k8s"
Expand All @@ -534,7 +534,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.10.7
value: 0.10.8

transform/events:
log_statements:
Expand Down
4 changes: 2 additions & 2 deletions charts/nr-k8s-otel-collector/examples/k8s-with-atp/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
spec:
replicas: 1
minReadySeconds: 5
Expand All @@ -26,7 +26,7 @@ spec:
app.kubernetes.io/name: nr-k8s-otel-collector
component: deployment
annotations:
checksum/config: 200e23524936cc269780cd8f198326d9e4b704203ea122499d1bebfe352aff11
checksum/config: 6e6773f34f586e9590e71ae04f2fa824938c44ede53b91ec13c909b399ca68e0
spec:
serviceAccountName: nr-k8s-otel-collector
containers:
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s-with-atp/rendered/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
data:
licenseKey: PE5SX2xpY2Vuc2VLZXk+
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s-with-atp/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
spec:
type: ClusterIP
ports:
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s-with-atp/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
annotations:
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
rules:
- apiGroups:
- ""
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
subjects:
- kind: ServiceAccount
name: nr-k8s-otel-collector
Expand Down
14 changes: 12 additions & 2 deletions charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
data:
daemonset-config.yaml: |
receivers:
Expand Down Expand Up @@ -101,6 +101,16 @@ data:
- source_labels: [__meta_kubernetes_node_name]
regex: ${KUBE_NODE_NAME}
action: keep
metric_relabel_configs:
- source_labels: [container]
regex: '^$'
action: drop
- source_labels: [image]
regex: '^$'
action: drop
- source_labels: [name]
regex: '^$'
action: drop
scheme: https
tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
Expand Down Expand Up @@ -603,7 +613,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.10.7
value: 0.10.8
- key: newrelic.entity.type
action: upsert
value: "k8s"
Expand Down
4 changes: 2 additions & 2 deletions charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
spec:
selector:
matchLabels:
Expand All @@ -24,7 +24,7 @@ spec:
app.kubernetes.io/name: nr-k8s-otel-collector
component: daemonset
annotations:
checksum/config: a09bfec6fd08e598dd58cfea7107d6e939fbe95726d43a32a08d7d76c6645edd
checksum/config: 092e19700f6a966e9e4088225aa6f3ecf8faeadc9154a8f88fb7de9b058fee6f
spec:
serviceAccountName: nr-k8s-otel-collector
initContainers:
Expand Down
6 changes: 3 additions & 3 deletions charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
data:
deployment-config.yaml: |
receivers:
Expand Down Expand Up @@ -516,7 +516,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.10.7
value: 0.10.8
- key: newrelic.entity.type
action: upsert
value: "k8s"
Expand All @@ -534,7 +534,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.10.7
value: 0.10.8

transform/events:
log_statements:
Expand Down
4 changes: 2 additions & 2 deletions charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
spec:
replicas: 1
minReadySeconds: 5
Expand All @@ -26,7 +26,7 @@ spec:
app.kubernetes.io/name: nr-k8s-otel-collector
component: deployment
annotations:
checksum/config: 200e23524936cc269780cd8f198326d9e4b704203ea122499d1bebfe352aff11
checksum/config: 6e6773f34f586e9590e71ae04f2fa824938c44ede53b91ec13c909b399ca68e0
spec:
serviceAccountName: nr-k8s-otel-collector
containers:
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s/rendered/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
data:
licenseKey: PE5SX2xpY2Vuc2VLZXk+
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
spec:
type: ClusterIP
ports:
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.7
helm.sh/chart: nr-k8s-otel-collector-0.10.8
annotations:
10 changes: 10 additions & 0 deletions charts/nr-k8s-otel-collector/templates/daemonset-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,16 @@ data:
- source_labels: [__meta_kubernetes_node_name]
regex: ${KUBE_NODE_NAME}
action: keep
metric_relabel_configs:
- source_labels: [container]
regex: '^$'
action: drop
- source_labels: [image]
regex: '^$'
action: drop
- source_labels: [name]
regex: '^$'
action: drop
scheme: https
tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
Expand Down
Loading