From e15a9893a3de97b3b638c80eaf83a358f823c905 Mon Sep 17 00:00:00 2001 From: mohamedasme-sf4303 <153055293+mohamedasme-sf4303@users.noreply.github.com> Date: Thu, 24 Jul 2025 19:18:58 +0530 Subject: [PATCH 1/9] Update AzureBlobStorage-BoldReports.json --- .../latest/AzureBlobStorage-BoldReports.json | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/armtemplates/latest/AzureBlobStorage-BoldReports.json b/armtemplates/latest/AzureBlobStorage-BoldReports.json index 4a354aa27..97a1ca18b 100644 --- a/armtemplates/latest/AzureBlobStorage-BoldReports.json +++ b/armtemplates/latest/AzureBlobStorage-BoldReports.json @@ -8,6 +8,18 @@ "description": "App name for Bold Reports Server. The name must be between 3 and 24 characters long, and can contain only numbers and lowercase letters." } }, + "appServicePlanSize": { + "type": "string", + "allowedValues": [ + "P1v3: 2core-8gb_RAM", + "P2v3: 4core-16gb_RAM", + "P3v3: 8core-32gb_RAM" + ], + "defaultValue": "P1v3: 2core-8gb_RAM", + "metadata": { + "description": "The pricing tier size for the App Service Plan." + } + }, "storageAccountName": { "type": "string", "metadata": { @@ -28,24 +40,35 @@ } }, "variables": { + "sizeMapping": { + "P1v3: 2core-8gb_RAM": "P1v3", + "P2v3: 4core-16gb_RAM": "P2v3", + "P3v3: 8core-32gb_RAM": "P3v3" + }, "WebAppSvcPlanWorkerSize": "0", - "WebAppSvcPlanSKU": "Basic", - "WebAppSvcPlanName": "SyncfusionAppSvcPlan" + "WebAppSvcPlanSKU": "PremiumV3", + "WebAppSvcPlanName": "BoldReportsAppSvcPlan", + "WebAppSvcPlanSize": "[variables('sizeMapping')[parameters('appServicePlanSize')]]", + "WebAppSvcPlanCapacity": 1 }, "resources": [ { "name": "[variables('WebAppSvcPlanName')]", "type": "Microsoft.Web/serverfarms", "location": "[resourceGroup().location]", - "apiVersion": "2014-06-01", + "apiVersion": "2022-03-01", "dependsOn": [], "tags": { "displayName": "AppSvcPlan" }, + "sku": { + "name": "[variables('WebAppSvcPlanSize')]", + "tier": "[variables('WebAppSvcPlanSKU')]", + "size": "[variables('WebAppSvcPlanSize')]", + "capacity": "[variables('WebAppSvcPlanCapacity')]" + }, "properties": { - "name": "[variables('WebAppSvcPlanName')]", - "sku": "[variables('WebAppSvcPlanSKU')]", - "workerSize": "[variables('WebAppSvcPlanWorkerSize')]" + "reserved": false } }, { From 88e3f3b12ad7a29cef7b3677afe84edf215ccfce Mon Sep 17 00:00:00 2001 From: mohamedasme-sf4303 <153055293+mohamedasme-sf4303@users.noreply.github.com> Date: Thu, 24 Jul 2025 19:24:41 +0530 Subject: [PATCH 2/9] Update BoldReportsAppServiceTemplate.json --- .../latest/BoldReportsAppServiceTemplate.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/armtemplates/latest/BoldReportsAppServiceTemplate.json b/armtemplates/latest/BoldReportsAppServiceTemplate.json index 94c6b7ddb..dacf1ef69 100644 --- a/armtemplates/latest/BoldReportsAppServiceTemplate.json +++ b/armtemplates/latest/BoldReportsAppServiceTemplate.json @@ -10,6 +10,18 @@ "description": "App name for Bold Reports Server. The name must be between 3 and 24 characters long, and can contain only numbers and lowercase letters." } }, + "appServicePlanSize": { + "type": "string", + "allowedValues": [ + "P1v3: 2core-8gb_RAM", + "P2v3: 4core-16gb_RAM", + "P3v3: 8core-32gb_RAM" + ], + "defaultValue": "P1v3: 2core-8gb_RAM", + "metadata": { + "description": "The pricing tier size for the App Service Plan." + } + }, "storageAccountName": { "type": "string", "maxLength": 24, From 8c0f806590af4a15c1cfda0a67c76eea0a697412 Mon Sep 17 00:00:00 2001 From: mohamedasme-sf4303 <153055293+mohamedasme-sf4303@users.noreply.github.com> Date: Thu, 24 Jul 2025 19:25:19 +0530 Subject: [PATCH 3/9] Update BoldReportsAppServiceTemplate.json --- armtemplates/latest/BoldReportsAppServiceTemplate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/armtemplates/latest/BoldReportsAppServiceTemplate.json b/armtemplates/latest/BoldReportsAppServiceTemplate.json index dacf1ef69..609ec0d10 100644 --- a/armtemplates/latest/BoldReportsAppServiceTemplate.json +++ b/armtemplates/latest/BoldReportsAppServiceTemplate.json @@ -45,7 +45,7 @@ } }, "variables": { - "templatelink": "https://raw.githubusercontent.com/boldreports/bold-reports-azure/master/armtemplates/v10.1.11/AzureBlobStorage-BoldReports.json" + "templatelink": "https://raw.githubusercontent.com/mohamedasme-sf4303/bold-reports-azure/refs/heads/master/armtemplates/latest/AzureBlobStorage-BoldReports.json" }, "resources": [ { From a153b4ea0f0403347b5a7ea147dc663879de9f17 Mon Sep 17 00:00:00 2001 From: mohamedasme-sf4303 <153055293+mohamedasme-sf4303@users.noreply.github.com> Date: Thu, 24 Jul 2025 20:24:58 +0530 Subject: [PATCH 4/9] Update BoldReportsAppServiceTemplate.json --- armtemplates/latest/BoldReportsAppServiceTemplate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/armtemplates/latest/BoldReportsAppServiceTemplate.json b/armtemplates/latest/BoldReportsAppServiceTemplate.json index 609ec0d10..c99b369a8 100644 --- a/armtemplates/latest/BoldReportsAppServiceTemplate.json +++ b/armtemplates/latest/BoldReportsAppServiceTemplate.json @@ -45,7 +45,7 @@ } }, "variables": { - "templatelink": "https://raw.githubusercontent.com/mohamedasme-sf4303/bold-reports-azure/refs/heads/master/armtemplates/latest/AzureBlobStorage-BoldReports.json" + "templatelink": "https://raw.githubusercontent.com/boldreports/bold-reports-azure/master/armtemplates/latest/AzureBlobStorage-BoldReports.json" }, "resources": [ { From 2579c0d5b91bb681b23f7d7dec3d595f05e2f964 Mon Sep 17 00:00:00 2001 From: mohamedasme-sf4303 <153055293+mohamedasme-sf4303@users.noreply.github.com> Date: Fri, 25 Jul 2025 14:52:11 +0530 Subject: [PATCH 5/9] Update BoldReportsAppServiceTemplate.json --- armtemplates/latest/BoldReportsAppServiceTemplate.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/armtemplates/latest/BoldReportsAppServiceTemplate.json b/armtemplates/latest/BoldReportsAppServiceTemplate.json index c99b369a8..382dab8be 100644 --- a/armtemplates/latest/BoldReportsAppServiceTemplate.json +++ b/armtemplates/latest/BoldReportsAppServiceTemplate.json @@ -13,9 +13,9 @@ "appServicePlanSize": { "type": "string", "allowedValues": [ - "P1v3: 2core-8gb_RAM", - "P2v3: 4core-16gb_RAM", - "P3v3: 8core-32gb_RAM" + "P1V3_2Core_8GB_DEV", + "P2V3_4Core_16GB_PROD", + "P3V3_8Core_32GB_PROD" ], "defaultValue": "P1v3: 2core-8gb_RAM", "metadata": { From f33944a224c364155a23bf0e2158f34371f19ab6 Mon Sep 17 00:00:00 2001 From: mohamedasme-sf4303 <153055293+mohamedasme-sf4303@users.noreply.github.com> Date: Fri, 25 Jul 2025 14:52:37 +0530 Subject: [PATCH 6/9] Update AzureBlobStorage-BoldReports.json --- .../latest/AzureBlobStorage-BoldReports.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/armtemplates/latest/AzureBlobStorage-BoldReports.json b/armtemplates/latest/AzureBlobStorage-BoldReports.json index 97a1ca18b..816197002 100644 --- a/armtemplates/latest/AzureBlobStorage-BoldReports.json +++ b/armtemplates/latest/AzureBlobStorage-BoldReports.json @@ -11,9 +11,9 @@ "appServicePlanSize": { "type": "string", "allowedValues": [ - "P1v3: 2core-8gb_RAM", - "P2v3: 4core-16gb_RAM", - "P3v3: 8core-32gb_RAM" + "P1V3_2Core_8GB_DEV", + "P2V3_4Core_16GB_PROD", + "P3V3_8Core_32GB_PROD" ], "defaultValue": "P1v3: 2core-8gb_RAM", "metadata": { @@ -41,9 +41,9 @@ }, "variables": { "sizeMapping": { - "P1v3: 2core-8gb_RAM": "P1v3", - "P2v3: 4core-16gb_RAM": "P2v3", - "P3v3: 8core-32gb_RAM": "P3v3" + "P1V3_2Core_8GB_DEV": "P1v3", + "P2V3_4Core_16GB_PROD": "P2v3", + "P3V3_8Core_32GB_PROD": "P3v3" }, "WebAppSvcPlanWorkerSize": "0", "WebAppSvcPlanSKU": "PremiumV3", From c8e4f8cdee83d29b6457c26db99d242ca63d8228 Mon Sep 17 00:00:00 2001 From: mohamedasme-sf4303 <153055293+mohamedasme-sf4303@users.noreply.github.com> Date: Fri, 25 Jul 2025 15:13:09 +0530 Subject: [PATCH 7/9] Update AzureBlobStorage-BoldReports.json --- .../latest/AzureBlobStorage-BoldReports.json | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/armtemplates/latest/AzureBlobStorage-BoldReports.json b/armtemplates/latest/AzureBlobStorage-BoldReports.json index 816197002..9ea74a3c1 100644 --- a/armtemplates/latest/AzureBlobStorage-BoldReports.json +++ b/armtemplates/latest/AzureBlobStorage-BoldReports.json @@ -15,7 +15,7 @@ "P2V3_4Core_16GB_PROD", "P3V3_8Core_32GB_PROD" ], - "defaultValue": "P1v3: 2core-8gb_RAM", + "defaultValue": "P1V3_2Core_8GB_DEV", "metadata": { "description": "The pricing tier size for the App Service Plan." } @@ -37,7 +37,7 @@ "description": "Type of the storage account created" }, "defaultValue": "Standard_LRS" - } + } }, "variables": { "sizeMapping": { @@ -75,7 +75,7 @@ "name": "[parameters('WebAppName')]", "type": "Microsoft.Web/sites", "location": "[resourceGroup().location]", - "apiVersion": "2015-08-01", + "apiVersion": "2022-03-01", "dependsOn": [ "[concat('Microsoft.Web/serverfarms/', variables('WebAppSvcPlanName'))]" ], @@ -85,20 +85,20 @@ }, "properties": { "name": "[parameters('WebAppName')]", - "siteConfig": { - "metadata": [ - { - "name": "CURRENT_STACK", - "value": "dotnet" - } - ] + "siteConfig": { + "metadata": [ + { + "name": "CURRENT_STACK", + "value": "dotnet" + } + ] }, - "clientAffinityEnabled": "false", + "clientAffinityEnabled": false, "serverFarmId": "[resourceId('Microsoft.Web/serverfarms/', variables('WebAppSvcPlanName'))]" }, "resources": [ { - "apiVersion": "2015-08-01", + "apiVersion": "2022-03-01", "name": "web", "type": "config", "dependsOn": [ @@ -138,7 +138,7 @@ "virtualPath": "/reporting/jobs", "physicalPath": "site\\wwwroot\\reporting\\jobs" }, - { + { "virtualPath": "/reporting/viewer", "physicalPath": "site\\wwwroot\\reporting\\viewer" }, @@ -146,16 +146,16 @@ "virtualPath": "/reporting/reportservice", "physicalPath": "site\\wwwroot\\reporting\\reportservice" }, - { + { "virtualPath": "/etlservice", "physicalPath": "site\\wwwroot\\etl\\etlservice" } ], - "http20Enabled": true + "http20Enabled": true } }, { - "apiVersion": "2015-08-01", + "apiVersion": "2022-03-01", "name": "web", "type": "sourcecontrols", "dependsOn": [ @@ -170,7 +170,7 @@ { "name": "appsettings", "type": "config", - "apiVersion": "2015-08-01", + "apiVersion": "2022-03-01", "dependsOn": [ "[concat('Microsoft.Web/sites/', parameters('WebAppName'))]", "web", @@ -181,18 +181,18 @@ }, "properties": { "IdP:AzureBlobStorageAccountName": "[toLower(parameters('storageAccountName'))]", - "IdP:AzureBlobServiceEndpoint": "[concat('https://',toLower(parameters('storageAccountName')), '.blob.core.windows.net/')]", + "IdP:AzureBlobServiceEndpoint": "[concat('https://', toLower(parameters('storageAccountName')), '.blob.core.windows.net/')]", "IdP:AzureBlobStorageAccessKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', toLower(parameters('storageAccountName'))), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value]", "IdP:AzureBlobContainerName": "boldreportscontainer", "IdP:AzureBlobConnectionType": "https", - "IdP:AzureBlobStorageUri": "[concat('https://',toLower(parameters('storageAccountName')), '.blob.core.windows.net/')]", + "IdP:AzureBlobStorageUri": "[concat('https://', toLower(parameters('storageAccountName')), '.blob.core.windows.net/')]", "IdP:StorageType": "AzureBlob", "StorageType": "AzureBlob", "IsAzureApplication": "true", "log4net.Config": "logs\\log4net.config", "WEBSITE_DYNAMIC_CACHE": "0", - "WEBSITE_LOAD_USER_PROFILE":"1", - "ApplicationUrl":"[concat('https://',parameters('WebAppName'), '.azurewebsites.net')]" + "WEBSITE_LOAD_USER_PROFILE": "1", + "ApplicationUrl": "[concat('https://', parameters('WebAppName'), '.azurewebsites.net')]" } } ] @@ -201,14 +201,14 @@ "name": "[toLower(parameters('storageAccountName'))]", "type": "Microsoft.Storage/storageAccounts", "location": "[resourceGroup().location]", - "apiVersion": "2015-06-15", - "dependsOn": [], + "apiVersion": "2022-05-01", "tags": { "displayName": "storageaccount" }, - "properties": { - "accountType": "[parameters('storageAccountType')]" - } + "sku": { + "name": "[parameters('storageAccountType')]" + }, + "properties": {} } ] } From 2dad9ed46a93a5b27c69c5c66db70ea31b597517 Mon Sep 17 00:00:00 2001 From: mohamedasme-sf4303 <153055293+mohamedasme-sf4303@users.noreply.github.com> Date: Mon, 28 Jul 2025 17:20:29 +0530 Subject: [PATCH 8/9] Update BoldReportsAppServiceTemplate.json --- armtemplates/latest/BoldReportsAppServiceTemplate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/armtemplates/latest/BoldReportsAppServiceTemplate.json b/armtemplates/latest/BoldReportsAppServiceTemplate.json index 382dab8be..f5f0eadac 100644 --- a/armtemplates/latest/BoldReportsAppServiceTemplate.json +++ b/armtemplates/latest/BoldReportsAppServiceTemplate.json @@ -17,7 +17,7 @@ "P2V3_4Core_16GB_PROD", "P3V3_8Core_32GB_PROD" ], - "defaultValue": "P1v3: 2core-8gb_RAM", + "defaultValue": "P1V3_2Core_8GB_DEV", "metadata": { "description": "The pricing tier size for the App Service Plan." } From 6cef6ea4420386c9c60919d6cc6fd245900ae706 Mon Sep 17 00:00:00 2001 From: mohamedasme-sf4303 <153055293+mohamedasme-sf4303@users.noreply.github.com> Date: Mon, 28 Jul 2025 18:10:11 +0530 Subject: [PATCH 9/9] Update AzureBlobStorage-BoldReports.json --- armtemplates/latest/AzureBlobStorage-BoldReports.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/armtemplates/latest/AzureBlobStorage-BoldReports.json b/armtemplates/latest/AzureBlobStorage-BoldReports.json index 9ea74a3c1..b5bea2fab 100644 --- a/armtemplates/latest/AzureBlobStorage-BoldReports.json +++ b/armtemplates/latest/AzureBlobStorage-BoldReports.json @@ -24,7 +24,8 @@ "type": "string", "metadata": { "description": "Storage account name for Bold Reports Server. The name must be between 3 to 24 characters long, and can contain only numbers and lowercase letters." - } + }, + "defaultValue": "storageaccountname" }, "storageAccountType": { "type": "string",