Skip to content

[otel] add receivers: apache, iis, mysql, postgresql, sqlserver v0.135.0#9344

Merged
ishleenk17 merged 16 commits into
elastic:mainfrom
mykola-elastic:add-receivers-v130
Sep 25, 2025
Merged

[otel] add receivers: apache, iis, mysql, postgresql, sqlserver v0.135.0#9344
ishleenk17 merged 16 commits into
elastic:mainfrom
mykola-elastic:add-receivers-v130

Conversation

@mykola-elastic
Copy link
Copy Markdown
Contributor

@mykola-elastic mykola-elastic commented Aug 13, 2025 •
edited
Loading

What does this PR do?

This PR is a redo of #9180 with merge conflicts solved (merge conflicts involved go.mod and go.sum, as the receivers in main branch got updated v0.135.0)

Receivers added:

  • mysqlreceiver
  • apachereceiver
  • iisreceiver
  • postgresqlreceiver
  • sqlserverreceiver

Why is it important?

Needed in order to add OTEL content packs to elastic/integrations which use the data from the receivers listed

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

@mykola-elastic mykola-elastic requested a review from a team as a code owner August 13, 2025 10:20
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Aug 13, 2025

This pull request does not have a backport label. Could you fix it @mykola-elastic? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label that automatically backports to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@mykola-elastic mykola-elastic mentioned this pull request Aug 13, 2025
Closed
8 tasks
@mykola-elastic
Copy link
Copy Markdown
Contributor Author

mykola-elastic commented Aug 13, 2025

Please add backport-9.1 label

@cmacknz cmacknz added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team backport-9.1 Automated backport to the 9.1 branch labels Aug 14, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Aug 14, 2025

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

kaanyalti
kaanyalti reviewed Aug 25, 2025
View reviewed changes
Comment thread changelog/fragments/1755080142-add-receivers-edot-collector.yaml Outdated
kaanyalti
kaanyalti reviewed Aug 25, 2025
View reviewed changes
Comment thread changelog/fragments/1755080142-add-receivers-edot-collector.yaml Outdated
kaanyalti
kaanyalti reviewed Aug 25, 2025
View reviewed changes
Comment thread changelog/fragments/1755080142-add-receivers-edot-collector.yaml Outdated
kaanyalti
kaanyalti previously approved these changes Aug 25, 2025
View reviewed changes
Copy link
Copy Markdown

@kaanyalti kaanyalti left a comment

Choose a reason for hiding this comment

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

Aside from the small suggestions for the changelog fragment, looks good to me

@mykola-elastic
Copy link
Copy Markdown
Contributor Author

mykola-elastic commented Aug 26, 2025

@kaanyalti thanks for the review. Addressed your comments, now the review was dismissed because of new commits. Can you please add your review again?

kaanyalti
kaanyalti previously approved these changes Aug 27, 2025
View reviewed changes
Copy link
Copy Markdown

@kaanyalti kaanyalti left a comment

Choose a reason for hiding this comment

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

Thank you for addressing the comments, the changes look good to me

@mykola-elastic
Copy link
Copy Markdown
Contributor Author

mykola-elastic commented Sep 18, 2025

@cmacknz thanks for the labels. It's been decided we don't to the backport. Can you please remove the backport-9.1 label? Or somebody else who subscribed to this PR and has permissions.

@mykola-elastic mykola-elastic changed the title [otel] add receivers: apache, iis, mysql, postgresql v0.130.0 [otel] add receivers: apache, iis, mysql, postgresql v0.132.0 Sep 18, 2025
@mykola-elastic
Copy link
Copy Markdown
Contributor Author

mykola-elastic commented Sep 18, 2025

After CI passes (after my merge conflicts resolution) - adding awss3receiver and sqlserverreceiver
CC @ishleenk17

ishleenk17
ishleenk17 reviewed Sep 19, 2025
View reviewed changes
Comment thread internal/pkg/otel/core-components.yaml
@mykola-elastic mykola-elastic changed the title [otel] add receivers: apache, iis, mysql, postgresql v0.135.0 [otel] add receivers: apache, iis, mysql, postgresql, awss3, sqlserver v0.135.0 Sep 22, 2025
ishleenk17
ishleenk17 previously approved these changes Sep 22, 2025
View reviewed changes
@kaanyalti
Copy link
Copy Markdown

kaanyalti commented Sep 22, 2025

Will replace 9.1 backport label with backport skip as @mykola-elastic requested in slack.

@kaanyalti kaanyalti added backport-skip and removed backport-9.1 Automated backport to the 9.1 branch labels Sep 22, 2025
@theletterf
Copy link
Copy Markdown
Member

theletterf commented Sep 22, 2025 •
edited
Loading

@elastic/ingest-otel-data Please note that PRs adding, editing, or removing EDOT Collector components might require editing the core-components.yml file, which is used to generate this table. A test, https://github.com/elastic/elastic-agent/blob/main/internal/pkg/otel/core_components_test.go, checks that the file is referring to the existing components. The YAML file is co-owned by the docs team.

cmacknz
cmacknz reviewed Sep 22, 2025
View reviewed changes
Comment thread internal/pkg/otel/core-components.yaml Outdated
@theletterf theletterf mentioned this pull request Sep 23, 2025
Merged
This was referenced Sep 23, 2025
Closed
Merged
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Sep 24, 2025

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 add-receivers-v130 upstream/add-receivers-v130
git merge upstream/main
git push upstream add-receivers-v130

@mykola-elastic mykola-elastic changed the title [otel] add receivers: apache, iis, mysql, postgresql, awss3, sqlserver v0.135.0 [otel] add receivers: apache, iis, mysql, postgresql, sqlserver v0.135.0 Sep 25, 2025
ishleenk17
ishleenk17 reviewed Sep 25, 2025
View reviewed changes
Comment thread internal/pkg/otel/testdata/all-components.yml
@ishleenk17 ishleenk17 requested a review from cmacknz September 25, 2025 06:31
@elastic-sonarqube
Copy link
Copy Markdown

elastic-sonarqube Bot commented Sep 25, 2025

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

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

See analysis details on SonarQube

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 25, 2025

💚 Build Succeeded

History

cc @mykola-elastic

@ishleenk17 ishleenk17 merged commit c8927a3 into elastic:main Sep 25, 2025
23 checks passed
v1v added a commit that referenced this pull request Sep 26, 2025
@v1v
Merge remote-tracking branch 'upstream' into test/gh-runners-macos
517a15e 
* upstream: (505 commits)
  Update journald tests now that Filebeat supports watching folders (#10131)
  [deploy/kubernetes]: add info about hostPID for Universal Profiling (#10173)
  Fall back to process runtime if otel runtime is unsupported (#10087)
  Conditionall check for ms_tls13kdf build tag (#10160)
  [docs][edot] add entry for profiles (#10163)
  edot/docs: add support for profiles (#10146)
  Add Logstash exporter (#10137)
  Add back publish to serverless. (#10159)
  Improve Integration test documentation (#10155)
  Fix multiarch service image push from main to serverless (#10129)
  Forward migrate action to endpoint (#9801)
  Comment out check for ms_tls13kdf tag for FIPS-capable binaries (#10148)
  [otel] add receivers: apache, iis, mysql, postgresql, sqlserver v0.135.0 (#9344)
  Add k8sevents receiver in kube-stack (#10086)
  feat: emit system resource metrics for EDOT subprocess (#10003)
  [AutoOps] Configure OTel Exporter to Send Maximum-sized Batches (#10126)
  keep enrollment token when replacing data with signed (#10115)
  Revert "Publish `elastic-agent-service` container directly to serverless from main (#9583)" (#10127)
  Add agent_policy_id and policy_revision_idx to checkin requests (#9931)
  remove resource/k8s processor and use k8sattributes processor for service attributes (#10108)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

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

@cmacknz cmacknz Awaiting requested review from cmacknz

3 more reviewers

@kaanyalti kaanyalti kaanyalti approved these changes

@ishleenk17 ishleenk17 ishleenk17 approved these changes

@colleenmcginnis colleenmcginnis colleenmcginnis left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@mykola-elastic mykola-elastic

Labels

backport-skip Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@mykola-elastic @elasticmachine @ishleenk17 @kaanyalti @theletterf @cmacknz @colleenmcginnis