Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 37 additions & 0 deletions changelog/fragments/1758622251-remove_resource_k8s_processor.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Kind can be one of:
# - breaking-change: a change to previously-documented behavior
# - deprecation: functionality that is being removed in a later release
# - bug-fix: fixes a problem in a previous version
# - enhancement: extends functionality but does not break or fix existing behavior
# - feature: new functionality
# - known-issue: problems that we are aware of in a given version
# - security: impacts on the security of a product or a user’s deployment.
# - upgrade: important information for someone upgrading from a prior version
# - other: does not fit into any of the other categories
kind: feature

# Change summary; a 80ish characters long description of the change.
summary: Remove resource/k8s processor and use k8sattributes processor for mOTEL service attributes

# Long description; in case the summary is not enough to describe the change
# this field accommodate a description without length limits.
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
description: |
This PR removes the `resource/k8s` processor in honour of the k8sattributes processor that
provides native support for the Service attributes:
https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.127.0/processor/k8sattributesprocessor#configuring-recommended-resource-attributes
This change is aligned with the respective Semantic Conventions' guidance:
https://opentelemetry.io/docs/specs/semconv/non-normative/k8s-attributes/#service-attributes

# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
component: elastic-agent

# PR URL; optional; the PR number that added the changeset.
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
# Please provide it if you are adding a fragment for a different PR.
#pr: https://github.com/owner/repo/1234

# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
# If not present is automatically filled by the tooling with the issue linked to the PR number.
#issue: https://github.com/owner/repo/1234
55 changes: 6 additions & 49 deletions deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,6 @@ collectors:
resource_attributes:
k8s.cluster.name:
enabled: true
# [Resource Processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourceprocessor)
resource/k8s: # Resource attributes tailored for services within Kubernetes.
attributes:
- key: service.name # Set the service.name resource attribute based on the well-known app.kubernetes.io/name label
from_attribute: app.label.name
action: insert
- key: service.name # Set the service.name resource attribute based on the k8s.container.name attribute
from_attribute: k8s.container.name
action: insert
- key: app.label.name # Delete app.label.name attribute previously used for service.name
action: delete
- key: service.version # Set the service.version resource attribute based on the well-known app.kubernetes.io/version label
from_attribute: app.label.version
action: insert
- key: app.label.version # Delete app.label.version attribute previously used for service.version
action: delete
resource/hostname:
attributes:
- key: host.name
Expand Down Expand Up @@ -121,13 +105,9 @@ collectors:
- "k8s.pod.ip"
- "k8s.pod.uid"
- "k8s.pod.start_time"
labels:
- tag_name: app.label.name
key: app.kubernetes.io/name
from: pod
- tag_name: app.label.version
key: app.kubernetes.io/version
from: pod
# Service attributes added based on https://opentelemetry.io/docs/specs/semconv/non-normative/k8s-attributes/#service-attributes
- "service.name"
- "service.version"
receivers:
# [K8s Objects Receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/k8sobjectsreceiver)
k8sobjects:
Expand Down Expand Up @@ -171,7 +151,6 @@ collectors:
- resourcedetection/eks
- resourcedetection/gcp
- resourcedetection/aks
- resource/k8s
- resource/hostname
receivers:
- k8s_cluster
Expand Down Expand Up @@ -293,22 +272,6 @@ collectors:
enabled: false
host.id:
enabled: true
# [Resource Processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourceprocessor)
resource/k8s: # Resource attributes tailored for services within Kubernetes.
attributes:
- key: service.name # Set the service.name resource attribute based on the well-known app.kubernetes.io/name label
from_attribute: app.label.name
action: insert
- key: service.name # Set the service.name resource attribute based on the k8s.container.name attribute
from_attribute: k8s.container.name
action: insert
- key: app.label.name # Delete app.label.name attribute previously used for service.name
action: delete
- key: service.version # Set the service.version resource attribute based on the well-known app.kubernetes.io/version label
from_attribute: app.label.version
action: insert
- key: app.label.version # Delete app.label.version attribute previously used for service.version
action: delete
resource/cloud:
attributes:
- key: cloud.instance.id
Expand Down Expand Up @@ -344,13 +307,9 @@ collectors:
- "k8s.pod.ip"
- "k8s.pod.uid"
- "k8s.pod.start_time"
labels:
- tag_name: app.label.name
key: app.kubernetes.io/name
from: pod
- tag_name: app.label.version
key: app.kubernetes.io/version
from: pod
# Service attributes added based on https://opentelemetry.io/docs/specs/semconv/non-normative/k8s-attributes/#service-attributes
- "service.name"
- "service.version"
receivers:
# [OTLP Receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver)
otlp:
Expand Down Expand Up @@ -496,7 +455,6 @@ collectors:
- resourcedetection/eks
- resourcedetection/gcp
- resourcedetection/aks
- resource/k8s
- resource/hostname
- resource/cloud
exporters:
Expand All @@ -512,7 +470,6 @@ collectors:
- resourcedetection/eks
- resourcedetection/gcp
- resourcedetection/aks
- resource/k8s
- resource/hostname
- resource/cloud
exporters:
Expand Down
Loading