Removed Activity Log Solution in LAW (#1151)
This commit is contained in:
Родитель
a80e7dffe1
Коммит
3bb0a9443d
|
@ -48,14 +48,6 @@
|
|||
],
|
||||
"defaultValue": "Yes"
|
||||
},
|
||||
"enableActivityLog": {
|
||||
"type": "string",
|
||||
"allowedValues": [
|
||||
"Yes",
|
||||
"No"
|
||||
],
|
||||
"defaultValue": "Yes"
|
||||
},
|
||||
"enableAntiMalware": {
|
||||
"type": "string",
|
||||
"allowedValues": [
|
||||
|
@ -108,10 +100,6 @@
|
|||
"name": "[concat('Updates', '(', parameters('workspaceName'), ')')]",
|
||||
"marketplaceName": "Updates"
|
||||
},
|
||||
"azureActivity": {
|
||||
"name": "[concat('AzureActivity', '(', parameters('workspaceName'), ')')]",
|
||||
"marketplaceName": "AzureActivity"
|
||||
},
|
||||
"sqlAssessment": {
|
||||
"name": "[concat('SQLAssessment', '(', parameters('workspaceName'), ')')]",
|
||||
"marketplaceName": "SQLAssessment"
|
||||
|
@ -180,22 +168,6 @@
|
|||
"publisher": "Microsoft"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "[equals(parameters('enableActivityLog'), 'Yes')]",
|
||||
"apiVersion": "2015-11-01-preview",
|
||||
"type": "Microsoft.OperationsManagement/solutions",
|
||||
"name": "[variables('solutions').azureActivity.name]",
|
||||
"location": "[parameters('workspaceRegion')]",
|
||||
"properties": {
|
||||
"workspaceResourceId": "[variables('laResourceId')]"
|
||||
},
|
||||
"plan": {
|
||||
"name": "[variables('solutions').azureActivity.name]",
|
||||
"product": "[concat('OMSGallery/', variables('solutions').azureActivity.marketplaceName)]",
|
||||
"promotionCode": "",
|
||||
"publisher": "Microsoft"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "[equals(parameters('enableChangeTracking'), 'Yes')]",
|
||||
"apiVersion": "2015-11-01-preview",
|
||||
|
|
|
@ -170,14 +170,6 @@
|
|||
],
|
||||
"defaultValue": "Yes"
|
||||
},
|
||||
"enableActivityLog": {
|
||||
"type": "string",
|
||||
"allowedValues": [
|
||||
"Yes",
|
||||
"No"
|
||||
],
|
||||
"defaultValue": "Yes"
|
||||
},
|
||||
"enableAntiMalware": {
|
||||
"type": "string",
|
||||
"allowedValues": [
|
||||
|
@ -559,7 +551,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"condition": "[and(not(empty(parameters('platformSubscriptionId'))), or(or(or(or(or(equals(parameters('enableSecuritySolution'), 'Yes'), equals(parameters('enableAgentHealth'), 'Yes')), equals(parameters('enableChangeTracking'), 'Yes')), equals(parameters('enableUpdateMgmt'), 'Yes'), equals(parameters('enableActivityLog'), 'Yes')), equals(parameters('enableAntiMalware'), 'Yes'), equals(parameters('enableVmInsights'), 'Yes')), equals(parameters('enableServiceMap'), 'Yes'), equals(parameters('enableSqlAssessment'), 'Yes')))]",
|
||||
"condition": "[and(not(empty(parameters('platformSubscriptionId'))), or(or(or(or(equals(parameters('enableSecuritySolution'), 'Yes'), equals(parameters('enableAgentHealth'), 'Yes')), equals(parameters('enableChangeTracking'), 'Yes')), equals(parameters('enableUpdateMgmt'), 'Yes')), equals(parameters('enableAntiMalware'), 'Yes'), equals(parameters('enableVmInsights'), 'Yes')), equals(parameters('enableServiceMap'), 'Yes'), equals(parameters('enableSqlAssessment'), 'Yes'))]",
|
||||
"type": "Microsoft.Resources/deployments",
|
||||
"apiVersion": "2019-05-01",
|
||||
"subscriptionId": "[parameters('platformSubscriptionId')]",
|
||||
|
@ -593,9 +585,6 @@
|
|||
"enableUpdateMgmt": {
|
||||
"value": "[parameters('enableUpdateMgmt')]"
|
||||
},
|
||||
"enableActivityLog": {
|
||||
"value": "[parameters('enableActivityLog')]"
|
||||
},
|
||||
"enableAntiMalware": {
|
||||
"value": "[parameters('enableAntiMalware')]"
|
||||
},
|
||||
|
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -104,7 +104,7 @@
|
|||
"required": false
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "mgmtSubsApi",
|
||||
"type": "Microsoft.Solutions.ArmApiControl",
|
||||
|
@ -128,7 +128,7 @@
|
|||
"allowedValues": "[map(steps('esGoalState').mgmtSubsApi.value, (sub) => parse(concat('{\"label\":\"', sub.displayName, '\",\"description\":\"', sub.subscriptionId, '\",\"value\":\"', toLower(sub.subscriptionId), '\"}')) )]",
|
||||
"required": true
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "textBlock1",
|
||||
"type": "Microsoft.Common.TextBlock",
|
||||
|
@ -159,8 +159,8 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "esChangeTracking",
|
||||
"type": "Microsoft.Common.OptionsGroup",
|
||||
|
@ -179,7 +179,7 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "esUpdateMgmt",
|
||||
|
@ -199,27 +199,7 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "esActivityLog",
|
||||
"type": "Microsoft.Common.OptionsGroup",
|
||||
"label": "Deploy Activity Log 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')]"
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "esVmInsights",
|
||||
|
@ -239,7 +219,7 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "esAntiMalware",
|
||||
|
@ -259,7 +239,7 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "esServiceMap",
|
||||
|
@ -279,7 +259,7 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "esSqlAssessment",
|
||||
|
@ -299,12 +279,12 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "textBlock0",
|
||||
"type": "Microsoft.Common.TextBlock",
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]",
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]",
|
||||
"options": {
|
||||
"text": "Select which Azure Security solutions you will enable.",
|
||||
"link": {
|
||||
|
@ -312,7 +292,7 @@
|
|||
"uri": "https://docs.microsoft.com/azure/security/fundamentals/overview"
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "esAsc",
|
||||
"type": "Microsoft.Common.OptionsGroup",
|
||||
|
@ -335,7 +315,7 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "esAscEmail",
|
||||
|
@ -349,7 +329,7 @@
|
|||
"regex": "^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$",
|
||||
"validationMessage": "Please provide a valid email address"
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "esSecuritySolution",
|
||||
"type": "Microsoft.Common.OptionsGroup",
|
||||
|
@ -368,8 +348,8 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
}
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
|
@ -448,7 +428,7 @@
|
|||
"validationMessage": "The virtual hubs network's address space, specified as one address prefixes in CIDR notation (e.g. 192.168.1.0/24)"
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
"name": "esLocationsApi",
|
||||
"type": "Microsoft.Solutions.ArmApiControl",
|
||||
"request": {
|
||||
|
@ -894,7 +874,7 @@
|
|||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "lzGoalState",
|
||||
"label": "Landing zone configuration",
|
||||
|
@ -985,7 +965,7 @@
|
|||
"allowedValues": "[map(steps('lzGoalState').lzCorpSubsApi.value, (sub) => parse(concat('{\"label\":\"', sub.displayName, '\",\"description\":\"', sub.subscriptionId, '\",\"value\":\"', toLower(sub.subscriptionId), '\"}')) )]",
|
||||
"required": false
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "azMonText",
|
||||
"type": "Microsoft.Common.TextBlock",
|
||||
|
@ -1057,7 +1037,7 @@
|
|||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "esVmMonitoring",
|
||||
"type": "Microsoft.Common.OptionsGroup",
|
||||
|
@ -1076,8 +1056,8 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics, 'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "esAzBackup",
|
||||
"type": "Microsoft.Common.OptionsGroup",
|
||||
|
@ -1225,19 +1205,18 @@
|
|||
"enterpriseScaleCompanyPrefix": "[steps('lzSettings').esMgmtGroup]",
|
||||
"platformSubscriptionId": "[if(not(empty(steps('esGoalState').esMgmtSub)), steps('esGoalState').esMgmtSub, if(not(empty(steps('esConnectivityGoalState').esConnectivitySub)), steps('esConnectivityGoalState').esConnectivitySub, ''))]",
|
||||
"enableLogAnalytics": "[steps('esGoalState').esLogAnalytics]",
|
||||
"retentionInDays": "[string(steps('esGoalState').esLogRetention)]",
|
||||
"retentionInDays": "[string(steps('esGoalState').esLogRetention)]",
|
||||
"enableAgentHealth": "[steps('esGoalState').esAgentSolution]",
|
||||
"enableChangeTracking": "[steps('esGoalState').esChangeTracking]",
|
||||
"enableUpdateMgmt": "[steps('esGoalState').esUpdateMgmt]",
|
||||
"enableActivityLog": "[steps('esGoalState').esActivityLog]",
|
||||
"enableVmInsights": "[steps('esGoalState').esVmInsights]",
|
||||
"enableAntiMalware": "[steps('esGoalState').esAntiMalware]",
|
||||
"enableServiceMap": "[steps('esGoalState').esServiceMap]",
|
||||
"enableSqlAssessment": "[steps('esGoalState').esSqlAssessment]",
|
||||
"enableAsc": "[steps('esGoalState').esAsc]",
|
||||
"emailContactAsc": "[steps('esGoalState').esAscEmail]",
|
||||
"emailContactAsc": "[steps('esGoalState').esAscEmail]",
|
||||
"enableSecuritySolution": "[steps('esGoalState').esSecuritySolution]",
|
||||
"location": "[steps('esConnectivityGoalState').esNwLocation]",
|
||||
"location": "[steps('esConnectivityGoalState').esNwLocation]",
|
||||
"vpnGwType": "[steps('esConnectivityGoalState').esVpnGwType]",
|
||||
"subnetMaskForGw": "[steps('esConnectivityGoalState').esAddressVpnOrEr]",
|
||||
"subnetMaskForAzFw": "[steps('esConnectivityGoalState').esAddressFw]",
|
||||
|
|
|
@ -1,11 +1,8 @@
|
|||
# Azure Landing Zones Deprecated Policies
|
||||
# Azure Landing Zones Deprecated Services
|
||||
|
||||
## In this section
|
||||
|
||||
- [Azure Landing Zones Deprecated Policies](#azure-landing-zones-deprecated-policies)
|
||||
- [In this section](#in-this-section)
|
||||
- [Overview](#overview)
|
||||
- [Deprecated policies](#deprecated-policies)
|
||||
- [Azure Landing Zones Deprecated Services](#azure-landing-zones-deprecated-services)
|
||||
|
||||
## Overview
|
||||
|
||||
|
@ -24,3 +21,7 @@ Over time, a deprecation process of there `ALZ / custom` policies will have to t
|
|||
| Deploy-Nsg-FlowLogs | [e920df7f-9a64-4066-9b58-52684c02a091](https://www.azadvertizer.net/azpolicyadvertizer/e920df7f-9a64-4066-9b58-52684c02a091.html?) | Custom policy replaced by built-in requires less administration overhead |
|
||||
| Deploy-Nsg-FlowLogs-to-LA | [e920df7f-9a64-4066-9b58-52684c02a091](https://www.azadvertizer.net/azpolicyadvertizer/e920df7f-9a64-4066-9b58-52684c02a091.html?) | Custom policy replaced by built-in requires less administration overhead |
|
||||
| Deny-PublicIP | [6c112d4e-5bc7-47ae-a041-ea2d9dccd749](https://www.azadvertizer.net/azpolicyadvertizer/6c112d4e-5bc7-47ae-a041-ea2d9dccd749.html?) | Custom policy replaced by built-in requires less administration overhead |½
|
||||
|
||||
## 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)
|
|
@ -89,7 +89,6 @@ See [Manage usage and costs with Azure Monitor Logs](https://docs.microsoft.com/
|
|||
- [Agent Health](https://docs.microsoft.com/en-us/azure/azure-monitor/insights/solution-agenthealth) helps you understand which monitoring agents are unresponsive and submitting operational data.
|
||||
- [Change Tracking](https://docs.microsoft.com/en-us/azure/automation/change-tracking/overview) tracks changes in virtual machines hosted in Azure, on-premises, and other cloud environments to help you pinpoint operational and environmental issues.
|
||||
- [Update Management](https://docs.microsoft.com/en-us/azure/automation/update-management/overview) assesses the status of available updates and allows you manage the process of installing required updates for your machines leveraging Azure Automation.
|
||||
- [Activity Log](https://docs.microsoft.com/en-us/azure/azure-monitor/essentials/activity-log#activity-log-analytics-monitoring-solution) helps to assess administration and operational events related to your subscriptions.
|
||||
- [VM Insights](https://docs.microsoft.com/en-us/azure/azure-monitor/vm/vminsights-overview) monitors the performance and health of your virtual machines and virtual machine scale sets, including their running processes and dependencies on other resources.
|
||||
- [Service Map](https://docs.microsoft.com/en-us/azure/azure-monitor/vm/service-map) automatically discovers application components on Windows and Linux systems and maps the communication between services.
|
||||
- [SQL Assessment](https://docs.microsoft.com/en-us/azure/azure-monitor/insights/sql-assessment) provides a prioritized list of recommendations specific to your deployed server infrastructure. The recommendations are categorized across six focus areas which help you quickly understand the risk and take corrective action.
|
||||
|
|
|
@ -62,6 +62,10 @@ Here's what's changed in Enterprise Scale/Azure Landing Zones:
|
|||
Impacted assignment: Deploy-ASC-Monitoring
|
||||
- Updated "**Deploy Diagnostic Settings for Data Factory to Log Analytics workspace" to include new categories of: `SandboxPipelineRuns` & `SandboxActivityRuns`
|
||||
|
||||
#### Tooling
|
||||
|
||||
- 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)
|
||||
|
||||
### November 2022
|
||||
|
||||
#### Docs
|
||||
|
|
|
@ -405,26 +405,6 @@
|
|||
},
|
||||
"visible": "[equals(steps('management').enableLogAnalytics,'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "enableActivityLog",
|
||||
"type": "Microsoft.Common.OptionsGroup",
|
||||
"label": "Deploy Activity Log 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": "enableVmInsights",
|
||||
"type": "Microsoft.Common.OptionsGroup",
|
||||
|
@ -2646,7 +2626,6 @@
|
|||
"enableAgentHealth": "[steps('management').enableAgentHealth]",
|
||||
"enableChangeTracking": "[steps('management').enableChangeTracking]",
|
||||
"enableUpdateMgmt": "[steps('management').enableUpdateMgmt]",
|
||||
"enableActivityLog": "[steps('management').enableActivityLog]",
|
||||
"enableVmInsights": "[steps('management').enableVmInsights]",
|
||||
"enableServiceMap": "[steps('management').enableServiceMap]",
|
||||
"enableSqlAssessment": "[steps('management').enableSqlAssessment]",
|
||||
|
@ -2730,4 +2709,4 @@
|
|||
"location": "[steps('basics').resourceScope.location.name]"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -72,14 +72,6 @@
|
|||
],
|
||||
"defaultValue": "Yes"
|
||||
},
|
||||
"enableActivityLog": {
|
||||
"type": "string",
|
||||
"allowedValues": [
|
||||
"Yes",
|
||||
"No"
|
||||
],
|
||||
"defaultValue": "Yes"
|
||||
},
|
||||
"enableVmInsights": {
|
||||
"type": "string",
|
||||
"allowedValues": [
|
||||
|
@ -1245,7 +1237,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(or(equals(parameters('enableSecuritySolution'), 'Yes'), equals(parameters('enableAgentHealth'), 'Yes')), equals(parameters('enableChangeTracking'), 'Yes')), equals(parameters('enableUpdateMgmt'), 'Yes'), equals(parameters('enableActivityLog'), '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('enableServiceMap'), '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]",
|
||||
|
@ -1283,9 +1275,6 @@
|
|||
"enableUpdateMgmt": {
|
||||
"value": "[parameters('enableUpdateMgmt')]"
|
||||
},
|
||||
"enableActivityLog": {
|
||||
"value": "[parameters('enableActivityLog')]"
|
||||
},
|
||||
"enableVmInsights": {
|
||||
"value": "[parameters('enableVmInsights')]"
|
||||
},
|
||||
|
@ -3161,7 +3150,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(or(equals(parameters('enableSecuritySolution'), 'Yes'), equals(parameters('enableAgentHealth'), 'Yes')), equals(parameters('enableChangeTracking'), 'Yes')), equals(parameters('enableUpdateMgmt'), 'Yes'), equals(parameters('enableActivityLog'), '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('enableServiceMap'), '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]",
|
||||
|
@ -3199,9 +3188,6 @@
|
|||
"enableUpdateMgmt": {
|
||||
"value": "[parameters('enableUpdateMgmt')]"
|
||||
},
|
||||
"enableActivityLog": {
|
||||
"value": "[parameters('enableActivityLog')]"
|
||||
},
|
||||
"enableVmInsights": {
|
||||
"value": "[parameters('enableVmInsights')]"
|
||||
},
|
||||
|
|
|
@ -23,9 +23,6 @@
|
|||
"enableUpdateMgmt": {
|
||||
"value": "Yes"
|
||||
},
|
||||
"enableActivityLog": {
|
||||
"value": "Yes"
|
||||
},
|
||||
"enableVmInsights": {
|
||||
"value": "Yes"
|
||||
},
|
||||
|
@ -243,4 +240,4 @@
|
|||
"value": 30
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -269,26 +269,6 @@
|
|||
},
|
||||
"visible": "[equals(steps('esGoalState').esLogAnalytics,'Yes')]"
|
||||
},
|
||||
{
|
||||
"name": "esActivityLog",
|
||||
"type": "Microsoft.Common.OptionsGroup",
|
||||
"label": "Deploy Activity Log 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": "esVmInsights",
|
||||
"type": "Microsoft.Common.OptionsGroup",
|
||||
|
@ -2357,7 +2337,6 @@
|
|||
"enableAgentHealth": "[steps('esGoalState').esAgentSolution]",
|
||||
"enableChangeTracking": "[steps('esGoalState').esChangeTracking]",
|
||||
"enableUpdateMgmt": "[steps('esGoalState').esUpdateMgmt]",
|
||||
"enableActivityLog": "[steps('esGoalState').esActivityLog]",
|
||||
"enableVmInsights": "[steps('esGoalState').esVmInsights]",
|
||||
"enableServiceMap": "[steps('esGoalState').esServiceMap]",
|
||||
"enableSqlAssessment": "[steps('esGoalState').esSqlAssessment]",
|
||||
|
|
|
@ -65,17 +65,6 @@
|
|||
"description": "Select whether update mgmt solution should be enabled or not."
|
||||
}
|
||||
},
|
||||
"enableActivityLog": {
|
||||
"type": "string",
|
||||
"allowedValues": [
|
||||
"Yes",
|
||||
"No"
|
||||
],
|
||||
"defaultValue": "Yes",
|
||||
"metadata": {
|
||||
"description": "Select whether activity log solution should be enabled or not."
|
||||
}
|
||||
},
|
||||
"enableVmInsights": {
|
||||
"type": "string",
|
||||
"allowedValues": [
|
||||
|
@ -151,10 +140,6 @@
|
|||
"name": "[concat('Updates', '(', parameters('workspaceName'), ')')]",
|
||||
"marketplaceName": "Updates"
|
||||
},
|
||||
"azureActivity": {
|
||||
"name": "[concat('AzureActivity', '(', parameters('workspaceName'), ')')]",
|
||||
"marketplaceName": "AzureActivity"
|
||||
},
|
||||
"sqlAssessment": {
|
||||
"name": "[concat('SQLAssessment', '(', parameters('workspaceName'), ')')]",
|
||||
"marketplaceName": "SQLAssessment"
|
||||
|
@ -212,23 +197,6 @@
|
|||
"publisher": "Microsoft"
|
||||
}
|
||||
},
|
||||
{
|
||||
// Conditionally deploy solution for activity log
|
||||
"condition": "[equals(parameters('enableActivityLog'), 'Yes')]",
|
||||
"apiVersion": "2015-11-01-preview",
|
||||
"type": "Microsoft.OperationsManagement/solutions",
|
||||
"name": "[variables('solutions').azureActivity.name]",
|
||||
"location": "[parameters('workspaceRegion')]",
|
||||
"properties": {
|
||||
"workspaceResourceId": "[variables('laResourceId')]"
|
||||
},
|
||||
"plan": {
|
||||
"name": "[variables('solutions').azureActivity.name]",
|
||||
"product": "[concat('OMSGallery/', variables('solutions').azureActivity.marketplaceName)]",
|
||||
"promotionCode": "",
|
||||
"publisher": "Microsoft"
|
||||
}
|
||||
},
|
||||
{
|
||||
// Conditionally deploy solution for change tracking
|
||||
"condition": "[equals(parameters('enableChangeTracking'), 'Yes')]",
|
||||
|
|
Загрузка…
Ссылка в новой задаче