Skip to content

[8.19](backport #46054) [Chore] Accomodate breaking from elastic-agent-libs and elastic-agent-system-metrics #46306

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
Merged
merged 6 commits into from
Sep 4, 2025
Merged

[8.19](backport #46054) [Chore] Accomodate breaking from elastic-agent-libs and elastic-agent-system-metrics #46306

merged 6 commits into from
Sep 4, 2025

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 29, 2025

This PR accommodates breaking changes made in this PR elastic/elastic-agent-libs#341 . It effectively uses local logger in place of global ones

And also accommodates breaking changes from elastic-agent-system-metrics

Proposed commit message

Checklist

  • 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.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

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

@khushijain21 @mergify
[Chore] Accomodate breaking from elastic-agent-libs and `elastic-ag…
773505e 
…ent-system-metrics` (#46054)

(cherry picked from commit a601b44)

# Conflicts:
#	NOTICE.txt
#	filebeat/input/filestream/input_delete_integration_test.go
#	filebeat/input/filestream/internal/input-logfile/metrics.go
#	filebeat/input/netmetrics/tcp.go
#	filebeat/input/netmetrics/udp.go
#	go.mod
#	go.sum
#	libbeat/outputs/metrics.go
#	winlogbeat/eventlog/metrics.go
#	x-pack/filebeat/input/awss3/input_benchmark_test.go
#	x-pack/libbeat/cmd/instance/receiver.go
@mergify mergify bot requested review from a team as code owners August 29, 2025 06:39
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 29, 2025
@mergify mergify bot requested review from khushijain21 and mauri870 and removed request for a team August 29, 2025 06:39
@mergify
Copy link
Contributor Author

mergify bot commented Aug 29, 2025

Cherry-pick of a601b44 has failed:

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

You are currently cherry-picking commit a601b44f7.
  (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:   filebeat/input/filestream/internal/input-logfile/input.go
	modified:   filebeat/input/kafka/config.go
	modified:   filebeat/input/unix/input.go
	modified:   libbeat/monitoring/inputmon/input_test.go
	modified:   libbeat/outputs/elasticsearch/client_integration_test.go
	modified:   libbeat/outputs/elasticsearch/client_test.go
	modified:   libbeat/outputs/kafka/config.go
	modified:   libbeat/processors/dns/dns.go
	modified:   libbeat/processors/dns/resolver.go
	modified:   libbeat/processors/dns/resolver_test.go
	modified:   libbeat/processors/script/javascript/javascript.go
	modified:   libbeat/publisher/pipeline/client_test.go
	modified:   libbeat/publisher/pipeline/controller.go
	modified:   libbeat/publisher/pipeline/controller_test.go
	modified:   libbeat/publisher/pipeline/module.go
	modified:   metricbeat/module/linux/iostat/iostat.go
	modified:   metricbeat/module/system/diskio/diskio.go
	modified:   metricbeat/module/system/load/load.go
	modified:   metricbeat/module/system/process/process.go
	modified:   metricbeat/module/windows/wmi/utils.go
	modified:   packetbeat/protos/protos.go
	modified:   packetbeat/protos/sip/plugin.go
	modified:   packetbeat/protos/tcp/tcp.go
	modified:   packetbeat/protos/udp/udp.go
	modified:   winlogbeat/eventlog/wineventlog.go
	modified:   x-pack/filebeat/input/awss3/metrics.go
	modified:   x-pack/filebeat/input/awss3/metrics_test.go
	modified:   x-pack/filebeat/input/awss3/s3_input.go
	modified:   x-pack/filebeat/input/awss3/s3_objects.go
	modified:   x-pack/filebeat/input/awss3/s3_objects_test.go
	modified:   x-pack/filebeat/input/awss3/s3_test.go
	modified:   x-pack/filebeat/input/awss3/sqs_input.go
	modified:   x-pack/filebeat/input/awss3/sqs_s3_event.go
	modified:   x-pack/filebeat/input/awss3/sqs_test.go
	modified:   x-pack/filebeat/input/azureblobstorage/auth_test.go
	modified:   x-pack/filebeat/input/azureblobstorage/input.go
	modified:   x-pack/filebeat/input/azureblobstorage/input_stateless.go
	modified:   x-pack/filebeat/input/azureblobstorage/input_test.go
	modified:   x-pack/filebeat/input/azureblobstorage/job.go
	modified:   x-pack/filebeat/input/azureblobstorage/metrics.go
	modified:   x-pack/filebeat/input/azureblobstorage/metrics_test.go
	modified:   x-pack/filebeat/input/azureblobstorage/scheduler.go
	modified:   x-pack/filebeat/input/azureeventhub/decoder_test.go
	modified:   x-pack/filebeat/input/azureeventhub/input_test.go
	modified:   x-pack/filebeat/input/azureeventhub/metrics.go
	modified:   x-pack/filebeat/input/azureeventhub/metrics_test.go
	modified:   x-pack/filebeat/input/azureeventhub/v1_input.go
	modified:   x-pack/filebeat/input/azureeventhub/v2_input.go
	modified:   x-pack/filebeat/input/benchmark/input.go
	modified:   x-pack/filebeat/input/cel/input.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/activedirectory/metrics.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/azuread/azure.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/azuread/metrics.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/jamf/jamf.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/jamf/metrics.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/okta/metrics.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/okta/okta.go
	modified:   x-pack/filebeat/input/etw/input.go
	modified:   x-pack/filebeat/input/etw/input_test.go
	modified:   x-pack/filebeat/input/gcppubsub/input.go
	modified:   x-pack/filebeat/input/gcppubsub/metrics.go
	modified:   x-pack/filebeat/input/gcppubsub/pubsub_test.go
	modified:   x-pack/filebeat/input/gcs/input.go
	modified:   x-pack/filebeat/input/gcs/input_stateless.go
	modified:   x-pack/filebeat/input/gcs/job.go
	modified:   x-pack/filebeat/input/gcs/metrics.go
	modified:   x-pack/filebeat/input/gcs/metrics_test.go
	modified:   x-pack/filebeat/input/gcs/scheduler.go
	modified:   x-pack/filebeat/input/http_endpoint/handler_test.go
	modified:   x-pack/filebeat/input/http_endpoint/input.go
	modified:   x-pack/filebeat/input/http_endpoint/input_test.go
	modified:   x-pack/filebeat/input/httpjson/input.go
	modified:   x-pack/filebeat/input/httpjson/metrics.go
	modified:   x-pack/filebeat/input/internal/httpmon/roundtripper.go
	modified:   x-pack/filebeat/input/lumberjack/input.go
	modified:   x-pack/filebeat/input/lumberjack/metrics.go
	modified:   x-pack/filebeat/input/lumberjack/server.go
	modified:   x-pack/filebeat/input/streaming/crowdstrike.go
	modified:   x-pack/filebeat/input/streaming/metrics.go
	modified:   x-pack/filebeat/input/streaming/metrics_test.go
	modified:   x-pack/filebeat/input/streaming/websocket.go
	modified:   x-pack/metricbeat/module/iis/application_pool/reader.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   NOTICE.txt
	deleted by us:   filebeat/input/filestream/input_delete_integration_test.go
	both modified:   filebeat/input/filestream/internal/input-logfile/metrics.go
	both modified:   filebeat/input/netmetrics/tcp.go
	both modified:   filebeat/input/netmetrics/udp.go
	both modified:   go.mod
	both modified:   go.sum
	both modified:   libbeat/outputs/metrics.go
	deleted by us:   winlogbeat/eventlog/metrics.go
	both modified:   x-pack/filebeat/input/awss3/input_benchmark_test.go
	both modified:   x-pack/libbeat/cmd/instance/receiver.go

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 29, 2025
@github-actions github-actions bot added Team:obs-ds-hosted-services Label for the Observability Hosted Services team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Security-Linux Platform Linux Platform Team in Security Solution Team:Security-Service Integrations Security Service Integrations Team Team:Security-Windows Platform Windows Platform Team in Security Solution Team:Integration-Experience labels Aug 29, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 29, 2025

Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services)

@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 29, 2025

Pinging @elastic/sec-windows-platform (Team:Security-Windows Platform)

@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 29, 2025

Pinging @elastic/sec-linux-platform (Team:Security-Linux Platform)

@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 29, 2025

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 29, 2025

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 29, 2025

Pinging @elastic/integration-experience (Team:Integration-Experience)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 29, 2025
@khushijain21
Copy link
Contributor

khushijain21 commented Aug 29, 2025

Waiting on #46124

@mergify
Copy link
Contributor Author

mergify bot commented Sep 1, 2025

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

@khushijain21 khushijain21 enabled auto-merge (squash) September 4, 2025 07:06
@khushijain21 khushijain21 merged commit 8eaa12a into 8.19 Sep 4, 2025
244 of 247 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/8.19/pr-46054 branch September 4, 2025 11:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@khushijain21 khushijain21 khushijain21 approved these changes

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

Assignees

@khushijain21 khushijain21

Labels

backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Integration-Experience Team:obs-ds-hosted-services Label for the Observability Hosted Services team Team:Security-Linux Platform Linux Platform Team in Security Solution Team:Security-Service Integrations Security Service Integrations Team Team:Security-Windows Platform Windows Platform Team in Security Solution

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @khushijain21