Skip to content

Commit 9321033

Browse files
authored
Merge pull request #115269 from MashaMSFT/move12
Move12
2 parents 92a634c + ea0db0a commit 9321033

File tree

213 files changed

+931
-789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+931
-789
lines changed

.openpublishing.redirection.json

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52981,6 +52981,146 @@
5298152981
"source_path": "articles/sql-database/sql-database-managed-instance-transactional-replication.md",
5298252982
"redirect_url": "/azure/azure-sql/database/transactional-replication-overview",
5298352983
"redirect_document_id": true
52984+
},
52985+
{
52986+
"source_path": "articles/sql-database/sql-database-monitor-tune-overview.md",
52987+
"redirect_url": "/azure/azure-sql/database/monitor-tune-overview",
52988+
"redirect_document_id": true
52989+
},
52990+
{
52991+
"source_path": "articles/sql-database/sql-database-move-resources-across-regions.md",
52992+
"redirect_url": "/azure/azure-sql/database/move-resources-across-regions",
52993+
"redirect_document_id": true
52994+
},
52995+
{
52996+
"source_path": "articles/sql-database/sql-database-planned-maintenance.md",
52997+
"redirect_url": "/azure/azure-sql/database/planned-maintenance",
52998+
"redirect_document_id": true
52999+
},
53000+
{
53001+
"source_path": "articles/sql-database/sql-database-powershell-samples.md",
53002+
"redirect_url": "/azure/azure-sql/database/powershell-script-content-guide",
53003+
"redirect_document_id": true
53004+
},
53005+
{
53006+
"source_path": "articles/sql-database/sql-database-purchase-models.md",
53007+
"redirect_url": "/azure/azure-sql/database/purchasing-models",
53008+
"redirect_document_id": true
53009+
},
53010+
{
53011+
"source_path": "articles/sql-database/sql-database-read-scale-out.md",
53012+
"redirect_url": "/azure/azure-sql/database/read-scale-out",
53013+
"redirect_document_id": true
53014+
},
53015+
{
53016+
"source_path": "articles/sql-database/sql-database-recovery-using-backups.md",
53017+
"redirect_url": "/azure/azure-sql/database/recovery-using-backups",
53018+
"redirect_document_id": true
53019+
},
53020+
{
53021+
"source_path": "articles/sql-database/sql-database-release-notes.md",
53022+
"redirect_url": "/azure/azure-sql/database/doc-changes-updates-release-notes",
53023+
"redirect_document_id": true
53024+
},
53025+
{
53026+
"source_path": "articles/sql-database/sql-database-reserved-capacity.md",
53027+
"redirect_url": "/azure/azure-sql/database/reserved-capacity-overview",
53028+
"redirect_document_id": true
53029+
},
53030+
{
53031+
"source_path": "articles/sql-database/sql-database-resource-health.md",
53032+
"redirect_url": "/azure/azure-sql/database/use-resource-health-troubleshoot-connectivity",
53033+
"redirect_document_id": true
53034+
},
53035+
{
53036+
"source_path": "articles/sql-database/sql-database-resource-manager-samples.md",
53037+
"redirect_url": "/azure/azure-sql/database/arm-templates-content-guide",
53038+
"redirect_document_id": true
53039+
},
53040+
{
53041+
"source_path": "articles/sql-database/sql-database-scale-resources.md",
53042+
"redirect_url": "/azure/azure-sql/database/scale-resources",
53043+
"redirect_document_id": true
53044+
},
53045+
{
53046+
"source_path": "articles/sql-database/sql-database-security-best-practice.md",
53047+
"redirect_url": "/azure/azure-sql/database/security-best-practice",
53048+
"redirect_document_id": true
53049+
},
53050+
{
53051+
"source_path": "articles/sql-database/sql-database-security-overview.md",
53052+
"redirect_url": "/azure/azure-sql/database/security-overview",
53053+
"redirect_document_id": true
53054+
},
53055+
{
53056+
"source_path": "articles/sql-database/sql-database-service-tier-business-critical.md",
53057+
"redirect_url": "/azure/azure-sql/database/service-tier-business-critical",
53058+
"redirect_document_id": true
53059+
},
53060+
{
53061+
"source_path": "articles/sql-database/sql-database-service-tier-general-purpose.md",
53062+
"redirect_url": "/azure/azure-sql/database/service-tier-general-purpose",
53063+
"redirect_document_id": true
53064+
},
53065+
{
53066+
"source_path": "articles/sql-database/sql-database-service-tiers-vcore.md",
53067+
"redirect_url": "/azure/azure-sql/database/service-tiers-vcore",
53068+
"redirect_document_id": true
53069+
},
53070+
{
53071+
"source_path": "articles/sql-database/sql-database-spark-connector.md",
53072+
"redirect_url": "/azure/azure-sql/database/spark-connector",
53073+
"redirect_document_id": true
53074+
},
53075+
{
53076+
"source_path": "articles/sql-database/sql-database-technical-overview.md",
53077+
"redirect_url": "/azure/azure-sql/database/technical-overview",
53078+
"redirect_document_id": true
53079+
},
53080+
{
53081+
"source_path": "articles/sql-database/sql-database-threat-detection-overview.md",
53082+
"redirect_url": "/azure/azure-sql/database/threat-detection-overview",
53083+
"redirect_document_id": true
53084+
},
53085+
{
53086+
"source_path": "articles/sql-database/sql-database-threat-detection.md",
53087+
"redirect_url": "/azure/azure-sql/database/threat-detection",
53088+
"redirect_document_id": true
53089+
},
53090+
{
53091+
"source_path": "articles/sql-database/sql-vulnerability-assessment.md",
53092+
"redirect_url": "/azure/azure-sql/database/sql-vulnerability-assessment",
53093+
"redirect_document_id": true
53094+
},
53095+
{
53096+
"source_path": "articles/sql-database/transparent-data-encryption-azure-sql.md",
53097+
"redirect_url": "/azure/azure-sql/database/transparent-data-encryption-tde-overview",
53098+
"redirect_document_id": true
53099+
},
53100+
{
53101+
"source_path": "articles/sql-database/transparent-data-encryption-byok-azure-sql-configure.md",
53102+
"redirect_url": "/azure/azure-sql/database/transparent-data-encryption-byok-configure",
53103+
"redirect_document_id": true
53104+
},
53105+
{
53106+
"source_path": "articles/sql-database/transparent-data-encryption-byok-azure-sql-key-rotation.md",
53107+
"redirect_url": "/azure/azure-sql/database/transparent-data-encryption-byok-key-rotation",
53108+
"redirect_document_id": true
53109+
},
53110+
{
53111+
"source_path": "articles/sql-database/transparent-data-encryption-byok-azure-sql-remove-tde-protector.md",
53112+
"redirect_url": "/azure/azure-sql/database/transparent-data-encryption-byok-remove-tde-protector",
53113+
"redirect_document_id": true
53114+
},
53115+
{
53116+
"source_path": "articles/sql-database/transparent-data-encryption-byok-azure-sql.md",
53117+
"redirect_url": "/azure/azure-sql/database/transparent-data-encryption-byok-overview",
53118+
"redirect_document_id": true
53119+
},
53120+
{
53121+
"source_path": "articles/sql-database/troubleshoot-connectivity-issues-microsoft-azure-sql-database.md",
53122+
"redirect_url": "/azure/azure-sql/database/troubleshoot-common-errors-issues",
53123+
"redirect_document_id": true
5298453124
}
5298553125
]
5298653126
}

articles/app-service/app-service-web-tutorial-dotnet-sqldatabase.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom: mvc, devcenter, vs-azure, seodec18
1010

1111
# Tutorial: Deploy an ASP.NET app to Azure with Azure SQL Database
1212

13-
[Azure App Service](overview.md) provides a highly scalable, self-patching web hosting service. This tutorial shows you how to deploy a data-driven ASP.NET app in App Service and connect it to [Azure SQL Database](../sql-database/sql-database-technical-overview.md). When you're finished, you have an ASP.NET app running in Azure and connected to SQL Database.
13+
[Azure App Service](overview.md) provides a highly scalable, self-patching web hosting service. This tutorial shows you how to deploy a data-driven ASP.NET app in App Service and connect it to [Azure SQL Database](../azure-sql/database/technical-overview.md). When you're finished, you have an ASP.NET app running in Azure and connected to SQL Database.
1414

1515
![Published ASP.NET application in Azure App Service](./media/app-service-web-tutorial-dotnet-sqldatabase/azure-app-in-browser.png)
1616

articles/azure-government/documentation-government-impact-level-5.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Azure HDInsight can be used in Azure Government supporting Impact Level 5 worklo
139139

140140
Azure SQL Warehouse can be used in Azure Government supporting Impact Level 5 workloads in the following configurations:
141141

142-
- Add Transparent Data Encryption with customer managed keys via Azure Key Vault (additional documentation and guidance found in the documentation for [Azure SQL transparent data encryption](../sql-database/transparent-data-encryption-byok-azure-sql.md)).
142+
- Add Transparent Data Encryption with customer managed keys via Azure Key Vault (additional documentation and guidance found in the documentation for [Azure SQL transparent data encryption](../azure-sql/database/transparent-data-encryption-byok-overview.md)).
143143

144144
> [!NOTE]
145145
> The instructions to enable this are the same as for Azure SQL database.
@@ -747,7 +747,7 @@ To help ensure the security and integrity of data moved to the cloud, StorSimple
747747

748748
Azure SQL Database can be used in Azure Government supporting Impact Level 5 workloads in the following configurations:
749749

750-
- Add Transparent Data Encryption with customer managed keys via Azure Key Vault (additional documentation and guidance found in the [Azure SQL documentation](../sql-database/transparent-data-encryption-byok-azure-sql.md)).
750+
- Add Transparent Data Encryption with customer managed keys via Azure Key Vault (additional documentation and guidance found in the [Azure SQL documentation](../azure-sql/database/transparent-data-encryption-byok-overview.md)).
751751

752752
| **Service** | **USGov VA** | **USGov IA** | **USGov TX** | **USGov AZ** | **USDoD East** | **USDoD Cent** |
753753
| --- | --- | --- | --- | --- | --- | --- |
@@ -757,7 +757,7 @@ Azure SQL Database can be used in Azure Government supporting Impact Level 5 wor
757757

758758
Azure SQL Stretch Database can be used in Azure Government supporting Impact Level 5 workloads in the following configurations:
759759

760-
- Add Transparent Data Encryption with customer managed keys via Azure Key Vault (additional documentation and guidance found in the documentation for [Azure SQL transparent data encryption](../sql-database/transparent-data-encryption-byok-azure-sql.md)).
760+
- Add Transparent Data Encryption with customer managed keys via Azure Key Vault (additional documentation and guidance found in the documentation for [Azure SQL transparent data encryption](../azure-sql/database/transparent-data-encryption-byok-overview.md)).
761761

762762
| **Service** | **USGov VA** | **USGov IA** | **USGov TX** | **USGov AZ** | **USDoD East** | **USDoD Cent** |
763763
| --- | --- | --- | --- | --- | --- | --- |

articles/azure-sql/database/aad-authentication-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.date: 03/27/2020
1515
---
1616
# Configure and manage Azure Active Directory authentication with SQL
1717

18-
This article shows you how to create and populate Azure AD, and then use Azure AD with [Azure SQL Database](../../sql-database/sql-database-technical-overview.md), [Azure SQL Managed Instance](../../sql-database/sql-database-managed-instance.md), and [Azure Synapse Analytics (formerly Azure SQL Data Warehouse)](../../synapse-analytics/sql-data-warehouse/sql-data-warehouse-overview-what-is.md). For an overview, see [Azure Active Directory Authentication](aad-authentication-overview.md).
18+
This article shows you how to create and populate Azure AD, and then use Azure AD with [Azure SQL Database](technical-overview.md), [Azure SQL Managed Instance](../../sql-database/sql-database-managed-instance.md), and [Azure Synapse Analytics (formerly Azure SQL Data Warehouse)](../../synapse-analytics/sql-data-warehouse/sql-data-warehouse-overview-what-is.md). For an overview, see [Azure Active Directory Authentication](aad-authentication-overview.md).
1919

2020
## Azure AD authentication methods
2121

articles/azure-sql/database/aad-authentication-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.date: 04/23/2020
1414
---
1515
# Use Azure Active Directory Authentication for authentication with Azure SQL
1616

17-
Azure Active Directory authentication is a mechanism of connecting to [Azure SQL Database](../../sql-database/sql-database-technical-overview.md), [Azure SQL Managed Instance](../../sql-database/sql-database-managed-instance.md), and [Azure Synapse Analytics (formerly Azure SQL Data Warehouse)](../../synapse-analytics/sql-data-warehouse/sql-data-warehouse-overview-what-is.md) by using identities in Azure Active Directory (Azure AD).
17+
Azure Active Directory authentication is a mechanism of connecting to [Azure SQL Database](technical-overview.md), [Azure SQL Managed Instance](../../sql-database/sql-database-managed-instance.md), and [Azure Synapse Analytics (formerly Azure SQL Data Warehouse)](../../synapse-analytics/sql-data-warehouse/sql-data-warehouse-overview-what-is.md) by using identities in Azure Active Directory (Azure AD).
1818

1919
> [!NOTE]
2020
> This article applies to Azure SQL Database, SQL Managed Instance, and Azure Synapse. For simplicity, Azure SQL is used when referring to all three.

articles/azure-sql/database/active-geo-replication-configure-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The following steps create a new secondary database in a geo-replication partner
3535

3636
To add a secondary database, you must be the subscription owner or co-owner.
3737

38-
The secondary database has the same name as the primary database and has, by default, the same service tier and compute size. The secondary database can be a single database or a pooled database. For more information, see [DTU-based purchasing model](dtu-service-tiers.md) and [vCore-based purchasing model](../../sql-database/sql-database-service-tiers-vcore.md).
38+
The secondary database has the same name as the primary database and has, by default, the same service tier and compute size. The secondary database can be a single database or a pooled database. For more information, see [DTU-based purchasing model](dtu-service-tiers.md) and [vCore-based purchasing model](service-tiers-vcore.md).
3939
After the secondary is created and seeded, data begins replicating from the primary database to the new secondary database.
4040

4141
> [!NOTE]

articles/azure-sql/database/active-geo-replication-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Transaction log rate throttling on the primary due to lower compute size on a se
122122
> [!NOTE]
123123
> Transaction log rate on the primary may be throttled for reasons unrelated to lower compute size on a secondary. This kind of throttling may occur even if the secondary has the same or higher compute size than the primary. For details, including wait types for different kinds of log rate throttling, see [Transaction log rate governance](resource-limits-logical-server.md#transaction-log-rate-governance).
124124
125-
For more information on the SQL Database compute sizes, see [What are SQL Database Service Tiers](../../sql-database/sql-database-purchase-models.md).
125+
For more information on the SQL Database compute sizes, see [What are SQL Database Service Tiers](purchasing-models.md).
126126

127127
## Cross-subscription geo-replication
128128

@@ -288,5 +288,5 @@ As discussed previously, active geo-replication can also be managed programmatic
288288
- SQL Database also supports auto-failover groups. For more information, see using [auto-failover groups](auto-failover-group-overview.md).
289289
- For a business continuity overview and scenarios, see [Business continuity overview](business-continuity-high-availability-disaster-recover-hadr-overview.md)
290290
- To learn about Azure SQL Database automated backups, see [SQL Database automated backups](automated-backups-overview.md).
291-
- To learn about using automated backups for recovery, see [Restore a database from the service-initiated backups](../../sql-database/sql-database-recovery-using-backups.md).
291+
- To learn about using automated backups for recovery, see [Restore a database from the service-initiated backups](recovery-using-backups.md).
292292
- To learn about authentication requirements for a new primary server and database, see [SQL Database security after disaster recovery](geo-replication-security-configure.md).

articles/azure-sql/database/advanced-data-security.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Advanced data security (ADS) is a unified package for advanced SQL security capa
2222
Advanced data security (ADS) provides a set of advanced SQL security capabilities, including data discovery & classification, vulnerability assessment, and Advanced Threat Protection.
2323

2424
- [Data Discovery & Classification](data-discovery-and-classification-overview.md) provides capabilities built into Azure SQL Database, Azure SQL Managed Instance, and Azure Synapse for discovering, classifying, labeling & reporting the sensitive data in your databases. It can be used to provide visibility into your database classification state, and to track the access to sensitive data within the database and beyond its borders.
25-
- [Vulnerability Assessment](../../sql-database/sql-vulnerability-assessment.md) is an easy to configure service that can discover, track, and help you remediate potential database vulnerabilities. It provides visibility into your security state, and includes actionable steps to resolve security issues, and enhance your database fortifications.
26-
- [Advanced Threat Protection](../../sql-database/sql-database-threat-detection-overview.md) detects anomalous activities indicating unusual and potentially harmful attempts to access or exploit your database. It continuously monitors your database for suspicious activities, and provides immediate security alerts on potential vulnerabilities, SQL injection attacks, and anomalous database access patterns. Advanced Threat Protection alerts provide details of the suspicious activity and recommend action on how to investigate and mitigate the threat.
25+
- [Vulnerability Assessment](sql-vulnerability-assessment.md) is an easy to configure service that can discover, track, and help you remediate potential database vulnerabilities. It provides visibility into your security state, and includes actionable steps to resolve security issues, and enhance your database fortifications.
26+
- [Advanced Threat Protection](threat-detection-overview.md) detects anomalous activities indicating unusual and potentially harmful attempts to access or exploit your database. It continuously monitors your database for suspicious activities, and provides immediate security alerts on potential vulnerabilities, SQL injection attacks, and anomalous database access patterns. Advanced Threat Protection alerts provide details of the suspicious activity and recommend action on how to investigate and mitigate the threat.
2727

2828
Enable SQL ADS once to enable all of these included features. With one click, you can enable ADS for all databases on your [server](logical-servers.md) in Azure (which hosts SQL Database or Azure Synapse Analytics) or in you instance in Azure SQL Managed Instance. Enabling or managing ADS settings requires belonging to the [SQL security manager](https://docs.microsoft.com/azure/role-based-access-control/built-in-roles#sql-security-manager) role, SQL database admin role or SQL server admin role.
2929

@@ -70,6 +70,6 @@ Advanced data security settings for your server or managed instance can also be
7070
## Next steps
7171

7272
- Learn more about [Data Discovery & Classification](data-discovery-and-classification-overview.md)
73-
- Learn more about [vulnerability Assessment](../../sql-database/sql-vulnerability-assessment.md)
74-
- Learn more about [Advanced Threat Protection](../../sql-database/sql-database-threat-detection.md)
73+
- Learn more about [vulnerability Assessment](sql-vulnerability-assessment.md)
74+
- Learn more about [Advanced Threat Protection](threat-detection.md)
7575
- Learn more about [Azure Security Center](https://docs.microsoft.com/azure/security-center/security-center-intro)
File renamed without changes.

articles/azure-sql/database/audit-log-format.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For example, for database `Database1` on `Server1` the following is a possible v
2525

2626
Server1/Database1/SqlDbAuditing_ServerAudit_NoRetention/2019-02-03/12_23_30_794_0.xel
2727

28-
[Read-only Replicas](../../sql-database/sql-database-read-scale-out.md) Audit logs are stored in the same container. The directory hierarchy within the container is of the form `<ServerName>/<DatabaseName>/<AuditName>/<Date>/RO/`. The Blob filename shares the same format. The Audit Logs of Read-only Replicas are stored in the same container.
28+
[Read-only Replicas](read-scale-out.md) Audit logs are stored in the same container. The directory hierarchy within the container is of the form `<ServerName>/<DatabaseName>/<AuditName>/<Date>/RO/`. The Blob filename shares the same format. The Audit Logs of Read-only Replicas are stored in the same container.
2929

3030

3131
### Event Hub

0 commit comments

Comments
 (0)