From 63d71c161bf178e41d49d89f90d5dfaeb20c6d96 Mon Sep 17 00:00:00 2001 From: Dan Kortschak Date: Wed, 23 Oct 2024 11:47:34 +1030 Subject: [PATCH] fix cherry pick failures --- CHANGELOG.next.asciidoc | 29 ------------------- .../activedirectory/activedirectory.go | 6 ---- 2 files changed, 35 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index b5bf701733a..0d5658d1ad4 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -99,35 +99,6 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Prevent GCP Pub/Sub input blockage by increasing default value of `max_outstanding_messages` {issue}35029[35029] {pull}38985[38985] - Updated Websocket input title to align with existing inputs {pull}39006[39006] - Log bad handshake details when websocket connection fails {pull}41300[41300] -- Restore netflow input on Windows {pull}39024[39024] -- Upgrade azure-event-hubs-go and azure-storage-blob-go dependencies. {pull}38861[38861] -- Fix concurrency/error handling bugs in the AWS S3 input that could drop data and prevent ingestion of large buckets. {pull}39131[39131] -- Fix EntraID query handling. {issue}39419[39419] {pull}39420[39420] -- Fix request trace filename handling in http_endpoint input. {pull}39410[39410] -- Fix filestream not correctly tracking the offset of a file when using the `include_message` parser. {pull}39873[39873] {issue}39653[39653] -- Upgrade github.com/hashicorp/go-retryablehttp to mitigate CVE-2024-6104 {pull}40036[40036] -- Fix for Google Workspace duplicate events issue by adding canonical sorting over fingerprint keys array to maintain key order. {pull}40055[40055] {issue}39859[39859] -- Fix handling of deeply nested numeric values in HTTP Endpoint CEL programs. {pull}40115[40115] -- Prevent panic in CEL and salesforce inputs when github.com/hashicorp/go-retryablehttp exceeds maximum retries. {pull}40144[40144] -- Fix bug in CEL input rate limit logic. {issue}40106[40106] {pull}40270[40270] -- Relax requirements in Okta entity analytics provider user and device profile data shape. {pull}40359[40359] -- Fix bug in Okta entity analytics rate limit logic. {issue}40106[40106] {pull}40267[40267] -- Fix crashes in the journald input. {pull}40061[40061] -- Fix order of configuration for EntraID entity analytics provider. {pull}40487[40487] -- Ensure Entra ID request bodies are not truncated and trace logs are rotated before 100MB. {pull}40494[40494] -- The Elasticsearch output now correctly logs the event fields to the event log file {issue}40509[40509] {pull}40512[40512] -- Fix the "No such input type exist: 'azure-eventhub'" error on the Windows platform {issue}40608[40608] {pull}40609[40609] -- awss3 input: Fix handling of SQS notifications that don't contain a region. {pull}40628[40628] -- Fix credential handling when workload identity is being used in GCS input. {issue}39977[39977] {pull}40663[40663] -- Fix publication of group data from the Okta entity analytics provider. {pull}40681[40681] -- Ensure netflow custom field configuration is applied. {issue}40735[40735] {pull}40730[40730] -- Fix replace processor handling of zero string replacement validation. {pull}40751[40751] -- Fix long filepaths in diagnostics exceeding max path limits on Windows. {pull}40909[40909] -- Add backup and delete for AWS S3 polling mode feature back. {pull}41071[41071] -- Fix a bug in Salesforce input to only handle responses with 200 status code {pull}41015[41015] -- Fixed failed job handling and removed false-positive error logs in the GCS input. {pull}41142[41142] -- Bump github.com/elastic/go-sfdc dependency used by x-pack/filebeat/input/salesforce. {pull}41192[41192] -- Log bad handshake details when websocket connection fails {pull}41300[41300] - Improve modification time handling for entities and entity deletion logic in the Active Directory entityanalytics input. {pull}41179[41179] *Heartbeat* diff --git a/x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go b/x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go index bb9e604e708..dbe692cc7d3 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go +++ b/x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go @@ -128,16 +128,10 @@ func (p *adInput) Run(inputCtx v2.Context, store *kvstore.Store, client beat.Cli syncTimer := time.NewTimer(syncWaitTime) updateTimer := time.NewTimer(updateWaitTime) -<<<<<<< HEAD -======= - p.cfg.UserAttrs = withMandatory(p.cfg.UserAttrs, "distinguishedName", "whenChanged") - p.cfg.GrpAttrs = withMandatory(p.cfg.GrpAttrs, "distinguishedName", "whenChanged") - var ( last time.Time err error ) ->>>>>>> 6b540745cb (x-pack/filebeat/input/entityanalytics/provider/activedirectory: improve modification time and deletion logic (#41179)) for { select { case <-inputCtx.Cancelation.Done():