mirror of
https://github.com/telekom-security/tpotce.git
synced 2025-04-19 21:52:27 +00:00
Merge branch 'master' into 22.x
This commit is contained in:
commit
c2aa0af2f3
3 changed files with 12 additions and 2 deletions
5
docker/elk/logstash/dist/http_output.conf
vendored
5
docker/elk/logstash/dist/http_output.conf
vendored
|
@ -584,6 +584,11 @@ filter {
|
||||||
date {
|
date {
|
||||||
match => [ "timestamp", "ISO8601" ]
|
match => [ "timestamp", "ISO8601" ]
|
||||||
}
|
}
|
||||||
|
mutate {
|
||||||
|
rename => {
|
||||||
|
"request" => "request_data"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Sentrypeer
|
# Sentrypeer
|
||||||
|
|
5
docker/elk/logstash/dist/logstash.conf
vendored
5
docker/elk/logstash/dist/logstash.conf
vendored
|
@ -584,6 +584,11 @@ filter {
|
||||||
date {
|
date {
|
||||||
match => [ "timestamp", "ISO8601" ]
|
match => [ "timestamp", "ISO8601" ]
|
||||||
}
|
}
|
||||||
|
mutate {
|
||||||
|
rename => {
|
||||||
|
"request" => "request_data"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Sentrypeer
|
# Sentrypeer
|
||||||
|
|
|
@ -7,8 +7,8 @@ services:
|
||||||
build: .
|
build: .
|
||||||
container_name: logstash
|
container_name: logstash
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
# environment:
|
||||||
- LS_JAVA_OPTS=-Xms2048m -Xmx2048m
|
# - LS_JAVA_OPTS=-Xms2048m -Xmx2048m
|
||||||
# depends_on:
|
# depends_on:
|
||||||
# elasticsearch:
|
# elasticsearch:
|
||||||
# condition: service_healthy
|
# condition: service_healthy
|
||||||
|
|
Loading…
Reference in a new issue