-
Notifications
You must be signed in to change notification settings - Fork 5k
[8.18](backport #46054) [Chore] Accomodate breaking from elastic-agent-libs
and elastic-agent-system-metrics
#46423
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.
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
base: 8.18
Are you sure you want to change the base?
Conversation
…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
Cherry-pick of a601b44 has failed:
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 |
Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services) |
Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane) |
Pinging @elastic/sec-linux-platform (Team:Security-Linux Platform) |
Pinging @elastic/security-service-integrations (Team:Security-Service Integrations) |
Pinging @elastic/sec-windows-platform (Team:Security-Windows Platform) |
Pinging @elastic/integration-experience (Team:Integration-Experience) |
This pull request has not been merged yet. Could you please review and merge it @khushijain21? 🙏 |
1 similar comment
This pull request has not been merged yet. Could you please review and merge it @khushijain21? 🙏 |
This pull request has not been merged yet. Could you please review and merge it @khushijain21? 🙏 |
requires #45944 |
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
CHANGELOG.next.asciidoc
orCHANGELOG-developer.next.asciidoc
.Related issues
This is an automatic backport of pull request #46054 done by [Mergify](https://mergify.com).