From fa89a92b7f0d51d5d1ace601c1b68acc4278232b Mon Sep 17 00:00:00 2001
From: Edoardo Tenani <edoardo.tenani@elastic.co>
Date: Tue, 17 Aug 2021 10:40:45 +0200
Subject: [PATCH 1/4] metricbeat/ci: update elasticsearch version

---
 metricbeat/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
index 40fba11d00dd..c16bd98c3d9f 100644
--- a/metricbeat/docker-compose.yml
+++ b/metricbeat/docker-compose.yml
@@ -15,11 +15,11 @@ services:
 
   # Used by base tests
   elasticsearch:
-    image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.12.0}-1
+    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.12.0}
+        ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.14.0}
     environment:
       - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
       - "network.host="

From f1ae19d8be01e1d85e80d3ae6f1a8bff5ff076d0 Mon Sep 17 00:00:00 2001
From: Edoardo Tenani <edoardo.tenani@elastic.co>
Date: Tue, 17 Aug 2021 10:40:56 +0200
Subject: [PATCH 2/4] metricbeat/ci: update kibana version

---
 metricbeat/docker-compose.yml        | 4 ++--
 x-pack/metricbeat/docker-compose.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
index c16bd98c3d9f..299bbb4f4b19 100644
--- a/metricbeat/docker-compose.yml
+++ b/metricbeat/docker-compose.yml
@@ -37,11 +37,11 @@ services:
 
   # Used by base tests
   kibana:
-    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.12.0}-1
+    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.12.0}
+        KIBANA_VERSION: ${KIBANA_VERSION:-7.14.0}
     depends_on:
       - elasticsearch
     ports:
diff --git a/x-pack/metricbeat/docker-compose.yml b/x-pack/metricbeat/docker-compose.yml
index e0d6f51617ee..bb0f6ba11dc6 100644
--- a/x-pack/metricbeat/docker-compose.yml
+++ b/x-pack/metricbeat/docker-compose.yml
@@ -24,11 +24,11 @@ services:
   kibana:
     # Copied configuration from OSS metricbeat because services with depends_on
     # cannot be extended with extends
-    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.12.0}-1
+    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.12.0}
+        KIBANA_VERSION: ${KIBANA_VERSION:-7.14.0}
     depends_on:
       - elasticsearch
     ports:

From ece1ea89c0be51e398ce991e348f01707ce077fa Mon Sep 17 00:00:00 2001
From: Edoardo Tenani <edoardo.tenani@elastic.co>
Date: Tue, 17 Aug 2021 10:41:07 +0200
Subject: [PATCH 3/4] metricbeat/ci: update metricbeat version

---
 metricbeat/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
index 299bbb4f4b19..805f64e4f96d 100644
--- a/metricbeat/docker-compose.yml
+++ b/metricbeat/docker-compose.yml
@@ -49,11 +49,11 @@ services:
 
   # Used by base tests
   metricbeat:
-    image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.12.0}-1
+    image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.14.0}-1
     build:
       context: ./module/beat/_meta
       args:
-        BEAT_VERSION: ${BEAT_VERSION:-7.12.0}
+        BEAT_VERSION: ${BEAT_VERSION:-7.14.0}
     command: '-e'
     ports:
       - 5066

From 4579588bf96f35019ee2bf0080c5828a20733ba4 Mon Sep 17 00:00:00 2001
From: Edoardo Tenani <edoardo.tenani@elastic.co>
Date: Tue, 17 Aug 2021 16:24:54 +0200
Subject: [PATCH 4/4] Revert "metricbeat/ci: update metricbeat version"

This reverts commit ece1ea89c0be51e398ce991e348f01707ce077fa.

This change is producing an error in the CI
Exception: Key 'beat.stats.info.version' found in event is not documented!

Reverting to get to a stable build.
---
 metricbeat/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
index 805f64e4f96d..299bbb4f4b19 100644
--- a/metricbeat/docker-compose.yml
+++ b/metricbeat/docker-compose.yml
@@ -49,11 +49,11 @@ services:
 
   # Used by base tests
   metricbeat:
-    image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.14.0}-1
+    image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.12.0}-1
     build:
       context: ./module/beat/_meta
       args:
-        BEAT_VERSION: ${BEAT_VERSION:-7.14.0}
+        BEAT_VERSION: ${BEAT_VERSION:-7.12.0}
     command: '-e'
     ports:
       - 5066