github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33584 from marketlogicsoftware/kayrus/enable_elk_k8s_metadata

Browse Source 
Automatic merge from submit-queue

Enable kubernetes_metadata by default for ELK stack

Looks like it was accidentally removed and was not restored back in this PR https://github.com/kubernetes/kubernetes/pull/29883
Because actually this plugin still exists in the image, but new ELK deployment don't allow you to index namespaces, pod names, etc.
This commit is contained in:
Kubernetes Submit Queue 2017-01-11 12:19:42 -08:00 committed by GitHub
commit 12e8271cd3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@ -16,7 +16,7 @@
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
IMAGE = fluentd-elasticsearch IMAGE = fluentd-elasticsearch
TAG = 1.20 TAG = 1.21
build: build:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .

7
cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
View File

@ -279,10 +279,9 @@
tag cluster-autoscaler tag cluster-autoscaler
</source> </source>
# Uncomment in a case of daemon-set usage <filter kubernetes.**>
#<filter kubernetes.**> type kubernetes_metadata
# type kubernetes_metadata </filter>
#</filter>
<match **> <match **>
type elasticsearch type elasticsearch