Add Elasticsearch 2.3.4 and bump Kibana versions

Add kibana password as an input to the shieldKibanaServerPwd
elastic · Jul 9, 2016 · 12719bc · 12719bc
1 parent 0103318
commit 12719bc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/build/allowedValues.json b/build/allowedValues.json
@@ -4,16 +4,19 @@
       "kibana": "4.2.2"
     },
     "2.1.2": {
-      "kibana": "4.3.2"
+      "kibana": "4.3.3"
     },
     "2.2.0": {
-      "kibana": "4.4.1"
+      "kibana": "4.4.2"
     },
     "2.3.2": {
-      "kibana": "4.5.1"
+      "kibana": "4.5.2"
     },
     "2.3.3": {
-      "kibana": "4.5.1"
+      "kibana": "4.5.2"
+    },
+    "2.3.4": {
+      "kibana": "4.5.2"
     }
   },
   "locations" : [

diff --git a/src/createUiDefinition.json b/src/createUiDefinition.json
@@ -53,7 +53,7 @@
             "name": "esVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Elasticsearch version",
-            "defaultValue": "v2.3.3",
+            "defaultValue": "v2.3.4",
             "toolTip": "Choose a version of Elasticsearch.",
             "constraints": {
               "allowedValues": [
@@ -76,6 +76,10 @@
                 {
                   "label": "v2.3.3",
                   "value": "2.3.3"
+                },
+                {
+                  "label": "v2.3.4",
+                  "value": "2.3.4"
                 }
               ]
             }

diff --git a/src/mainTemplate.json b/src/mainTemplate.json
@@ -11,13 +11,14 @@
     },
     "esVersion": {
       "type": "string",
-      "defaultValue": "2.3.3",
+      "defaultValue": "2.3.4",
       "allowedValues": [
         "2.0.2",
         "2.1.2",
         "2.2.0",
         "2.3.2",
-        "2.3.3"
+        "2.3.3",
+        "2.3.4"
       ],
       "metadata": {
         "description": "Elasticsearch version to install"
@@ -534,10 +535,11 @@
     },
     "esToKibanaMapping": {
       "2.0.2": "4.2.2",
-      "2.1.2": "4.3.2",
-      "2.2.0": "4.4.1",
-      "2.3.2": "4.5.1",
-      "2.3.3": "4.5.1"
+      "2.1.2": "4.3.3",
+      "2.2.0": "4.4.2",
+      "2.3.2": "4.5.2",
+      "2.3.3": "4.5.2",
+      "2.3.4": "4.5.2"
     },
     "esSettings": {
       "clusterName": "[parameters('esClusterName')]",
@@ -546,7 +548,7 @@
       "shieldAdminPwd": "[parameters('shieldAdminPassword')]",
       "shieldReadPwd": "[parameters('shieldReadPassword')]",
       "shieldKibanaPwd": "[parameters('shieldKibanaPassword')]",
-      "shieldKibanaServerPwd": "[uniqueString(resourceGroup().id, deployment().name)]",
+      "shieldKibanaServerPwd": "[uniqueString(resourceGroup().id, deployment().name, parameters('shieldKibanaPassword'))]",
       "kibanaVersion": "[variables('esToKibanaMapping')[parameters('esVersion')]]"
     },
     "namespacePrefix": "[parameters('vmHostNamePrefix')]",