From 3a9f52ad2c886cd0d1c4d3118f5fbcad3c45d416 Mon Sep 17 00:00:00 2001
From: Russ Cam <russ.cam@elastic.co>
Date: Fri, 2 Aug 2019 12:11:25 +1000
Subject: [PATCH]  Add support for Elastic Stack 7.3.0 (#302)

This commit adds support for Elastic Stack 7.3.0.
Bump Elastic Stack 7.2 to 7.2.1
Bump Elastic Stack 6.8 to 6.8.2
Bump Elastic Stack 5.6 to 5.6.16
Bump parameter version values to 7.3.0

Closes #301
---
 README.md                           |  2 +-
 build/allowedValues.json            |  7 ++++---
 docs/azure-arm-template.asciidoc    |  4 ++--
 parameters/password.parameters.json |  2 +-
 parameters/ssh.parameters.json      |  2 +-
 src/createUiDefinition.json         | 18 +++++++++++-------
 src/mainTemplate.json               |  9 +++++----
 7 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index e8ee7a03..2cc44781 100644
--- a/README.md
+++ b/README.md
@@ -635,7 +635,7 @@ where `<name>` refers to the resource group you just created.
   ```powershell
   $clusterParameters = @{
       "_artifactsLocation" = "https://raw.githubusercontent.com/elastic/azure-marketplace/master/src/"
-      "esVersion" = "7.2.0"
+      "esVersion" = "7.3.0"
       "esClusterName" = "elasticsearch"
       "loadBalancerType" = "internal"
       "vmDataDiskCount" = 1
diff --git a/build/allowedValues.json b/build/allowedValues.json
index 8916c1da..5b6001df 100644
--- a/build/allowedValues.json
+++ b/build/allowedValues.json
@@ -1,16 +1,17 @@
 {
   "versions": [
-    "5.6.15",
+    "5.6.16",
     "6.2.4",
     "6.3.2",
     "6.4.3",
     "6.5.4",
     "6.6.2",
     "6.7.2",
-    "6.8.0",
+    "6.8.2",
     "7.0.1",
     "7.1.1",
-    "7.2.0"
+    "7.2.1",
+    "7.3.0"
   ],
   "numberOfDataNodes" : 50,
   "numberOfClientNodes" : 20,
diff --git a/docs/azure-arm-template.asciidoc b/docs/azure-arm-template.asciidoc
index 02fbdcb3..37c3b1ba 100644
--- a/docs/azure-arm-template.asciidoc
+++ b/docs/azure-arm-template.asciidoc
@@ -1,8 +1,8 @@
 :marketplace: https://azuremarketplace.microsoft.com/en-au/marketplace/apps/elastic.elasticsearch
 :portal: https://portal.azure.com
 :github: https://github.com/elastic/azure-marketplace
-:current: 7.2
-:version: 7.2.0
+:current: 7.3
+:version: 7.3.0
 :register: https://register.elastic.co
 :elasticguide: https://www.elastic.co/guide/en/elasticsearch
 :elasticdocs: {elasticguide}/reference/{current}
diff --git a/parameters/password.parameters.json b/parameters/password.parameters.json
index 6c869891..8aceae9e 100644
--- a/parameters/password.parameters.json
+++ b/parameters/password.parameters.json
@@ -1,7 +1,7 @@
 {
   "_artifactsLocation":{"value":"https://raw.githubusercontent.com/elastic/azure-marketplace/master/src/"},
   "_artifactsLocationSasToken":{"value":""},
-  "esVersion":{"value":"6.7.0"},
+  "esVersion":{"value":"7.3.0"},
   "esClusterName":{"value":"my-azure-cluster"},
   "loadBalancerType":{"value":"internal"},
   "loadBalancerInternalSku":{"value":"Basic"},
diff --git a/parameters/ssh.parameters.json b/parameters/ssh.parameters.json
index df0ca33b..ca252a70 100644
--- a/parameters/ssh.parameters.json
+++ b/parameters/ssh.parameters.json
@@ -1,7 +1,7 @@
 {
   "_artifactsLocation":{"value":"https://raw.githubusercontent.com/elastic/azure-marketplace/master/src/"},
   "_artifactsLocationSasToken":{"value":""},
-  "esVersion":{"value":"6.7.0"},
+  "esVersion":{"value":"7.3.0"},
   "esClusterName":{"value":"my-azure-cluster"},
   "loadBalancerType":{"value":"internal"},
   "loadBalancerInternalSku":{"value":"Basic"},
diff --git a/src/createUiDefinition.json b/src/createUiDefinition.json
index 0ccc1f4f..a43c2a77 100644
--- a/src/createUiDefinition.json
+++ b/src/createUiDefinition.json
@@ -54,13 +54,13 @@
             "name": "esVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Elasticsearch version",
-            "defaultValue": "v7.2.0",
+            "defaultValue": "v7.3.0",
             "toolTip": "Choose a version of Elasticsearch.",
             "constraints": {
               "allowedValues": [
                 {
-                  "label": "v5.6.15",
-                  "value": "5.6.15"
+                  "label": "v5.6.16",
+                  "value": "5.6.16"
                 },
                 {
                   "label": "v6.2.4",
@@ -87,8 +87,8 @@
                   "value": "6.7.2"
                 },
                 {
-                  "label": "v6.8.0",
-                  "value": "6.8.0"
+                  "label": "v6.8.2",
+                  "value": "6.8.2"
                 },
                 {
                   "label": "v7.0.1",
@@ -99,8 +99,12 @@
                   "value": "7.1.1"
                 },
                 {
-                  "label": "v7.2.0",
-                  "value": "7.2.0"
+                  "label": "v7.2.1",
+                  "value": "7.2.1"
+                },
+                {
+                  "label": "v7.3.0",
+                  "value": "7.3.0"
                 }
               ]
             }
diff --git a/src/mainTemplate.json b/src/mainTemplate.json
index 41c222c9..91623167 100644
--- a/src/mainTemplate.json
+++ b/src/mainTemplate.json
@@ -28,19 +28,20 @@
     },
     "esVersion": {
       "type": "string",
-      "defaultValue": "7.2.0",
+      "defaultValue": "7.3.0",
       "allowedValues": [
-        "5.6.15",
+        "5.6.16",
         "6.2.4",
         "6.3.2",
         "6.4.3",
         "6.5.4",
         "6.6.2",
         "6.7.2",
-        "6.8.0",
+        "6.8.2",
         "7.0.1",
         "7.1.1",
-        "7.2.0"
+        "7.2.1",
+        "7.3.0"
       ],
       "metadata": {
         "description": "Elastic Stack version to install"