Skip to content

enableDiagnosticLogCategoryAll #4

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

Draft
SeSeicht wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

enableDiagnosticLogCategoryAll #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2c2356
enableDiagnosticLogCategoryAll
SeSeicht Dec 7, 2022
1fe7728
remove helper bool
SeSeicht Dec 9, 2022
588d1cf
format
SeSeicht Dec 9, 2022
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
22 changes: 11 additions & 11 deletions modules/Microsoft.Network/virtualNetworks/.test/common/deploy.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ module resourceGroupResources 'dependencies.bicep' = {
scope: resourceGroup
name: '${uniqueString(deployment().name, location)}-paramNested'
params: {
managedIdentityName: 'dep-<<namePrefix>>-msi-${serviceShort}'
routeTableName: 'dep-<<namePrefix>>-rt-${serviceShort}'
networkSecurityGroupName: 'dep-<<namePrefix>>-nsg-${serviceShort}'
managedIdentityName: 'dep-ses-msi-${serviceShort}'
routeTableName: 'dep-ses-rt-${serviceShort}'
networkSecurityGroupName: 'dep-ses-nsg-${serviceShort}'
}
}

Expand All @@ -43,10 +43,10 @@ module diagnosticDependencies '../../../../.shared/dependencyConstructs/diagnost
scope: resourceGroup
name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
params: {
storageAccountName: 'dep<<namePrefix>>diasa${serviceShort}01'
logAnalyticsWorkspaceName: 'dep-<<namePrefix>>-law-${serviceShort}'
eventHubNamespaceEventHubName: 'dep-<<namePrefix>>-evh-${serviceShort}'
eventHubNamespaceName: 'dep-<<namePrefix>>-evhns-${serviceShort}'
storageAccountName: 'depsesdiasa${serviceShort}01'
logAnalyticsWorkspaceName: 'dep-ses-law-${serviceShort}'
eventHubNamespaceEventHubName: 'dep-ses-evh-${serviceShort}'
eventHubNamespaceName: 'dep-ses-evhns-${serviceShort}'
location: location
}
}
Expand All @@ -60,7 +60,7 @@ module testDeployment '../../deploy.bicep' = {
name: '${uniqueString(deployment().name)}-test-${serviceShort}'
params: {
enableDefaultTelemetry: enableDefaultTelemetry
name: '<<namePrefix>>${serviceShort}001'
name: 'ses${serviceShort}001'
addressPrefixes: [
'10.0.0.0/16'
]
Expand Down Expand Up @@ -90,7 +90,7 @@ module testDeployment '../../deploy.bicep' = {
}
{
addressPrefix: '10.0.0.0/24'
name: '<<namePrefix>>-az-subnet-x-001'
name: 'ses-az-subnet-x-001'
networkSecurityGroupId: resourceGroupResources.outputs.networkSecurityGroupResourceId
roleAssignments: [
{
Expand Down Expand Up @@ -121,11 +121,11 @@ module testDeployment '../../deploy.bicep' = {
}
}
]
name: '<<namePrefix>>-az-subnet-x-002'
name: 'ses-az-subnet-x-002'
}
{
addressPrefix: '10.0.6.0/24'
name: '<<namePrefix>>-az-subnet-x-003'
name: 'ses-az-subnet-x-003'
privateEndpointNetworkPolicies: 'Disabled'
privateLinkServiceNetworkPolicies: 'Enabled'
}
Expand Down
2 changes: 1 addition & 1 deletion modules/Microsoft.Network/virtualNetworks/.test/min/deploy.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module testDeployment '../../deploy.bicep' = {
name: '${uniqueString(deployment().name)}-test-${serviceShort}'
params: {
enableDefaultTelemetry: enableDefaultTelemetry
name: '<<namePrefix>>${serviceShort}001'
name: 'ses${serviceShort}001'
addressPrefixes: [
'10.0.0.0/16'
]
Expand Down
20 changes: 17 additions & 3 deletions modules/Microsoft.Network/virtualNetworks/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,13 @@ param tags object = {}
@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
param enableDefaultTelemetry bool = true

@description('Optional. The name of logs that will be streamed.')
@description('Optional. The name of logs that will be streamed. "allLogs" includes all possible logs for the resource.')
@allowed([
'allLogs'
'VMProtectionAlerts'
])
param diagnosticLogCategoriesToEnable array = [
'VMProtectionAlerts'
'allLogs'
]

@description('Optional. The name of metrics that will be streamed.')
Expand All @@ -72,7 +73,7 @@ param diagnosticMetricsToEnable array = [
@description('Optional. The name of the diagnostic setting, if deployed.')
param diagnosticSettingsName string = '${name}-diagnosticSettings'

var diagnosticsLogs = [for category in diagnosticLogCategoriesToEnable: {
var diagnosticsLogsSpecified = [for category in filter(diagnosticLogCategoriesToEnable, item => item != 'allLogs'): {
category: category
enabled: true
retentionPolicy: {
Expand All @@ -81,6 +82,17 @@ var diagnosticsLogs = [for category in diagnosticLogCategoriesToEnable: {
}
}]

var diagnosticsLogs = contains(diagnosticLogCategoriesToEnable, 'allLogs') ? [
{
categoryGroup: 'allLogs'
enabled: true
retentionPolicy: {
enabled: true
days: diagnosticLogsRetentionInDays
}
}
] : diagnosticsLogsSpecified

var diagnosticsMetrics = [for metric in diagnosticMetricsToEnable: {
category: metric
timeGrain: null
Expand Down Expand Up @@ -265,3 +277,5 @@ output subnetResourceIds array = [for subnet in subnets: az.resourceId('Microsof

@description('The location the resource was deployed into.')
output location string = virtualNetwork.location

output diagnosticsLogs array = diagnosticsLogs