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.

Merge pull request #33584 from marketlogicsoftware/kayrus/enable_elk_k8s_metadata
12e8271c · Kubernetes Submit Queue · GitHub · cb7792d4 · 8435d199 · 12e8271c
Commit 12e8271c authored Jan 11, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

Makefile ...er/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +1 -1

td-agent.conf ...dons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf +3 -4

No files found.
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -16,7 +16,7 @@

 PREFIX = gcr.io/google_containers
 IMAGE = fluentd-elasticsearch
-TAG = 1.20
+TAG = 1.21

 build:
 	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .

--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
@@ -279,10 +279,9 @@
  tag cluster-autoscaler
 </source>

-# Uncomment in a case of daemon-set usage
-#<filter kubernetes.**>
-#  type kubernetes_metadata
-#</filter>
+<filter kubernetes.**>
+  type kubernetes_metadata
+</filter>

 <match **>
   type elasticsearch