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.

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

Merge main into 8.16 branch #39

Merged
merged 4 commits into from
Oct 29, 2024
Merged

Merge main into 8.16 branch #39

merged 4 commits into from
Oct 29, 2024

Conversation

rogercoll
Copy link
Contributor

No description provided.

gizas and others added 4 commits October 24, 2024 17:07
Adding fix for host.name field update based on k8s.node.name
…gurability (#33)

* use release versions of the elastic-otel-node and elastic-otel-python Docker images

* chore: add components documentation

* chore: add service attributes annotations

* fix: reduce words in favor of hyprlink

* fix: api and endpoints annotations

* Update resources/kubernetes/operator/helm/values.yaml

Co-authored-by: Andrew Gizas <[email protected]>

* docs: add values and zero-code links

* chore: add pod resource

* move links to hyperlinks

* Update resources/kubernetes/operator/helm/values.yaml

Co-authored-by: Edu González de la Herrán <[email protected]>

* Update resources/kubernetes/operator/helm/values.yaml

Co-authored-by: Edu González de la Herrán <[email protected]>

---------

Co-authored-by: Andrew Gizas <[email protected]>
Co-authored-by: Edu González de la Herrán <[email protected]>

defaultCRConfig:
image:
repository: "docker.elastic.co/beats/elastic-agent"
tag: "8.16.0-SNAPSHOT"
targetAllocator:
enabled: false
enabled: false # Enable/disable the Operator's Target allocator.
# Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: dont like it so much that is in 2 lines
Maybe to move Refer line before targetAllocator and line 23?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me, but I think we will need to do this in another PR to keep the history aligned with main

@rogercoll rogercoll merged commit 61353d1 into 8.16 Oct 29, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants