Merge pull request #36857 from Shrugs/fix/elasticsearch-template-mapping

Automatic merge from submit-queue fix: elasticsearch template mapping to parse kubernetes.labels **What this PR does / why we need it**: This PR updates the field mappings for the elasticsearch template that ships with the EFK stack implementation. Specifically, elasticsearch cannot parse the `kubernetes.labels` object because it attempts to treat it as a string and produces an error. This update treats `kubernetes.labels` as an object and all of the properties within as a string, allowing accurate indexing and allowing users in kibana to search on `kubernetes.labels.*`. **Release note**: ```release-note Fluentd/Elastisearch add-on: correctly parse and index kubernetes labels ```

Merge pull request #36857 from Shrugs/fix/elasticsearch-template-mapping
d77610fc · Kubernetes Submit Queue · GitHub · 00aae980 · 00f6592d · d77610fc
Commit d77610fc authored Nov 29, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 30 additions and 17 deletions

template-k8s-logstash.json ...fluentd-elasticsearch/es-image/template-k8s-logstash.json +30 -17

No files found.
--- a/cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json
+++ b/cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json
 {
-  "template_k8s_logstash" : {
+  "template" : "logstash-*",
-    "template" : "logstash-*",
+  "settings" : {
-    "settings" : {
+    "index.refresh_interval" : "5s"
-      "index.refresh_interval" : "5s"
+  },
-    },
+  "mappings" : {
-    "mappings" : {
+    "_default_" : {
-      "_default_" : {
+      "dynamic_templates" : [ {
-        "dynamic_templates" : [ {
+        "kubernetes_labels" : {
-          "kubernetes_field" : {
+          "path_match" : "kubernetes.labels",
-            "path_match" : "kubernetes.*",
+          "mapping" : {
-            "mapping" : {
+            "type" : "object",
-              "type" : "string",
+            "dynamic_templates" : [ {
-              "index" : "not_analyzed"
+              "match_mapping_type": "string",
-            }
+              "path_match" : "*",
+              "mapping" : {
+                "type" : "string",
+                "index" : "not_analyzed"
+              }
+            } ]
          }
-        } ]
+        }
-      }
+      }, {
+        "kubernetes_field" : {
+          "match_mapping_type": "string",
+          "path_match" : "kubernetes.*",
+          "mapping" : {
+            "type" : "string",
+            "index" : "not_analyzed"
+          }
+        }
+      } ]
    }
  }
 }