From 9e452c7166d9121d42616f5dd74d07def08ea81c Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Thu, 24 Feb 2022 16:48:18 +0100
Subject: [PATCH] Devenv: Update Elasticsearch v7 image so it is usable on ARM
 (M1) (#45612)

* Devenv: Update Elasticsearch v7 images so they are usable on ARM (M1)

* Remove changes in 77

* Update data sources
---
 devenv/datasources.yaml                           | 8 ++++----
 devenv/docker/blocks/elastic7/docker-compose.yaml | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/devenv/datasources.yaml b/devenv/datasources.yaml
index 94b419e3cca..2bf076b4ec4 100644
--- a/devenv/datasources.yaml
+++ b/devenv/datasources.yaml
@@ -195,7 +195,7 @@ datasources:
       timeInterval: 10s
       interval: Daily
       timeField: "@timestamp"
-      esVersion: 70
+      esVersion: 7.10.0
 
   - name: gdev-elasticsearch-v7-logs
     type: elasticsearch
@@ -205,7 +205,7 @@ datasources:
     jsonData:
       interval: Daily
       timeField: "@timestamp"
-      esVersion: 70
+      esVersion: 7.10.0
 
   - name: gdev-elasticsearch-v7-filebeat
     type: elasticsearch
@@ -215,7 +215,7 @@ datasources:
     jsonData:
       interval: Daily
       timeField: "@timestamp"
-      esVersion: 70
+      esVersion: 7.10.0
       timeInterval: "10s"
       logMessageField: message
       logLevelField: fields.level
@@ -228,7 +228,7 @@ datasources:
     jsonData:
       interval: Daily
       timeField: "@timestamp"
-      esVersion: 70
+      esVersion: 7.10.0
       timeInterval: "10s"
 
   - name: gdev-mysql
diff --git a/devenv/docker/blocks/elastic7/docker-compose.yaml b/devenv/docker/blocks/elastic7/docker-compose.yaml
index d4d981c6b55..b4e144c2b5b 100644
--- a/devenv/docker/blocks/elastic7/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic7/docker-compose.yaml
@@ -1,7 +1,7 @@
 # You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
 
   elasticsearch7:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
     command: elasticsearch -E "discovery.type=single-node"
     ports:
       - "12200:9200"
@@ -17,7 +17,7 @@
       FD_PORT: 9200
 
   filebeat7:
-    image: docker.elastic.co/beats/filebeat-oss:7.0.0
+    image: docker.elastic.co/beats/filebeat-oss:7.17.0
     command: filebeat -e -strict.perms=false
     volumes:
       - ./docker/blocks/elastic7/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
@@ -25,7 +25,7 @@
       - ../data/log:/var/log/grafana:ro
 
   metricbeat7:
-    image: docker.elastic.co/beats/metricbeat-oss:7.0.0
+    image: docker.elastic.co/beats/metricbeat-oss:7.17.0
     command: metricbeat -e -strict.perms=false
     user: root
     volumes: