Clean up fixture files (#25971)

(cherry picked from commit e5b976a) # Conflicts: # x-pack/filebeat/module/crowdstrike/falcon/test/falcon-sample.log-expected.json
elastic · May 27, 2021 · 382512c · 382512c
1 parent d3cf991
commit 382512c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 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
@@ -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
@@ -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"
             },