From db5edfb5b1b2eb5b505aa45c4c6aa46bc01872b6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 19:28:14 +0000 Subject: [PATCH] dev release: 3.5.2-dev.2 --- README.md | 2 +- package-lock.json | 2 +- package.json | 2 +- ..._fortigate_autoscale.hybrid_licensing.json | 387 +++++++++++++----- ...ate_autoscale.hybrid_licensing.params.json | 186 ++++++--- ..._template.database.access_restriction.json | 2 +- templates/link_template.database.json | 2 +- templates/link_template.faz_integration.json | 2 +- ...plate.function_app.access_restriction.json | 2 +- ...k_template.function_app.configuration.json | 2 +- templates/link_template.function_app.json | 2 +- .../link_template.function_app.setup.json | 6 +- templates/link_template.load_balancer.json | 2 +- templates/link_template.vmss.json | 2 +- .../link_template.vnet.configuration.json | 4 +- templates/link_template.vnet.json | 4 +- .../template_function.join_string_array.json | 4 +- 17 files changed, 446 insertions(+), 167 deletions(-) diff --git a/README.md b/README.md index fb95837..5bb9dad 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ A deployment guide is available from the Fortinet Document Library: ## Launch a demo - + # Support diff --git a/package-lock.json b/package-lock.json index 93b3ddb..2688e5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fortigate-autoscale-azure", - "version": "3.5.1", + "version": "3.5.2-dev.2", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index 1de9575..37fdf97 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fortigate-autoscale-azure", - "version": "3.5.1", + "version": "3.5.2-dev.2", "description": "Fortinet FortiGate Autoscale for Azure", "main": "dist/transpiled/index.js", "types": "dist/types/index.d.ts", diff --git a/templates/deploy_fortigate_autoscale.hybrid_licensing.json b/templates/deploy_fortigate_autoscale.hybrid_licensing.json index 565e143..daa709c 100644 --- a/templates/deploy_fortigate_autoscale.hybrid_licensing.json +++ b/templates/deploy_fortigate_autoscale.hybrid_licensing.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "AccessRestrictionIPRange": { "defaultValue": "", @@ -176,7 +176,7 @@ }, "PackageResURL": { "type": "String", - "defaultValue": "https://github.com/fortinet/fortigate-autoscale-azure/releases/download/3.5.1/fortigate-autoscale-azure-funcapp.zip", + "defaultValue": "https://github.com/fortinet/fortigate-autoscale-azure/releases/download/3.5.2-dev.2/fortigate-autoscale-azure-funcapp.zip", "metadata": { "description": "Public URL of the Autoscale Function App source file fortigate-autoscale-azure-funcapp.zip. This URL must be accessible by Azure. The default value points to the source file available in the release assets of the GitHub repo fortinet/fortigate-autoscale-azure." } @@ -239,7 +239,9 @@ "defaultValue": "Standard_LRS", "allowedValues": ["Standard_LRS", "Standard_GRS", "Standard_RAGRS"], "type": "String", - "metadata": { "description": "Storage account type." } + "metadata": { + "description": "Storage account type." + } }, "Subnet1AddressRange": { "type": "String", @@ -463,7 +465,10 @@ "apiVersion": "2019-06-01", "name": "[variables('storageAccountName')]", "location": "[resourceGroup().location]", - "sku": { "name": "[parameters('StorageAccountType')]", "tier": "Standard" }, + "sku": { + "name": "[parameters('StorageAccountType')]", + "tier": "Standard" + }, "kind": "Storage" }, { @@ -480,11 +485,20 @@ { "objectId": "[parameters('ServicePrincipalObjectID')]", "tenantId": "[subscription().tenantId]", - "permissions": { "keys": ["List", "Get"], "secrets": ["List", "Get"] } + "permissions": { + "keys": ["List", "Get"], + "secrets": ["List", "Get"] + } } ], - "sku": { "name": "Standard", "family": "A" }, - "networkAcls": { "defaultAction": "Allow", "bypass": "AzureServices" } + "sku": { + "name": "Standard", + "family": "A" + }, + "networkAcls": { + "defaultAction": "Allow", + "bypass": "AzureServices" + } } }, { @@ -493,7 +507,9 @@ "name": "[concat(variables('keyVaultName'), '/', 'faz-autoscale-admin-username')]", "location": "[resourceGroup().location]", "dependsOn": ["[resourceId('Microsoft.KeyVault/vaults', variables('keyVaultName'))]"], - "properties": { "value": "[parameters('FortiAnalyzerAutoscaleAdminUsername')]" } + "properties": { + "value": "[parameters('FortiAnalyzerAutoscaleAdminUsername')]" + } }, { "type": "Microsoft.KeyVault/vaults/secrets", @@ -501,7 +517,9 @@ "name": "[concat(variables('keyVaultName'), '/', 'faz-autoscale-admin-password')]", "location": "[resourceGroup().location]", "dependsOn": ["[resourceId('Microsoft.KeyVault/vaults', variables('keyVaultName'))]"], - "properties": { "value": "[parameters('FortiAnalyzerAutoscaleAdminPassword')]" } + "properties": { + "value": "[parameters('FortiAnalyzerAutoscaleAdminPassword')]" + } }, { "type": "Microsoft.Storage/storageAccounts/blobServices/containers", @@ -517,7 +535,11 @@ "properties": { "name": "[variables('databaseAccountName')]", "databaseAccountOfferType": "Standard", - "locations": [{ "locationName": "[variables('location')]" }] + "locations": [ + { + "locationName": "[variables('location')]" + } + ] } }, { @@ -528,12 +550,18 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/link_template.database.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/link_template.database.json" }, "parameters": { - "DatabaseAccountName": { "value": "[variables('databaseAccountName')]" }, - "DatabaseName": { "value": "[variables('databaseName')]" }, - "SharedThroughput": { "value": "[variables('databaseSharedThroughput')]" }, + "DatabaseAccountName": { + "value": "[variables('databaseAccountName')]" + }, + "DatabaseName": { + "value": "[variables('databaseName')]" + }, + "SharedThroughput": { + "value": "[variables('databaseSharedThroughput')]" + }, "EnableFortiAnalyzer": { "value": "[if(variables('enableFortiAnalyzer'), 'yes', 'no')]" }, @@ -553,15 +581,21 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/link_template.vnet.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/link_template.vnet.json" }, "parameters": { - "Subnets": { "value": "[variables('subnets')]" }, + "Subnets": { + "value": "[variables('subnets')]" + }, "UniqueResourceNamePrefix": { "value": "[variables('uniqueResourceNamePrefix')]" }, - "VnetAddressSpace": { "value": "[parameters('VnetAddressSpace')]" }, - "VNetName": { "value": "[variables('vNetName')]" } + "VnetAddressSpace": { + "value": "[parameters('VnetAddressSpace')]" + }, + "VNetName": { + "value": "[variables('vNetName')]" + } } }, "subscriptionId": "[subscription().subscriptionId]", @@ -575,7 +609,7 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/link_template.vnet.configuration.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/link_template.vnet.configuration.json" }, "parameters": { "NetworkSecurityGroupRulesSubnet1Inbound": { @@ -584,14 +618,24 @@ "NetworkSecurityGroupRulesSubnet1Outbound": { "value": "[createArray(createArray(if(variables('ifCreateVNet'), reference('CreateVirtualNetwork').outputs.networkSecurityGroupNameExternal.value, parameters('Subnet1NetworkSecurityGroupName')), concat(reference('CreateLoadBalancers').outputs.externalLBName.value, '-outbound-all'), 'Allow', '*', createArray(), '*', createArray(), string(parameters('Subnet1NetworkSecurityGroupRulePriority')), '*', '*', createArray(), '*', createArray()))]" }, - "NetworkSecurityGroupRulesExtraSubnetsInbound": { "value": "[createArray()]" }, - "NetworkSecurityGroupRulesExtraSubnetsOutbound": { "value": "[createArray()]" }, - "Subnet1AddressRange": { "value": "[parameters('Subnet1AddressRange')]" }, - "Subnet1Name": { "value": "[variables('subnet1Name')]" }, + "NetworkSecurityGroupRulesExtraSubnetsInbound": { + "value": "[createArray()]" + }, + "NetworkSecurityGroupRulesExtraSubnetsOutbound": { + "value": "[createArray()]" + }, + "Subnet1AddressRange": { + "value": "[parameters('Subnet1AddressRange')]" + }, + "Subnet1Name": { + "value": "[variables('subnet1Name')]" + }, "Subnet1NetworkSecurityGroupName": { "value": "[if(variables('ifCreateVNet'), reference('CreateVirtualNetwork').outputs.networkSecurityGroupNameExternal.value, parameters('Subnet1NetworkSecurityGroupName'))]" }, - "VNetName": { "value": "[variables('vNetName')]" } + "VNetName": { + "value": "[variables('vNetName')]" + } } }, "subscriptionId": "[subscription().subscriptionId]", @@ -605,23 +649,39 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/link_template.load_balancer.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/link_template.load_balancer.json" }, "parameters": { - "ExternalLBBackendPoolNames": { "value": ["fortigate-vmss-port1"] }, - "ExternalLBFrontendIPId": { "value": "[parameters('FrontendIPAddressID')]" }, + "ExternalLBBackendPoolNames": { + "value": ["fortigate-vmss-port1"] + }, + "ExternalLBFrontendIPId": { + "value": "[parameters('FrontendIPAddressID')]" + }, "ExternalLBNATBackendPortHTTPS": { "value": "[variables('adminPortNumberHTTPS')]" }, - "ExternalLBNATBackendPortSSH": { "value": "[variables('adminPortNumberSSH')]" }, - "ExternalLBRules": { "value": [] }, - "InternalLBFrontendIPAddress": { "value": "" }, - "InternalLBFrontendSubnetId": { "value": "" }, + "ExternalLBNATBackendPortSSH": { + "value": "[variables('adminPortNumberSSH')]" + }, + "ExternalLBRules": { + "value": [] + }, + "InternalLBFrontendIPAddress": { + "value": "" + }, + "InternalLBFrontendSubnetId": { + "value": "" + }, "UniqueResourceNamePrefix": { "value": "[variables('uniqueResourceNamePrefix')]" }, - "VMSSNameBYOL": { "value": "[variables('vmssNameBYOL')]" }, - "VMSSNamePAYG": { "value": "[variables('vmssNamePAYG')]" } + "VMSSNameBYOL": { + "value": "[variables('vmssNameBYOL')]" + }, + "VMSSNamePAYG": { + "value": "[variables('vmssNamePAYG')]" + } } }, "subscriptionId": "[subscription().subscriptionId]", @@ -636,11 +696,15 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/link_template.faz_integration.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/link_template.faz_integration.json" }, "parameters": { - "AdminPassword": { "value": "[parameters('AdminPassword')]" }, - "AdminUsername": { "value": "[parameters('AdminUsername')]" }, + "AdminPassword": { + "value": "[parameters('AdminPassword')]" + }, + "AdminUsername": { + "value": "[parameters('AdminUsername')]" + }, "FortiAnalyzerAutoscaleAdminPassword": { "value": "[parameters('FortiAnalyzerAutoscaleAdminPassword')]" }, @@ -656,11 +720,15 @@ "FortiAnalyzerInstanceType": { "value": "[parameters('FortiAnalyzerInstanceType')]" }, - "SubnetId": { "value": "[variables('subnet1').id]" }, + "SubnetId": { + "value": "[variables('subnet1').id]" + }, "UniqueResourceNamePrefix": { "value": "[variables('uniqueResourceNamePrefix')]" }, - "VmImgReferenceFaz": { "value": "[variables('vmImgReferenceFazBYOL')]" } + "VmImgReferenceFaz": { + "value": "[variables('vmImgReferenceFazBYOL')]" + } } }, "subscriptionId": "[subscription().subscriptionId]", @@ -674,15 +742,27 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/link_template.function_app.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/link_template.function_app.json" }, "parameters": { - "FunctionAppName": { "value": "[variables('functionAppName')]" }, - "FunctionExtensionVersion": { "value": "~3" }, - "NodeJSRuntimeVersion": { "value": "~12" }, - "PackageResURL": { "value": "[parameters('PackageResURL')]" }, - "ServicePlanTier": { "value": "[parameters('ServicePlanTier')]" }, - "StorageAccountName": { "value": "[variables('storageAccountName')]" }, + "FunctionAppName": { + "value": "[variables('functionAppName')]" + }, + "FunctionExtensionVersion": { + "value": "~3" + }, + "NodeJSRuntimeVersion": { + "value": "~12" + }, + "PackageResURL": { + "value": "[parameters('PackageResURL')]" + }, + "ServicePlanTier": { + "value": "[parameters('ServicePlanTier')]" + }, + "StorageAccountName": { + "value": "[variables('storageAccountName')]" + }, "UniqueResourceNamePrefix": { "value": "[variables('uniqueResourceNamePrefix')]" } @@ -699,15 +779,21 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/link_template.vmss.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/link_template.vmss.json" }, "parameters": { - "AdminPassword": { "value": "[parameters('AdminPassword')]" }, - "AdminUsername": { "value": "[parameters('AdminUsername')]" }, + "AdminPassword": { + "value": "[parameters('AdminPassword')]" + }, + "AdminUsername": { + "value": "[parameters('AdminUsername')]" + }, "AvailabilityZones": { "value": "[if(empty(parameters('VMSSAvailabilityZones')), createArray(), parameters('VMSSAvailabilityZones'))]" }, - "BYOLInstanceCount": { "value": "[parameters('BYOLInstanceCount')]" }, + "BYOLInstanceCount": { + "value": "[parameters('BYOLInstanceCount')]" + }, "ExternalLBBackendAddressPoolIds": { "value": "[reference('CreateLoadBalancers').outputs.externalLBBackendAddressPoolIds.value]" }, @@ -717,38 +803,72 @@ "ExternalLBInboundNatPoolIdsPAYG": { "value": "[reference('CreateLoadBalancers').outputs.externalLBInboundNatPoolIdsPAYG.value]" }, - "FunctionAppName": { "value": "[variables('functionAppName')]" }, - "FunctionAppResourceGroupName": { "value": "[resourceGroup().name]" }, + "FunctionAppName": { + "value": "[variables('functionAppName')]" + }, + "FunctionAppResourceGroupName": { + "value": "[resourceGroup().name]" + }, "FunctionNameFgtAsHandler": { "value": "[reference('CreateFunctionApp').outputs.functionNameFgtAsHandler.value]" }, "FunctionNameLicenseHandler": { "value": "[reference('CreateFunctionApp').outputs.functionNameLicenseHandler.value]" }, - "InstanceType": { "value": "[parameters('InstanceType')]" }, - "LicensingModel": { "value": "[variables('licensingModel')]" }, - "MaxBYOLInstanceCount": { "value": "[parameters('MaxBYOLInstanceCount')]" }, - "MaxPAYGInstanceCount": { "value": "[parameters('MaxPAYGInstanceCount')]" }, - "MinBYOLInstanceCount": { "value": "[parameters('MinBYOLInstanceCount')]" }, - "MinPAYGInstanceCount": { "value": "[parameters('MinPAYGInstanceCount')]" }, - "PAYGInstanceCount": { "value": "[parameters('PAYGInstanceCount')]" }, - "ResourceNamePrefix": { "value": "[parameters('ResourceNamePrefix')]" }, - "ScaleInThreshold": { "value": "[parameters('ScaleInThreshold')]" }, - "ScaleOutThreshold": { "value": "[parameters('ScaleOutThreshold')]" }, + "InstanceType": { + "value": "[parameters('InstanceType')]" + }, + "LicensingModel": { + "value": "[variables('licensingModel')]" + }, + "MaxBYOLInstanceCount": { + "value": "[parameters('MaxBYOLInstanceCount')]" + }, + "MaxPAYGInstanceCount": { + "value": "[parameters('MaxPAYGInstanceCount')]" + }, + "MinBYOLInstanceCount": { + "value": "[parameters('MinBYOLInstanceCount')]" + }, + "MinPAYGInstanceCount": { + "value": "[parameters('MinPAYGInstanceCount')]" + }, + "PAYGInstanceCount": { + "value": "[parameters('PAYGInstanceCount')]" + }, + "ResourceNamePrefix": { + "value": "[parameters('ResourceNamePrefix')]" + }, + "ScaleInThreshold": { + "value": "[parameters('ScaleInThreshold')]" + }, + "ScaleOutThreshold": { + "value": "[parameters('ScaleOutThreshold')]" + }, "SinglePlacementGroup": { "value": "[equals(parameters('VMSSPlacementGroups'), 'single')]" }, - "StorageAccountName": { "value": "[variables('storageAccountName')]" }, + "StorageAccountName": { + "value": "[variables('storageAccountName')]" + }, "SubnetIds": { "value": "[if(variables('ifCreateVNet'), reference('CreateVirtualNetwork').outputs.subnetIds.value, variables('subnetIds').subnetIdsCopyIt)]" }, "UniqueResourceNamePrefix": { "value": "[variables('uniqueResourceNamePrefix')]" }, - "VmImageReferenceFgtBYOL": { "value": "[variables('vmImgReferenceFgtBYOL')]" }, - "VmImageReferenceFgtPAYG": { "value": "[variables('vmImgReferenceFgtPAYG')]" }, - "VmssNameBYOL": { "value": "[variables('vmssNameBYOL')]" }, - "VmssNamePAYG": { "value": "[variables('vmssNamePAYG')]" }, + "VmImageReferenceFgtBYOL": { + "value": "[variables('vmImgReferenceFgtBYOL')]" + }, + "VmImageReferenceFgtPAYG": { + "value": "[variables('vmImgReferenceFgtPAYG')]" + }, + "VmssNameBYOL": { + "value": "[variables('vmssNameBYOL')]" + }, + "VmssNamePAYG": { + "value": "[variables('vmssNamePAYG')]" + }, "ZoneBalance": { "value": "[if(empty(parameters('VMSSAvailabilityZones')), false(), true())]" } @@ -770,7 +890,7 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/link_template.database.access_restriction.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/link_template.database.access_restriction.json" }, "parameters": { "AllowAccessFromSubnetIds": { @@ -779,7 +899,9 @@ "CommaSeparatedIPAddressString": { "value": "[concat(parameters('AccessRestrictionIPRange'), if(empty(parameters('AccessRestrictionIPRange')), '', ','), reference('CreateFunctionApp').outputs.functionAppPossibleOutboundIpAddresses.value)]" }, - "DatabaseAccountName": { "value": "[variables('databaseAccountName')]" } + "DatabaseAccountName": { + "value": "[variables('databaseAccountName')]" + } } }, "subscriptionId": "[subscription().subscriptionId]", @@ -799,31 +921,45 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/link_template.function_app.setup.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/link_template.function_app.setup.json" }, "parameters": { - "AdminPortNumber": { "value": "[variables('adminPortNumberHTTPS')]" }, + "AdminPortNumber": { + "value": "[variables('adminPortNumberHTTPS')]" + }, "AllowAccessFromIPAddresses": { "value": "[if(empty(parameters('AccessRestrictionIPRange')), createArray(), split(parameters('AccessRestrictionIPRange'), ','))]" }, "AllowAccessFromSubnetIds": { "value": "[createArray(if(variables('ifCreateVNet'), reference('CreateVirtualNetwork').outputs.subnet1Id.value, variables('subnet1').id))]" }, - "BYOLInstanceCount": { "value": "[parameters('BYOLInstanceCount')]" }, - "DatabaseAccountName": { "value": "[variables('databaseAccountName')]" }, - "DatabaseName": { "value": "[variables('databaseName')]" }, + "BYOLInstanceCount": { + "value": "[parameters('BYOLInstanceCount')]" + }, + "DatabaseAccountName": { + "value": "[variables('databaseAccountName')]" + }, + "DatabaseName": { + "value": "[variables('databaseName')]" + }, "FortiAnalyzerIntegrationOptions": { "value": "[parameters('FortiAnalyzerIntegrationOptions')]" }, "FortiAnalyzerPublicIp": { "value": "[if(variables('enableFortiAnalyzer'), reference('FortiAnalyzerIntegrationResources').outputs.fazPublicIp.value, '')]" }, - "FortiGatePSKSecret": { "value": "[parameters('FortiGatePSKSecret')]" }, + "FortiGatePSKSecret": { + "value": "[parameters('FortiGatePSKSecret')]" + }, "FunctionAppInsightName": { "value": "[reference('CreateFunctionApp').outputs.appInsightName.value]" }, - "FunctionAppName": { "value": "[variables('functionAppName')]" }, - "FunctionAppResourceGroupName": { "value": "[resourceGroup().name]" }, + "FunctionAppName": { + "value": "[variables('functionAppName')]" + }, + "FunctionAppResourceGroupName": { + "value": "[resourceGroup().name]" + }, "FunctionNameFazAuthHandler": { "value": "[reference('CreateFunctionApp').outputs.functionNameFazAuthHandler.value]" }, @@ -833,33 +969,75 @@ "HeartBeatDelayAllowance": { "value": "[parameters('HeartBeatDelayAllowance')]" }, - "HeartBeatInterval": { "value": "[parameters('HeartBeatInterval')]" }, - "HeartBeatLossCount": { "value": "[parameters('HeartBeatLossCount')]" }, - "KeyVaultName": { "value": "[variables('keyVaultName')]" }, - "LicenseFileDirectory": { "value": "[variables('licenseFileDirectory')]" }, - "MaxBYOLInstanceCount": { "value": "[parameters('MaxBYOLInstanceCount')]" }, - "MaxPAYGInstanceCount": { "value": "[parameters('MaxPAYGInstanceCount')]" }, - "MinBYOLInstanceCount": { "value": "[parameters('MinBYOLInstanceCount')]" }, - "PAYGInstanceCount": { "value": "[parameters('PAYGInstanceCount')]" }, - "PackageResURL": { "value": "[parameters('PackageResURL')]" }, - "PrimaryElectionTimeout": { "value": "[parameters('PrimaryElectionTimeout')]" }, - "ScaleSetNameBYOL": { "value": "[variables('vmssNameBYOL')]" }, - "ScaleSetNamePAYG": { "value": "[variables('vmssNamePAYG')]" }, - "ScaleSetNamePrimary": { "value": "[variables('vmssNamePrimary')]" }, - "ServicePrincipalAppID": { "value": "[parameters('ServicePrincipalAppID')]" }, + "HeartBeatInterval": { + "value": "[parameters('HeartBeatInterval')]" + }, + "HeartBeatLossCount": { + "value": "[parameters('HeartBeatLossCount')]" + }, + "KeyVaultName": { + "value": "[variables('keyVaultName')]" + }, + "LicenseFileDirectory": { + "value": "[variables('licenseFileDirectory')]" + }, + "MaxBYOLInstanceCount": { + "value": "[parameters('MaxBYOLInstanceCount')]" + }, + "MaxPAYGInstanceCount": { + "value": "[parameters('MaxPAYGInstanceCount')]" + }, + "MinBYOLInstanceCount": { + "value": "[parameters('MinBYOLInstanceCount')]" + }, + "PAYGInstanceCount": { + "value": "[parameters('PAYGInstanceCount')]" + }, + "PackageResURL": { + "value": "[parameters('PackageResURL')]" + }, + "PrimaryElectionTimeout": { + "value": "[parameters('PrimaryElectionTimeout')]" + }, + "ScaleSetNameBYOL": { + "value": "[variables('vmssNameBYOL')]" + }, + "ScaleSetNamePAYG": { + "value": "[variables('vmssNamePAYG')]" + }, + "ScaleSetNamePrimary": { + "value": "[variables('vmssNamePrimary')]" + }, + "ServicePrincipalAppID": { + "value": "[parameters('ServicePrincipalAppID')]" + }, "ServicePrincipalAppSecret": { "value": "[parameters('ServicePrincipalAppSecret')]" }, - "StorageAccountName": { "value": "[variables('storageAccountName')]" }, - "SyncRecoveryCount": { "value": "[parameters('SyncRecoveryCount')]" }, - "TerminateUnhealthyVM": { "value": "[parameters('TerminateUnhealthyVM')]" }, - "TrafficPortNumber": { "value": "[variables('trafficPortNumber')]" }, + "StorageAccountName": { + "value": "[variables('storageAccountName')]" + }, + "SyncRecoveryCount": { + "value": "[parameters('SyncRecoveryCount')]" + }, + "TerminateUnhealthyVM": { + "value": "[parameters('TerminateUnhealthyVM')]" + }, + "TrafficPortNumber": { + "value": "[variables('trafficPortNumber')]" + }, "UniqueResourceNamePrefix": { "value": "[variables('uniqueResourceNamePrefix')]" }, - "VnetAddressSpace": { "value": "[parameters('VnetAddressSpace')]" }, - "VnetName": { "value": "[variables('vNetName')]" }, - "VmssResourceGroupName": { "value": "[resourceGroup().name]" } + "VnetAddressSpace": { + "value": "[parameters('VnetAddressSpace')]" + }, + "VnetName": { + "value": "[variables('vNetName')]" + }, + "VmssResourceGroupName": { + "value": "[resourceGroup().name]" + } } }, "subscriptionId": "[subscription().subscriptionId]", @@ -903,7 +1081,10 @@ "type": "String", "value": "[concat('az account set -s ', subscription().subscriptionId, ';', reference('UpdateVirtualNetwork').outputs.cmdDeleteAll.value)]" }, - "deploymentPackageVersion": { "type": "string", "value": "3.5.1" }, + "deploymentPackageVersion": { + "type": "string", + "value": "3.5.2-dev.2" + }, "externalLBInboundNatPortRanges": { "type": "Array", "value": "[reference('CreateLoadBalancers').outputs.externalLBInboundNatPortRanges.value]" @@ -936,8 +1117,14 @@ "type": "String", "value": "[reference('CreateVirtualMachineScaleSet').outputs.paygScaleSetName.value]" }, - "resourceGroupName": { "type": "String", "value": "[resourceGroup().name]" }, - "storageAccountName": { "type": "String", "value": "[variables('storageAccountName')]" }, + "resourceGroupName": { + "type": "String", + "value": "[resourceGroup().name]" + }, + "storageAccountName": { + "type": "String", + "value": "[variables('storageAccountName')]" + }, "uniqueResourceNamePrefix": { "type": "String", "value": "[variables('uniqueResourceNamePrefix')]" diff --git a/templates/deploy_fortigate_autoscale.hybrid_licensing.params.json b/templates/deploy_fortigate_autoscale.hybrid_licensing.params.json index cc6cb4b..beda263 100644 --- a/templates/deploy_fortigate_autoscale.hybrid_licensing.params.json +++ b/templates/deploy_fortigate_autoscale.hybrid_licensing.params.json @@ -1,52 +1,144 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { - "AccessRestrictionIPRange": { "value": "" }, - "AdminPassword": { "value": "" }, - "AdminUsername": { "value": "azureadmin" }, - "BYOLInstanceCount": { "value": 2 }, - "FortiAnalyzerAutoscaleAdminPassword": { "value": "" }, - "FortiAnalyzerAutoscaleAdminUsername": { "value": "" }, - "FortiAnalyzerCustomPrivateIPAddress": { "value": "" }, - "FortiAnalyzerInstanceType": { "value": "Standard_D2" }, - "FortiAnalyzerVersion": { "value": "6.4.5" }, - "FortiGatePSKSecret": { "value": "" }, - "FOSVersion": { "value": "7.2.2" }, - "HeartBeatDelayAllowance": { "value": 30 }, - "HeartBeatInterval": { "value": 60 }, - "HeartBeatLossCount": { "value": 3 }, - "InstanceType": { "value": "Standard_F4" }, - "MaxBYOLInstanceCount": { "value": 2 }, - "MaxPAYGInstanceCount": { "value": 6 }, - "MinBYOLInstanceCount": { "value": 2 }, - "MinPAYGInstanceCount": { "value": 0 }, - "PAYGInstanceCount": { "value": 0 }, - "PrimaryElectionTimeout": { "value": 600 }, - "ResourceNamePrefix": { "value": "" }, - "ScaleInThreshold": { "value": 20 }, - "ScaleOutThreshold": { "value": 80 }, - "ServicePlanTier": { "value": "Premium (P1V2)" }, - "ServicePrincipalAppID": { "value": "" }, - "ServicePrincipalAppSecret": { "value": "" }, - "ServicePrincipalObjectID": { "value": "" }, - "StorageAccountType": { "value": "Standard_LRS" }, - "Subnet1AddressRange": { "value": "10.0.0.0/24" }, - "Subnet1Name": { "value": "" }, - "Subnet1NetworkSecurityGroupName": { "value": "" }, - "Subnet2AddressRange": { "value": "10.0.1.0/24" }, - "Subnet2Name": { "value": "" }, - "Subnet3AddressRange": { "value": "" }, - "Subnet3Name": { "value": "" }, - "Subnet4AddressRange": { "value": "" }, - "Subnet4Name": { "value": "" }, - "SyncRecoveryCount": { "value": 3 }, - "TerminateUnhealthyVM": { "value": "no" }, - "VMSSAvailabilityZones": { "value": [] }, - "VMSSPlacementGroups": { "value": "single" }, - "VnetAddressSpace": { "value": "10.0.0.0/16" }, - "VnetDeploymentMethod": { "value": "create new" }, - "VnetName": { "value": "" }, - "VnetResourceGroupName": { "value": "" } + "AccessRestrictionIPRange": { + "value": "" + }, + "AdminPassword": { + "value": "" + }, + "AdminUsername": { + "value": "azureadmin" + }, + "BYOLInstanceCount": { + "value": 2 + }, + "FortiAnalyzerAutoscaleAdminPassword": { + "value": "" + }, + "FortiAnalyzerAutoscaleAdminUsername": { + "value": "" + }, + "FortiAnalyzerCustomPrivateIPAddress": { + "value": "" + }, + "FortiAnalyzerInstanceType": { + "value": "Standard_D2" + }, + "FortiAnalyzerVersion": { + "value": "6.4.5" + }, + "FortiGatePSKSecret": { + "value": "" + }, + "FOSVersion": { + "value": "7.2.2" + }, + "HeartBeatDelayAllowance": { + "value": 30 + }, + "HeartBeatInterval": { + "value": 60 + }, + "HeartBeatLossCount": { + "value": 3 + }, + "InstanceType": { + "value": "Standard_F4" + }, + "MaxBYOLInstanceCount": { + "value": 2 + }, + "MaxPAYGInstanceCount": { + "value": 6 + }, + "MinBYOLInstanceCount": { + "value": 2 + }, + "MinPAYGInstanceCount": { + "value": 0 + }, + "PAYGInstanceCount": { + "value": 0 + }, + "PrimaryElectionTimeout": { + "value": 600 + }, + "ResourceNamePrefix": { + "value": "" + }, + "ScaleInThreshold": { + "value": 20 + }, + "ScaleOutThreshold": { + "value": 80 + }, + "ServicePlanTier": { + "value": "Premium (P1V2)" + }, + "ServicePrincipalAppID": { + "value": "" + }, + "ServicePrincipalAppSecret": { + "value": "" + }, + "ServicePrincipalObjectID": { + "value": "" + }, + "StorageAccountType": { + "value": "Standard_LRS" + }, + "Subnet1AddressRange": { + "value": "10.0.0.0/24" + }, + "Subnet1Name": { + "value": "" + }, + "Subnet1NetworkSecurityGroupName": { + "value": "" + }, + "Subnet2AddressRange": { + "value": "10.0.1.0/24" + }, + "Subnet2Name": { + "value": "" + }, + "Subnet3AddressRange": { + "value": "" + }, + "Subnet3Name": { + "value": "" + }, + "Subnet4AddressRange": { + "value": "" + }, + "Subnet4Name": { + "value": "" + }, + "SyncRecoveryCount": { + "value": 3 + }, + "TerminateUnhealthyVM": { + "value": "no" + }, + "VMSSAvailabilityZones": { + "value": [] + }, + "VMSSPlacementGroups": { + "value": "single" + }, + "VnetAddressSpace": { + "value": "10.0.0.0/16" + }, + "VnetDeploymentMethod": { + "value": "create new" + }, + "VnetName": { + "value": "" + }, + "VnetResourceGroupName": { + "value": "" + } } } diff --git a/templates/link_template.database.access_restriction.json b/templates/link_template.database.access_restriction.json index 48d169a..0a7b52b 100644 --- a/templates/link_template.database.access_restriction.json +++ b/templates/link_template.database.access_restriction.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "AllowAccessFromSubnetIds": { "type": "array" diff --git a/templates/link_template.database.json b/templates/link_template.database.json index 6db136c..1623736 100644 --- a/templates/link_template.database.json +++ b/templates/link_template.database.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "DatabaseAccountName": { "type": "String" diff --git a/templates/link_template.faz_integration.json b/templates/link_template.faz_integration.json index 89ed765..a81fbd0 100644 --- a/templates/link_template.faz_integration.json +++ b/templates/link_template.faz_integration.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "AdminPassword": { "type": "SecureString" diff --git a/templates/link_template.function_app.access_restriction.json b/templates/link_template.function_app.access_restriction.json index 119bc11..81a0901 100644 --- a/templates/link_template.function_app.access_restriction.json +++ b/templates/link_template.function_app.access_restriction.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "AllowAccessFromIPAddresses": { "type": "array" diff --git a/templates/link_template.function_app.configuration.json b/templates/link_template.function_app.configuration.json index 797b2d0..c10c020 100644 --- a/templates/link_template.function_app.configuration.json +++ b/templates/link_template.function_app.configuration.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "AdminPortNumber": { "type": "Int" diff --git a/templates/link_template.function_app.json b/templates/link_template.function_app.json index 024d2a6..7ef8845 100644 --- a/templates/link_template.function_app.json +++ b/templates/link_template.function_app.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "FunctionAppName": { "type": "String" diff --git a/templates/link_template.function_app.setup.json b/templates/link_template.function_app.setup.json index 10c5290..a5a1bc1 100644 --- a/templates/link_template.function_app.setup.json +++ b/templates/link_template.function_app.setup.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "AdminPortNumber": { "type": "Int" @@ -130,7 +130,7 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/link_template.function_app.configuration.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/link_template.function_app.configuration.json" }, "parameters": { "AdminPortNumber": { @@ -263,7 +263,7 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/link_template.function_app.access_restriction.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/link_template.function_app.access_restriction.json" }, "parameters": { "AllowAccessFromIPAddresses": { diff --git a/templates/link_template.load_balancer.json b/templates/link_template.load_balancer.json index 3a981ad..9ce6b7a 100644 --- a/templates/link_template.load_balancer.json +++ b/templates/link_template.load_balancer.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "ExternalLBBackendPoolNames": { "type": "Array" diff --git a/templates/link_template.vmss.json b/templates/link_template.vmss.json index 70a76f1..2fe75a1 100644 --- a/templates/link_template.vmss.json +++ b/templates/link_template.vmss.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "AdminPassword": { "type": "SecureString" diff --git a/templates/link_template.vnet.configuration.json b/templates/link_template.vnet.configuration.json index a4424ae..aad18f0 100644 --- a/templates/link_template.vnet.configuration.json +++ b/templates/link_template.vnet.configuration.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "NetworkSecurityGroupRulesSubnet1Inbound": { "type": "Array" @@ -80,7 +80,7 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/template_function.join_string_array.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/template_function.join_string_array.json" }, "parameters": { "InputString": { diff --git a/templates/link_template.vnet.json b/templates/link_template.vnet.json index 1b4b0ba..aa1259a 100644 --- a/templates/link_template.vnet.json +++ b/templates/link_template.vnet.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "Subnets": { "type": "array", @@ -79,7 +79,7 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/template_function.join_string_array.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/template_function.join_string_array.json" }, "parameters": { "InputString": { diff --git a/templates/template_function.join_string_array.json b/templates/template_function.join_string_array.json index 3b0f93a..a7deb97 100644 --- a/templates/template_function.join_string_array.json +++ b/templates/template_function.join_string_array.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "3.5.1.0", + "contentVersion": "3.5.2.0", "parameters": { "InputString": { "defaultValue": "", @@ -32,7 +32,7 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.1/templates/template_function.join_string_array.json" + "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.5.2-dev.2/templates/template_function.join_string_array.json" }, "parameters": { "InputString": {