Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Built-in Policy Release c88dad95 #1307

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Built-in Policy Release c88dad95 #1307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 47 additions & 2 deletions built-in-policies/policyDefinitions/Monitoring/AzureMonitor_DCRA_Linux_DINE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"mode": "Indexed",
"description": "Deploy Association to link Linux virtual machines, virtual machine scale sets, and Arc machines to the specified Data Collection Rule or the specified Data Collection Endpoint. The list of locations and OS images are updated over time as support is increased.",
"metadata": {
"version": "6.2.0",
"version": "6.3.0",
"category": "Monitoring"
},
"version": "6.2.0",
"version": "6.3.0",
"parameters": {
"effect": {
"type": "String",
Expand All @@ -22,6 +22,18 @@
],
"defaultValue": "DeployIfNotExists"
},
"scopeToSupportedImages": {
"type": "Boolean",
"metadata": {
"displayName": "Scope Policy to Azure Monitor Agent-Supported Operating Systems",
"description": "If set to true, the policy will apply only to machines with AMA-supported operating systems. Otherwise, the policy will apply to all machines in the assignment scope. For supported operating systems, see https://aka.ms/AMAOverview."
},
"allowedValues": [
true,
false
],
"defaultValue": true
},
"listOfLinuxImageIdToInclude": {
"type": "Array",
"metadata": {
Expand Down Expand Up @@ -147,6 +159,38 @@
},
{
"anyOf": [
{
"allOf": [
{
"value": "[parameters('scopeToSupportedImages')]",
"equals": false
},
{
"field": "type",
"equals": "Microsoft.Compute/virtualMachines"
},
{
"field": "Microsoft.Compute/virtualMachines/storageProfile.osDisk.osType",
"like": "Linux*"
}
]
},
{
"allOf": [
{
"value": "[parameters('scopeToSupportedImages')]",
"equals": false
},
{
"field": "type",
"equals": "Microsoft.Compute/virtualMachineScaleSets"
},
{
"field": "Microsoft.Compute/virtualMachineScaleSets/virtualMachineProfile.storageProfile.osDisk.osType",
"like": "Linux*"
}
]
},
{
"field": "Microsoft.Compute/imageId",
"in": "[parameters('listOfLinuxImageIdToInclude')]"
Expand Down Expand Up @@ -623,6 +667,7 @@
}
},
"versions": [
"6.3.0",
"6.2.0",
"6.1.0"
]
Expand Down
49 changes: 47 additions & 2 deletions built-in-policies/policyDefinitions/Monitoring/AzureMonitor_DCRA_Windows_DINE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"mode": "Indexed",
"description": "Deploy Association to link Windows virtual machines, virtual machine scale sets, and Arc machines to the specified Data Collection Rule or the specified Data Collection Endpoint. The list of locations and OS images are updated over time as support is increased.",
"metadata": {
"version": "4.3.0",
"version": "4.4.0",
"category": "Monitoring"
},
"version": "4.3.0",
"version": "4.4.0",
"parameters": {
"effect": {
"type": "String",
Expand All @@ -22,6 +22,18 @@
],
"defaultValue": "DeployIfNotExists"
},
"scopeToSupportedImages": {
"type": "Boolean",
"metadata": {
"displayName": "Scope Policy to Azure Monitor Agent-Supported Operating Systems",
"description": "If set to true, the policy will apply only to machines with AMA-supported operating systems. Otherwise, the policy will apply to all machines in the assignment scope. For supported operating systems, see https://aka.ms/AMAOverview."
},
"allowedValues": [
true,
false
],
"defaultValue": true
},
"listOfWindowsImageIdToInclude": {
"type": "Array",
"metadata": {
Expand Down Expand Up @@ -147,6 +159,38 @@
},
{
"anyOf": [
{
"allOf": [
{
"value": "[parameters('scopeToSupportedImages')]",
"equals": false
},
{
"field": "type",
"equals": "Microsoft.Compute/virtualMachines"
},
{
"field": "Microsoft.Compute/virtualMachines/storageProfile.osDisk.osType",
"like": "Linux*"
}
]
},
{
"allOf": [
{
"value": "[parameters('scopeToSupportedImages')]",
"equals": false
},
{
"field": "type",
"equals": "Microsoft.Compute/virtualMachineScaleSets"
},
{
"field": "Microsoft.Compute/virtualMachineScaleSets/virtualMachineProfile.storageProfile.osDisk.osType",
"like": "Linux*"
}
]
},
{
"field": "Microsoft.Compute/imageId",
"in": "[parameters('listOfWindowsImageIdToInclude')]"
Expand Down Expand Up @@ -459,6 +503,7 @@
}
},
"versions": [
"4.4.0",
"4.3.0",
"4.2.0"
]
Expand Down
8 changes: 4 additions & 4 deletions ...in-policies/policyDefinitions/Network/VirtualNetwork_FlowLog_TrafficAnalytics_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"properties": {
"displayName": "Configure virtual networks to use specific workspace, storage account and retention interval for Flow logs and Traffic Analytics",
"displayName": "Configure virtual networks to enforce workspace, storage account and retention interval for Flow logs and Traffic Analytics",
"description": "If a virtual network already has traffic analytics enabled, then, this policy will overwrite its existing settings with the ones provided during policy creation. Traffic analytics is a cloud-based solution that provides visibility into user and application activity in cloud networks.",
"policyType": "BuiltIn",
"mode": "Indexed",
"metadata": {
"version": "1.1.1",
"version": "1.1.2",
"category": "Network"
},
"version": "1.1.1",
"version": "1.1.2",
"parameters": {
"effect": {
"type": "string",
Expand Down Expand Up @@ -323,8 +323,8 @@
}
},
"versions": [
"1.1.2",
"1.1.1",
"1.1.0",
"1.0.0"
]
},
Expand Down
83 changes: 0 additions & 83 deletions ...t-in-policies/policyDefinitions/Security Center/DeployAtpOnMySqlFlexibleServers_DINE.json
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions built-in-policies/policySetDefinitions/Monitoring/AzureMonitor_LinuxPlatform_EnableDCR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"policyType": "BuiltIn",
"description": "Monitor and secure your Linux virtual machines, virtual machine scale sets, and Arc machines by deploying the Azure Monitor Agent extension and associating the machines with a specified Data Collection Rule. Deployment will occur on machines with supported OS images (or machines matching the provided list of images) in supported regions.",
"metadata": {
"version": "3.1.0",
"version": "3.2.0",
"category": "Monitoring"
},
"version": "3.1.0",
"version": "3.2.0",
"parameters": {
"effect": {
"type": "String",
Expand Down Expand Up @@ -100,6 +100,9 @@
"effect": {
"value": "[parameters('effect')]"
},
"scopeToSupportedImages": {
"value": "[parameters('scopeToSupportedImages')]"
},
"listOfLinuxImageIdToInclude": {
"value": "[parameters('listOfLinuxImageIdToInclude')]"
},
Expand All @@ -113,6 +116,7 @@
}
],
"versions": [
"3.2.0",
"3.1.0"
]
},
Expand Down
8 changes: 6 additions & 2 deletions ...in-policies/policySetDefinitions/Monitoring/AzureMonitor_LinuxPlatform_UAI_EnableDCR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"policyType": "BuiltIn",
"description": "Monitor your Linux virtual machines and virtual machine scale sets by deploying the Azure Monitor Agent extension with user-assigned managed identity authentication and associating with specified Data Collection Rule. Azure Monitor Agent Deployment will occur on machines with supported OS images (or machines matching the provided list of images) in supported regions.",
"metadata": {
"version": "2.2.0",
"version": "2.3.0",
"category": "Monitoring"
},
"version": "2.2.0",
"version": "2.3.0",
"parameters": {
"effect": {
"type": "String",
Expand Down Expand Up @@ -188,6 +188,9 @@
"effect": {
"value": "[parameters('effect')]"
},
"scopeToSupportedImages": {
"value": "[parameters('scopeToSupportedImages')]"
},
"listOfLinuxImageIdToInclude": {
"value": "[parameters('listOfLinuxImageIdToInclude')]"
},
Expand All @@ -201,6 +204,7 @@
}
],
"versions": [
"2.3.0",
"2.2.0"
]
},
Expand Down
8 changes: 6 additions & 2 deletions ...t-in-policies/policySetDefinitions/Monitoring/AzureMonitor_WindowsPlatform_EnableDCR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"policyType": "BuiltIn",
"description": "Monitor and secure your Windows virtual machines, virtual machine scale sets, and Arc machines by deploying the Azure Monitor Agent extension and associating the machines with a specified Data Collection Rule. Deployment will occur on machines with supported OS images (or machines matching the provided list of images) in supported regions.",
"metadata": {
"version": "3.1.0",
"version": "3.2.0",
"category": "Monitoring"
},
"version": "3.1.0",
"version": "3.2.0",
"parameters": {
"effect": {
"type": "String",
Expand Down Expand Up @@ -101,6 +101,9 @@
"effect": {
"value": "[parameters('effect')]"
},
"scopeToSupportedImages": {
"value": "[parameters('scopeToSupportedImages')]"
},
"listOfWindowsImageIdToInclude": {
"value": "[parameters('listOfWindowsImageIdToInclude')]"
},
Expand All @@ -114,6 +117,7 @@
}
],
"versions": [
"3.2.0",
"3.1.0"
]
},
Expand Down
8 changes: 6 additions & 2 deletions ...-policies/policySetDefinitions/Monitoring/AzureMonitor_WindowsPlatform_UAI_EnableDCR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"policyType": "BuiltIn",
"description": "Monitor your Windows virtual machines and virtual machine scale sets by deploying the Azure Monitor Agent extension with user-assigned managed identity authentication and associating with specified Data Collection Rule. Azure Monitor Agent Deployment will occur on machines with supported OS images (or machines matching the provided list of images) in supported regions.",
"metadata": {
"version": "2.2.0",
"version": "2.3.0",
"category": "Monitoring"
},
"version": "2.2.0",
"version": "2.3.0",
"parameters": {
"effect": {
"type": "String",
Expand Down Expand Up @@ -188,6 +188,9 @@
"effect": {
"value": "[parameters('effect')]"
},
"scopeToSupportedImages": {
"value": "[parameters('scopeToSupportedImages')]"
},
"listOfWindowsImageIdToInclude": {
"value": "[parameters('listOfWindowsImageIdToInclude')]"
},
Expand All @@ -201,6 +204,7 @@
}
],
"versions": [
"2.3.0",
"2.2.0"
]
},
Expand Down
Loading