Skip to content
This repository has been archived by the owner on Mar 30, 2023. It is now read-only.

Commit

Permalink
Add support for Elastic Stack 7.8.0 (#349)
Browse files Browse the repository at this point in the history
This commit adds support for Elastic Stack
7.8.0, making it the default version. Bump 7.7
to the latest 7.7.1 patch release.
  • Loading branch information
russcam authored Jun 19, 2020
1 parent 96c84c6 commit ab16f38
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 16 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ where `<name>` refers to the resource group you just created.

```powershell
$branch = "master"
$esVersion = "7.7.0"
$esVersion = "7.8.0"
$clusterParameters = @{
"_artifactsLocation" = "https://raw.githubusercontent.com/elastic/azure-marketplace/$branch/src/"
Expand Down Expand Up @@ -677,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.7.0` tag release with PowerShell](https://github.com/elastic/azure-marketplace/tree/7.7.0)
For example, to target the [`7.8.0` tag release with PowerShell](https://github.com/elastic/azure-marketplace/tree/7.8.0)

```powershell
$templateVersion = "7.7.0"
$templateVersion = "7.8.0"
$_artifactsLocation = "https://raw.githubusercontent.com/elastic/azure-marketplace/$templateVersion/src/"
# minimum parameters required to deploy
$clusterParameters = @{
"_artifactsLocation" = $_artifactsLocation
"esVersion" = "7.7.0"
"esVersion" = "7.8.0"
"adminUsername" = "russ"
"adminPassword" = "Password1234"
"securityBootstrapPassword" = "Password1234"
Expand Down
3 changes: 2 additions & 1 deletion build/allowedValues.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"7.4.2",
"7.5.2",
"7.6.2",
"7.7.0"
"7.7.1",
"7.8.0"
],
"numberOfDataNodes" : 50,
"numberOfClientNodes" : 20,
Expand Down
2 changes: 1 addition & 1 deletion build/tasks/arm-validator.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ var login = (cb) => {
var version = [ '--version' ];
az(version, (error, stdout, stderr) => {
// ignore stderr if it's simply a warning about an older version of Azure CLI
if (error || (stderr && !/^WARNING: You have \d+ updates available/.test(stderr) && !/Unable to check if your CLI is up-to-date. Check your internet connection./.test(stderr))) {
if (error || (stderr && !/You have \d+ updates available/.test(stderr) && !/Unable to check if your CLI is up-to-date. Check your internet connection./.test(stderr))) {
return bailOut(error || new Error(stderr));
}

Expand Down
4 changes: 2 additions & 2 deletions docs/azure-arm-template.asciidoc
Original file line number Diff line number Diff line change
@@ -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.7
:version: 7.7.0
:current: 7.8
:version: 7.8.0
:register: https://register.elastic.co
:elasticguide: https://www.elastic.co/guide/en/elasticsearch
:elasticdocs: {elasticguide}/reference/{current}
Expand Down
2 changes: 1 addition & 1 deletion docs/trial-license-warning.asciidoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:current: 7.7
:current: 7.8
:register: https://register.elastic.co
:elasticdocs: https://www.elastic.co/guide/en/elasticsearch/reference/{current}
:licenseexpiration: {kibana-ref}/managing-licenses.html#license-expiration
Expand Down
2 changes: 1 addition & 1 deletion parameters/password.parameters.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_artifactsLocation":{"value":"https://raw.githubusercontent.com/elastic/azure-marketplace/master/src/"},
"_artifactsLocationSasToken":{"value":""},
"esVersion":{"value":"7.7.0"},
"esVersion":{"value":"7.8.0"},
"esClusterName":{"value":"my-azure-cluster"},
"loadBalancerType":{"value":"internal"},
"loadBalancerInternalSku":{"value":"Basic"},
Expand Down
2 changes: 1 addition & 1 deletion parameters/ssh.parameters.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_artifactsLocation":{"value":"https://raw.githubusercontent.com/elastic/azure-marketplace/master/src/"},
"_artifactsLocationSasToken":{"value":""},
"esVersion":{"value":"7.7.0"},
"esVersion":{"value":"7.8.0"},
"esClusterName":{"value":"my-azure-cluster"},
"loadBalancerType":{"value":"internal"},
"loadBalancerInternalSku":{"value":"Basic"},
Expand Down
10 changes: 7 additions & 3 deletions src/createUiDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"name": "esVersion",
"type": "Microsoft.Common.DropDown",
"label": "Elasticsearch version",
"defaultValue": "v7.7.0",
"defaultValue": "v7.8.0",
"toolTip": "Choose a version of Elasticsearch.",
"constraints": {
"allowedValues": [
Expand Down Expand Up @@ -99,8 +99,12 @@
"value": "7.6.2"
},
{
"label": "v7.7.0",
"value": "7.7.0"
"label": "v7.7.1",
"value": "7.7.1"
},
{
"label": "v7.8.0",
"value": "7.8.0"
}
]
}
Expand Down
5 changes: 3 additions & 2 deletions src/mainTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"esVersion": {
"type": "string",
"defaultValue": "7.7.0",
"defaultValue": "7.8.0",
"allowedValues": [
"6.6.2",
"6.7.2",
Expand All @@ -40,7 +40,8 @@
"7.4.2",
"7.5.2",
"7.6.2",
"7.7.0"
"7.7.1",
"7.8.0"
],
"metadata": {
"description": "Elastic Stack version to install"
Expand Down

0 comments on commit ab16f38

Please sign in to comment.