IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Devenv: fix connection in elastic 5 and 6 blocks (#20304)

Browse Source 
* Docker block: fix failed connection in elastic5 block

* Fix docker block elastic6 data link

* Fix elastic7 datagenerator
This commit is contained in:
David 2019-11-11 17:06:03 +01:00 committed by GitHub
parent b756aa0bb1
commit fa91462d53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devenv/docker/blocks/elastic5/docker-compose.yaml
View File

@ -9,7 +9,7 @@
image: grafana/fake-data-gen image: grafana/fake-data-gen
links: links:
- elasticsearch5 - elasticsearch5
# network_mode: bridge
environment: environment:
FD_SERVER: elasticsearch5
FD_DATASOURCE: elasticsearch FD_DATASOURCE: elasticsearch
FD_PORT: 10200 FD_PORT: 9200

6
devenv/docker/blocks/elastic6/docker-compose.yaml
View File

@ -9,10 +9,12 @@
fake-elastic6-data: fake-elastic6-data:
image: grafana/fake-data-gen image: grafana/fake-data-gen
network_mode: bridge links:
- elasticsearch6
environment: environment:
FD_SERVER: elasticsearch6
FD_DATASOURCE: elasticsearch6 FD_DATASOURCE: elasticsearch6
FD_PORT: 11200 FD_PORT: 9200
filebeat6: filebeat6:
image: docker.elastic.co/beats/filebeat-oss:6.7.1 image: docker.elastic.co/beats/filebeat-oss:6.7.1

6
devenv/docker/blocks/elastic7/docker-compose.yaml
View File

@ -9,10 +9,12 @@
fake-elastic7-data: fake-elastic7-data:
image: grafana/fake-data-gen image: grafana/fake-data-gen
network_mode: bridge links:
- elasticsearch7
environment: environment:
FD_SERVER: elasticsearch7
FD_DATASOURCE: elasticsearch7 FD_DATASOURCE: elasticsearch7
FD_PORT: 12200 FD_PORT: 9200
filebeat7: filebeat7:
image: docker.elastic.co/beats/filebeat-oss:7.0.0 image: docker.elastic.co/beats/filebeat-oss:7.0.0