From 382512c0d1691d4ce0517fd15fb699d9d65b056d Mon Sep 17 00:00:00 2001 From: Andrew Stucki Date: Thu, 27 May 2021 17:12:02 -0400 Subject: [PATCH] Clean up fixture files (#25971) (cherry picked from commit e5b976a3bee54553b96b82be8bbaf1e6835c280d) # Conflicts: # x-pack/filebeat/module/crowdstrike/falcon/test/falcon-sample.log-expected.json --- .../module/crowdstrike/falcon/test/falcon-sample.log | 4 ++-- .../falcon/test/falcon-sample.log-expected.json | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-sample.log b/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-sample.log index efd3b565576..6a811c1efb2 100644 --- a/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-sample.log +++ b/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-sample.log @@ -87,11 +87,11 @@ }, { "Key": "actor_user_uuid", - "ValueString": "123ab141-fab1-41c9-85c5-43a1ef90d2c2" + "ValueString": "123ab123-abc1-12a1-12a1-12a1ab12a1a1" }, { "Key": "actor_cid", - "ValueString": "774694c2ef8c43fdb64ec3056ddfb96d" + "ValueString": "123456a1ab1a12abc12ab1234abcd12a" }, { "Key": "target_user", diff --git a/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-sample.log-expected.json b/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-sample.log-expected.json index b49e03fd863..03268138fc5 100644 --- a/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-sample.log-expected.json +++ b/x-pack/filebeat/module/crowdstrike/falcon/test/falcon-sample.log-expected.json @@ -117,6 +117,17 @@ { "crowdstrike.event.AuditKeyValues": [ { +<<<<<<< HEAD +======= + "Key": "actor_cid", + "ValueString": "123456a1ab1a12abc12ab1234abcd12a" + }, + { + "Key": "actor_user_uuid", + "ValueString": "123ab123-abc1-12a1-12a1-12a1ab12a1a1" + }, + { +>>>>>>> e5b976a3b (Clean up fixture files (#25971)) "Key": "trace_id", "ValueString": "b0b33836-555c-4e0e-a5ef-d368f6799f6b" },