mirror of
https://github.com/telekom-security/tpotce.git
synced 2025-07-01 20:42:11 +00:00
Bump Elastic Stack to 8.18.3
- Logstash: include syslog output plugin and config example
This commit is contained in:
parent
6933ee0065
commit
175e1944c2
6 changed files with 27 additions and 12 deletions
|
@ -22,7 +22,7 @@ services:
|
||||||
mem_limit: 4g
|
mem_limit: 4g
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:64298:9200"
|
- "127.0.0.1:64298:9200"
|
||||||
image: "dtagdevsec/elasticsearch:24.04"
|
image: "ghcr.io/telekom-security/elasticsearch:24.04.1"
|
||||||
volumes:
|
volumes:
|
||||||
- $HOME/tpotce/data:/data
|
- $HOME/tpotce/data:/data
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ services:
|
||||||
mem_limit: 1g
|
mem_limit: 1g
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:64296:5601"
|
- "127.0.0.1:64296:5601"
|
||||||
image: "dtagdevsec/kibana:24.04"
|
image: "ghcr.io/telekom-security/kibana:24.04.1"
|
||||||
|
|
||||||
## Logstash service
|
## Logstash service
|
||||||
logstash:
|
logstash:
|
||||||
|
@ -50,7 +50,7 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
image: "dtagdevsec/logstash:24.04"
|
image: "ghcr.io/telekom-security/logstash:24.04.1"
|
||||||
volumes:
|
volumes:
|
||||||
- $HOME/tpotce/data:/data
|
- $HOME/tpotce/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
|
||||||
|
@ -63,7 +63,7 @@ services:
|
||||||
tty: true
|
tty: true
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:6379:6379"
|
- "127.0.0.1:6379:6379"
|
||||||
image: "dtagdevsec/redis:24.04"
|
image: "ghcr.io/telekom-security/redis:24.04.1"
|
||||||
read_only: true
|
read_only: true
|
||||||
|
|
||||||
# Map Web Service
|
# Map Web Service
|
||||||
|
@ -77,7 +77,7 @@ services:
|
||||||
tty: true
|
tty: true
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:64299:64299"
|
- "127.0.0.1:64299:64299"
|
||||||
image: "dtagdevsec/map:24.04"
|
image: "ghcr.io/telekom-security/map:24.04.1"
|
||||||
depends_on:
|
depends_on:
|
||||||
- map_redis
|
- map_redis
|
||||||
|
|
||||||
|
@ -89,6 +89,6 @@ services:
|
||||||
- MAP_COMMAND=DataServer_v2.py
|
- MAP_COMMAND=DataServer_v2.py
|
||||||
stop_signal: SIGKILL
|
stop_signal: SIGKILL
|
||||||
tty: true
|
tty: true
|
||||||
image: "dtagdevsec/map:24.04"
|
image: "ghcr.io/telekom-security/map:24.04.1"
|
||||||
depends_on:
|
depends_on:
|
||||||
- map_redis
|
- map_redis
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
FROM ubuntu:24.04
|
FROM ubuntu:24.04
|
||||||
ENV DEBIAN_FRONTEND noninteractive
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
ENV ES_VER=8.18.2
|
ENV ES_VER=8.18.3
|
||||||
#
|
#
|
||||||
# Include dist
|
# Include dist
|
||||||
COPY dist/ /root/dist/
|
COPY dist/ /root/dist/
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
FROM node:20.18.2-alpine3.20
|
FROM node:20.19.2-alpine3.20
|
||||||
ENV KB_VER=8.18.2
|
ENV KB_VER=8.18.3
|
||||||
#
|
#
|
||||||
# Include dist
|
# Include dist
|
||||||
COPY dist/ /root/dist/
|
COPY dist/ /root/dist/
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
FROM ubuntu:24.04
|
FROM ubuntu:24.04
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ENV LS_VER=8.18.2
|
ENV LS_VER=8.18.3
|
||||||
#
|
#
|
||||||
# Include dist
|
# Include dist
|
||||||
COPY dist/ /root/dist/
|
COPY dist/ /root/dist/
|
||||||
|
@ -42,6 +42,7 @@ RUN apt-get update -y && \
|
||||||
cp tpot-template.json /etc/logstash/ && \
|
cp tpot-template.json /etc/logstash/ && \
|
||||||
cd /usr/share/logstash && \
|
cd /usr/share/logstash && \
|
||||||
bin/logstash-plugin update logstash-filter-translate && \
|
bin/logstash-plugin update logstash-filter-translate && \
|
||||||
|
bin/logstash-plugin install logstash-output-syslog && \
|
||||||
rm /etc/logstash/pipelines.yml && \
|
rm /etc/logstash/pipelines.yml && \
|
||||||
rm /etc/logstash/logstash.yml && \
|
rm /etc/logstash/logstash.yml && \
|
||||||
#
|
#
|
||||||
|
|
9
docker/elk/logstash/dist/http_input.conf
vendored
9
docker/elk/logstash/dist/http_input.conf
vendored
|
@ -17,5 +17,12 @@ output {
|
||||||
template => "/etc/logstash/tpot-template.json"
|
template => "/etc/logstash/tpot-template.json"
|
||||||
template_overwrite => "true"
|
template_overwrite => "true"
|
||||||
}
|
}
|
||||||
|
# Syslog Output Example
|
||||||
|
# syslog {
|
||||||
|
# host => "192.168.1.1"
|
||||||
|
# port => 514
|
||||||
|
# protocol => tcp
|
||||||
|
# appname => "logstash-logs"
|
||||||
|
# severity => "6"
|
||||||
|
# }
|
||||||
}
|
}
|
||||||
|
|
9
docker/elk/logstash/dist/logstash.conf
vendored
9
docker/elk/logstash/dist/logstash.conf
vendored
|
@ -816,7 +816,14 @@ output {
|
||||||
template => "/etc/logstash/tpot-template.json"
|
template => "/etc/logstash/tpot-template.json"
|
||||||
template_overwrite => "true"
|
template_overwrite => "true"
|
||||||
}
|
}
|
||||||
|
# Syslog Output Example
|
||||||
|
# syslog {
|
||||||
|
# host => "192.168.1.1"
|
||||||
|
# port => 514
|
||||||
|
# protocol => tcp
|
||||||
|
# appname => "logstash-logs"
|
||||||
|
# severity => "6"
|
||||||
|
# }
|
||||||
#if [type] == "Suricata" {
|
#if [type] == "Suricata" {
|
||||||
# file {
|
# file {
|
||||||
# file_mode => 0770
|
# file_mode => 0770
|
||||||
|
|
Loading…
Reference in a new issue