From 2103c7b29126c7ec9a043188e1de092ee2532e5d Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 14 Jun 2022 14:50:03 +0200 Subject: [PATCH 01/14] readme update --- arm/Microsoft.Automation/automationAccounts/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/arm/Microsoft.Automation/automationAccounts/readme.md b/arm/Microsoft.Automation/automationAccounts/readme.md index 11fff4a2e2..dedda461e6 100644 --- a/arm/Microsoft.Automation/automationAccounts/readme.md +++ b/arm/Microsoft.Automation/automationAccounts/readme.md @@ -374,7 +374,6 @@ userAssignedIdentities: { "keyVersion": { "value": "9917c14be51d4d93b37218de7d326f60" }, - "userAssignedIdentities": { "value": { "/subscriptions/<>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<>-az-msi-x-001": {} From 975ec446ef85384c44a495575028c6c7df84216b Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 14 Jun 2022 15:10:09 +0200 Subject: [PATCH 02/14] solution dep law --- arm/Microsoft.OperationalInsights/workspaces/deploy.bicep | 1 + 1 file changed, 1 insertion(+) diff --git a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep index ffe87f3fae..b3a5bc9ed5 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep +++ b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep @@ -245,6 +245,7 @@ module logAnalyticsWorkspace_solutions '../../Microsoft.OperationsManagement/sol publisher: contains(gallerySolution, 'publisher') ? gallerySolution.publisher : 'Microsoft' enableDefaultTelemetry: enableReferencedModulesTelemetry } + dependsOn: logAnalyticsWorkspace_linkedServices }] resource logAnalyticsWorkspace_lock 'Microsoft.Authorization/locks@2017-04-01' = if (!empty(lock)) { From 8fe4795b8e46db014b7335ef1a61b3cd7eb2f2f9 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 12:03:45 +0200 Subject: [PATCH 03/14] disable link --- .../workspaces/.parameters/parameters.json | 16 ++++++++-------- .../workspaces/deploy.bicep | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json index 17ebcd712b..6ea1cf1d2d 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json +++ b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json @@ -30,14 +30,14 @@ } ] }, - "linkedServices": { - "value": [ - { - "name": "Automation", - "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001" - } - ] - }, + // "linkedServices": { + // "value": [ + // { + // "name": "Automation", + // "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001" + // } + // ] + // }, "savedSearches": { "value": [ { diff --git a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep index b3a5bc9ed5..5a5837d515 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep +++ b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep @@ -245,7 +245,7 @@ module logAnalyticsWorkspace_solutions '../../Microsoft.OperationsManagement/sol publisher: contains(gallerySolution, 'publisher') ? gallerySolution.publisher : 'Microsoft' enableDefaultTelemetry: enableReferencedModulesTelemetry } - dependsOn: logAnalyticsWorkspace_linkedServices + // dependsOn: logAnalyticsWorkspace_linkedServices }] resource logAnalyticsWorkspace_lock 'Microsoft.Authorization/locks@2017-04-01' = if (!empty(lock)) { From 8ecf8125f6ddd086c0d0ccfd7fcb90360ff34dfc Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 12:05:47 +0200 Subject: [PATCH 04/14] readme --- .../workspaces/readme.md | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/arm/Microsoft.OperationalInsights/workspaces/readme.md b/arm/Microsoft.OperationalInsights/workspaces/readme.md index ca794e10bd..af2edfc082 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/readme.md +++ b/arm/Microsoft.OperationalInsights/workspaces/readme.md @@ -515,14 +515,14 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { } ] }, - "linkedServices": { - "value": [ - { - "name": "Automation", - "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001" - } - ] - }, + // "linkedServices": { + // "value": [ + // { + // "name": "Automation", + // "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001" + // } + // ] + // }, "savedSearches": { "value": [ { @@ -683,12 +683,6 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { ] } ] - linkedServices: [ - { - name: 'Automation' - resourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001' - } - ] savedSearches: [ { name: 'VMSSQueries' From 257ca6147ee94163732a166c95cf5d5a828e3c49 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 12:14:33 +0200 Subject: [PATCH 05/14] disable sol --- .../workspaces/.parameters/parameters.json | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json index 6ea1cf1d2d..2f02ea67b7 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json +++ b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json @@ -30,14 +30,14 @@ } ] }, - // "linkedServices": { - // "value": [ - // { - // "name": "Automation", - // "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001" - // } - // ] - // }, + "linkedServices": { + "value": [ + { + "name": "Automation", + "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001" + } + ] + }, "savedSearches": { "value": [ { @@ -140,15 +140,15 @@ } ] }, - "gallerySolutions": { - "value": [ - { - "name": "AzureAutomation", - "product": "OMSGallery", - "publisher": "Microsoft" - } - ] - }, + // "gallerySolutions": { + // "value": [ + // { + // "name": "AzureAutomation", + // "product": "OMSGallery", + // "publisher": "Microsoft" + // } + // ] + // }, "useResourcePermissions": { "value": true }, From fad23b8ff4c9ad8cb02f1f692242a9d7c2cd59a3 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 12:15:11 +0200 Subject: [PATCH 06/14] readme --- .../workspaces/readme.md | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/arm/Microsoft.OperationalInsights/workspaces/readme.md b/arm/Microsoft.OperationalInsights/workspaces/readme.md index af2edfc082..5e6e9cf7ee 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/readme.md +++ b/arm/Microsoft.OperationalInsights/workspaces/readme.md @@ -515,14 +515,14 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { } ] }, - // "linkedServices": { - // "value": [ - // { - // "name": "Automation", - // "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001" - // } - // ] - // }, + "linkedServices": { + "value": [ + { + "name": "Automation", + "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001" + } + ] + }, "savedSearches": { "value": [ { @@ -625,15 +625,15 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { } ] }, - "gallerySolutions": { - "value": [ - { - "name": "AzureAutomation", - "product": "OMSGallery", - "publisher": "Microsoft" - } - ] - }, + // "gallerySolutions": { + // "value": [ + // { + // "name": "AzureAutomation", + // "product": "OMSGallery", + // "publisher": "Microsoft" + // } + // ] + // }, "useResourcePermissions": { "value": true }, @@ -683,6 +683,12 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { ] } ] + linkedServices: [ + { + name: 'Automation' + resourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001' + } + ] savedSearches: [ { name: 'VMSSQueries' @@ -781,13 +787,6 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { state: 'Enabled' } ] - gallerySolutions: [ - { - name: 'AzureAutomation' - product: 'OMSGallery' - publisher: 'Microsoft' - } - ] useResourcePermissions: true diagnosticLogsRetentionInDays: 7 diagnosticStorageAccountId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001' From aea5d751faa6bd2e04483568129bc025534a9191 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 12:35:59 +0200 Subject: [PATCH 07/14] resource name --- .../workspaces/.parameters/parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json index 2f02ea67b7..4236d7c54c 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json +++ b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-az-la-x-001" + "value": "<>-az-law-x-001" }, "lock": { "value": "CanNotDelete" From cb1dbdf10f83f90447000d5ba8aa9a2b685739e7 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 12:36:45 +0200 Subject: [PATCH 08/14] readme --- arm/Microsoft.OperationalInsights/workspaces/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arm/Microsoft.OperationalInsights/workspaces/readme.md b/arm/Microsoft.OperationalInsights/workspaces/readme.md index 5e6e9cf7ee..2027bc5a5d 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/readme.md +++ b/arm/Microsoft.OperationalInsights/workspaces/readme.md @@ -488,7 +488,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-az-la-x-001" + "value": "<>-az-law-x-001" }, "lock": { "value": "CanNotDelete" @@ -667,7 +667,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { name: '${uniqueString(deployment().name)}-workspaces' params: { - name: '<>-az-la-x-001' + name: '<>-az-law-x-001' lock: 'CanNotDelete' publicNetworkAccessForIngestion: 'Disabled' publicNetworkAccessForQuery: 'Disabled' From ca757585587fe7ae57748058c1cc4f9b1009822b Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 12:49:26 +0200 Subject: [PATCH 09/14] change names --- .../workspaces/.parameters/parameters.json | 4 ++-- arm/Microsoft.OperationalInsights/workspaces/deploy.bicep | 2 +- arm/Microsoft.OperationalInsights/workspaces/readme.md | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json index 4236d7c54c..ae7791453b 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json +++ b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json @@ -33,8 +33,8 @@ "linkedServices": { "value": [ { - "name": "Automation", - "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001" + "name": "AutomationLAW", + "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-002" } ] }, diff --git a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep index 5a5837d515..bfaa5cce50 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep +++ b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep @@ -192,7 +192,7 @@ module logAnalyticsWorkspace_linkedServices 'linkedServices/deploy.bicep' = [for params: { logAnalyticsWorkspaceName: logAnalyticsWorkspace.name name: linkedService.name - resourceId: linkedService.resourceId + resourceId: contains(linkedService, 'resourceId') ? linkedService.resourceId : '' writeAccessResourceId: contains(linkedService, 'writeAccessResourceId') ? linkedService.writeAccessResourceId : '' enableDefaultTelemetry: enableReferencedModulesTelemetry } diff --git a/arm/Microsoft.OperationalInsights/workspaces/readme.md b/arm/Microsoft.OperationalInsights/workspaces/readme.md index 2027bc5a5d..8b26a944e0 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/readme.md +++ b/arm/Microsoft.OperationalInsights/workspaces/readme.md @@ -518,8 +518,8 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { "linkedServices": { "value": [ { - "name": "Automation", - "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001" + "name": "AutomationLAW", + "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-002" } ] }, @@ -685,8 +685,8 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { ] linkedServices: [ { - name: 'Automation' - resourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-001' + name: 'AutomationLAW' + resourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-002' } ] savedSearches: [ From edabf4cfc7beb5c3b52cf55c23b3667a5c313427 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 12:56:35 +0200 Subject: [PATCH 10/14] change linked name --- .../workspaces/.parameters/parameters.json | 2 +- arm/Microsoft.OperationalInsights/workspaces/readme.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json index ae7791453b..9b22f01cdb 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json +++ b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json @@ -33,7 +33,7 @@ "linkedServices": { "value": [ { - "name": "AutomationLAW", + "name": "Automation", "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-002" } ] diff --git a/arm/Microsoft.OperationalInsights/workspaces/readme.md b/arm/Microsoft.OperationalInsights/workspaces/readme.md index 8b26a944e0..5c078205c1 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/readme.md +++ b/arm/Microsoft.OperationalInsights/workspaces/readme.md @@ -518,7 +518,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { "linkedServices": { "value": [ { - "name": "AutomationLAW", + "name": "Automation", "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-002" } ] @@ -685,7 +685,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { ] linkedServices: [ { - name: 'AutomationLAW' + name: 'Automation' resourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-002' } ] From 2346064d977b6ae809cd8ad50fc8509d806ae193 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 13:12:49 +0200 Subject: [PATCH 11/14] aut name update --- .../automationAccounts/.parameters/encr.parameters.json | 2 +- .../automationAccounts/.parameters/min.parameters.json | 2 +- .../automationAccounts/.parameters/parameters.json | 2 +- .../workspaces/.parameters/parameters.json | 2 +- .../automationAccounts/parameters/parameters.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json b/arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json index d95cd78497..de787fa3bb 100644 --- a/arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json +++ b/arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-wd-aut-encr-001" + "value": "<>-az-aut-encr-001" }, "encryptionKeySource": { "value": "Microsoft.Keyvault" diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json b/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json index 36d11228da..fedb59ca60 100644 --- a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json +++ b/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-wd-aut-min-001" + "value": "adp-<>-az-aut-min-001" } } } diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json b/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json index 4b1dc95b56..ae5e51517b 100644 --- a/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json +++ b/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-wd-aut-x-001" + "value": "<>-az-aut-x-001" }, "lock": { "value": "CanNotDelete" diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json index 9b22f01cdb..4c1202dfcd 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json +++ b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json @@ -34,7 +34,7 @@ "value": [ { "name": "Automation", - "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-002" + "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-az-aut-x-001" } ] }, diff --git a/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/parameters.json b/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/parameters.json index 2f53ae1738..7feb8576e2 100644 --- a/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/parameters.json +++ b/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "adp-<>-wd-aut-x-001" + "value": "adp-<>-az-aut-x-001" } } } From 0bdb0e8dfd751397b75d775f4732645005aa13f0 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 13:29:41 +0200 Subject: [PATCH 12/14] law name update solutions back --- .../workspaces/.parameters/min.parameters.json | 2 +- .../workspaces/.parameters/parameters.json | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json b/arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json index 0220489395..97fc2fafe4 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json +++ b/arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-az-la-min-001" + "value": "<>-az-law-min-001" } } } diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json index 4c1202dfcd..e69b24d3ff 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json +++ b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json @@ -140,15 +140,15 @@ } ] }, - // "gallerySolutions": { - // "value": [ - // { - // "name": "AzureAutomation", - // "product": "OMSGallery", - // "publisher": "Microsoft" - // } - // ] - // }, + "gallerySolutions": { + "value": [ + { + "name": "AzureAutomation", + "product": "OMSGallery", + "publisher": "Microsoft" + } + ] + }, "useResourcePermissions": { "value": true }, From b487ba9f29301e7d24c3d3b851bc3a80cafa0300 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 13:33:31 +0200 Subject: [PATCH 13/14] readme --- .../.parameters/min.parameters.json | 2 +- .../automationAccounts/readme.md | 12 +++---- .../workspaces/readme.md | 33 +++++++++++-------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json b/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json index fedb59ca60..c76e891806 100644 --- a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json +++ b/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "adp-<>-az-aut-min-001" + "value": "<>-az-aut-min-001" } } } diff --git a/arm/Microsoft.Automation/automationAccounts/readme.md b/arm/Microsoft.Automation/automationAccounts/readme.md index dedda461e6..b95992ee0c 100644 --- a/arm/Microsoft.Automation/automationAccounts/readme.md +++ b/arm/Microsoft.Automation/automationAccounts/readme.md @@ -357,7 +357,7 @@ userAssignedIdentities: { "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-wd-aut-encr-001" + "value": "<>-az-aut-encr-001" }, "encryptionKeySource": { "value": "Microsoft.Keyvault" @@ -394,7 +394,7 @@ userAssignedIdentities: { module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bicep' = { name: '${uniqueString(deployment().name)}-automationAccounts' params: { - name: '<>-wd-aut-encr-001' + name: '<>-az-aut-encr-001' encryptionKeySource: 'Microsoft.Keyvault' encryptionUserAssignedIdentity: '/subscriptions/<>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<>-az-msi-x-001' keyName: 'keyEncryptionKey' @@ -421,7 +421,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-wd-aut-min-001" + "value": "<>-az-aut-min-001" } } } @@ -438,7 +438,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bicep' = { name: '${uniqueString(deployment().name)}-automationAccounts' params: { - name: '<>-wd-aut-min-001' + name: '<>-az-aut-min-001' } ``` @@ -457,7 +457,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-wd-aut-x-001" + "value": "<>-az-aut-x-001" }, "lock": { "value": "CanNotDelete" @@ -664,7 +664,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bicep' = { name: '${uniqueString(deployment().name)}-automationAccounts' params: { - name: '<>-wd-aut-x-001' + name: '<>-az-aut-x-001' lock: 'CanNotDelete' schedules: [ { diff --git a/arm/Microsoft.OperationalInsights/workspaces/readme.md b/arm/Microsoft.OperationalInsights/workspaces/readme.md index 5c078205c1..90c8ddfcb0 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/readme.md +++ b/arm/Microsoft.OperationalInsights/workspaces/readme.md @@ -452,7 +452,7 @@ tags: { "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-az-la-min-001" + "value": "<>-az-law-min-001" } } } @@ -469,7 +469,7 @@ tags: { module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { name: '${uniqueString(deployment().name)}-workspaces' params: { - name: '<>-az-la-min-001' + name: '<>-az-law-min-001' } ``` @@ -519,7 +519,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { "value": [ { "name": "Automation", - "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-002" + "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-az-aut-x-001" } ] }, @@ -625,15 +625,15 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { } ] }, - // "gallerySolutions": { - // "value": [ - // { - // "name": "AzureAutomation", - // "product": "OMSGallery", - // "publisher": "Microsoft" - // } - // ] - // }, + "gallerySolutions": { + "value": [ + { + "name": "AzureAutomation", + "product": "OMSGallery", + "publisher": "Microsoft" + } + ] + }, "useResourcePermissions": { "value": true }, @@ -686,7 +686,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { linkedServices: [ { name: 'Automation' - resourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-wd-aut-x-002' + resourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<>-az-aut-x-001' } ] savedSearches: [ @@ -787,6 +787,13 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = { state: 'Enabled' } ] + gallerySolutions: [ + { + name: 'AzureAutomation' + product: 'OMSGallery' + publisher: 'Microsoft' + } + ] useResourcePermissions: true diagnosticLogsRetentionInDays: 7 diagnosticStorageAccountId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001' From 1055fd2618f6ce3ce928dc080e9dec668295684d Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 15 Jun 2022 13:35:49 +0200 Subject: [PATCH 14/14] cleanup --- arm/Microsoft.OperationalInsights/workspaces/deploy.bicep | 1 - 1 file changed, 1 deletion(-) diff --git a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep index bfaa5cce50..ef5d91997d 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep +++ b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep @@ -245,7 +245,6 @@ module logAnalyticsWorkspace_solutions '../../Microsoft.OperationsManagement/sol publisher: contains(gallerySolution, 'publisher') ? gallerySolution.publisher : 'Microsoft' enableDefaultTelemetry: enableReferencedModulesTelemetry } - // dependsOn: logAnalyticsWorkspace_linkedServices }] resource logAnalyticsWorkspace_lock 'Microsoft.Authorization/locks@2017-04-01' = if (!empty(lock)) {