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.x](backport #6627) Add redis and nginx otel receivers #6642

Merged
merged 7 commits into from
Feb 3, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 30, 2025

What does this PR do?

This PR adds the redis and nginx opentelemetry receiver components to EDOT.

Why is it important?

These 2 receivers will provide support for metrics collection from NGINX and Redis workloads.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

This is an automatic backport of pull request #6627 done by [Mergify](https://mergify.com).

* Add redis and nginx otel receivers

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* Apply suggestions from code review

Co-authored-by: Andrzej Stencel <andrzej.stencel@elastic.co>

---------

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>
Co-authored-by: Andrzej Stencel <andrzej.stencel@elastic.co>
(cherry picked from commit 300d88e)

# Conflicts:
#	internal/pkg/otel/README.md
@mergify mergify bot requested a review from a team as a code owner January 30, 2025 11:01
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 30, 2025
@mergify mergify bot requested review from andrzej-stencel and michel-laterman and removed request for a team January 30, 2025 11:01
Copy link
Contributor Author

mergify bot commented Jan 30, 2025

Cherry-pick of 300d88e has failed:

On branch mergify/bp/8.x/pr-6627
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 300d88e3e.
  (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:   NOTICE.txt
	new file:   changelog/fragments/1738160406-add_redis_nginx_otel_comps.yaml
	modified:   go.mod
	modified:   go.sum
	modified:   internal/pkg/otel/components.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/otel/README.md

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

@github-actions github-actions bot added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Jan 30, 2025
@elasticmachine
Copy link
Contributor

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

@ChrsMark ChrsMark enabled auto-merge (squash) January 31, 2025 12:42
Copy link
Contributor Author

mergify bot commented Feb 3, 2025

This pull request has not been merged yet. Could you please review and merge it @ChrsMark? 🙏

@ChrsMark ChrsMark disabled auto-merge February 3, 2025 07:51
@jlind23 jlind23 merged commit 8bc7c7b into 8.x Feb 3, 2025
11 of 13 checks passed
@jlind23 jlind23 deleted the mergify/bp/8.x/pr-6627 branch February 3, 2025 08:04
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 Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants