Bump to ES 6.8.5, fixed broken provisioning

This commit is contained in:
2019-11-24 16:26:29 +01:00
parent e4788c862e
commit cba243f2a5

View File

@@ -1,19 +1,20 @@
version: '2' version: '2'
services: services:
# MongoDB: https://hub.docker.com/_/mongo/ # MongoDB: https://hub.docker.com/_/mongo/
mongodb: mongodb:
image: 'mongo:3' image: mongo:3
volumes: volumes:
- 'mongo_data:/data/db' - mongo_data:/data/db
# Elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/6.x/docker.html # Elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/6.x/docker.html
elasticsearch: elasticsearch:
image: 'docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.4' image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.5
mem_limit: 4g mem_limit: 4g
restart: always restart: always
volumes: volumes:
- 'es_data:/usr/share/elasticsearch/data' - es_data:/usr/share/elasticsearch/data
env_file: env_file:
- ./elasticsearch.env - ./elasticsearch.env
ulimits: ulimits:
@@ -21,52 +22,52 @@ services:
soft: -1 soft: -1
hard: -1 hard: -1
ports: ports:
- '9200:9200' - 9200:9200
# Graylog: https://hub.docker.com/r/graylog/graylog/ # Graylog: https://hub.docker.com/r/graylog/graylog/
graylog: graylog:
build: build:
context: ./graylog/. context: ./graylog/.
volumes: volumes:
- 'graylog_journal:/usr/share/graylog/data/journal' - graylog_journal:/usr/share/graylog/data/journal
- './service-names-port-numbers.csv:/etc/graylog/server/service-names-port-numbers.csv' - ./service-names-port-numbers.csv:/etc/graylog/server/service-names-port-numbers.csv
env_file: env_file:
- ./graylog.env - ./graylog.env
links: links:
- 'mongodb:mongo' - mongodb:mongo
- elasticsearch - elasticsearch
depends_on: depends_on:
- mongodb - mongodb
- elasticsearch - elasticsearch
ports: ports:
# Netflow # Netflow
- '2055:2055/udp' - 2055:2055/udp
# Syslog Feed # Syslog Feed
- '5442:5442/udp' - 5442:5442/udp
# Graylog web interface and REST API # Graylog web interface and REST API
- '9000:9000' - 9000:9000
# Syslog TCP # Syslog TCP
- '1514:1514' - 1514:1514
# Syslog UDP # Syslog UDP
- '1514:1514/udp' - 1514:1514/udp
# GELF TCP # GELF TCP
- '12201:12201' - 12201:12201
# GELF UDP # GELF UDP
- '12201:12201/udp' - 12201:12201/udp
# Kibana : https://www.elastic.co/guide/en/kibana/6.8/index.html # Kibana : https://www.elastic.co/guide/en/kibana/6.8/index.html
kibana: kibana:
image: 'docker.elastic.co/kibana/kibana-oss:6.8.4' image: docker.elastic.co/kibana/kibana-oss:6.8.5
env_file: env_file:
- kibana.env - kibana.env
depends_on: depends_on:
- elasticsearch - elasticsearch
ports: ports:
- '5601:5601' - 5601:5601
cerebro: cerebro:
image: lmenezes/cerebro image: lmenezes/cerebro
ports: ports:
- '9001:9000' - 9001:9000
links: links:
- elasticsearch - elasticsearch
depends_on: depends_on:
@@ -81,23 +82,23 @@ services:
env_file: env_file:
- ./influxdb.env - ./influxdb.env
ports: ports:
- '8086:8086' - 8086:8086
volumes: volumes:
- 'influxdb:/var/lib/influxdb' - influxdb:/var/lib/influxdb
logging: logging:
driver: "json-file" driver: "json-file"
options: options:
max-size: "100M" max-size: "100M"
grafana: grafana:
image: 'grafana/grafana:latest' image: grafana/grafana:latest
env_file: env_file:
- ./grafana.env - ./grafana.env
ports: ports:
- '3000:3000' - 3000:3000
volumes: volumes:
- 'grafana:/var/lib/grafana' - grafana:/var/lib/grafana
- './provisioning/:/etc/grafana/provisioning' - ./grafana/provisioning/:/etc/grafana/provisioning
links: links:
- elasticsearch - elasticsearch
- influxdb - influxdb