Code Review
/
clamp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Upgrade ELK to 6.1.3"
[clamp.git]
/
extra
/
docker
/
elk
/
logstash-conf
/
logstash.conf
diff --git
a/extra/docker/elk/logstash-conf/logstash.conf
b/extra/docker/elk/logstash-conf/logstash.conf
index
c511995
..
2b71686
100644
(file)
--- a/
extra/docker/elk/logstash-conf/logstash.conf
+++ b/
extra/docker/elk/logstash-conf/logstash.conf
@@
-31,8
+31,8
@@
input {
}
socket_timeout => 30
request_timeout => 30
}
socket_timeout => 30
request_timeout => 30
- interval => 60
codec => "plain"
codec => "plain"
+ schedule => { "every" => "1m" }
}
}
}
}
@@
-131,15
+131,15
@@
output {
if [http_request_failure] {
elasticsearch {
codec => "json"
if [http_request_failure] {
elasticsearch {
codec => "json"
- hosts => [
elasticsearch
]
+ hosts => [
"${elasticsearch_hosts}"
]
index => "errors-%{+YYYY.MM.DD}"
doc_as_upsert => true
}
} else {
elasticsearch {
codec => "json"
index => "errors-%{+YYYY.MM.DD}"
doc_as_upsert => true
}
} else {
elasticsearch {
codec => "json"
- hosts => [
elasticsearch
]
- index => "
logstash
-%{+YYYY.MM.DD}" # creates daily indexes
+ hosts => [
"${elasticsearch_hosts}"
]
+ index => "
events
-%{+YYYY.MM.DD}" # creates daily indexes
doc_as_upsert => true
}
doc_as_upsert => true
}