From 4d40382037a0bd51ba5e099b15c349ffa9bb3b0a Mon Sep 17 00:00:00 2001
From: endorama <526307+endorama@users.noreply.github.com>
Date: Tue, 17 Aug 2021 18:28:23 +0200
Subject: [PATCH 1/2] [Metricbeat] CI: update stack to 7.14 (#27416)

(cherry picked from commit 2eb46016959cad14400db4cfc72e4a45dda62f1c)

# Conflicts:
#	metricbeat/docker-compose.yml
#	x-pack/metricbeat/docker-compose.yml
---
 metricbeat/docker-compose.yml        | 16 ++++++++++++++++
 x-pack/metricbeat/docker-compose.yml |  8 ++++++++
 2 files changed, 24 insertions(+)

diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
index 03c4f37a24f8..07127e15b927 100644
--- a/metricbeat/docker-compose.yml
+++ b/metricbeat/docker-compose.yml
@@ -15,11 +15,19 @@ services:
 
   # Used by base tests
   elasticsearch:
+<<<<<<< HEAD
     image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.13.4}-1
     build:
       context: ./module/elasticsearch/_meta
       args:
         ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.13.4}
+=======
+    image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.14.0}-1
+    build:
+      context: ./module/elasticsearch/_meta
+      args:
+        ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.14.0}
+>>>>>>> 2eb4601695 ([Metricbeat] CI: update stack to 7.14 (#27416))
     environment:
       - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
       - "network.host="
@@ -37,11 +45,19 @@ services:
 
   # Used by base tests
   kibana:
+<<<<<<< HEAD
     image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.13.4}-1
     build:
       context: ./module/kibana/_meta
       args:
         KIBANA_VERSION: ${KIBANA_VERSION:-7.13.4}
+=======
+    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.14.0}-1
+    build:
+      context: ./module/kibana/_meta
+      args:
+        KIBANA_VERSION: ${KIBANA_VERSION:-7.14.0}
+>>>>>>> 2eb4601695 ([Metricbeat] CI: update stack to 7.14 (#27416))
     depends_on:
       - elasticsearch
     ports:
diff --git a/x-pack/metricbeat/docker-compose.yml b/x-pack/metricbeat/docker-compose.yml
index bec85b02393d..90b7c68267d4 100644
--- a/x-pack/metricbeat/docker-compose.yml
+++ b/x-pack/metricbeat/docker-compose.yml
@@ -24,11 +24,19 @@ services:
   kibana:
     # Copied configuration from OSS metricbeat because services with depends_on
     # cannot be extended with extends
+<<<<<<< HEAD
     image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.13.4}-1
     build:
       context: ../../metricbeat/module/kibana/_meta
       args:
         KIBANA_VERSION: ${KIBANA_VERSION:-7.13.4}
+=======
+    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.14.0}-1
+    build:
+      context: ../../metricbeat/module/kibana/_meta
+      args:
+        KIBANA_VERSION: ${KIBANA_VERSION:-7.14.0}
+>>>>>>> 2eb4601695 ([Metricbeat] CI: update stack to 7.14 (#27416))
     depends_on:
       - elasticsearch
     ports:

From 8c2a73db2784a7a17077f21e4bcc441b8d4e0c32 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Thu, 19 Aug 2021 12:17:39 +0200
Subject: [PATCH 2/2] Fix conflicts

---
 metricbeat/docker-compose.yml        | 16 ----------------
 x-pack/metricbeat/docker-compose.yml |  8 --------
 2 files changed, 24 deletions(-)

diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
index 07127e15b927..9e4be5d03757 100644
--- a/metricbeat/docker-compose.yml
+++ b/metricbeat/docker-compose.yml
@@ -15,19 +15,11 @@ services:
 
   # Used by base tests
   elasticsearch:
-<<<<<<< HEAD
-    image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.13.4}-1
-    build:
-      context: ./module/elasticsearch/_meta
-      args:
-        ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.13.4}
-=======
     image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.14.0}-1
     build:
       context: ./module/elasticsearch/_meta
       args:
         ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.14.0}
->>>>>>> 2eb4601695 ([Metricbeat] CI: update stack to 7.14 (#27416))
     environment:
       - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
       - "network.host="
@@ -45,19 +37,11 @@ services:
 
   # Used by base tests
   kibana:
-<<<<<<< HEAD
-    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.13.4}-1
-    build:
-      context: ./module/kibana/_meta
-      args:
-        KIBANA_VERSION: ${KIBANA_VERSION:-7.13.4}
-=======
     image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.14.0}-1
     build:
       context: ./module/kibana/_meta
       args:
         KIBANA_VERSION: ${KIBANA_VERSION:-7.14.0}
->>>>>>> 2eb4601695 ([Metricbeat] CI: update stack to 7.14 (#27416))
     depends_on:
       - elasticsearch
     ports:
diff --git a/x-pack/metricbeat/docker-compose.yml b/x-pack/metricbeat/docker-compose.yml
index 90b7c68267d4..bb0f6ba11dc6 100644
--- a/x-pack/metricbeat/docker-compose.yml
+++ b/x-pack/metricbeat/docker-compose.yml
@@ -24,19 +24,11 @@ services:
   kibana:
     # Copied configuration from OSS metricbeat because services with depends_on
     # cannot be extended with extends
-<<<<<<< HEAD
-    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.13.4}-1
-    build:
-      context: ../../metricbeat/module/kibana/_meta
-      args:
-        KIBANA_VERSION: ${KIBANA_VERSION:-7.13.4}
-=======
     image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.14.0}-1
     build:
       context: ../../metricbeat/module/kibana/_meta
       args:
         KIBANA_VERSION: ${KIBANA_VERSION:-7.14.0}
->>>>>>> 2eb4601695 ([Metricbeat] CI: update stack to 7.14 (#27416))
     depends_on:
       - elasticsearch
     ports: