Commit f8b9dba6 authored by ale's avatar ale

Merge branch 'es7' into 'master'

Elasticsearch 7

See merge request !115
parents d17ff9a4 91a6885e
Pipeline #6788 passed with stage
in 3 minutes and 15 seconds
......@@ -93,3 +93,8 @@ gateway.expected_nodes: 1
#
#action.destructive_requires_name: true
#
cluster.initial_master_nodes:
{% for s in groups['log-collector']|sort %}
- "{{ s }}"
{% endfor %}
......@@ -32,10 +32,9 @@
##
################################################################
## GC configuration
-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75
-XX:+UseCMSInitiatingOccupancyOnly
-XX:+UseG1GC
-XX:G1ReservePercent=25
-XX:InitiatingHeapOccupancyPercent=30
## optimizations
......
......@@ -61,7 +61,7 @@ log-collector:
env:
BABEL_CACHE_PATH: "/var/lib/kibana/.babelcache.json"
- name: elasticsearch
image: registry.git.autistici.org/ai3/docker/elasticsearch:master
image: registry.git.autistici.org/ai3/docker/elasticsearch:es7
port: 9200
volumes:
- /etc/elasticsearch: /etc/elasticsearch
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment