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

Revert "[OTEL-1018] Improve host metadata resource attributes" #5249

Merged
merged 1 commit into from
Jan 17, 2024
Merged

Revert "[OTEL-1018] Improve host metadata resource attributes" #5249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 3 additions & 45 deletions ci/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@ config:
metrics:
system.cpu.utilization:
enabled: true
system.cpu.physical.count:
enabled: true
system.cpu.logical.count:
enabled: true
system.cpu.frequency:
enabled: true
disk:
load:
memory:
Expand Down Expand Up @@ -104,15 +98,6 @@ config:
- key: service
from_attribute: service_name
action: upsert
transform:
metric_statements: &statements
- context: resource
statements:
- set(attributes["datadog.host.use_as_metadata"],true)
- set(attributes["datadog.host.tag.foo"],"bar")
trace_statements: *statements
log_statements: *statements

attributes/kafkasrc:
include:
match_type: regexp
Expand All @@ -135,33 +120,6 @@ config:
detectors: [env, gcp, ecs, ec2, azure, system]
timeout: 5s
override: false
system:
# Enable optional system attributes
resource_attributes:
os.type:
enabled: true
os.description:
enabled: true
host.ip:
enabled: true
host.mac:
enabled: true
host.arch:
enabled: true
host.cpu.vendor.id:
enabled: true
host.cpu.model.name:
enabled: true
host.cpu.family:
enabled: true
host.cpu.model.id:
enabled: true
host.cpu.stepping:
enabled: true
host.cpu.cache.l2.size:
enabled: true
host.id:
enabled: false
# adds various tags related to k8s
# adds various tags related to k8s
k8sattributes:
Expand Down Expand Up @@ -227,12 +185,12 @@ config:
pipelines:
metrics:
receivers: [otlp, hostmetrics, prometheus]
processors: [resourcedetection, k8sattributes, transform, batch]
processors: [resourcedetection, k8sattributes, batch]
exporters: [datadog]
traces:
receivers: [otlp]
processors: [resourcedetection, k8sattributes, transform, batch]
processors: [resourcedetection, k8sattributes, batch]
exporters: [datadog]
logs:
processors: [memory_limiter, resourcedetection, k8sattributes, attributes, attributes/kafkasrc, transform, batch]
processors: [memory_limiter, resourcedetection, k8sattributes, attributes, attributes/kafkasrc, batch]
exporters: [datadog]
Loading