Code Review
/
clamp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Upgrade ELK to 6.1.3"
[clamp.git]
/
extra
/
docker
/
elk
/
docker-compose.yml
diff --git
a/extra/docker/elk/docker-compose.yml
b/extra/docker/elk/docker-compose.yml
index
388c318
..
3b5571e
100644
(file)
--- a/
extra/docker/elk/docker-compose.yml
+++ b/
extra/docker/elk/docker-compose.yml
@@
-2,16
+2,20
@@
version: '3.1'
services:
elasticsearch:
services:
elasticsearch:
- image:
elasticsearch
+ image:
docker.elastic.co/elasticsearch/elasticsearch:6.1.3
ports:
- 9200:9200
networks:
es_net:
aliases:
- elasticsearch
ports:
- 9200:9200
networks:
es_net:
aliases:
- elasticsearch
+ environment:
+ - cluster.name=docker-cluster
+ - bootstrap.memory_lock=false
+ - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
logstash:
logstash:
- image:
logstash
+ image:
docker.elastic.co/logstash/logstash:6.1.3
volumes:
- ./logstash-conf:/config-dir
- ./logstash-input:/log-input
volumes:
- ./logstash-conf:/config-dir
- ./logstash-input:/log-input
@@
-29,9
+33,10
@@
services:
- event_topic=EVENT_TOPIC
- notification_topic=NOTIFICATION_TOPIC
- request_topic=REQUEST_TOPIC
- event_topic=EVENT_TOPIC
- notification_topic=NOTIFICATION_TOPIC
- request_topic=REQUEST_TOPIC
+ - elasticsearch_hosts=elasticsearch
kibana:
kibana:
- image:
kibana
+ image:
docker.elastic.co/kibana/kibana:6.1.3
ports:
- 5601:5601
depends_on:
ports:
- 5601:5601
depends_on: