Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 19, 2025

Proposed commit message

This PR updates elastic-agent-libs and accomodates the logger changes made in this PR elastic/elastic-agent-libs#334

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

* Replace global loggers with local logger #13

(cherry picked from commit 8df1efe)

# Conflicts:
#	NOTICE.txt
#	filebeat/input/redis/redis_integration_test.go
#	go.mod
#	go.sum
#	metricbeat/mb/module/example_test.go
#	metricbeat/module/mongodb/collstats/collstats.go
#	metricbeat/module/mongodb/dbstats/dbstats.go
#	metricbeat/module/mongodb/metrics/metrics.go
#	x-pack/filebeat/input/http_endpoint/input.go
#	x-pack/filebeat/input/http_endpoint/input_test.go
#	x-pack/metricbeat/module/sql/query/dsn.go
#	x-pack/metricbeat/module/sql/query/dsn_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 19, 2025
@mergify mergify bot requested review from a team as code owners August 19, 2025 04:51
@mergify mergify bot requested review from a team as code owners August 19, 2025 04:51
@mergify
Copy link
Contributor Author

mergify bot commented Aug 19, 2025

Cherry-pick of 8df1efe has failed:

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

You are currently cherry-picking commit 8df1efe87.
  (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:   filebeat/input/mqtt/client.go
	modified:   filebeat/input/mqtt/input.go
	modified:   filebeat/input/redis/input.go
	modified:   filebeat/inputsource/tcp/server.go
	modified:   heartbeat/monitors/active/http/http.go
	modified:   heartbeat/monitors/active/tcp/tcp.go
	modified:   libbeat/common/transport/transptest/testing.go
	modified:   libbeat/esleg/eslegclient/connection.go
	modified:   libbeat/otelbeat/oteltranslate/tls_otel.go
	modified:   libbeat/outputs/kafka/config.go
	modified:   libbeat/outputs/logstash/logstash.go
	modified:   libbeat/outputs/redis/redis.go
	modified:   libbeat/processors/add_cloud_metadata/add_cloud_metadata.go
	modified:   libbeat/processors/translate_ldap_attribute/translate_ldap_attribute.go
	modified:   metricbeat/helper/http.go
	modified:   metricbeat/helper/http_test.go
	modified:   metricbeat/helper/http_windows_test.go
	modified:   metricbeat/helper/server/http/http.go
	modified:   metricbeat/module/aerospike/aerospike.go
	modified:   metricbeat/module/aerospike/aerospike_test.go
	modified:   metricbeat/module/aerospike/namespace/namespace.go
	modified:   metricbeat/module/elasticsearch/cluster_stats/data_test.go
	modified:   metricbeat/module/elasticsearch/index/data_test.go
	modified:   metricbeat/module/kafka/metricset.go
	modified:   metricbeat/module/mongodb/mongodb.go
	modified:   metricbeat/module/mongodb/replstatus/replstatus.go
	modified:   metricbeat/module/mongodb/replstatus/replstatus_integration_test.go
	modified:   metricbeat/module/mongodb/status/status.go
	modified:   metricbeat/module/mysql/mysql.go
	modified:   metricbeat/module/mysql/query/query.go
	modified:   metricbeat/module/redis/metricset.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/conf.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/oauth2/oauth2.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/jamf/jamf.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/okta/okta.go
	modified:   x-pack/filebeat/input/httpjson/input.go
	modified:   x-pack/filebeat/input/lumberjack/server.go
	modified:   x-pack/filebeat/input/salesforce/input.go
	modified:   x-pack/filebeat/input/streaming/crowdstrike.go
	modified:   x-pack/filebeat/input/streaming/websocket.go
	modified:   x-pack/libbeat/common/aws/credentials.go
	modified:   x-pack/libbeat/common/cloudfoundry/hub.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   NOTICE.txt
	both modified:   filebeat/input/redis/redis_integration_test.go
	both modified:   go.mod
	both modified:   go.sum
	both modified:   metricbeat/mb/module/example_test.go
	both modified:   metricbeat/module/mongodb/collstats/collstats.go
	both modified:   metricbeat/module/mongodb/dbstats/dbstats.go
	both modified:   metricbeat/module/mongodb/metrics/metrics.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/metricbeat/module/sql/query/dsn.go
	deleted by us:   x-pack/metricbeat/module/sql/query/dsn_test.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 19, 2025
@mergify mergify bot requested review from khushijain21 and leehinman and removed request for a team August 19, 2025 04:51
@github-actions github-actions bot added Team:Integrations Label for the Integrations team 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-Service Integrations Security Service Integrations Team Team:Security-Windows Platform Windows Platform Team in Security Solution Team:Monitoring Stack Monitoring team labels Aug 19, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/integrations (Team:Integrations)

@elasticmachine
Copy link
Contributor

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

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

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

@elasticmachine
Copy link
Contributor

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

@elasticmachine
Copy link
Contributor

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

@khushijain21 khushijain21 enabled auto-merge (squash) August 21, 2025 06:24
@khushijain21 khushijain21 merged commit 922cbb1 into 9.0 Aug 21, 2025
218 of 222 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/9.0/pr-45720 branch August 21, 2025 07:56
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:Integrations Label for the Integrations team Team:Monitoring Stack Monitoring team Team:obs-ds-hosted-services Label for the Observability Hosted Services team 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