diff --git a/docs/wiki/ALZ-Deprecated-Services.md b/docs/wiki/ALZ-Deprecated-Services.md index 0514225e..be4cd7ed 100644 --- a/docs/wiki/ALZ-Deprecated-Services.md +++ b/docs/wiki/ALZ-Deprecated-Services.md @@ -33,3 +33,4 @@ Policies being deprecated: ## Deprecated services - Removed `ActivityLog` Solution as an option to be deployed into the Log Analytics Workspace, as this has been superseded by the Activity Log Insights Workbook, as documented [here.](https://learn.microsoft.com/azure/azure-monitor/essentials/activity-log-insights) +- Removed `Service Map` solution as an option to be deployed, as this has been superseded by VM Insights, as documented [here.](https://learn.microsoft.com/azure/azure-monitor/essentials/activity-log-insights) Guidance on migrating and removing the Service Map solution can be found [here.](https://learn.microsoft.com/en-us/azure/azure-monitor/vm/vminsights-migrate-from-service-map) diff --git a/docs/wiki/Whats-new.md b/docs/wiki/Whats-new.md index 82f200ee..31ce50fa 100644 --- a/docs/wiki/Whats-new.md +++ b/docs/wiki/Whats-new.md @@ -156,6 +156,7 @@ Note that a number of initiatives have been updated that will fail to deploy if #### Portal Accelerator - FIX: Updated the Fairfax (US Gov) portal accelerator experience so it now works as expected. +- Service Map solution has been removed as an option to be deployed, as this has been superseded by VM Insights, as documented [here.](https://learn.microsoft.com/azure/azure-monitor/essentials/activity-log-insights) Guidance on migrating and removing the Service Map solution can be found [here.](https://learn.microsoft.com/en-us/azure/azure-monitor/vm/vminsights-migrate-from-service-map) #### Other @@ -828,4 +829,4 @@ Note that a number of initiatives have been updated that will fail to deploy if #### Other -- Contoso Reference Implementation Update - Virtual WAN Hub default CIDR changed from `/16` to `/23` - closing issue [#440](https://github.com/Azure/Enterprise-Scale/issues/440) \ No newline at end of file +- Contoso Reference Implementation Update - Virtual WAN Hub default CIDR changed from `/16` to `/23` - closing issue [#440](https://github.com/Azure/Enterprise-Scale/issues/440) diff --git a/eslzArm/eslz-portal.json b/eslzArm/eslz-portal.json index 67c003b6..323ef431 100644 --- a/eslzArm/eslz-portal.json +++ b/eslzArm/eslz-portal.json @@ -470,26 +470,6 @@ }, "visible": "[equals(steps('management').enableLogAnalytics,'Yes')]" }, - { - "name": "enableServiceMap", - "type": "Microsoft.Common.OptionsGroup", - "label": "Deploy Service Map solution", - "defaultValue": "Yes (recommended)", - "toolTip": "If 'Yes' is selected when also adding a subscription for management, ARM will deploy resources and enable them for continuous compliance", - "constraints": { - "allowedValues": [ - { - "label": "Yes (recommended)", - "value": "Yes" - }, - { - "label": "No", - "value": "No" - } - ] - }, - "visible": "[equals(steps('management').enableLogAnalytics,'Yes')]" - }, { "name": "enableSqlAssessment", "type": "Microsoft.Common.OptionsGroup", @@ -3012,7 +2992,6 @@ "enableChangeTracking": "[steps('management').enableChangeTracking]", "enableUpdateMgmt": "[steps('management').enableUpdateMgmt]", "enableVmInsights": "[steps('management').enableVmInsights]", - "enableServiceMap": "[steps('management').enableServiceMap]", "enableSqlAssessment": "[steps('management').enableSqlAssessment]", "enableSqlVulnerabilityAssessment": "[steps('management').enableSqlVulnerabilityAssessment]", "enableSqlAdvancedThreatProtection": "[steps('management').enableSqlAdvancedThreatProtection]", diff --git a/eslzArm/eslzArm.json b/eslzArm/eslzArm.json index 375c460f..4c9b36d5 100644 --- a/eslzArm/eslzArm.json +++ b/eslzArm/eslzArm.json @@ -80,14 +80,6 @@ ], "defaultValue": "Yes" }, - "enableServiceMap": { - "type": "string", - "allowedValues": [ - "Yes", - "No" - ], - "defaultValue": "Yes" - }, "enableSqlAssessment": { "type": "string", "allowedValues": [ @@ -1368,7 +1360,7 @@ }, { // Deploying Log Analytics solutions to Log Analytics workspace if condition is true - "condition": "[and(and(not(empty(parameters('managementSubscriptionId'))), equals(parameters('enableLogAnalytics'), 'Yes')), equals(parameters('enableLogAnalytics'), 'Yes'), or(or(or(or(or(or(equals(parameters('enableSecuritySolution'), 'Yes'), equals(parameters('enableAgentHealth'), 'Yes')), equals(parameters('enableChangeTracking'), 'Yes')), equals(parameters('enableUpdateMgmt'), 'Yes'), equals(parameters('enableVmInsights'), 'Yes')), equals(parameters('enableServiceMap'), 'Yes'), equals(parameters('enableSqlAssessment'), 'Yes')), equals(parameters('enableSqlAdvancedThreatProtection'), 'Yes')), equals(parameters('enableSqlVulnerabilityAssessment'), 'Yes')))]", + "condition": "[and(and(not(empty(parameters('managementSubscriptionId'))), equals(parameters('enableLogAnalytics'), 'Yes')), equals(parameters('enableLogAnalytics'), 'Yes'), or(or(or(or(or(or(equals(parameters('enableSecuritySolution'), 'Yes'), equals(parameters('enableAgentHealth'), 'Yes')), equals(parameters('enableChangeTracking'), 'Yes')), equals(parameters('enableUpdateMgmt'), 'Yes'), equals(parameters('enableVmInsights'), 'Yes')), equals(parameters('enableSqlAssessment'), 'Yes')), equals(parameters('enableSqlAdvancedThreatProtection'), 'Yes')), equals(parameters('enableSqlVulnerabilityAssessment'), 'Yes')))]", "type": "Microsoft.Resources/deployments", "apiVersion": "2020-10-01", "name": "[variables('deploymentNames').monitoringSolutionsDeploymentName]", @@ -1409,9 +1401,6 @@ "enableVmInsights": { "value": "[parameters('enableVmInsights')]" }, - "enableServiceMap": { - "value": "[parameters('enableServiceMap')]" - }, "enableSqlAssessment": { "value": "[parameters('enableSqlAssessment')]" }, @@ -3645,7 +3634,7 @@ */ { // Deploying Log Analytics solutions to Log Analytics workspace if condition is true - "condition": "[and(and(not(empty(parameters('singlePlatformSubscriptionId'))), equals(parameters('enableLogAnalytics'), 'Yes')), equals(parameters('enableLogAnalytics'), 'Yes'), or(or(or(or(or(or(equals(parameters('enableSecuritySolution'), 'Yes'), equals(parameters('enableAgentHealth'), 'Yes')), equals(parameters('enableChangeTracking'), 'Yes')), equals(parameters('enableUpdateMgmt'), 'Yes'), equals(parameters('enableVmInsights'), 'Yes')), equals(parameters('enableServiceMap'), 'Yes'), equals(parameters('enableSqlAssessment'), 'Yes')), equals(parameters('enableSqlAdvancedThreatProtection'), 'Yes')), equals(parameters('enableSqlVulnerabilityAssessment'), 'Yes')))]", + "condition": "[and(and(not(empty(parameters('singlePlatformSubscriptionId'))), equals(parameters('enableLogAnalytics'), 'Yes')), equals(parameters('enableLogAnalytics'), 'Yes'), or(or(or(or(or(or(equals(parameters('enableSecuritySolution'), 'Yes'), equals(parameters('enableAgentHealth'), 'Yes')), equals(parameters('enableChangeTracking'), 'Yes')), equals(parameters('enableUpdateMgmt'), 'Yes'), equals(parameters('enableVmInsights'), 'Yes')), equals(parameters('enableSqlAssessment'), 'Yes')), equals(parameters('enableSqlAdvancedThreatProtection'), 'Yes')), equals(parameters('enableSqlVulnerabilityAssessment'), 'Yes')))]", "type": "Microsoft.Resources/deployments", "apiVersion": "2020-10-01", "name": "[variables('esLiteDeploymentNames').monitoringSolutionsLiteDeploymentName]", @@ -3686,9 +3675,6 @@ "enableVmInsights": { "value": "[parameters('enableVmInsights')]" }, - "enableServiceMap": { - "value": "[parameters('enableServiceMap')]" - }, "enableSqlAssessment": { "value": "[parameters('enableSqlAssessment')]" }, diff --git a/eslzArm/eslzArm.test.param.json b/eslzArm/eslzArm.test.param.json index c22f282d..15ad9215 100644 --- a/eslzArm/eslzArm.test.param.json +++ b/eslzArm/eslzArm.test.param.json @@ -26,9 +26,6 @@ "enableVmInsights": { "value": "Yes" }, - "enableServiceMap": { - "value": "Yes" - }, "enableSqlAssessment": { "value": "Yes" }, diff --git a/eslzArm/fairfaxeslz-portal.json b/eslzArm/fairfaxeslz-portal.json index f4c89d5b..433ca540 100644 --- a/eslzArm/fairfaxeslz-portal.json +++ b/eslzArm/fairfaxeslz-portal.json @@ -313,26 +313,6 @@ }, "visible": "[equals(steps('esGoalState').esLogAnalytics,'Yes')]" }, - { - "name": "esServiceMap", - "type": "Microsoft.Common.OptionsGroup", - "label": "Deploy Service Map solution", - "defaultValue": "Yes (recommended)", - "toolTip": "If 'Yes' is selected when also adding a subscription for management, ARM will deploy resources and enable them for continous compliance", - "constraints": { - "allowedValues": [ - { - "label": "Yes (recommended)", - "value": "Yes" - }, - { - "label": "No", - "value": "No" - } - ] - }, - "visible": "[equals(steps('esGoalState').esLogAnalytics,'Yes')]" - }, { "name": "esSqlAssessment", "type": "Microsoft.Common.OptionsGroup", @@ -2362,7 +2342,6 @@ "enableChangeTracking": "[steps('esGoalState').esChangeTracking]", "enableUpdateMgmt": "[steps('esGoalState').esUpdateMgmt]", "enableVmInsights": "[steps('esGoalState').esVmInsights]", - "enableServiceMap": "[steps('esGoalState').esServiceMap]", "enableSqlAssessment": "[steps('esGoalState').esSqlAssessment]", "enableSqlVulnerabilityAssessment": "[steps('esGoalState').esSqlVulnerabilityAssessment]", "enableSqlAdvancedThreatProtection": "[steps('esGoalState').esSqlAdvancedThreatProtection]", diff --git a/eslzArm/subscriptionTemplates/logAnalyticsSolutions.json b/eslzArm/subscriptionTemplates/logAnalyticsSolutions.json index 69d635cf..3d89534d 100644 --- a/eslzArm/subscriptionTemplates/logAnalyticsSolutions.json +++ b/eslzArm/subscriptionTemplates/logAnalyticsSolutions.json @@ -76,17 +76,6 @@ "description": "Select whether VM insights solution should be enabled or not." } }, - "enableServiceMap": { - "type": "string", - "allowedValues": [ - "Yes", - "No" - ], - "defaultValue": "Yes", - "metadata": { - "description": "Select whether service map solution should be enabled or not." - } - }, "enableSqlAssessment": { "type": "string", "allowedValues": [ @@ -156,10 +145,6 @@ "name": "[concat('VMInsights', '(', parameters('workspaceName'), ')')]", "marketplaceName": "VMInsights" }, - "serviceMap": { - "name": "[concat('ServiceMap', '(', parameters('workspaceName'), ')')]", - "marketplaceName": "ServiceMap" - }, "securityInsights": { "name": "[concat('SecurityInsights', '(', parameters('workspaceName'), ')')]", "marketplaceName": "SecurityInsights" @@ -265,23 +250,6 @@ "publisher": "Microsoft" } }, - { - // Conditionally deploy solution for service map - "condition": "[equals(parameters('enableServiceMap'), 'Yes')]", - "apiVersion": "2015-11-01-preview", - "type": "Microsoft.OperationsManagement/solutions", - "name": "[variables('solutions').serviceMap.name]", - "location": "[parameters('workspaceRegion')]", - "properties": { - "workspaceResourceId": "[variables('laResourceId')]" - }, - "plan": { - "name": "[variables('solutions').serviceMap.name]", - "product": "[concat('OMSGallery/', variables('solutions').serviceMap.marketplaceName)]", - "promotionCode": "", - "publisher": "Microsoft" - } - }, { // Conditionally deploy solution for SQL assessment "condition": "[equals(parameters('enableSqlAssessment'), 'Yes')]",