Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 8, 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).

…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/input.go
#	filebeat/input/filestream/internal/input-logfile/metrics.go
#	filebeat/input/netmetrics/tcp.go
#	filebeat/input/netmetrics/udp.go
#	filebeat/input/unix/input.go
#	go.mod
#	go.sum
#	libbeat/monitoring/inputmon/input_test.go
#	libbeat/outputs/elasticsearch/client_integration_test.go
#	libbeat/outputs/elasticsearch/client_test.go
#	libbeat/outputs/metrics.go
#	libbeat/processors/dns/resolver_test.go
#	libbeat/publisher/pipeline/client_test.go
#	libbeat/publisher/pipeline/controller.go
#	metricbeat/module/windows/wmi/utils.go
#	packetbeat/protos/protos.go
#	packetbeat/protos/sip/plugin.go
#	winlogbeat/eventlog/metrics.go
#	winlogbeat/eventlog/wineventlog.go
#	x-pack/filebeat/input/awss3/input_benchmark_test.go
#	x-pack/filebeat/input/awss3/metrics.go
#	x-pack/filebeat/input/awss3/metrics_test.go
#	x-pack/filebeat/input/awss3/s3_input.go
#	x-pack/filebeat/input/awss3/s3_objects.go
#	x-pack/filebeat/input/awss3/s3_objects_test.go
#	x-pack/filebeat/input/awss3/s3_test.go
#	x-pack/filebeat/input/awss3/sqs_input.go
#	x-pack/filebeat/input/awss3/sqs_s3_event.go
#	x-pack/filebeat/input/awss3/sqs_test.go
#	x-pack/filebeat/input/azureblobstorage/input.go
#	x-pack/filebeat/input/azureblobstorage/input_stateless.go
#	x-pack/filebeat/input/azureblobstorage/input_test.go
#	x-pack/filebeat/input/azureblobstorage/job.go
#	x-pack/filebeat/input/azureblobstorage/metrics.go
#	x-pack/filebeat/input/azureblobstorage/metrics_test.go
#	x-pack/filebeat/input/azureblobstorage/scheduler.go
#	x-pack/filebeat/input/azureeventhub/decoder_test.go
#	x-pack/filebeat/input/azureeventhub/input_test.go
#	x-pack/filebeat/input/azureeventhub/metrics.go
#	x-pack/filebeat/input/azureeventhub/metrics_test.go
#	x-pack/filebeat/input/azureeventhub/v1_input.go
#	x-pack/filebeat/input/azureeventhub/v2_input.go
#	x-pack/filebeat/input/benchmark/input.go
#	x-pack/filebeat/input/cel/input.go
#	x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go
#	x-pack/filebeat/input/entityanalytics/provider/activedirectory/metrics.go
#	x-pack/filebeat/input/entityanalytics/provider/azuread/azure.go
#	x-pack/filebeat/input/entityanalytics/provider/azuread/metrics.go
#	x-pack/filebeat/input/entityanalytics/provider/jamf/jamf.go
#	x-pack/filebeat/input/entityanalytics/provider/jamf/metrics.go
#	x-pack/filebeat/input/entityanalytics/provider/okta/metrics.go
#	x-pack/filebeat/input/entityanalytics/provider/okta/okta.go
#	x-pack/filebeat/input/etw/input.go
#	x-pack/filebeat/input/etw/input_test.go
#	x-pack/filebeat/input/gcppubsub/metrics.go
#	x-pack/filebeat/input/gcppubsub/pubsub_test.go
#	x-pack/filebeat/input/gcs/input.go
#	x-pack/filebeat/input/gcs/input_stateless.go
#	x-pack/filebeat/input/gcs/job.go
#	x-pack/filebeat/input/gcs/metrics.go
#	x-pack/filebeat/input/gcs/metrics_test.go
#	x-pack/filebeat/input/gcs/scheduler.go
#	x-pack/filebeat/input/http_endpoint/handler_test.go
#	x-pack/filebeat/input/http_endpoint/input.go
#	x-pack/filebeat/input/http_endpoint/input_test.go
#	x-pack/filebeat/input/httpjson/input.go
#	x-pack/filebeat/input/lumberjack/input.go
#	x-pack/filebeat/input/lumberjack/metrics.go
#	x-pack/filebeat/input/lumberjack/server.go
#	x-pack/filebeat/input/streaming/crowdstrike.go
#	x-pack/filebeat/input/streaming/metrics.go
#	x-pack/filebeat/input/streaming/metrics_test.go
#	x-pack/filebeat/input/streaming/websocket.go
#	x-pack/libbeat/cmd/instance/receiver.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 8, 2025
@mergify mergify bot requested review from a team as code owners September 8, 2025 07:50
Copy link
Contributor Author

mergify bot commented Sep 8, 2025

Cherry-pick of a601b44 has failed:

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

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/kafka/config.go
	modified:   libbeat/outputs/kafka/config.go
	modified:   libbeat/processors/dns/dns.go
	modified:   libbeat/processors/dns/resolver.go
	modified:   libbeat/processors/script/javascript/javascript.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:   packetbeat/protos/tcp/tcp.go
	modified:   packetbeat/protos/udp/udp.go
	modified:   x-pack/filebeat/input/azureblobstorage/auth_test.go
	modified:   x-pack/filebeat/input/gcppubsub/input.go
	modified:   x-pack/filebeat/input/httpjson/metrics.go
	modified:   x-pack/filebeat/input/internal/httpmon/roundtripper.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/input.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:   filebeat/input/unix/input.go
	both modified:   go.mod
	both modified:   go.sum
	both modified:   libbeat/monitoring/inputmon/input_test.go
	both modified:   libbeat/outputs/elasticsearch/client_integration_test.go
	both modified:   libbeat/outputs/elasticsearch/client_test.go
	both modified:   libbeat/outputs/metrics.go
	both modified:   libbeat/processors/dns/resolver_test.go
	both modified:   libbeat/publisher/pipeline/client_test.go
	both modified:   libbeat/publisher/pipeline/controller.go
	deleted by us:   metricbeat/module/windows/wmi/utils.go
	both modified:   packetbeat/protos/protos.go
	both modified:   packetbeat/protos/sip/plugin.go
	deleted by us:   winlogbeat/eventlog/metrics.go
	both modified:   winlogbeat/eventlog/wineventlog.go
	both modified:   x-pack/filebeat/input/awss3/input_benchmark_test.go
	both modified:   x-pack/filebeat/input/awss3/metrics.go
	both modified:   x-pack/filebeat/input/awss3/metrics_test.go
	both modified:   x-pack/filebeat/input/awss3/s3_input.go
	both modified:   x-pack/filebeat/input/awss3/s3_objects.go
	both modified:   x-pack/filebeat/input/awss3/s3_objects_test.go
	both modified:   x-pack/filebeat/input/awss3/s3_test.go
	both modified:   x-pack/filebeat/input/awss3/sqs_input.go
	both modified:   x-pack/filebeat/input/awss3/sqs_s3_event.go
	both modified:   x-pack/filebeat/input/awss3/sqs_test.go
	both modified:   x-pack/filebeat/input/azureblobstorage/input.go
	both modified:   x-pack/filebeat/input/azureblobstorage/input_stateless.go
	both modified:   x-pack/filebeat/input/azureblobstorage/input_test.go
	both modified:   x-pack/filebeat/input/azureblobstorage/job.go
	both modified:   x-pack/filebeat/input/azureblobstorage/metrics.go
	both modified:   x-pack/filebeat/input/azureblobstorage/metrics_test.go
	both modified:   x-pack/filebeat/input/azureblobstorage/scheduler.go
	both modified:   x-pack/filebeat/input/azureeventhub/decoder_test.go
	both modified:   x-pack/filebeat/input/azureeventhub/input_test.go
	both modified:   x-pack/filebeat/input/azureeventhub/metrics.go
	both modified:   x-pack/filebeat/input/azureeventhub/metrics_test.go
	both modified:   x-pack/filebeat/input/azureeventhub/v1_input.go
	both modified:   x-pack/filebeat/input/azureeventhub/v2_input.go
	both modified:   x-pack/filebeat/input/benchmark/input.go
	both modified:   x-pack/filebeat/input/cel/input.go
	both modified:   x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go
	both modified:   x-pack/filebeat/input/entityanalytics/provider/activedirectory/metrics.go
	both modified:   x-pack/filebeat/input/entityanalytics/provider/azuread/azure.go
	both modified:   x-pack/filebeat/input/entityanalytics/provider/azuread/metrics.go
	both modified:   x-pack/filebeat/input/entityanalytics/provider/jamf/jamf.go
	both modified:   x-pack/filebeat/input/entityanalytics/provider/jamf/metrics.go
	both modified:   x-pack/filebeat/input/entityanalytics/provider/okta/metrics.go
	both modified:   x-pack/filebeat/input/entityanalytics/provider/okta/okta.go
	both modified:   x-pack/filebeat/input/etw/input.go
	both modified:   x-pack/filebeat/input/etw/input_test.go
	both modified:   x-pack/filebeat/input/gcppubsub/metrics.go
	both modified:   x-pack/filebeat/input/gcppubsub/pubsub_test.go
	both modified:   x-pack/filebeat/input/gcs/input.go
	both modified:   x-pack/filebeat/input/gcs/input_stateless.go
	both modified:   x-pack/filebeat/input/gcs/job.go
	both modified:   x-pack/filebeat/input/gcs/metrics.go
	both modified:   x-pack/filebeat/input/gcs/metrics_test.go
	both modified:   x-pack/filebeat/input/gcs/scheduler.go
	both modified:   x-pack/filebeat/input/http_endpoint/handler_test.go
	both modified:   x-pack/filebeat/input/http_endpoint/input.go
	both modified:   x-pack/filebeat/input/http_endpoint/input_test.go
	both modified:   x-pack/filebeat/input/httpjson/input.go
	both modified:   x-pack/filebeat/input/lumberjack/input.go
	both modified:   x-pack/filebeat/input/lumberjack/metrics.go
	both modified:   x-pack/filebeat/input/lumberjack/server.go
	both modified:   x-pack/filebeat/input/streaming/crowdstrike.go
	both modified:   x-pack/filebeat/input/streaming/metrics.go
	deleted by us:   x-pack/filebeat/input/streaming/metrics_test.go
	both modified:   x-pack/filebeat/input/streaming/websocket.go
	deleted by us:   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

@mergify mergify bot requested review from AndersonQ and khushijain21 and removed request for a team September 8, 2025 07:50
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 8, 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 Sep 8, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 8, 2025
@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

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

Copy link
Contributor Author

mergify bot commented Sep 8, 2025

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

1 similar comment
Copy link
Contributor Author

mergify bot commented Sep 15, 2025

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

@mergify mergify bot deleted the mergify/bp/8.18/pr-46054 branch September 15, 2025 09:40
@khushijain21 khushijain21 restored the mergify/bp/8.18/pr-46054 branch September 29, 2025 07:21
@khushijain21 khushijain21 reopened this Sep 29, 2025
Copy link
Contributor Author

mergify bot commented Sep 29, 2025

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

@khushijain21
Copy link
Contributor

requires #45944

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-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
Development

Successfully merging this pull request may close these issues.

2 participants