diff --git a/README.md b/README.md index 28dbce3b..6344b063 100644 --- a/README.md +++ b/README.md @@ -637,9 +637,12 @@ where `` refers to the resource group you just created. correspond the parameters defined in the [Parameters section](#parameters) ```powershell + $branch = "master" + $esVersion = "7.6.0" + $clusterParameters = @{ - "_artifactsLocation" = "https://raw.githubusercontent.com/elastic/azure-marketplace/master/src/" - "esVersion" = "7.5.0" + "_artifactsLocation" = "https://raw.githubusercontent.com/elastic/azure-marketplace/$branch/src/" + "esVersion" = $esVersion "esClusterName" = "elasticsearch" "loadBalancerType" = "internal" "vmDataDiskCount" = 1 @@ -674,16 +677,16 @@ the `_artifactsLocation` parameter of the template to point to a specific tagged **Targeting a specific template version is recommended for repeatable production deployments.** -For example, to target the [`7.5.0` tag release with PowerShell](https://github.com/elastic/azure-marketplace/tree/7.5.0) +For example, to target the [`7.6.0` tag release with PowerShell](https://github.com/elastic/azure-marketplace/tree/7.6.0) ```powershell -$templateVersion = "7.5.0" +$templateVersion = "7.6.0" $_artifactsLocation = "https://raw.githubusercontent.com/elastic/azure-marketplace/$templateVersion/src/" # minimum parameters required to deploy $clusterParameters = @{ "_artifactsLocation" = $_artifactsLocation - "esVersion" = "7.5.0" + "esVersion" = "7.6.0" "adminUsername" = "russ" "adminPassword" = "Password1234" "securityBootstrapPassword" = "Password1234" diff --git a/build/allowedValues.json b/build/allowedValues.json index c6064c5a..b592f495 100644 --- a/build/allowedValues.json +++ b/build/allowedValues.json @@ -1,6 +1,5 @@ { "versions": [ - "6.3.2", "6.4.3", "6.5.4", "6.6.2", @@ -11,7 +10,8 @@ "7.2.1", "7.3.2", "7.4.2", - "7.5.0" + "7.5.2", + "7.6.0" ], "numberOfDataNodes" : 50, "numberOfClientNodes" : 20, diff --git a/build/tasks/arm-validator.js b/build/tasks/arm-validator.js index 2d782031..0a734271 100644 --- a/build/tasks/arm-validator.js +++ b/build/tasks/arm-validator.js @@ -410,14 +410,13 @@ var sanityCheckDeployment = (test, stdout, cb) => { } var getApplicationGatewayPublicIp = (() => { - var applicationGatewayPublicIp = ""; - + var applicationGatewayPublicIps = {}; return (test, cb) => { - if (applicationGatewayPublicIp) - cb(applicationGatewayPublicIp); - else { - var t = armTests[test]; - var rg = t.resourceGroup; + var t = armTests[test]; + var rg = t.resourceGroup; + if (applicationGatewayPublicIps.hasOwnProperty(rg)) + cb(applicationGatewayPublicIps[rg]); + else { var operationList = [ 'network', 'public-ip', 'show', '--name', 'app-gateway-ip', '--resource-group', rg, @@ -429,12 +428,12 @@ var getApplicationGatewayPublicIp = (() => { log(test, `operationPublicIpShowResult: ${stdout || stderr}`); if (error || stderr) { log(`getting public ip for application gateway in ${t.name} resulted in error: ${JSON.stringify(error, null, 2)}`); - cb(applicationGatewayPublicIp); + cb(applicationGatewayPublicIps[rg]); } else { var result = JSON.parse(stdout); - applicationGatewayPublicIp = `https://${result.dnsSettings.fqdn}:9200`; - cb(applicationGatewayPublicIp); + applicationGatewayPublicIps[rg] = `https://${result.dnsSettings.fqdn}:9200`; + cb(applicationGatewayPublicIps[rg]); } }); } diff --git a/docs/azure-arm-template.asciidoc b/docs/azure-arm-template.asciidoc index 47c4526b..a227eea0 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.5 -:version: 7.5.0 +:current: 7.6 +:version: 7.6.0 :register: https://register.elastic.co :elasticguide: https://www.elastic.co/guide/en/elasticsearch :elasticdocs: {elasticguide}/reference/{current} diff --git a/docs/trial-license-warning.asciidoc b/docs/trial-license-warning.asciidoc index df1f8ca6..afe0db8f 100644 --- a/docs/trial-license-warning.asciidoc +++ b/docs/trial-license-warning.asciidoc @@ -1,4 +1,4 @@ -:current: 7.5 +:current: 7.6 :register: https://register.elastic.co :elasticdocs: https://www.elastic.co/guide/en/elasticsearch/reference/{current} :licenseexpiration: {stackdocs}/license-expiration.html diff --git a/parameters/password.parameters.json b/parameters/password.parameters.json index 079ab1fe..7afb202c 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":"7.5.0"}, + "esVersion":{"value":"7.6.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 88edbf9b..65ffd63b 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":"7.5.0"}, + "esVersion":{"value":"7.6.0"}, "esClusterName":{"value":"my-azure-cluster"}, "loadBalancerType":{"value":"internal"}, "loadBalancerInternalSku":{"value":"Basic"}, diff --git a/src/createUiDefinition.json b/src/createUiDefinition.json index f269eaa9..fa99b029 100644 --- a/src/createUiDefinition.json +++ b/src/createUiDefinition.json @@ -54,14 +54,10 @@ "name": "esVersion", "type": "Microsoft.Common.DropDown", "label": "Elasticsearch version", - "defaultValue": "v7.5.0", + "defaultValue": "v7.6.0", "toolTip": "Choose a version of Elasticsearch.", "constraints": { "allowedValues": [ - { - "label": "v6.3.2", - "value": "6.3.2" - }, { "label": "v6.4.3", "value": "6.4.3" @@ -103,8 +99,12 @@ "value": "7.4.2" }, { - "label": "v7.5.0", - "value": "7.5.0" + "label": "v7.5.2", + "value": "7.5.2" + }, + { + "label": "v7.6.0", + "value": "7.6.0" } ] } diff --git a/src/mainTemplate.json b/src/mainTemplate.json index 45c50fc8..5c679c1f 100644 --- a/src/mainTemplate.json +++ b/src/mainTemplate.json @@ -28,9 +28,8 @@ }, "esVersion": { "type": "string", - "defaultValue": "7.5.0", + "defaultValue": "7.6.0", "allowedValues": [ - "6.3.2", "6.4.3", "6.5.4", "6.6.2", @@ -41,7 +40,8 @@ "7.2.1", "7.3.2", "7.4.2", - "7.5.0" + "7.5.2", + "7.6.0" ], "metadata": { "description": "Elastic Stack version to install" diff --git a/src/partials/vm.json b/src/partials/vm.json index ce13735f..b84d8432 100644 --- a/src/partials/vm.json +++ b/src/partials/vm.json @@ -96,7 +96,7 @@ "nsgIpConfig": "[variables('nsgIpConfigs')[if(empty(parameters('vm').nsg), 0, if(parameters('vm').standardInternalLoadBalancer, 2, 1))]]", "nicProperties": { "primary": true, - "enableAcceleratedNetworking": "[equals(parameters('vm').acceleratedNetworking, 'Yes')]", + "enableAcceleratedNetworking": "[equals(parameters('vm').acceleratedNetworking, 'Yes')]", "ipConfigurations": [ { "name": "ipconfig1",