From ccfb8c03831b72e4c81338072793757bdecbadc8 Mon Sep 17 00:00:00 2001 From: Anup Singh <64248163+anupteal@users.noreply.github.com> Date: Wed, 2 Dec 2020 23:28:06 +0530 Subject: [PATCH] Arm 7.11.2 (#68) * ARM templates - Postgresql JDBC driver is updated (for 7.10.2 compatibility) * ARM templates - RT and JCR 7.10.2, Xray 3.9.1 * VM image publish template - RT 7.10.5 * ARM template for 7.10.5 * ARM template for Xray 3.10.3 * Updated artifactoryVersion and location * Updated 7.10.5 version for JCR Azure application * updated version on azuredeploy_ms_ps.json * updated azuredeploy_ms_ps.json * updated azuredeploy_ms_ps.json * updated 7.10.6 verion in azuredeploy_ms_ps.json, MP_submission/createUiDefinition.json, MP_submission/mainTemplate.json * Updated the Version for JCR * updated new xray version 3.11.2 in template files * updated new x-ray version in createUiDefinition.json mainTemplate.json * updated createUiDefinition.json mainTemplate.json * updated 7.11.2 changes for xray, rt and jcr * ARM template, fixing formatting Co-authored-by: danielmkn Co-authored-by: Aayush-sood94 --- .../MP_submission/createUiDefinition.json | 17 ++++++++--- .../MP_submission/mainTemplate.json | 13 +++++---- .../scripts/install_artifactory7.sh | 3 -- .../Artifactory/azuredeploy_ms_ps.json | 13 +++++---- .../azuredeploy_ms_ps.parameters.json | 14 +++++----- .../scripts/install_artifactory7.sh | 3 -- .../vm_install/install_pro7_to_vm.sh | 2 +- .../Artifactory/vm_install/vm_deploy.json | 4 +-- .../Artifactory/vm_install/vm_parameters.json | 4 +-- .../MP_submission_7/createUiDefinition.json | 17 +++++++++-- .../JCR/MP_submission_7/mainTemplate.json | 11 +++++--- AzureResourceManager/JCR/azuredeploy.json | 11 +++++--- .../JCR/vm_install/vm_parameters.json | 4 +-- .../MP_submission/createUiDefinition.json | 12 ++++++-- .../Xray/MP_submission/mainTemplate.json | 12 ++++---- .../nested/Postgresql_deploy.json | 2 +- .../Xray/azuredeploy_xray.parameters.json | 28 +++++++++---------- .../Xray/azuredeploy_xray_vmss.json | 12 ++++---- .../Xray/nested/Postgresql_deploy.json | 2 +- .../Xray/vm_install/vm_parameters.json | 4 +-- 20 files changed, 113 insertions(+), 75 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index 76ebfdd..6d850e3 100644 --- a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json @@ -132,7 +132,7 @@ "name": "artifactoryVersion", "type": "Microsoft.Common.DropDown", "label": "Artifactory-vm image version to deploy.", - "defaultValue": "7.10.2", + "defaultValue": "7.11.2", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -170,8 +170,17 @@ }, { "label": "7.10.2", - "value": "0.0.3" - } + "value": "0.0.31" + }, + { + "label": "7.10.5", + "value": "0.0.4" + }, + { + "label": "7.10.6", + "value": "0.0.52" + }, + { "label": "7.11.2", "value": "0.0.6" } ], "required": true }, @@ -533,4 +542,4 @@ "storageAccountType": "[steps('storageConfig').storageAccountsType]" } } -} \ No newline at end of file +} diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index cb86554..aed2a82 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.3", + "defaultValue": "0.0.6", "allowedValues": [ "6.6.0", "6.6.1", @@ -96,7 +96,10 @@ "7.4.30", "0.0.1", "0.0.2", - "0.0.3" + "0.0.31", + "0.0.4", + "0.0.52", + "0.0.6" ], "metadata": { "description": "Artifactory-vm image version to deploy." @@ -778,7 +781,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[variables('scaleSetPrimaryName')]", "location": "[parameters('location')]", - "apiVersion": "2018-10-01", + "apiVersion": "2020-06-01", "dependsOn": [ "[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]", "[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", @@ -876,7 +879,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[variables('scaleSetMemberName')]", "location": "[parameters('location')]", - "apiVersion": "2018-10-01", + "apiVersion": "2020-06-01", "dependsOn": [ "[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]", "[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", @@ -978,4 +981,4 @@ "type": "string" } } -} \ No newline at end of file +} diff --git a/AzureResourceManager/Artifactory/MP_submission/scripts/install_artifactory7.sh b/AzureResourceManager/Artifactory/MP_submission/scripts/install_artifactory7.sh index 115fccf..8ecc72e 100644 --- a/AzureResourceManager/Artifactory/MP_submission/scripts/install_artifactory7.sh +++ b/AzureResourceManager/Artifactory/MP_submission/scripts/install_artifactory7.sh @@ -25,9 +25,6 @@ export DEBIAN_FRONTEND=noninteractive mkdir -p /etc/pki/tls/private/ /etc/pki/tls/certs/ openssl req -nodes -x509 -newkey rsa:4096 -keyout /etc/pki/tls/private/example.key -out /etc/pki/tls/certs/example.pem -days 356 -subj "/C=US/ST=California/L=SantaClara/O=IT/CN=*.localhost" -# Install Postgresql driver -curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/postgresql-9.4.1212.jar https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar >> /tmp/install-databse-driver.log 2>&1 - CERTIFICATE_DOMAIN=$(cat /var/lib/cloud/instance/user-data.txt | grep "^CERTIFICATE_DOMAIN=" | sed "s/CERTIFICATE_DOMAIN=//") [ -z "$CERTIFICATE_DOMAIN" ] && CERTIFICATE_DOMAIN=artifactory diff --git a/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json b/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json index 9b2399a..9b707c5 100644 --- a/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json +++ b/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.3", + "defaultValue": "0.0.6", "allowedValues": [ "6.11.3", "6.15.0", @@ -93,7 +93,10 @@ "7.5.7", "0.0.1", "0.0.2", - "0.0.3" + "0.0.31", + "0.0.4", + "0.0.52", + "0.0.6" ], "metadata": { "description": "Artifactory-vm image version to deploy." @@ -775,7 +778,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[variables('scaleSetPrimaryName')]", "location": "[parameters('location')]", - "apiVersion": "2018-10-01", + "apiVersion": "2020-06-01", "dependsOn": [ "[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]", "[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", @@ -873,7 +876,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[variables('scaleSetMemberName')]", "location": "[parameters('location')]", - "apiVersion": "2018-10-01", + "apiVersion": "2020-06-01", "dependsOn": [ "[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]", "[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", @@ -975,4 +978,4 @@ "type": "string" } } -} \ No newline at end of file +} diff --git a/AzureResourceManager/Artifactory/azuredeploy_ms_ps.parameters.json b/AzureResourceManager/Artifactory/azuredeploy_ms_ps.parameters.json index 8e4317e..7c09c75 100644 --- a/AzureResourceManager/Artifactory/azuredeploy_ms_ps.parameters.json +++ b/AzureResourceManager/Artifactory/azuredeploy_ms_ps.parameters.json @@ -9,7 +9,7 @@ "value": "vmuser" }, "adminPassword": { - "value": "password" + "value": "OWERWRITE_THE_PASSWORD" }, "db_type": { "value": "Postgresql_deploy.json" @@ -18,7 +18,7 @@ "value": "artifactory" }, "db_password": { - "value": "password" + "value": "OWERWRITE_THE_PASSWORD" }, "db_name": { "value": "artdb" @@ -50,19 +50,19 @@ "value": "GENERATE_JOIN_KEY" }, "certificate": { - "value": "-----BEGIN CERTIFICATE----- -----END CERTIFICATE-----" + "value": "-----BEGIN CERTIFICATE----- -----END CERTIFICATE-----" }, "certificateKey": { - "value": "-----BEGIN PRIVATE KEY----- -----END PRIVATE KEY-----" + "value": "-----BEGIN PRIVATE KEY----- -----END PRIVATE KEY-----" }, "artifactoryLicense1": { - "value": "" + "value": "" }, "artifactoryLicense2": { - "value": "" + "value": "" }, "artifactoryLicense3": { - "value": "" + "value": "" } } } \ No newline at end of file diff --git a/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh b/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh index 115fccf..8ecc72e 100644 --- a/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh +++ b/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh @@ -25,9 +25,6 @@ export DEBIAN_FRONTEND=noninteractive mkdir -p /etc/pki/tls/private/ /etc/pki/tls/certs/ openssl req -nodes -x509 -newkey rsa:4096 -keyout /etc/pki/tls/private/example.key -out /etc/pki/tls/certs/example.pem -days 356 -subj "/C=US/ST=California/L=SantaClara/O=IT/CN=*.localhost" -# Install Postgresql driver -curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/postgresql-9.4.1212.jar https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar >> /tmp/install-databse-driver.log 2>&1 - CERTIFICATE_DOMAIN=$(cat /var/lib/cloud/instance/user-data.txt | grep "^CERTIFICATE_DOMAIN=" | sed "s/CERTIFICATE_DOMAIN=//") [ -z "$CERTIFICATE_DOMAIN" ] && CERTIFICATE_DOMAIN=artifactory diff --git a/AzureResourceManager/Artifactory/vm_install/install_pro7_to_vm.sh b/AzureResourceManager/Artifactory/vm_install/install_pro7_to_vm.sh index b5ebd3c..4d3728d 100644 --- a/AzureResourceManager/Artifactory/vm_install/install_pro7_to_vm.sh +++ b/AzureResourceManager/Artifactory/vm_install/install_pro7_to_vm.sh @@ -37,7 +37,7 @@ EOF #Install database drivers (for Java 11, path is different for RT6 and RT7) curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/mysql-connector-java-5.1.38.jar https://bintray.com/artifact/download/bintray/jcenter/mysql/mysql-connector-java/5.1.38/mysql-connector-java-5.1.38.jar >> /tmp/install-databse-driver.log 2>&1 curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/mssql-jdbc-7.4.1.jre11.jar https://bintray.com/artifact/download/bintray/jcenter/com/microsoft/sqlserver/mssql-jdbc/7.4.1.jre11/mssql-jdbc-7.4.1.jre11.jar >> /tmp/install-databse-driver.log 2>&1 -curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/postgresql-9.4.1212.jar https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar >> /tmp/install-databse-driver.log 2>&1 +curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/postgresql-42.2.18.jar https://jdbc.postgresql.org/download/postgresql-42.2.18.jar >> /tmp/install-databse-driver.log 2>&1 #Configuring nginx rm /etc/nginx/sites-enabled/default diff --git a/AzureResourceManager/Artifactory/vm_install/vm_deploy.json b/AzureResourceManager/Artifactory/vm_install/vm_deploy.json index 2d8053b..0503514 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_deploy.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_deploy.json @@ -70,7 +70,7 @@ "metadata": { "description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated." }, - "defaultValue": "https://raw.githubusercontent.com/jfrog/JFrog-Cloud-Installers/vm-image-templates/AzureResourceManager/Artifactory/" + "defaultValue": "https://raw.githubusercontent.com/jfrog/JFrog-Cloud-Installers/master/AzureResourceManager/Artifactory/" }, "_artifactsLocationSasToken": { "type": "securestring", @@ -259,4 +259,4 @@ "value": "[variables('commandToExecute')]" } } -} \ No newline at end of file +} diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json index 8241d9c..d8c4b27 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json @@ -90,10 +90,10 @@ "value": "OWERWRITE_THE_PASSWORD" }, "artifactoryVersion": { - "value": "7.10.2" + "value": "7.11.2" }, "scriptName": { "value": "install_pro7_to_vm.sh" } } -} \ No newline at end of file +} diff --git a/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json b/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json index 0918f67..d7c9d94 100644 --- a/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json +++ b/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json @@ -101,7 +101,7 @@ "name": "artifactoryVersion", "type": "Microsoft.Common.DropDown", "label": "JFrog Container Registry-vm image version to deploy.", - "defaultValue": "7.10.2", + "defaultValue": "7.11.2", "toolTip": "Version of JFrog Container Registry to deploy", "constraints": { "allowedValues": [ @@ -124,6 +124,18 @@ { "label": "7.10.2", "value": "0.0.3" + }, + { + "label": "7.10.5", + "value": "0.0.4" + }, + { + "label": "7.10.6", + "value": "0.0.5" + }, + { + "label": "7.11.2", + "value": "0.0.61" } ], "required": true @@ -178,6 +190,7 @@ "validationMessage": "Provide SSL Certificate Key." }, "options": { + "hideConfirmation": true } }, @@ -345,4 +358,4 @@ "storageAccountType": "[steps('storageConfig').storageAccountsType]" } } -} \ No newline at end of file +} diff --git a/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json b/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json index 6277267..d5a1a06 100644 --- a/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json +++ b/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json @@ -25,13 +25,16 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.3", + "defaultValue": "0.0.61", "allowedValues": [ "7.2.1", "7.3.2", "7.4.3", "0.0.2", - "0.0.3" + "0.0.3", + "0.0.4", + "0.0.5", + "0.0.61" ], "metadata": { "description": "JFrog Container Registry-vm image version to deploy." @@ -519,7 +522,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[variables('scaleSetPrimaryName')]", "location": "[parameters('location')]", - "apiVersion": "2018-10-01", + "apiVersion": "2020-06-01", "dependsOn": [ "[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]", "[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", @@ -618,4 +621,4 @@ "type": "string" } } -} \ No newline at end of file +} diff --git a/AzureResourceManager/JCR/azuredeploy.json b/AzureResourceManager/JCR/azuredeploy.json index b1ec59b..aa4a791 100644 --- a/AzureResourceManager/JCR/azuredeploy.json +++ b/AzureResourceManager/JCR/azuredeploy.json @@ -25,13 +25,16 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.3", + "defaultValue": "0.0.61", "allowedValues": [ "7.2.1", "7.3.2", "7.4.3", "0.0.2", - "0.0.3" + "0.0.3", + "0.0.4", + "0.0.5", + "0.0.61" ], "metadata": { "description": "JFrog Container Registry-vm image version to deploy." @@ -519,7 +522,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[variables('scaleSetPrimaryName')]", "location": "[parameters('location')]", - "apiVersion": "2018-10-01", + "apiVersion": "2020-06-01", "dependsOn": [ "[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]", "[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", @@ -618,4 +621,4 @@ "type": "string" } } -} \ No newline at end of file +} diff --git a/AzureResourceManager/JCR/vm_install/vm_parameters.json b/AzureResourceManager/JCR/vm_install/vm_parameters.json index 58c512d..0d4b2b0 100644 --- a/AzureResourceManager/JCR/vm_install/vm_parameters.json +++ b/AzureResourceManager/JCR/vm_install/vm_parameters.json @@ -81,10 +81,10 @@ "value": "OWERWRITE_THE_PASSWORD" }, "artifactoryVersion": { - "value": "7.10.2" + "value": "7.11.2" }, "scriptName": { "value": "install_jcr7_to_vm.sh" } } -} \ No newline at end of file +} diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json index 88e3488..17931e9 100644 --- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json @@ -123,7 +123,7 @@ "name": "xrayVersion", "type": "Microsoft.Common.DropDown", "label": "Xray-vm image version to deploy.", - "defaultValue": "3.9.1", + "defaultValue": "3.11.2", "toolTip": "Version of Xray to deploy", "constraints": { "allowedValues": [ @@ -142,7 +142,13 @@ { "label": "3.9.1", "value": "0.0.6" - } + }, + { + "label": "3.10.3", + "value": "0.0.7" + }, + { "label": "3.11.2", "value": "0.0.8" + } ], "required": true }, @@ -324,4 +330,4 @@ "db_password": "[steps('databaseConfig').db_password]" } } -} \ No newline at end of file +} diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index 15bf701..92d7a81 100644 --- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json @@ -19,12 +19,14 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.6", + "defaultValue": "0.0.8", "allowedValues": [ "0.0.3", "0.0.4", "0.0.5", - "0.0.6" + "0.0.6", + "0.0.7", + "0.0.8" ], "metadata": { "description": "Xray-vm image version to deploy." @@ -275,7 +277,7 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2018-11-01", + "apiVersion": "2019-06-01", "name": "[variables('storageAccountName')]", "location": "[parameters('location')]", "sku": { @@ -320,7 +322,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[concat(variables('namingInfix'), 'xrayScaleset')]", "location": "[parameters('location')]", - "apiVersion": "2018-10-01", + "apiVersion": "2020-06-01", "dependsOn": [ "[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]", "[resourceId('Microsoft.Network/networkInterfaces/', variables('nicName'))]" @@ -401,4 +403,4 @@ } } ] -} \ No newline at end of file +} diff --git a/AzureResourceManager/Xray/MP_submission/nested/Postgresql_deploy.json b/AzureResourceManager/Xray/MP_submission/nested/Postgresql_deploy.json index 4f6d8ce..cdc3a2b 100644 --- a/AzureResourceManager/Xray/MP_submission/nested/Postgresql_deploy.json +++ b/AzureResourceManager/Xray/MP_submission/nested/Postgresql_deploy.json @@ -32,7 +32,7 @@ }, "skuSizeMB": { "type": "int", - "defaultValue": 5120 + "defaultValue": 204800 }, "skuTier": { "type": "string", diff --git a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json index 2f18bb9..30c98e8 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json +++ b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json @@ -3,19 +3,19 @@ "contentVersion": "1.0.0.0", "parameters": { "clusterName": { - "value": "GEN-UNIQUE" + "value": "GENERATE-CLUSTER-NAME" }, "adminUsername": { - "value": "GEN-UNIQUE" + "value": "ADMIN-USERNAME" }, "adminPassword": { - "value": "GEN-UNIQUE" + "value": "ADMIN-PASSWORD" }, "virtualNetworkName": { - "value": "existing-vm-network-name" + "value": "EXISTING-VM-NETWORK-NAME" }, "subnetName": { - "value": "existing-subnet-name" + "value": "EXISTING-SUBNET-NAME" }, "virtualNetworkNewOrExisting": { "value": "existing" @@ -24,7 +24,7 @@ "value": "10.0.0.0/16" }, "virtualNetworkResourceGroup": { - "value": "resource-group-name" + "value": "RESOURCE-GROUP-NAME" }, "virtualMachineSize": { "value": "Standard_D4s_v3" @@ -33,25 +33,25 @@ "value": "10.0.1.0/24" }, "xrayVersion": { - "value": "0.0.6" + "value": "0.0.8" }, "artifactoryURL": { - "value": "http://artifactory-url.cloudapp.azure.com" + "value": "http://ARTIFACTORY-URL.cloudapp.azure.com" }, "masterKey": { - "value": "GEN-UNIQUE" + "value": "GENERATE-MASTER-KEY" }, "joinKey": { - "value": "GEN-UNIQUE" + "value": "GET-JOIN-KEY-IN-ARTIFACTORY-UI" }, "db_type": { - "value": "Postgresql_existing.json" + "value": "Postgresql_deploy.json" }, "db_user": { - "value": "GEN-UNIQUE" + "value": "DB-USERNAME" }, "db_password": { - "value": "GEN-UNIQUE" + "value": "DB-PASSWORD" }, "manual_db_url": { "value": "jdbc:postgresql://postgressrvr.postgres.database.azure.com:5432" @@ -60,4 +60,4 @@ "value": "postgressrvr" } } -} \ No newline at end of file +} diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json index a16eb18..0b72892 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json +++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json @@ -19,12 +19,14 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.6", + "defaultValue": "0.0.8", "allowedValues": [ "0.0.3", "0.0.4", "0.0.5", - "0.0.6" + "0.0.6", + "0.0.7", + "0.0.8" ], "metadata": { "description": "Xray-vm image version to deploy." @@ -275,7 +277,7 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2018-11-01", + "apiVersion": "2019-06-01", "name": "[variables('storageAccountName')]", "location": "[parameters('location')]", "sku": { @@ -320,7 +322,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[concat(variables('namingInfix'), 'xrayScaleset')]", "location": "[parameters('location')]", - "apiVersion": "2018-10-01", + "apiVersion": "2020-06-01", "dependsOn": [ "[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]", "[resourceId('Microsoft.Network/networkInterfaces/', variables('nicName'))]" @@ -401,4 +403,4 @@ } } ] -} \ No newline at end of file +} diff --git a/AzureResourceManager/Xray/nested/Postgresql_deploy.json b/AzureResourceManager/Xray/nested/Postgresql_deploy.json index 4f6d8ce..cdc3a2b 100644 --- a/AzureResourceManager/Xray/nested/Postgresql_deploy.json +++ b/AzureResourceManager/Xray/nested/Postgresql_deploy.json @@ -32,7 +32,7 @@ }, "skuSizeMB": { "type": "int", - "defaultValue": 5120 + "defaultValue": 204800 }, "skuTier": { "type": "string", diff --git a/AzureResourceManager/Xray/vm_install/vm_parameters.json b/AzureResourceManager/Xray/vm_install/vm_parameters.json index 6296ec4..1527241 100644 --- a/AzureResourceManager/Xray/vm_install/vm_parameters.json +++ b/AzureResourceManager/Xray/vm_install/vm_parameters.json @@ -90,10 +90,10 @@ "value": "OWERWRITE_THE_PASSWORD" }, "xrayVersion": { - "value": "3.9.1" + "value": "3.11.2" }, "scriptName": { "value": "install_xray_to_vm.sh" } } -} \ No newline at end of file +}