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

[8.14](backport #4908) Added k8s components to otel distribution #4978

Merged
merged 6 commits into from
Jun 21, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 21, 2024

Included backport of #4968

Added Extensions

  • file_storage

Added Receivers

  • kubeletstats
  • k8sclusterreceiver
  • hostmetricsreceiver

Added Processors
- resourcedetectionprocessor

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

cc @ChrsMark @AlexanderWert


This is an automatic backport of pull request #4908 done by Mergify.

(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 requested a review from a team as a code owner June 21, 2024 07:50
@mergify mergify bot added the backport label Jun 21, 2024
@mergify mergify bot removed the request for review from a team June 21, 2024 07:50
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 21, 2024
@mergify mergify bot requested review from michalpristas and leehinman June 21, 2024 07:50
Copy link
Contributor Author

mergify bot commented Jun 21, 2024

Cherry-pick of 6b78791 has failed:

On branch mergify/bp/8.14/pr-4908
Your branch is up to date with 'origin/8.14'.

You are currently cherry-picking commit 6b7879127d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   internal/pkg/agent/cmd/cmd_test.go
	modified:   internal/pkg/agent/cmd/otel.go
	modified:   internal/pkg/agent/cmd/otel_flags.go
	modified:   internal/pkg/agent/cmd/otel_flags_test.go
	new file:   internal/pkg/agent/cmd/otel_windows.go
	new file:   internal/pkg/agent/cmd/otel_windows_test.go
	modified:   internal/pkg/agent/cmd/validate.go
	modified:   internal/pkg/agent/cmd/validate_test.go
	modified:   internal/pkg/otel/config_file_provider.go
	modified:   internal/pkg/otel/config_file_provider_test.go
	modified:   internal/pkg/otel/run.go
	modified:   internal/pkg/otel/validate.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/agent/cmd/common.go
	both modified:   internal/pkg/otel/README.md
	both modified:   internal/pkg/otel/components.go
	deleted by us:   internal/pkg/otel/run_test.go
	deleted by us:   internal/pkg/otel/testdata/all-components.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@michalpristas
Copy link
Contributor

depends on #4979

Copy link
Contributor Author

mergify bot commented Jun 21, 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 mergify/bp/8.14/pr-4908 upstream/mergify/bp/8.14/pr-4908
git merge upstream/8.14
git push upstream mergify/bp/8.14/pr-4908

@michalpristas michalpristas reopened this Jun 21, 2024
@michalpristas michalpristas merged commit b69d948 into 8.14 Jun 21, 2024
13 checks passed
@michalpristas michalpristas deleted the mergify/bp/8.14/pr-4908 branch June 21, 2024 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants