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.

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

Update Policy Library (automated) #538

Merged
merged 3 commits into from
May 31, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"displayName": "AppService append sites with minimum TLS version to enforce.",
"description": "Append the AppService sites object to ensure that min Tls version is set to required minimum TLS version. Please note Append does not enforce compliance use then deny.",
"metadata": {
"version": "1.0.0",
"version": "1.1.0",
"category": "App Service",
"source": "https://github.com/Azure/Enterprise-Scale/",
"alzCloudEnvironments": [
Expand Down Expand Up @@ -49,8 +49,8 @@
"if": {
"allOf": [
{
"field": "type",
"equals": "Microsoft.Web/sites/config"
"field": "Microsoft.Web/sites/config/minTlsVersion",
"exists": "true"
},
{
"field": "Microsoft.Web/sites/config/minTlsVersion",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"displayName": "Deploy Diagnostic Settings for API Management to Log Analytics workspace",
"description": "Deploys the diagnostic settings for API Management to stream to a Log Analytics workspace when any API Management which is missing this diagnostic settings is created or updated. The Policy will set the diagnostic with all metrics and category enabled",
"metadata": {
"version": "1.1.0",
"version": "1.2.0",
"category": "Monitoring",
"source": "https://github.com/Azure/Enterprise-Scale/",
"alzCloudEnvironments": [
Expand All @@ -27,6 +27,18 @@
"strongType": "omsWorkspace"
}
},
"logAnalyticsDestinationType": {
"type": "String",
"metadata": {
"displayName": "Log Analytics destination type",
"description": "Select destination type for Log Analytics. Allowed values are 'Dedicated' (resource specific) and 'AzureDiagnostics'. Default is 'AzureDiagnostics'"
},
"defaultValue": "AzureDiagnostics",
"allowedValues": [
"AzureDiagnostics",
"Dedicated"
]
},
"effect": {
"type": "String",
"defaultValue": "DeployIfNotExists",
Expand Down Expand Up @@ -115,6 +127,9 @@
"logAnalytics": {
"type": "String"
},
"logAnalyticsDestinationType": {
"type": "String"
},
"location": {
"type": "String"
},
Expand Down Expand Up @@ -158,7 +173,8 @@
"category": "WebSocketConnectionLogs",
"enabled": "[parameters('logsEnabled')]"
}
]
],
"logAnalyticsDestinationType": "[parameters('logAnalyticsDestinationType')]"
}
}
],
Expand All @@ -168,6 +184,9 @@
"logAnalytics": {
"value": "[parameters('logAnalytics')]"
},
"logAnalyticsDestinationType": {
"value": "[parameters('logAnalyticsDestinationType')]"
},
"location": {
"value": "[field('location')]"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"displayName": "Deploy Diagnostic Settings to Azure Services",
"description": "This policy set deploys the configurations of application Azure resources to forward diagnostic logs and metrics to an Azure Log Analytics workspace. See the list of policies of the services that are included ",
"metadata": {
"version": "2.0.0",
"version": "2.1.0",
"category": "Monitoring",
"source": "https://github.com/Azure/Enterprise-Scale/",
"alzCloudEnvironments": [
Expand Down Expand Up @@ -104,6 +104,18 @@
"description": "Deploys the diagnostic settings for API Management to stream to a Log Analytics workspace when any API Management which is missing this diagnostic settings is created or updated. The Policy will set the diagnostic with all metrics and category enabled"
}
},
"APIMgmtLogAnalyticsDestinationType": {
"type": "String",
"defaultValue": "AzureDiagnostics",
"allowedValues": [
"AzureDiagnostics",
"Dedicated"
],
"metadata": {
"displayName": "Destination table for the Diagnostic Setting for API Management to Log Analytics workspace",
"description": "Destination table for the diagnostic setting for API Management to Log Analytics workspace, allowed values are 'Dedicated' (for resource-specific) and 'AzureDiagnostics'. Default value is 'AzureDiagnostics'"
}
},
"ApplicationGatewayLogAnalyticsEffect": {
"type": "String",
"defaultValue": "DeployIfNotExists",
Expand Down Expand Up @@ -1045,6 +1057,9 @@
"logAnalytics": {
"value": "[[parameters('logAnalytics')]"
},
"logAnalyticsDestinationType": {
"value": "[[parameters('APIMgmtLogAnalyticsDestinationType')]"
},
"effect": {
"value": "[[parameters('APIMgmtLogAnalyticsEffect')]"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
"logAnalytics": {
"value": "[[parameters('logAnalytics')]"
},
"logAnalyticsDestinationType": {
"value": "[[parameters('APIMgmtLogAnalyticsDestinationType')]"
},
"effect": {
"value": "[[parameters('APIMgmtLogAnalyticsEffect')]"
},
Expand Down