aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStaffan Olsson <staffan@repos.se>2017-11-04 17:19:06 +0100
committerStaffan Olsson <staffan@repos.se>2017-11-04 17:20:45 +0100
commit504911a038f51c943a5bd335ae48235256d4eed6 (patch)
tree253b286ffcf33a5d0c6d3b14f3f5691610d811cf
parent52c28e8057a28270c3197766654ea46a9225976c (diff)
downloadkubernetes-kafka-504911a038f51c943a5bd335ae48235256d4eed6.tar.gz
kubernetes-kafka-504911a038f51c943a5bd335ae48235256d4eed6.tar.bz2
kubernetes-kafka-504911a038f51c943a5bd335ae48235256d4eed6.zip
Fixes kubernetes metadata inclusion
thanks to https://discuss.elastic.co/t/kubernetes-metadata/90865/15
-rw-r--r--logs-streaming/filebeat-config.yml4
-rw-r--r--logs-streaming/filebeat-logs-kube-kafka.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/logs-streaming/filebeat-config.yml b/logs-streaming/filebeat-config.yml
index 2df5ac7..828bdc0 100644
--- a/logs-streaming/filebeat-config.yml
+++ b/logs-streaming/filebeat-config.yml
@@ -10,8 +10,7 @@ data:
- type: log
enabled: true
paths:
- - /var/log/containers/*.log
- # Logs say a lot of https://github.com/elastic/beats/blob/v6.0.0-rc2/filebeat/prospector/log/prospector.go#L250
+ - /var/lib/docker/containers/*/*.log
symlinks: true
# reduce the risk for aggregation recursion: match pod names to exclude own's logs + test logs
exclude_files: ['^(.*\/)?logs-','^(.*\/)?test-']
@@ -19,6 +18,7 @@ data:
processors:
- add_kubernetes_metadata:
in_cluster: true
+ namespace: logs-kafka
output.kafka:
hosts: ["kafka-0.broker.kafka.svc.cluster.local:9092", "kafka-1.broker.kafka.svc.cluster.local:9092", "kafka-2.broker.kafka.svc.cluster.local:9092"]
diff --git a/logs-streaming/filebeat-logs-kube-kafka.yml b/logs-streaming/filebeat-logs-kube-kafka.yml
index 7e7fcd3..52bc245 100644
--- a/logs-streaming/filebeat-logs-kube-kafka.yml
+++ b/logs-streaming/filebeat-logs-kube-kafka.yml
@@ -26,7 +26,7 @@ spec:
- -c
- /etc/filebeat/filebeat.yml
- -d
- - "service,beat"
+ - "service,beat,kubernetes"
env:
- name: TOPIC
value: ops-kube-logs-filebeat-001