mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
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.
This commit is contained in:
commit
12e8271cd3
@ -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) .
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user