Increase template order of new templates to 1

This makes sure, in case for example a metricbeat-* and a metricbeat-{beatversion}-* template exist, the more precise one / newer one overloads the older one. This is important for people migrating from 5.x to 6.x. Closes elastic#3657
ruflin · Feb 24, 2017 · 3ff4f66 · 3ff4f66
1 parent 4e1a173
commit 3ff4f66
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/filebeat/filebeat.template-es2x.json b/filebeat/filebeat.template-es2x.json
@@ -533,7 +533,7 @@
       }
     }
   },
-  "order": 0,
+  "order": 1,
   "settings": {
     "index.refresh_interval": "5s"
   },

diff --git a/filebeat/filebeat.template.json b/filebeat/filebeat.template.json
@@ -453,7 +453,7 @@
       }
     }
   },
-  "order": 0,
+  "order": 1,
   "settings": {
     "index": {
       "mapping": {

diff --git a/heartbeat/heartbeat.template-es2x.json b/heartbeat/heartbeat.template-es2x.json
@@ -211,7 +211,7 @@
       }
     }
   },
-  "order": 0,
+  "order": 1,
   "settings": {
     "index.refresh_interval": "5s"
   },

diff --git a/heartbeat/heartbeat.template.json b/heartbeat/heartbeat.template.json
@@ -183,7 +183,7 @@
       }
     }
   },
-  "order": 0,
+  "order": 1,
   "settings": {
     "index": {
       "mapping": {

diff --git a/libbeat/template/template.go b/libbeat/template/template.go
@@ -86,7 +86,7 @@ func createTemplate(properties common.MapStr, version string, esVersion Version,
 				"properties":        properties,
 			},
 		},
-		"order": 0,
+		"order": 1,
 		"settings": common.MapStr{
 			"index.refresh_interval": "5s",
 		},

diff --git a/metricbeat/metricbeat.template-es2x.json b/metricbeat/metricbeat.template-es2x.json
@@ -4296,7 +4296,7 @@
       }
     }
   },
-  "order": 0,
+  "order": 1,
   "settings": {
     "index.refresh_interval": "5s"
   },

diff --git a/metricbeat/metricbeat.template.json b/metricbeat/metricbeat.template.json
@@ -4235,7 +4235,7 @@
       }
     }
   },
-  "order": 0,
+  "order": 1,
   "settings": {
     "index": {
       "mapping": {

diff --git a/packetbeat/packetbeat.template-es2x.json b/packetbeat/packetbeat.template-es2x.json
@@ -1595,7 +1595,7 @@
       }
     }
   },
-  "order": 0,
+  "order": 1,
   "settings": {
     "index.refresh_interval": "5s"
   },

diff --git a/packetbeat/packetbeat.template.json b/packetbeat/packetbeat.template.json
@@ -1388,7 +1388,7 @@
       }
     }
   },
-  "order": 0,
+  "order": 1,
   "settings": {
     "index": {
       "mapping": {

diff --git a/winlogbeat/winlogbeat.template-es2x.json b/winlogbeat/winlogbeat.template-es2x.json
@@ -215,7 +215,7 @@
       }
     }
   },
-  "order": 0,
+  "order": 1,
   "settings": {
     "index.refresh_interval": "5s"
   },

diff --git a/winlogbeat/winlogbeat.template.json b/winlogbeat/winlogbeat.template.json
@@ -176,7 +176,7 @@
       }
     }
   },
-  "order": 0,
+  "order": 1,
   "settings": {
     "index": {
       "mapping": {