From bb56207a35f6396d2731fed2721002f2e8b617b1 Mon Sep 17 00:00:00 2001
From: Russ Cam <russ.cam@elastic.co>
Date: Fri, 8 Feb 2019 15:53:08 +1000
Subject: [PATCH] Add Elastic Stack 6.6 support (#258)

Add support for 6.6.0
Add support for 6.5.4
Add support for 5.6.14

Remove support for 5.6.12 as this is superseded by 5.6.14
Remove support for 5.5 as this is now EOL for support.
Remove minor versions of 6.5 prior to 6.5.4

Closes #257
---
 build/allowedValues.json    | 11 +++--------
 src/createUiDefinition.json | 34 +++++++---------------------------
 src/mainTemplate.json       | 13 ++++---------
 3 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/build/allowedValues.json b/build/allowedValues.json
index 2ee48c30..6996528a 100644
--- a/build/allowedValues.json
+++ b/build/allowedValues.json
@@ -1,18 +1,13 @@
 {
   "versions": [
-    "5.5.3",
-    "5.6.12",
+    "5.6.14",
     "6.0.1",
     "6.1.3",
     "6.2.4",
     "6.3.2",
-    "6.4.1",
-    "6.4.2",
     "6.4.3",
-    "6.5.0",
-    "6.5.1",
-    "6.5.2",
-    "6.5.3"
+    "6.5.4",
+    "6.6.0"
   ],
   "numberOfDataNodes" : 50,
   "numberOfClientNodes" : 20,
diff --git a/src/createUiDefinition.json b/src/createUiDefinition.json
index 9193efcf..ef38960d 100644
--- a/src/createUiDefinition.json
+++ b/src/createUiDefinition.json
@@ -54,17 +54,13 @@
             "name": "esVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Elasticsearch version",
-            "defaultValue": "v6.5.3",
+            "defaultValue": "v6.6.0",
             "toolTip": "Choose a version of Elasticsearch.",
             "constraints": {
               "allowedValues": [
                 {
-                  "label": "v5.5.3",
-                  "value": "5.5.3"
-                },
-                {
-                  "label": "v5.6.12",
-                  "value": "5.6.12"
+                  "label": "v5.6.14",
+                  "value": "5.6.14"
                 },
                 {
                   "label": "v6.0.1",
@@ -82,33 +78,17 @@
                   "label": "v6.3.2",
                   "value": "6.3.2"
                 },
-                {
-                  "label": "v6.4.1",
-                  "value": "6.4.1"
-                },
-                {
-                  "label": "v6.4.2",
-                  "value": "6.4.2"
-                },
                 {
                   "label": "v6.4.3",
                   "value": "6.4.3"
                 },
                 {
-                  "label": "v6.5.0",
-                  "value": "6.5.0"
-                },
-                {
-                  "label": "v6.5.1",
-                  "value": "6.5.1"
-                },
-                {
-                  "label": "v6.5.2",
-                  "value": "6.5.2"
+                  "label": "v6.5.4",
+                  "value": "6.5.4"
                 },
                 {
-                  "label": "v6.5.3",
-                  "value": "6.5.3"
+                  "label": "v6.6.0",
+                  "value": "6.6.0"
                 }
               ]
             }
diff --git a/src/mainTemplate.json b/src/mainTemplate.json
index 1444e0c3..bd64b9ea 100644
--- a/src/mainTemplate.json
+++ b/src/mainTemplate.json
@@ -21,21 +21,16 @@
     },
     "esVersion": {
       "type": "string",
-      "defaultValue": "6.5.3",
+      "defaultValue": "6.6.0",
       "allowedValues": [
-        "5.5.3",
-        "5.6.12",
+        "5.6.14",
         "6.0.1",
         "6.1.3",
         "6.2.4",
         "6.3.2",
-        "6.4.1",
-        "6.4.2",
         "6.4.3",
-        "6.5.0",
-        "6.5.1",
-        "6.5.2",
-        "6.5.3"
+        "6.5.4",
+        "6.6.0"
       ],
       "metadata": {
         "description": "Elasticsearch version to install"