Skip to content

Commit b0a50cf

Browse files
committed
resolve conflict
2 parents f222aab + 4049433 commit b0a50cf

33 files changed

Lines changed: 64 additions & 62 deletions

azure-sql/database/data-discovery-and-classification-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ After the organization-wide policy has been defined, you can continue classifyin
107107

108108
## <a id="audit-sensitive-data"></a>Audit access to sensitive data
109109

110-
An important aspect of the classification is the ability to monitor access to sensitive data. [Azure SQL Auditing](../../azure-sql/database/auditing-overview.md) has been enhanced to include a new field in the audit log called `data_sensitivity_information`. This field logs the sensitivity classifications (labels) of the data that was returned by a query. Here's an example:
110+
An important aspect of the classification is the ability to monitor access to sensitive data. [Azure SQL Auditing](/azure/azure-sql/database/auditing-overview) has been enhanced to include a new field in the audit log called `data_sensitivity_information`. This field logs the sensitivity classifications (labels) of the data that was returned by a query. Here's an example:
111111

112112
[![Audit log](./media/data-discovery-and-classification-overview/11_data_classification_audit_log.png)](./media/data-discovery-and-classification-overview/11_data_classification_audit_log.png#lightbox)
113113

@@ -228,6 +228,6 @@ You can use the following SQL drivers to retrieve classification metadata:
228228

229229
## Next steps
230230

231-
- Consider configuring [Azure SQL Auditing](../../azure-sql/database/auditing-overview.md) for monitoring and auditing access to your classified sensitive data.
231+
- Consider configuring [Azure SQL Auditing](/azure/azure-sql/database/auditing-overview) for monitoring and auditing access to your classified sensitive data.
232232
- For a presentation that includes data Discovery & Classification, see [Discovering, classifying, labeling & protecting SQL data | Data Exposed](https://www.youtube.com/watch?v=itVi9bkJUNc).
233233
- To classify your Azure SQL Databases and Azure Synapse Analytics with Microsoft Purview labels using T-SQL commands, see [Classify your Azure SQL data using Microsoft Purview labels](/azure/sql-database/scripts/sql-database-import-purview-labels).

azure-sql/database/disaster-recovery-guidance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ For more information about database alert rules, see [Receive Alert Notification
107107

108108
### Enable auditing
109109

110-
If auditing is required to access your database, you need to enable Auditing after the database recovery. For more information, see [Database auditing](../../azure-sql/database/auditing-overview.md).
110+
If auditing is required to access your database, you need to enable Auditing after the database recovery. For more information, see [Database auditing](/azure/azure-sql/database/auditing-overview).
111111

112112
## Next steps
113113

azure-sql/database/dns-alias-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Presently, a DNS alias has the following limitations:
102102
- _Table auditing is not supported:_ You cannot use a DNS alias on a server that has *table auditing* enabled on a database.
103103
- Table auditing is deprecated.
104104
- We recommend that you move to [Blob Auditing](auditing-overview.md).
105+
- We recommend that you move to [Blob Auditing](/azure/azure-sql/database/auditing-overview).
105106
- DNS alias is subject to [naming restrictions](/azure/azure-resource-manager/management/resource-name-rules).
106107

107108
## Related resources

azure-sql/database/firewall-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ You create the first server-level firewall setting by using the [Azure portal](h
120120
To improve performance, server-level IP firewall rules are temporarily cached at the database level. To refresh the cache, see [DBCC FLUSHAUTHCACHE](/sql/t-sql/database-console-commands/dbcc-flushauthcache-transact-sql).
121121

122122
> [!TIP]
123-
> You can use [Database Auditing](../../azure-sql/database/auditing-overview.md) to audit server-level and database-level firewall changes.
123+
> You can use [Database Auditing](/azure/azure-sql/database/auditing-overview) to audit server-level and database-level firewall changes.
124124
125125
### Use the Azure portal to manage server-level IP firewall rules
126126

azure-sql/database/logical-servers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.date: 03/12/2019
1515
# What is a logical SQL server in Azure SQL Database and Azure Synapse?
1616
[!INCLUDE[appliesto-sqldb-asa](../includes/appliesto-sqldb-asa.md)]
1717

18-
In Azure SQL Database and Azure Synapse Analytics, a server is a logical construct that acts as a central administrative point for a collection of databases. At the server level, you can administer [logins](logins-create-manage.md), [firewall rules](firewall-configure.md), [auditing rules](../../azure-sql/database/auditing-overview.md), [threat detection policies](threat-detection-configure.md), and [auto-failover groups](auto-failover-group-sql-db.md). A server can be in a different region than its resource group. The server must exist before you can create a database in Azure SQL Database or a data warehouse database in Azure Synapse Analytics. All databases managed by a single server are created within the same region as the server.
18+
In Azure SQL Database and Azure Synapse Analytics, a server is a logical construct that acts as a central administrative point for a collection of databases. At the server level, you can administer [logins](logins-create-manage.md), [firewall rules](firewall-configure.md), [auditing rules](/azure/azure-sql/database/auditing-overview), [threat detection policies](threat-detection-configure.md), and [auto-failover groups](auto-failover-group-sql-db.md) . A server can be in a different region than its resource group. The server must exist before you can create a database in Azure SQL Database or a data warehouse database in Azure Synapse Analytics. All databases managed by a single server are created within the same region as the server.
1919

2020
This server is distinct from a SQL Server instance that you may be familiar with in the on-premises world. Specifically, there are no guarantees regarding location of the databases or data warehouse database in relation to the server that manages them. Furthermore, neither Azure SQL Database nor Azure Synapse expose any instance-level access or features. In contrast, the instance databases in a managed instance are all physically co-located - in the same way that you are familiar with SQL Server in the on-premises or virtual machine world.
2121

azure-sql/database/maintenance-window.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ To get the maximum benefit from maintenance windows, make sure your client appli
134134

135135
* In Azure SQL Database, any connections using the proxy connection policy could be affected by both the chosen maintenance window and a gateway node maintenance window. However, client connections using the recommended redirect connection policy are unaffected by a gateway node maintenance reconfiguration.
136136

137-
* In Azure SQL Managed Instance, the gateway nodes are hosted [within the virtual cluster](../../azure-sql/managed-instance/connectivity-architecture-overview.md#virtual-cluster-connectivity-architecture) and have the same maintenance window as the managed instance, but using the redirect connection policy is still recommended to minimize number of disruptions during the maintenance event.
137+
* In Azure SQL Managed Instance, the gateway nodes are hosted [within the virtual cluster](/azure/azure-sql/managed-instance/connectivity-architecture-overview#virtual-cluster-connectivity-architecture) and have the same maintenance window as the managed instance, but using the redirect connection policy is still recommended to minimize number of disruptions during the maintenance event.
138138

139139
For more on the client connection policy in Azure SQL Database, see [Azure SQL Database Connection policy](../database/connectivity-architecture.md#connection-policy).
140140

141-
For more on the client connection policy in Azure SQL Managed Instance, see [Azure SQL Managed Instance connection types](../../azure-sql/managed-instance/connection-types-overview.md).
141+
For more on the client connection policy in Azure SQL Managed Instance, see [Azure SQL Managed Instance connection types](/azure/azure-sql/managed-instance/connection-types-overview).
142142

143143
## Considerations for Azure SQL Managed Instance
144144

azure-sql/database/manage-data-after-migrating-to-database.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ To learn more about Disaster recovery, see: [Azure SQL Database Disaster Recover
8585
SQL Database takes Security and Privacy very seriously. Security within SQL Database is available at the database level and at the platform level and is best understood when categorized into several layers. At each layer you get to control and provide optimal security for your application. The layers are:
8686

8787
- Identity & authentication ([SQL authentication and Azure Active Directory [Azure AD] authentication](logins-create-manage.md)).
88-
- Monitoring activity ([Auditing](../../azure-sql/database/auditing-overview.md) and [threat detection](threat-detection-configure.md)).
88+
- Monitoring activity ([Auditing](/azure/azure-sql/database/auditing-overview) and [threat detection](threat-detection-configure.md)).
8989
- Protecting actual data ([Transparent Data Encryption [TDE]](/sql/relational-databases/security/encryption/transparent-data-encryption-azure-sql) and [Always Encrypted [AE]](/sql/relational-databases/security/encryption/always-encrypted-database-engine)).
9090
- Controlling Access to sensitive and privileged data ([Row Level security](/sql/relational-databases/security/row-level-security) and [Dynamic Data Masking](/sql/relational-databases/security/dynamic-data-masking)).
9191

92-
[Microsoft Defender for Cloud](https://azure.microsoft.com/services/security-center/) offers centralized security management across workloads running in Azure, on-premises, and in other clouds. You can view whether essential SQL Database protection such as [Auditing](../../azure-sql/database/auditing-overview.md) and [Transparent Data Encryption [TDE]](/sql/relational-databases/security/encryption/transparent-data-encryption-azure-sql) are configured on all resources, and create policies based on your own requirements.
92+
[Microsoft Defender for Cloud](https://azure.microsoft.com/services/security-center/) offers centralized security management across workloads running in Azure, on-premises, and in other clouds. You can view whether essential SQL Database protection such as [Auditing](/azure/azure-sql/database/auditing-overview) and [Transparent Data Encryption [TDE]](/sql/relational-databases/security/encryption/transparent-data-encryption-azure-sql) are configured on all resources, and create policies based on your own requirements.
9393

9494
### What user authentication methods are offered in SQL Database
9595

@@ -147,7 +147,7 @@ Port 1433. SQL Database communicates over this port. To connect from within a co
147147

148148
#### SQL Database Auditing
149149

150-
With SQL Database, you can turn ON Auditing to track database events. [SQL Database Auditing](../../azure-sql/database/auditing-overview.md) records database events and writes them into an audit log file in your Azure Storage Account. Auditing is especially useful if you intend to gain insight into potential security and policy violations, maintain regulatory compliance etc. It allows you to define and configure certain categories of events that you think need auditing and based on that you can get preconfigured reports and a dashboard to get an overview of events occurring on your database. You can apply these auditing policies either at the database level or at the server level. A guide on how to turn on auditing for your server/database, see: [Enable SQL Database Auditing](secure-database-tutorial.md#enable-security-features).
150+
With SQL Database, you can turn ON Auditing to track database events. [SQL Database Auditing](/azure/azure-sql/database/auditing-overview) records database events and writes them into an audit log file in your Azure Storage Account. Auditing is especially useful if you intend to gain insight into potential security and policy violations, maintain regulatory compliance etc. It allows you to define and configure certain categories of events that you think need auditing and based on that you can get preconfigured reports and a dashboard to get an overview of events occurring on your database. You can apply these auditing policies either at the database level or at the server level. A guide on how to turn on auditing for your server/database, see: [Enable SQL Database Auditing](secure-database-tutorial.md#enable-security-features).
151151

152152
#### Threat detection
153153

azure-sql/database/move-resources-across-regions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ This article provides a general workflow for moving resources to a different reg
5858
1. If database-level audit is enabled, disable it and enable server-level auditing instead. After failover, database-level auditing will require the cross-region traffic, which isn't desired or possible after the move.
5959
1. For server-level audits, ensure that:
6060
- The storage container, Log Analytics, or event hub with the existing audit logs is moved to the target region.
61-
- Auditing is configured on the target server. For more information, see [Get started with SQL Database auditing](../../azure-sql/database/auditing-overview.md).
61+
- Auditing is configured on the target server. For more information, see [Get started with SQL Database auditing](/azure/azure-sql/database/auditing-overview).
6262
1. If your instance has a long-term retention policy (LTR), the existing LTR backups will remain associated with the current server. Because the target server is different, you'll be able to access the older LTR backups in the source region by using the source server, even if the server is deleted.
6363

6464
> [!NOTE]
@@ -109,7 +109,7 @@ Once the move completes, remove the resources in the source region to avoid unne
109109
1. If a database-level audit is enabled, disable it and enable server-level auditing instead. After failover, database-level auditing will require cross-region traffic, which is not desired, or possible after the move.
110110
1. For server-level audits, ensure that:
111111
- The storage container, Log Analytics, or event hub with the existing audit logs is moved to the target region.
112-
- Audit configuration is configured at the target server. For more information, see [SQL Database auditing](../../azure-sql/database/auditing-overview.md).
112+
- Audit configuration is configured at the target server. For more information, see [SQL Database auditing](/azure/azure-sql/database/auditing-overview).
113113
1. If your instance has a long-term retention policy (LTR), the existing LTR backups will remain associated with the current server. Because the target server is different, you'll be able to access the older LTR backups in the source region using the source server, even if the server is deleted.
114114

115115
> [!NOTE]

azure-sql/database/resource-limits-vcore-elastic-pools.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.topic: reference
1010
author: dimitri-furman
1111
ms.author: dfurman
1212
ms.reviewer: kendralittle, mathoma
13-
ms.date: 04/13/2022
13+
ms.date: 04/25/2022
1414
---
1515
# Resource limits for elastic pools using the vCore purchasing model
1616
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
@@ -136,7 +136,7 @@ vCore resource limits are listed in the following articles, please be sure to up
136136
|Max number DBs per pool <sup>1</sup>|100|200|500|500|500|500|500|
137137
|Columnstore support|Yes|Yes|Yes|Yes|Yes|Yes|Yes|
138138
|In-memory OLTP storage (GB)|N/A|N/A|N/A|N/A|N/A|N/A|N/A|
139-
|Max data size (GB)|512|756|1536|1536|1536|2048|2048|
139+
|Max data size (GB)|512|756|1536|2048|2048|2048|2048|
140140
|Max log size (GB) <sup>2</sup>|154|227|461|461|461|614|614|
141141
|TempDB max data size (GB)|64|128|192|256|320|384|448|
142142
|Storage type|Premium (Remote) Storage|Premium (Remote) Storage|Premium (Remote) Storage|Premium (Remote) Storage|Premium (Remote) Storage|Premium (Remote) Storage|Premium (Remote) Storage|
@@ -385,7 +385,7 @@ vCore resource limits are listed in the following articles, please be sure to up
385385
|Max number DBs per pool <sup>1</sup>|50|100|100|100|100|100|
386386
|Columnstore support|Yes|Yes|Yes|Yes|Yes|Yes|
387387
|In-memory OLTP storage (GB)|3.14|4.71|6.28|8.65|11.02|13.39|
388-
|Max data size (GB)|1024|1536|1536|1536|3072|3072|
388+
|Max data size (GB)|1024|1536|2048|2048|3072|3072|
389389
|Max log size (GB) <sup>2</sup>|307|307|461|461|922|922|
390390
|TempDB max data size (GB)|128|192|256|320|384|448|
391391
|[Max local storage size](resource-limits-logical-server.md#storage-space-governance) (GB)|4829|4829|4829|4829|4829|4829|

azure-sql/database/resource-limits-vcore-single-databases.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.topic: reference
1010
author: dimitri-furman
1111
ms.author: dfurman
1212
ms.reviewer: kendralittle, mathoma
13-
ms.date: 04/13/2022
13+
ms.date: 04/25/2022
1414
---
1515
# Resource limits for single databases using the vCore purchasing model
1616
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
@@ -63,7 +63,7 @@ The [serverless compute tier](serverless-tier-overview.md) is currently availabl
6363
|Min-max auto-pause delay (minutes)|60-10080|60-10080|60-10080|60-10080|60-10080|
6464
|Columnstore support|Yes <sup>1</sup>|Yes|Yes|Yes|Yes|
6565
|In-memory OLTP storage (GB)|N/A|N/A|N/A|N/A|N/A|
66-
|Max data size (GB)|512|1024|1024|1024|1536|
66+
|Max data size (GB)|512|1024|1024|1024|2048|
6767
|Max log size (GB) <sup>2</sup>|154|307|307|307|461|
6868
|Tempdb max data size (GB)|32|64|128|192|256|
6969
|Storage type|Remote SSD|Remote SSD|Remote SSD|Remote SSD|Remote SSD|
@@ -93,7 +93,7 @@ The [serverless compute tier](serverless-tier-overview.md) is currently availabl
9393
|Min-max auto-pause delay (minutes)|60-10080|60-10080|60-10080|60-10080|
9494
|Columnstore support|Yes|Yes|Yes|Yes|
9595
|In-memory OLTP storage (GB)|N/A|N/A|N/A|N/A|
96-
|Max data size (GB)|1536|3072|3072|3072|
96+
|Max data size (GB)|2048|3072|3072|3072|
9797
|Max log size (GB) <sup>1</sup>|461|461|461|922|
9898
|Tempdb max data size (GB)|320|384|448|512|
9999
|Storage type|Remote SSD|Remote SSD|Remote SSD|Remote SSD|
@@ -361,7 +361,7 @@ The [serverless compute tier](serverless-tier-overview.md) is currently availabl
361361
|Memory (GB)|10.4|20.8|31.1|41.5|51.9|62.3|72.7|
362362
|Columnstore support|Yes|Yes|Yes|Yes|Yes|Yes|Yes|
363363
|In-memory OLTP storage (GB)|N/A|N/A|N/A|N/A|N/A|N/A|N/A|
364-
|Max data size (GB)|1024|1024|1536|1536|1536|3072|3072|
364+
|Max data size (GB)|1024|1024|1536|2048|2048|3072|3072|
365365
|Max log size (GB) <sup>1</sup>|307|307|461|461|461|922|922|
366366
|Tempdb max data size (GB)|64|128|192|256|320|384|384|
367367
|Storage type|Remote SSD|Remote SSD|Remote SSD|Remote SSD|Remote SSD|Remote SSD|Remote SSD|
@@ -565,7 +565,7 @@ The [serverless compute tier](serverless-tier-overview.md) is currently availabl
565565
|Memory (GB)|10.4|20.8|31.1|41.5|51.9|62.3|72.7|
566566
|Columnstore support|Yes|Yes|Yes|Yes|Yes|Yes|Yes|
567567
|In-memory OLTP storage (GB)|1.57|3.14|4.71|6.28|8.65|11.02|13.39|
568-
|Max data size (GB)|1024|1024|1536|1536|1536|3072|3072|
568+
|Max data size (GB)|1024|1024|1536|2048|2048|3072|3072|
569569
|Max log size (GB) <sup>1</sup>|307|307|461|461|461|922|922|
570570
|Tempdb max data size (GB)|64|128|192|256|320|384|448|
571571
|[Max local storage size](resource-limits-logical-server.md#storage-space-governance) (GB)|4829|4829|4829|4829|4829|4829|4829|

0 commit comments

Comments
 (0)