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
This commit is contained in:
Ivana Huckova 2022-02-24 16:48:18 +01:00 committed by GitHub
parent 14decdb58c
commit 9e452c7166
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -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

View File

@ -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: