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 #29883 Because actually this plugin still exists in the image, but new ELK deployment don't allow you to index namespaces, pod names, etc.
kubernetes · Jan 11, 2017 · 12e8271 · 12e8271
2 parents cb7792d + 8435d19
commit 12e8271
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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) .

diff --git 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