Removed Service Map (#1297)
This commit is contained in:
Arjen Huitema
GitHub
Родитель
b547ac3e5d
Коммит
152d284d5f
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
- 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)
|
||||
|
|
|
|||
|
|
@ -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]",
|
||||
|
|
|
|||
|
|
@ -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')]"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -26,9 +26,6 @@
|
|||
"enableVmInsights": {
|
||||
"value": "Yes"
|
||||
},
|
||||
"enableServiceMap": {
|
||||
"value": "Yes"
|
||||
},
|
||||
"enableSqlAssessment": {
|
||||
"value": "Yes"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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]",
|
||||
|
|
|
|||
|
|
@ -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')]",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче