Rebuild Logstash, Elasticsearch

Setting static limits for Elasticsearch / Logstash on Xms, Xmx and Container RAM results in unwanted side effects for some installations. With Elastic supporting dynamic heap management for Java 14+ we now use OpenJDK 16 JRE and as such remove limitations. This should improve stability for T-Pot, provided the minimum requirements will be met.
This commit is contained in:
t3chn0m4g3
2021-05-26 11:00:49 +00:00
parent 0c5ab33b8a
commit de38e5e86f
8 changed files with 32 additions and 29 deletions

View File

@ -10,7 +10,7 @@ services:
restart: always
environment:
- bootstrap.memory_lock=true
- ES_JAVA_OPTS=-Xms2048m -Xmx2048m
# - ES_JAVA_OPTS=-Xms2048m -Xmx2048m
- ES_TMPDIR=/tmp
cap_add:
- IPC_LOCK
@ -21,7 +21,7 @@ services:
nofile:
soft: 65536
hard: 65536
mem_limit: 4g
# mem_limit: 4g
ports:
- "127.0.0.1:64298:9200"
image: "ghcr.io/telekom-security/elasticsearch:2006"
@ -46,8 +46,8 @@ services:
build: logstash/.
container_name: logstash
restart: always
environment:
- LS_JAVA_OPTS=-Xms2048m -Xmx2048m
# environment:
# - LS_JAVA_OPTS=-Xms2048m -Xmx2048m
depends_on:
elasticsearch:
condition: service_healthy