-
Notifications
You must be signed in to change notification settings - Fork 198
[9.0] (backport #10145) test: remove otel skip statement #10350
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.
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
Conversation
* test: remove otel skip statement * chore: bump kube-stack Helm Chart to 0.9.4 * chore: bump kube-stack to 0.10.4 * chore: bump kube-stack to 0.10.5 --------- Co-authored-by: Ruben Ruiz de Gauna <[email protected]> (cherry picked from commit b74a86b)
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
|
@elastic/elastic-agent-control-plane Is there any planned release from this branch? The inital PR #10145 considered That is because the k8sattributes Otel component in the |
|
The --- i/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml
+++ w/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml
@@ -17,7 +17,7 @@ crds:
defaultCRConfig:
image:
repository: "docker.elastic.co/beats/elastic-agent"
targetAllocator:
enabled: false # Enable/disable the Operator's Target allocator.
# Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator
@@ -315,7 +315,7 @@ collectors:
from_attribute: host.id
action: insert
# [K8s Attributes Processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/k8s
attributesprocessor)
- k8sattributes:
+ k8sattributes/edot:
filter:
# Only retrieve pods running on the same node as the collector
node_from_env_var: OTEL_K8S_NODE_NAME
@@ -351,6 +351,7 @@ collectors:
- tag_name: app.label.version
key: app.kubernetes.io/version
from: pod
+ k8sattributes: null
receivers:
# [OTLP Receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver)
otlp:
@@ -490,7 +491,7 @@ collectors:
- filelog
processors:
- batch
- - k8sattributes
+ - k8sattributes/edot
- resourcedetection/system
- resourcedetection/eks
- resourcedetection/gcp
@@ -506,7 +507,7 @@ collectors:
- hostmetrics
processors:
- batch/metrics
- - k8sattributes
+ - k8sattributes/edot
- resourcedetection/system
- resourcedetection/eks
- resourcedetection/gcp |
|
As there is no plan to update the Otel collector components, the configuration was updated to avoid using the |
💚 Build Succeeded
History
cc @rogercoll |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed in our weekly, I think this is a good way to go here.
What does this PR do?
Fixes #10020
Upstream fix of Helm Chart uninstallation open-telemetry/opentelemetry-helm-charts#1877
Why is it important?
Any deployment of the kube-stack Helm Chart prior to v0.10.5 version cannot be uninstalled.
Checklist
./changelog/fragmentsusing the changelog toolDisruptive User Impact
How to test this PR locally
Related issues
Questions to ask yourself
This is an automatic backport of pull request #10145 done by [Mergify](https://mergify.com).