From 435406dbc8d471a07296477ec29c259bfd0b859a Mon Sep 17 00:00:00 2001 From: Saumilkumar Kiritkumar Shah <76719429+SaumilkumarShah@users.noreply.github.com> Date: Fri, 4 Mar 2022 23:10:19 +0530 Subject: [PATCH 1/7] Microsoft.AnalysisServices-Servers-Max param file (#1073) * Microsoft.AnalysisServices-Servers-Max param file * location fix * remove location param * Update ms.analysisservices.servers.yml * Update ms.analysisservices.servers.yml * Update max.parameters.json --- .../ms.analysisservices.servers.yml | 1 + .../workflows/ms.analysisservices.servers.yml | 2 +- .../servers/.parameters/max.parameters.json | 63 +++++++++++++++++++ 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml index 625a1186cf..7f92175c58 100644 --- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml +++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml @@ -44,6 +44,7 @@ stages: deploymentBlocks: - path: $(modulePath)/.parameters/min.parameters.json - path: $(modulePath)/.parameters/parameters.json + - path: $(modulePath)/.parameters/max.parameters.json - stage: Publishing displayName: Publish module diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml index ac017a39bf..1513b0a8a4 100644 --- a/.github/workflows/ms.analysisservices.servers.yml +++ b/.github/workflows/ms.analysisservices.servers.yml @@ -81,7 +81,7 @@ jobs: strategy: fail-fast: false matrix: - parameterFilePaths: ['min.parameters.json', 'parameters.json'] + parameterFilePaths: ['min.parameters.json', 'parameters.json','max.parameters.json'] steps: - name: 'Checkout' uses: actions/checkout@v2 diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json b/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json new file mode 100644 index 0000000000..39640b11d6 --- /dev/null +++ b/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json @@ -0,0 +1,63 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "skuName": { + "value": "S0" + }, + "skuCapacity": { + "value": 1 + }, + "firewallSettings": { + "value": { + "firewallRules": [ + { + "firewallRuleName": "AllowFromAll", + "rangeStart": "0.0.0.0", + "rangeEnd": "255.255.255.255" + } + ], + "enablePowerBIService": true + } + }, + "diagnosticLogsRetentionInDays": { + "value": 365 + }, + "diagnosticStorageAccountId": { + "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001" + }, + "diagnosticWorkspaceId": { + "value": "/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-x-001" + }, + "diagnosticEventHubAuthorizationRuleId": { + "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey" + }, + "diagnosticEventHubName": { + "value": "adp-<>-az-evh-x-001" + }, + "lock": { + "value": "NotSpecified" + }, + "roleAssignments": { + "value": [ + { + "roleDefinitionIdOrName": "Reader", + "principalIds": [ + "<>" + ] + } + ] + }, + "logsToEnable": { + "value": [ + "Engine", + "Service" + ] + }, + "metricsToEnable": { + "value": [ + "AllMetrics" + ] + } + } +} From caf2a5fdd2ffb258ee6e1b7914ee9b051ee82351 Mon Sep 17 00:00:00 2001 From: Saumilkumar Shah Date: Mon, 7 Mar 2022 10:26:09 +0530 Subject: [PATCH 2/7] Added Required Params --- .../servers/.parameters/max.parameters.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json b/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json index 39640b11d6..f8d4e4972b 100644 --- a/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json +++ b/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json @@ -2,6 +2,9 @@ "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", "contentVersion": "1.0.0.0", "parameters": { + "name": { + "value": "<>azasweux001" + }, "skuName": { "value": "S0" }, From a022610b824fc9d041458a8da6398ccce119fb51 Mon Sep 17 00:00:00 2001 From: Saumilkumar Shah Date: Mon, 7 Mar 2022 11:20:06 +0530 Subject: [PATCH 3/7] Fix right SKU --- .../servers/.parameters/parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/parameters.json b/arm/Microsoft.AnalysisServices/servers/.parameters/parameters.json index 29ad01f8a9..e2e01dcad7 100644 --- a/arm/Microsoft.AnalysisServices/servers/.parameters/parameters.json +++ b/arm/Microsoft.AnalysisServices/servers/.parameters/parameters.json @@ -6,7 +6,7 @@ "value": "<>azasweux001" }, "skuName": { - "value": "D1" + "value": "S0" }, "roleAssignments": { "value": [ From d2a226070d83039b85c15ba9cbf60f407ea8135a Mon Sep 17 00:00:00 2001 From: Saumilkumar Shah Date: Mon, 7 Mar 2022 11:57:55 +0530 Subject: [PATCH 4/7] fix --- settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.json b/settings.json index b3b82ad280..6a5df25529 100644 --- a/settings.json +++ b/settings.json @@ -5,7 +5,7 @@ "localTokens": [ { "name": "namePrefix", - "value": "carml", + "value": "saum", "metadata": { "description": "A 3-5 character length string, included in the resources names" } From f6590f203c3788131d9d54b34a3f04b8f17d09c9 Mon Sep 17 00:00:00 2001 From: Saumilkumar Shah Date: Mon, 7 Mar 2022 12:15:25 +0530 Subject: [PATCH 5/7] Fix --- .../servers/.parameters/max.parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json b/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json index f8d4e4972b..41182c8ef4 100644 --- a/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json +++ b/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json @@ -33,7 +33,7 @@ "value": "/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-x-001" }, "diagnosticEventHubAuthorizationRuleId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey" + "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<>-az-evh-x-001/AuthorizationRules/RootManageSharedAccessKey" }, "diagnosticEventHubName": { "value": "adp-<>-az-evh-x-001" From 6c27fdf9a7113e60841bc434d40f0119eda59248 Mon Sep 17 00:00:00 2001 From: Saumilkumar Shah Date: Mon, 7 Mar 2022 12:54:46 +0530 Subject: [PATCH 6/7] fixes --- .../servers/.parameters/max.parameters.json | 2 +- settings.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json b/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json index 41182c8ef4..f8d4e4972b 100644 --- a/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json +++ b/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json @@ -33,7 +33,7 @@ "value": "/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-x-001" }, "diagnosticEventHubAuthorizationRuleId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<>-az-evh-x-001/AuthorizationRules/RootManageSharedAccessKey" + "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey" }, "diagnosticEventHubName": { "value": "adp-<>-az-evh-x-001" diff --git a/settings.json b/settings.json index 6a5df25529..b3b82ad280 100644 --- a/settings.json +++ b/settings.json @@ -5,7 +5,7 @@ "localTokens": [ { "name": "namePrefix", - "value": "saum", + "value": "carml", "metadata": { "description": "A 3-5 character length string, included in the resources names" } From a3f1cf18783723beab314db62ab756c35377d885 Mon Sep 17 00:00:00 2001 From: Saumilkumar Shah Date: Mon, 7 Mar 2022 16:27:41 +0530 Subject: [PATCH 7/7] name param fix --- .../servers/.parameters/max.parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json b/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json index f8d4e4972b..acc51af8ca 100644 --- a/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json +++ b/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>azasweux001" + "value": "<>azasweumax001" }, "skuName": { "value": "S0"