Skip to content

K
k3s
Commit 12e8271c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #33584 from marketlogicsoftware/kayrus/enable_elk_k8s_metadata

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.
parents cb7792d4 8435d199
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View file @ 12e8271c
...@@ -16,7 +16,7 @@ ...@@ -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) .
......
cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
View file @ 12e8271c
...@@ -279,10 +279,9 @@ ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment