diff --git a/docker/cowrie/Dockerfile b/docker/cowrie/Dockerfile index b04a137c..4659a9da 100644 --- a/docker/cowrie/Dockerfile +++ b/docker/cowrie/Dockerfile @@ -33,6 +33,7 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \ cd /home/cowrie && \ git clone --depth=1 https://github.com/micheloosterhof/cowrie -b v2.1.0 && \ cd cowrie && \ + sed -i s/logfile.DailyLogFile/logfile.LogFile/g src/cowrie/output/jsonlog.py && \ mkdir -p log && \ cp /root/dist/requirements.txt . && \ pip3 install -r requirements.txt && \ diff --git a/docker/elk/docker-compose.yml b/docker/elk/docker-compose.yml index 7f5276e3..09d59dbb 100644 --- a/docker/elk/docker-compose.yml +++ b/docker/elk/docker-compose.yml @@ -46,6 +46,8 @@ services: build: logstash/. container_name: logstash restart: always + environment: + - LS_JAVA_OPTS=-Xms2048m -Xmx2048m depends_on: elasticsearch: condition: service_healthy diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile index e75cdfe3..65f7218b 100644 --- a/docker/elk/elasticsearch/Dockerfile +++ b/docker/elk/elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:3.12 # # VARS ENV ES_VER=7.8.0 \ diff --git a/docker/elk/head/Dockerfile b/docker/elk/head/Dockerfile index 8eafeefa..e1022f55 100644 --- a/docker/elk/head/Dockerfile +++ b/docker/elk/head/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.12 # # Setup env and apt RUN apk -U add \ diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile index 45a6358a..9990b39d 100644 --- a/docker/elk/logstash/Dockerfile +++ b/docker/elk/logstash/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:3.12 # # VARS ENV LS_VER=7.8.0 @@ -56,4 +56,5 @@ HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9600' # # Start logstash #USER logstash:logstash +#CMD update.sh && exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf --config.reload.automatic --java-execution --log.level debug CMD update.sh && exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf --config.reload.automatic --java-execution diff --git a/docker/elk/logstash/docker-compose.yml b/docker/elk/logstash/docker-compose.yml index 5b74feb3..ed94864b 100644 --- a/docker/elk/logstash/docker-compose.yml +++ b/docker/elk/logstash/docker-compose.yml @@ -7,6 +7,8 @@ services: build: . container_name: logstash restart: always + environment: + - LS_JAVA_OPTS=-Xms2048m -Xmx2048m # depends_on: # elasticsearch: # condition: service_healthy @@ -15,4 +17,4 @@ services: image: "dtagdevsec/logstash:2006" volumes: - /data:/data - - /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf +# - /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf diff --git a/etc/compose/collector.yml b/etc/compose/collector.yml index 81d044a2..1827e2fe 100644 --- a/etc/compose/collector.yml +++ b/etc/compose/collector.yml @@ -159,6 +159,8 @@ services: logstash: container_name: logstash restart: always + environment: + - LS_JAVA_OPTS=-Xms2048m -Xmx2048m depends_on: elasticsearch: condition: service_healthy diff --git a/etc/compose/industrial.yml b/etc/compose/industrial.yml index 1369472d..07df0f4a 100644 --- a/etc/compose/industrial.yml +++ b/etc/compose/industrial.yml @@ -366,6 +366,8 @@ services: logstash: container_name: logstash restart: always + environment: + - LS_JAVA_OPTS=-Xms2048m -Xmx2048m depends_on: elasticsearch: condition: service_healthy diff --git a/etc/compose/medical.yml b/etc/compose/medical.yml index 71eae866..9fad7fbb 100644 --- a/etc/compose/medical.yml +++ b/etc/compose/medical.yml @@ -144,6 +144,8 @@ services: logstash: container_name: logstash restart: always + environment: + - LS_JAVA_OPTS=-Xms2048m -Xmx2048m depends_on: elasticsearch: condition: service_healthy diff --git a/etc/compose/nextgen.yml b/etc/compose/nextgen.yml index f587f620..7d140c59 100644 --- a/etc/compose/nextgen.yml +++ b/etc/compose/nextgen.yml @@ -564,6 +564,8 @@ services: logstash: container_name: logstash restart: always + environment: + - LS_JAVA_OPTS=-Xms2048m -Xmx2048m depends_on: elasticsearch: condition: service_healthy diff --git a/etc/compose/standard.yml b/etc/compose/standard.yml index 31397f3a..2543da4d 100644 --- a/etc/compose/standard.yml +++ b/etc/compose/standard.yml @@ -542,6 +542,8 @@ services: logstash: container_name: logstash restart: always + environment: + - LS_JAVA_OPTS=-Xms2048m -Xmx2048m depends_on: elasticsearch: condition: service_healthy