Skip to content

[8.18](backport #6627) Add redis and nginx otel receivers#6692

Merged
ChrsMark merged 2 commits into8.18from
mergify/bp/8.18/pr-6627
Feb 3, 2025
Merged

[8.18](backport #6627) Add redis and nginx otel receivers#6692
ChrsMark merged 2 commits into8.18from
mergify/bp/8.18/pr-6627

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 3, 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 February 3, 2025 08:07
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 3, 2025
@mergify mergify bot requested review from blakerouse and kaanyalti and removed request for a team February 3, 2025 08:07
@mergify
Copy link
Contributor Author

mergify bot commented Feb 3, 2025

Cherry-pick of 300d88e has failed:

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

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 Feb 3, 2025
@elasticmachine
Copy link
Contributor

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

@mergify
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 enabled auto-merge (squash) February 3, 2025 08:28
@ChrsMark ChrsMark merged commit bd6b53d into 8.18 Feb 3, 2025
13 checks passed
@ChrsMark ChrsMark deleted the mergify/bp/8.18/pr-6627 branch February 3, 2025 10:52
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

2 participants