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

improves sql-database-with-management example #2970

Merged
merged 13 commits into from
Jun 2, 2021
+706 −943
Merged

improves sql-database-with-management example #2970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e6716b7
adds sql database example
Apr 21, 2021
5b670d0
updates index.json
Apr 21, 2021
10063c5
fixes whitespaces
Apr 21, 2021
b59d203
removes extra end line
Apr 21, 2021
4fa2612
removes more empty lines
Apr 21, 2021
5ee569a
adds extra line in main.bicep
Apr 21, 2021
031e725
adds back new lines at end
Apr 21, 2021
e8a2e19
adds new line at end of sql-database.bicep
Apr 21, 2021
a9d4275
compiled modules as well
Apr 21, 2021
6f9711f
updated json after SetBaseline.ps1
Apr 22, 2021
3d46e8e
Merge branch 'Azure:main' into main
slavizh May 26, 2021
5ee3d89
Merge branch 'Azure:main' into main
slavizh Jun 2, 2021
9c8b849
improves sql-database-with-management example
Jun 2, 2021
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
58 changes: 27 additions & 31 deletions docs/examples/301/sql-database-with-management/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
targetScope = 'subscription'

@description('Resource Group object definition.')
param resourceGroup object

@secure()
param password string

var defaultResourceGroupProperties = {
tags: {}
deploy: true
}

// Deploy Resource Group
resource sqlRg 'Microsoft.Resources/resourceGroups@2020-10-01' = if (union(defaultResourceGroupProperties, resourceGroup).deploy) {
name: resourceGroup.name
location: resourceGroup.location
tags: union(defaultResourceGroupProperties, resourceGroup).tags
properties: {}
}

// Start SQL Logical Servers deployment
module sqlLogicalServers 'modules/sql-logical-servers.bicep' = {
name: 'sqlLogicalServers'
scope: sqlRg
params: {
sqlLogicalServers: resourceGroup.sqlLogicalServers
tags: union(defaultResourceGroupProperties, resourceGroup).tags
password: password
}
}
targetScope = 'subscription'

@description('Resource Group object definition.')
param resourceGroup object

var defaultResourceGroupProperties = {
tags: {}
deploy: true
}

// Deploy Resource Group
resource sqlRg 'Microsoft.Resources/resourceGroups@2021-04-01' = if (union(defaultResourceGroupProperties, resourceGroup).deploy) {
name: resourceGroup.name
location: resourceGroup.location
tags: union(defaultResourceGroupProperties, resourceGroup).tags
properties: {}
}

// Start SQL Logical Servers deployment
module sqlLogicalServers 'modules/sql-logical-servers.bicep' = {
name: 'sqlLogicalServers'
scope: sqlRg
params: {
sqlLogicalServers: resourceGroup.sqlLogicalServers
tags: union(defaultResourceGroupProperties, resourceGroup).tags
}
}
149 changes: 52 additions & 97 deletions docs/examples/301/sql-database-with-management/main.json
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions docs/examples/301/sql-database-with-management/modules/audit-settings.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
param sqlDatabase object
param sqlServerName string
var defaultAuditActionsAndGroups = [
'SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP'
'FAILED_DATABASE_AUTHENTICATION_GROUP'
'BATCH_COMPLETED_GROUP'
]
// Audit settings need for enabling auditing to Log Analytics workspace
resource auditSettings 'Microsoft.Sql/servers/databases/auditingSettings@2020-08-01-preview' = {
name: '${sqlServerName}/${sqlDatabase.name}/Default'
properties: {
state: sqlDatabase.diagnosticLogsAndMetrics.auditLogs ? 'Enabled' : 'Disabled'
auditActionsAndGroups: !empty(sqlDatabase.auditActionsAndGroups) ? sqlDatabase.auditActionsAndGroups : defaultAuditActionsAndGroups
storageEndpoint: ''
storageAccountAccessKey: ''
storageAccountSubscriptionId: '00000000-0000-0000-0000-000000000000'
retentionDays: 0
isAzureMonitorTargetEnabled: sqlDatabase.diagnosticLogsAndMetrics.auditLogs
}
}
param sqlDatabase object
param sqlServerName string

var defaultAuditActionsAndGroups = [
'SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP'
'FAILED_DATABASE_AUTHENTICATION_GROUP'
'BATCH_COMPLETED_GROUP'
]

// Audit settings need for enabling auditing to Log Analytics workspace
resource auditSettings 'Microsoft.Sql/servers/databases/auditingSettings@2021-02-01-preview' = {
name: '${sqlServerName}/${sqlDatabase.name}/Default'
properties: {
state: sqlDatabase.diagnosticLogsAndMetrics.auditLogs ? 'Enabled' : 'Disabled'
auditActionsAndGroups: !empty(sqlDatabase.auditActionsAndGroups) ? sqlDatabase.auditActionsAndGroups : defaultAuditActionsAndGroups
storageEndpoint: ''
storageAccountAccessKey: ''
storageAccountSubscriptionId: '00000000-0000-0000-0000-000000000000'
retentionDays: 0
isAzureMonitorTargetEnabled: sqlDatabase.diagnosticLogsAndMetrics.auditLogs
}
}
4 changes: 2 additions & 2 deletions docs/examples/301/sql-database-with-management/modules/audit-settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "dev",
"templateHash": "13898863446734417779"
"templateHash": "4499755266351443773"
}
},
"parameters": {
Expand All @@ -27,7 +27,7 @@
"resources": [
{
"type": "Microsoft.Sql/servers/databases/auditingSettings",
"apiVersion": "2020-08-01-preview",
"apiVersion": "2021-02-01-preview",
"name": "[format('{0}/{1}/Default', parameters('sqlServerName'), parameters('sqlDatabase').name)]",
"properties": {
"state": "[if(parameters('sqlDatabase').diagnosticLogsAndMetrics.auditLogs, 'Enabled', 'Disabled')]",
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/301/sql-database-with-management/modules/azure-defender.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ param sqlDatabase object
param sqlServerName string

// Azure Defender
resource azureDefender 'Microsoft.Sql/servers/databases/securityAlertPolicies@2020-08-01-preview' = {
resource azureDefender 'Microsoft.Sql/servers/databases/securityAlertPolicies@2021-02-01-preview' = {
name: '${sqlServerName}/${sqlDatabase.name}/Default'
properties: {
state: sqlDatabase.azureDefender.enabled ? 'Enabled' : 'Disabled'
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/301/sql-database-with-management/modules/azure-defender.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "dev",
"templateHash": "3149608550700302182"
"templateHash": "15009839048358250877"
}
},
"parameters": {
Expand All @@ -20,7 +20,7 @@
"resources": [
{
"type": "Microsoft.Sql/servers/databases/securityAlertPolicies",
"apiVersion": "2020-08-01-preview",
"apiVersion": "2021-02-01-preview",
"name": "[format('{0}/{1}/Default', parameters('sqlServerName'), parameters('sqlDatabase').name)]",
"properties": {
"state": "[if(parameters('sqlDatabase').azureDefender.enabled, 'Enabled', 'Disabled')]",
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/301/sql-database-with-management/modules/short-term-backup.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ param sqlDatabase object
param sqlServerName string

// Short term backup
resource shortTermBackup 'Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies@2020-08-01-preview' = {
resource shortTermBackup 'Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies@2021-02-01-preview' = {
name: '${sqlServerName}/${sqlDatabase.name}/Default'
properties: {
retentionDays: sqlDatabase.shortTermBackupRetention
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/301/sql-database-with-management/modules/short-term-backup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "dev",
"templateHash": "15978855867572262081"
"templateHash": "1280408386363466909"
}
},
"parameters": {
Expand All @@ -20,7 +20,7 @@
"resources": [
{
"type": "Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies",
"apiVersion": "2020-08-01-preview",
"apiVersion": "2021-02-01-preview",
"name": "[format('{0}/{1}/Default', parameters('sqlServerName'), parameters('sqlDatabase').name)]",
"properties": {
"retentionDays": "[parameters('sqlDatabase').shortTermBackupRetention]"
Expand Down
Loading