From 3ff4f66256d37a1c2f11a041a154264e314ce734 Mon Sep 17 00:00:00 2001
From: ruflin <spam@ruflin.com>
Date: Fri, 24 Feb 2017 17:22:02 +0100
Subject: [PATCH] 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 https://github.com/elastic/beats/issues/3657
---
 filebeat/filebeat.template-es2x.json     | 2 +-
 filebeat/filebeat.template.json          | 2 +-
 heartbeat/heartbeat.template-es2x.json   | 2 +-
 heartbeat/heartbeat.template.json        | 2 +-
 libbeat/template/template.go             | 2 +-
 metricbeat/metricbeat.template-es2x.json | 2 +-
 metricbeat/metricbeat.template.json      | 2 +-
 packetbeat/packetbeat.template-es2x.json | 2 +-
 packetbeat/packetbeat.template.json      | 2 +-
 winlogbeat/winlogbeat.template-es2x.json | 2 +-
 winlogbeat/winlogbeat.template.json      | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/filebeat/filebeat.template-es2x.json b/filebeat/filebeat.template-es2x.json
index f9d7fe1f96c..8c2b38ce7b3 100644
--- 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
index b046b004e9f..c26b021ac61 100644
--- 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
index 6c839efed31..e93090def37 100644
--- 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
index f3d27d05ed5..e866bdeeb5d 100644
--- 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
index a51859a7d53..23a33fed754 100644
--- 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
index 45d8b2c507e..6d876e07e67 100644
--- 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
index 326d1a66a48..0737811235f 100644
--- 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
index 2855fa809af..c4654fc64fa 100644
--- 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
index ea32712ef4d..2ee4f09dba4 100644
--- 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
index d4180c77a5b..28cb3fd4f86 100644
--- 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
index 84f0744f404..74e072f5a0c 100644
--- a/winlogbeat/winlogbeat.template.json
+++ b/winlogbeat/winlogbeat.template.json
@@ -176,7 +176,7 @@
       }
     }
   },
-  "order": 0,
+  "order": 1,
   "settings": {
     "index": {
       "mapping": {