merging with main

Signed-off-by: Andreas Gkizas <[email protected]>

Author: gizas

.github/CODEOWNERS

@@ -307,6 +307,10 @@
 /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
@@ -480,3 +484,7 @@
 /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

packages/arista_ngfw/_dev/build/build.yml

@@ -1,3 +1,3 @@
 dependencies:
   ecs:
-    reference: "git@v8.11.0"
+    reference: "git@v8.17.0"

packages/arista_ngfw/changelog.yml

@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.3.0"
+  changes:
+    - description: ECS version updated to 8.17.0.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/12569
 - version: "1.2.1"
   changes:
     - description: Correct Grok pattern due to change in Syslog message format.

packages/arista_ngfw/data_stream/log/_dev/test/pipeline/test-admin-login.log-expected.json

@@ -3,7 +3,11 @@
         {
             "@timestamp": "2023-05-24T13:09:53.477-06:00",
             "ecs": {
+<<<<<<< HEAD
                 "version": "8.11.0"
+=======
+                "version": "8.17.0"
+>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
@@ -60,7 +64,11 @@
         {
             "@timestamp": "2023-05-23T10:06:57.518-06:00",
             "ecs": {
+<<<<<<< HEAD
                 "version": "8.11.0"
+=======
+                "version": "8.17.0"
+>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
@@ -117,7 +125,11 @@
         {
             "@timestamp": "2023-05-23T13:35:42.611-06:00",
             "ecs": {
+<<<<<<< HEAD
                 "version": "8.11.0"
+=======
+                "version": "8.17.0"
+>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
@@ -174,7 +186,11 @@
         {
             "@timestamp": "2023-05-22T13:47:59.495-06:00",
             "ecs": {
+<<<<<<< HEAD
                 "version": "8.11.0"
+=======
+                "version": "8.17.0"
+>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
@@ -231,7 +247,11 @@
         {
             "@timestamp": "2023-05-21T09:58:40.250-06:00",
             "ecs": {
+<<<<<<< HEAD
                 "version": "8.11.0"
+=======
+                "version": "8.17.0"
+>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
@@ -288,7 +308,11 @@
         {
             "@timestamp": "2023-05-20T08:12:47.018-06:00",
             "ecs": {
+<<<<<<< HEAD
                 "version": "8.11.0"
+=======
+                "version": "8.17.0"
+>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
@@ -346,7 +370,11 @@
         {
             "@timestamp": "2023-05-18T15:08:14.224-06:00",
             "ecs": {
+<<<<<<< HEAD
                 "version": "8.11.0"
+=======
+                "version": "8.17.0"
+>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
@@ -403,7 +431,11 @@
         {
             "@timestamp": "2023-05-18T06:58:38.360-06:00",
             "ecs": {
+<<<<<<< HEAD
                 "version": "8.11.0"
+=======
+                "version": "8.17.0"
+>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
@@ -460,7 +492,11 @@
         {
             "@timestamp": "2023-05-17T15:04:03.772-06:00",
             "ecs": {
+<<<<<<< HEAD
                 "version": "8.11.0"
+=======
+                "version": "8.17.0"
+>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
@@ -517,7 +553,11 @@
         {
             "@timestamp": "2023-05-12T09:09:40.787-06:00",
             "ecs": {
+<<<<<<< HEAD
                 "version": "8.11.0"
+=======
+                "version": "8.17.0"
+>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
             },
             "event": {
                 "category": [
@@ -572,4 +612,8 @@
             }
         }
     ]
-}
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6