From d3fd956daccd436d9909ffc27d6892d710e5d091 Mon Sep 17 00:00:00 2001
From: haoyuan <haoyuan.ge@caicloud.io>
Date: Wed, 17 May 2017 19:20:14 +0800
Subject: [PATCH] remove the elasticsearch template

---
 .../fluentd-elasticsearch/es-image/Dockerfile |  3 --
 .../es-image/template-k8s-logstash.json       | 35 -------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json

diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
index 5a444a6bdf1..972cae297dc 100644
--- a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
@@ -37,9 +37,6 @@ RUN set -x \
     && tar xf elasticsearch-$ELASTICSEARCH_VERSION.tar.gz -C /elasticsearch --strip-components=1 \
     && rm elasticsearch-$ELASTICSEARCH_VERSION.tar.gz
 
-RUN mkdir -p /elasticsearch/config/templates
-COPY template-k8s-logstash.json /elasticsearch/config/templates/template-k8s-logstash.json
-
 COPY config /elasticsearch/config
 
 COPY run.sh /
diff --git a/cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json b/cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json
deleted file mode 100644
index 77e42b5385c..00000000000
--- a/cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "template" : "logstash-*",
-  "settings" : {
-    "index.refresh_interval" : "5s"
-  },
-  "mappings" : {
-    "_default_" : {
-      "dynamic_templates" : [ {
-        "kubernetes_labels" : {
-          "path_match" : "kubernetes.labels",
-          "mapping" : {
-            "type" : "object",
-            "dynamic_templates" : [ {
-              "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"
-          }
-        }
-      } ]
-    }
-  }
-}