merging with main

gizas · gizas · commit f3e6fd9aea00 · 2025-02-05T12:43:44.000+02:00
Signed-off-by: Andreas Gkizas &lt;andreas.gkizas@elastic.co&gt;
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -307,10 +307,7 @@
 /packages/nginx_ingress_controller_otel @elastic/obs-infraobs-integrations
 /packages/o365 @elastic/security-service-integrations
 /packages/okta @elastic/security-service-integrations
-<<<<<<< HEAD
-=======
 /packages/openai @elastic/obs-infraobs-integrations
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
 /packages/opencanary @elastic/security-service-integrations
 /packages/oracle @elastic/obs-infraobs-integrations
 /packages/oracle_weblogic @elastic/obs-infraobs-integrations
@@ -484,7 +481,4 @@
 /packages/o365_metrics/data_stream/yammer_device_usage @elastic/obs-infraobs-integrations
 /packages/o365_metrics/data_stream/service_health @elastic/obs-infraobs-integrations
 /packages/o365_metrics/data_stream/viva_engage_device_usage_user_counts @elastic/obs-infraobs-integrations
-<<<<<<< HEAD
-=======
 /packages/o365_metrics/data_stream/subscriptions @elastic/obs-infraobs-integrations
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
diff --git a/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-admin-login.log-expected.json b/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-admin-login.log-expected.json
@@ -3,11 +3,7 @@
         {
             "@timestamp": "2023-05-24T13:09:53.477-06:00",
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
diff --git a/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-firewall-event.log-expected.json b/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-firewall-event.log-expected.json
@@ -6,11 +6,7 @@
                 "flagged": false
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
diff --git a/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-http-request.log-expected.json b/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-http-request.log-expected.json
@@ -31,11 +31,7 @@
                 "port": 443
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
diff --git a/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-http-response.log-expected.json b/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-http-response.log-expected.json
@@ -32,11 +32,7 @@
                 "port": 80
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
diff --git a/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-interface-stats.log-expected.json b/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-interface-stats.log-expected.json
@@ -16,11 +16,7 @@
                 }
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
diff --git a/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-intrusion-detection.log-expected.json b/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-intrusion-detection.log-expected.json
@@ -12,11 +12,7 @@
                 "ip": "1.128.0.72"
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
diff --git a/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-session-event.log-expected.json b/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-session-event.log-expected.json
@@ -33,11 +33,7 @@
                 "port": 9930
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
diff --git a/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-session-stats.log-expected.json b/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-session-stats.log-expected.json
@@ -31,11 +31,7 @@
                 "port": 9930
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
diff --git a/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-system-stats.log-expected.json b/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-system-stats.log-expected.json
@@ -67,11 +67,7 @@
                 }
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
@@ -175,11 +171,7 @@
                 }
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
diff --git a/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-unsupported-mesage-class.log-expected.json b/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-unsupported-mesage-class.log-expected.json
@@ -2,8 +2,4 @@
     "expected": [
         null
     ]
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
diff --git a/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-web-filter.log-expected.json b/packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-web-filter.log-expected.json
@@ -31,11 +31,7 @@
                 "port": 443
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
diff --git a/packages/cef/data_stream/log/_dev/test/pipeline/test-arcsight.json-expected.json b/packages/cef/data_stream/log/_dev/test/pipeline/test-arcsight.json-expected.json
@@ -50,11 +50,7 @@
                 "version": "0"
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "code": "agent:016",
diff --git a/packages/cef/data_stream/log/_dev/test/pipeline/test-cef.json-expected.json b/packages/cef/data_stream/log/_dev/test/pipeline/test-cef.json-expected.json
@@ -31,11 +31,7 @@
                 "port": 443
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "code": "18",
diff --git a/packages/cef/data_stream/log/_dev/test/pipeline/test-checkpoint.json-expected.json b/packages/cef/data_stream/log/_dev/test/pipeline/test-checkpoint.json-expected.json
@@ -77,11 +77,7 @@
                 "port": 443
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "action": "Accept",
diff --git a/packages/cef/data_stream/log/_dev/test/pipeline/test-cisco-asa.json-expected.json b/packages/cef/data_stream/log/_dev/test/pipeline/test-cisco-asa.json-expected.json
@@ -88,11 +88,7 @@
                 "version": "0"
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "code": "305012",
diff --git a/packages/cef/data_stream/log/_dev/test/pipeline/test-fp-ngfw-smc.json-expected.json b/packages/cef/data_stream/log/_dev/test/pipeline/test-fp-ngfw-smc.json-expected.json
@@ -21,11 +21,7 @@
                 "version": "0"
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "code": "0",
diff --git a/packages/cef/data_stream/log/_dev/test/pipeline/test-netscaler.json-expected.json b/packages/cef/data_stream/log/_dev/test/pipeline/test-netscaler.json-expected.json
@@ -28,11 +28,7 @@
                 "version": "0"
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "action": "blocked",
diff --git a/packages/cef/data_stream/log/_dev/test/pipeline/test-syslog.json-expected.json b/packages/cef/data_stream/log/_dev/test/pipeline/test-syslog.json-expected.json
@@ -56,11 +56,7 @@
                 "domain": "centos7"
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "action": "Started",
diff --git a/packages/cef/data_stream/log/_dev/test/pipeline/test-trend-micro.json-expected.json b/packages/cef/data_stream/log/_dev/test/pipeline/test-trend-micro.json-expected.json
@@ -19,11 +19,7 @@
                 "version": "0"
             },
             "ecs": {
-<<<<<<< HEAD
-                "version": "8.11.0"
-=======
                 "version": "8.17.0"
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "code": "600",
