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

Jump to bottom

Added k8s components to otel distribution #4908

Merged
merged 33 commits into from
Jun 20, 2024
Merged

Added k8s components to otel distribution #4908

merged 33 commits into from
Jun 20, 2024

Conversation

michalpristas
Copy link
Contributor

@michalpristas michalpristas commented Jun 11, 2024 •
edited
Loading

Added Extensions

  • file_storage

Added Receivers

  • kubeletstats
  • k8sclusterreceiver
  • hostmetricsreceiver

Added Processors
- resourcedetectionprocessor

Fixes: #4723
Fixes: #4902
Fixes: #4724

cc @ChrsMark @AlexanderWert

@michalpristas michalpristas self-assigned this Jun 11, 2024
@michalpristas michalpristas requested a review from a team as a code owner June 11, 2024 15:02
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@ycombinator ycombinator linked an issue Jun 11, 2024 that may be closed by this pull request
Make kubeletstatsreceiver available in otel mode #4902
Closed
1 task
@ycombinator
Copy link
Contributor

Could we add this receiver to the test configuration file too, as mentioned in the Definition of Done in #4902?

@ycombinator ycombinator added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Jun 11, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@ycombinator ycombinator requested review from ChrsMark and removed request for blakerouse June 11, 2024 22:14
blakerouse
blakerouse reviewed Jun 12, 2024
View reviewed changes
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Can tests be added to cover that they exists? That way we can ensure a tests catches if they are accidentally removed?

@AlexanderWert
Copy link
Member

AlexanderWert commented Jun 12, 2024 •
edited
Loading

@michalpristas @ycombinator @andrzej-stencel
Just discussed with @gizas, for the Kubernetes story we will also need:

Let's make sure to include those as well (either in this PR or a follow up)

@ChrsMark
Copy link
Member

k8sattributesprocessor is already in: #4893. So only k8sclusterreceiver is missing.

@michalpristas
Copy link
Contributor Author

added k8sclusterreceiver
let's see if i can fit tests in this sprint

ChrsMark
ChrsMark approved these changes Jun 13, 2024
View reviewed changes
Copy link
Member

@ChrsMark ChrsMark left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM. I'm fine with adding the tests in follow-up PR(s).

@ChrsMark
Copy link
Member

@ishleenk17 @AlexanderWert will we need the resourcedetection processor as well?

@ishleenk17
Copy link

@ishleenk17 @AlexanderWert will we need the resourcedetection processor as well?

Yes, this is needed for getting all the metadata.

@michalpristas
Copy link
Contributor Author

michalpristas commented Jun 13, 2024 •
edited
Loading

i added CC0-1.0 license to allow list due to indirect dependency. this should be fine
just FYI @cmacknz
already added in different PR

@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 19, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b otel/added-k8s-comps upstream/otel/added-k8s-comps
git merge upstream/main
git push upstream otel/added-k8s-comps

@elastic-sonarqube Elastic SonarQube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
48.1% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

@michalpristas michalpristas merged commit 6b78791 into elastic:main Jun 20, 2024
13 checks passed
@michalpristas michalpristas added backport-v8.14.0 Automated backport with mergify and removed backport-skip labels Jun 21, 2024
mergify bot pushed a commit that referenced this pull request Jun 21, 2024
@michalpristas @mergify
Added k8s components to otel distribution (#4908)
5d4d625 
(cherry picked from commit 6b78791)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/agent/cmd/common.go
#	internal/pkg/otel/README.md
#	internal/pkg/otel/components.go
#	internal/pkg/otel/run_test.go
#	internal/pkg/otel/testdata/all-components.yml
@mergify mergify bot mentioned this pull request Jun 21, 2024
Merged
@ycombinator ycombinator mentioned this pull request Jun 21, 2024
Closed
michalpristas added a commit that referenced this pull request Jun 21, 2024
@mergify @michalpristas @andrzej-stencel
[8.14](backport #4908) Added k8s components to otel distribution (#4978)
b69d948 
* Added k8s components to otel distribution (#4908)

(cherry picked from commit 6b78791)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/agent/cmd/common.go
#	internal/pkg/otel/README.md
#	internal/pkg/otel/components.go
#	internal/pkg/otel/run_test.go
#	internal/pkg/otel/testdata/all-components.yml

* conflicts

* resolved conflict with 8.14 branch

* remove 8.15 commands

* missing file

---------

Co-authored-by: Michal Pristas <[email protected]>
Co-authored-by: Andrzej Stencel <[email protected]>
@andrzej-stencel andrzej-stencel mentioned this pull request Jun 24, 2024
Closed
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blakerouse blakerouse blakerouse left review comments

@jlind23 jlind23 jlind23 approved these changes

@ChrsMark ChrsMark ChrsMark approved these changes

@andrzej-stencel andrzej-stencel Awaiting requested review from andrzej-stencel andrzej-stencel is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@michalpristas michalpristas

Labels
backport-v8.14.0 Automated backport with mergify skip-changelog Team:Elastic-Agent Label for the Agent team Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Milestone
No milestone
8 participants
@michalpristas @elasticmachine @ycombinator @AlexanderWert @ChrsMark @ishleenk17 @blakerouse @jlind23