Add support for Elasticsearch 5.x

* Use log4j2.properties instead of logging.yml
* Add jvm.options
* Use bootstrap.memory_lock instead of bootstrap.mlockall
* Get rid of work directory
* Executable does not accept `-D` anymore, replace with `-E` and `-p`
* Get rid of 5.x default (file)s
This commit is contained in:
Maarten Bezemer 2016-11-03 15:24:17 +01:00
parent 56837b0627
commit 523270405e
9 changed files with 218 additions and 5 deletions

View file

@ -14,17 +14,21 @@ DATA_DIR={{ data_dirs | array_to_str }}
# Elasticsearch logs directory
LOG_DIR={{log_dir}}
{% if es_version | version_compare('2.0', '<=') %}
# Elasticsearch work directory
WORK_DIR={{work_dir}}
{% endif %}
# Elasticsearch PID directory
PID_DIR={{pid_dir}}
{% if es_version | version_compare('2.0', '<=') %}
# Heap size defaults to 256m min, 1g max
# Set ES_HEAP_SIZE to 50% of available RAM, but no more than 31g
{% if es_heap_size is defined %}
ES_HEAP_SIZE={{es_heap_size}}
{% endif %}
{% endif %}
# Heap new generation
#ES_HEAP_NEWSIZE=
@ -74,7 +78,7 @@ MAX_OPEN_FILES={{es_max_open_files}}
{% endif %}
# The maximum number of bytes of memory that may be locked into RAM
# Set to "unlimited" if you use the 'bootstrap.mlockall: true' option
# Set to "unlimited" if you use the 'bootstrap.{% if es_version | version_compare('2.0', '>') %}memory_lock{% else %}mlockall{% endif %}: true' option
# in elasticsearch.yml (ES_HEAP_SIZE must also be set).
# When using Systemd, the LimitMEMLOCK property must be set
# in /usr/lib/systemd/system/elasticsearch.service