Skip to content

Commit 7354aca

Browse files
authored
Merge pull request #115081 from MashaMSFT/move4
Move4
2 parents 63c60a9 + 0098473 commit 7354aca

File tree

141 files changed

+399
-325
lines changed

Some content is hidden

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

141 files changed

+399
-325
lines changed

.openpublishing.redirection.json

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52246,6 +52246,81 @@
5224652246
"source_path": "articles/sql-database/sql-database-copy.md",
5224752247
"redirect_url": "/azure/azure-sql/database/database-copy",
5224852248
"redirect_document_id": true
52249+
},
52250+
{
52251+
"source_path": "articles/sql-database/sql-database-data-sync-agent.md",
52252+
"redirect_url": "/azure/azure-sql/database/data-sync-agent",
52253+
"redirect_document_id": true
52254+
},
52255+
{
52256+
"source_path": "articles/sql-database/sql-database-develop-direct-route-ports-adonet-v12.md",
52257+
"redirect_url": "/azure/azure-sql/database/adonet-v12-develop-direct-route-ports",
52258+
"redirect_document_id": true
52259+
},
52260+
{
52261+
"source_path": "articles/sql-database/sql-database-disaster-recovery-strategies-for-applications-with-elastic-pool.md",
52262+
"redirect_url": "/azure/azure-sql/database/disaster-recovery-strategies-for-applications-with-elastic-pool",
52263+
"redirect_document_id": true
52264+
},
52265+
{
52266+
"source_path": "articles/sql-database/sql-database-dtu-resource-limits-elastic-pools.md",
52267+
"redirect_url": "/azure/azure-sql/database/resource-limits-dtu-elastic-pools",
52268+
"redirect_document_id": true
52269+
},
52270+
{
52271+
"source_path": "articles/sql-database/sql-database-dtu-resource-limits-single-databases.md",
52272+
"redirect_url": "/azure/azure-sql/database/resource-limits-dtu-single-databases",
52273+
"redirect_document_id": true
52274+
},
52275+
{
52276+
"source_path": "articles/sql-database/sql-database-dtu-to-vcore.md",
52277+
"redirect_url": "/azure/azure-sql/database/migrate-dtu-to-vcore",
52278+
"redirect_document_id": true
52279+
},
52280+
{
52281+
"source_path": "articles/sql-database/sql-database-dynamic-data-masking-get-started-portal.md",
52282+
"redirect_url": "/azure/azure-sql/database/dynamic-data-masking-configure-portal",
52283+
"redirect_document_id": true
52284+
},
52285+
{
52286+
"source_path": "articles/sql-database/sql-database-dynamic-data-masking-get-started.md",
52287+
"redirect_url": "/azure/azure-sql/database/dynamic-data-masking-overview",
52288+
"redirect_document_id": true
52289+
},
52290+
{
52291+
"source_path": "articles/sql-database/sql-database-elastic-convert-to-use-elastic-tools.md",
52292+
"redirect_url": "/azure/azure-sql/database/elastic-convert-to-use-elastic-tools",
52293+
"redirect_document_id": true
52294+
},
52295+
{
52296+
"source_path": "articles/sql-database/sql-database-elastic-database-client-library.md",
52297+
"redirect_url": "/azure/azure-sql/database/elastic-database-client-library",
52298+
"redirect_document_id": true
52299+
},
52300+
{
52301+
"source_path": "articles/sql-database/sql-database-elastic-database-perf-counters.md",
52302+
"redirect_url": "/azure/azure-sql/database/elastic-database-perf-counters",
52303+
"redirect_document_id": true
52304+
},
52305+
{
52306+
"source_path": "articles/sql-database/sql-database-elastic-database-recovery-manager.md",
52307+
"redirect_url": "/azure/azure-sql/database/elastic-database-recovery-manager",
52308+
"redirect_document_id": true
52309+
},
52310+
{
52311+
"source_path": "articles/sql-database/sql-database-elastic-pool-failover-group-tutorial.md",
52312+
"redirect_url": "/azure/azure-sql/database/tutorial-add-elastic-pool-failover-group",
52313+
"redirect_document_id": true
52314+
},
52315+
{
52316+
"source_path": "articles/sql-database/sql-database-elastic-pool-manage.md",
52317+
"redirect_url": "/azure/azure-sql/database/elastic-pool-manage",
52318+
"redirect_document_id": true
52319+
},
52320+
{
52321+
"source_path": "articles/sql-database/sql-database-elastic-pool.md",
52322+
"redirect_url": "/azure/azure-sql/database/elastic-pool-overview",
52323+
"redirect_document_id": true
5224952324
}
5225052325
]
5225152326
}

articles/app-service/environment/app-service-app-service-environment-network-configuration-expressroute.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ App Service Environment requires the following network connectivity settings to
3131

3232
* Outbound network connectivity to the Azure Files service on port 445.
3333

34-
* Outbound network connectivity to Azure SQL Database endpoints that are located in the same region as App Service Environment. SQL Database endpoints resolve under the database.windows.net domain, which requires open access to ports 1433, 11000-11999, and 14000-14999. For details about SQL Database V12 port usage, see [Ports beyond 1433 for ADO.NET 4.5](../../sql-database/sql-database-develop-direct-route-ports-adonet-v12.md).
34+
* Outbound network connectivity to Azure SQL Database endpoints that are located in the same region as App Service Environment. SQL Database endpoints resolve under the database.windows.net domain, which requires open access to ports 1433, 11000-11999, and 14000-14999. For details about SQL Database V12 port usage, see [Ports beyond 1433 for ADO.NET 4.5](../../azure-sql/database/adonet-v12-develop-direct-route-ports.md).
3535

3636
* Outbound network connectivity to the Azure management-plane endpoints (both Azure classic deployment model and Azure Resource Manager endpoints). Connectivity to these endpoints includes the management.core.windows.net and management.azure.com domains.
3737

articles/sql-database/sql-database-develop-direct-route-ports-adonet-v12.md renamed to articles/azure-sql/database/adonet-v12-develop-direct-route-ports.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.date: 04/03/2019
1717
This topic describes the Azure SQL Database connection behavior for clients that use ADO.NET 4.5 or a later version.
1818

1919
> [!IMPORTANT]
20-
> For information about connectivity architecture, see [Azure SQL Database connectivity architecture](../azure-sql/database/connectivity-architecture.md).
20+
> For information about connectivity architecture, see [Azure SQL Database connectivity architecture](connectivity-architecture.md).
2121
>
2222
2323
## Outside vs inside
@@ -77,6 +77,5 @@ https://www.microsoft.com/download/details.aspx?id=56567
7777
https://techcommunity.microsoft.com/t5/DataCAT/Connect-to-Azure-SQL-Database-V12-via-Redirection/ba-p/305362
7878

7979
* [TDS protocol version list](https://www.freetds.org/userguide/tdshistory.htm)
80-
* [SQL Database Development Overview](sql-database-develop-overview.md)
81-
* [Azure SQL Database firewall](sql-database-firewall-configure.md)
82-
* [How to: Configure firewall settings on SQL Database](sql-database-configure-firewall-settings.md)
80+
* [SQL Database Development Overview](../../sql-database/sql-database-develop-overview.md)
81+
* [Azure SQL Database firewall](../../sql-database/sql-database-firewall-configure.md)

articles/azure-sql/database/connectivity-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,5 @@ Details of how traffic shall be migrated to new Gateways in specific regions are
115115
## Next steps
116116

117117
- For information on how to change the Azure SQL Database connection policy for a server, see [conn-policy](https://docs.microsoft.com/cli/azure/sql/server/conn-policy).
118-
- For information about Azure SQL Database connection behavior for clients that use ADO.NET 4.5 or a later version, see [Ports beyond 1433 for ADO.NET 4.5](../../sql-database/sql-database-develop-direct-route-ports-adonet-v12.md).
118+
- For information about Azure SQL Database connection behavior for clients that use ADO.NET 4.5 or a later version, see [Ports beyond 1433 for ADO.NET 4.5](adonet-v12-develop-direct-route-ports.md).
119119
- For general application development overview information, see [SQL Database Application Development Overview](../../sql-database/sql-database-develop-overview.md).

articles/sql-database/sql-database-data-sync-agent.md renamed to articles/azure-sql/database/data-sync-agent.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.date: 12/20/2018
1414
---
1515
# Data Sync Agent for SQL Data Sync
1616

17-
Sync data with on-premises SQL Server databases by installing and configuring the Data Sync Agent for SQL Data Sync in Azure. For more info about SQL Data Sync, see [Sync data across multiple cloud and on-premises databases with SQL Data Sync](sql-database-sync-data.md).
17+
Sync data with on-premises SQL Server databases by installing and configuring the Data Sync Agent for SQL Data Sync in Azure. For more info about SQL Data Sync, see [Sync data across multiple cloud and on-premises databases with SQL Data Sync](../../sql-database/sql-database-sync-data.md).
1818

1919
> [!IMPORTANT]
2020
> SQL Data Sync does **not** support Azure SQL Managed Instance at this time.
@@ -39,7 +39,7 @@ msiexec /i "SQLDataSyncAgent-2.0-x86-ENU.msi" TARGETDIR="C:\Program Files (x86)\
3939

4040
## Sync data with SQL Server on-premises
4141

42-
To configure the Data Sync Agent so you can sync data with one or more on-premises SQL Server databases, see [Add an on-premises SQL Server database](sql-database-get-started-sql-data-sync.md#add-on-prem).
42+
To configure the Data Sync Agent so you can sync data with one or more on-premises SQL Server databases, see [Add an on-premises SQL Server database](../../sql-database/sql-database-get-started-sql-data-sync.md#add-on-prem).
4343

4444
## <a name="agent-faq"></a> Data Sync Agent FAQ
4545

@@ -134,7 +134,7 @@ These scenarios might cause this issue:
134134

135135
You discover that the agent isn't running on a computer that hosts SQL Server. When you attempt to manually start the agent, you see a dialog box that displays the message, "Error 1069: The service did not start due to a logon failure."
136136

137-
![Data Sync error 1069 dialog box](media/sql-database-troubleshoot-data-sync/sync-error-1069.png)
137+
![Data Sync error 1069 dialog box](./media/data-sync-agent/sync-error-1069.png)
138138

139139
- **Cause**. A likely cause of this error is that the password on the local server has changed since you created the agent and agent password.
140140

@@ -158,7 +158,7 @@ You discover that the agent isn't running on a computer that hosts SQL Server. W
158158

159159
After you create or re-create a key for an agent, you try to submit the key through the SqlAzureDataSyncAgent application. The submission fails to complete.
160160

161-
![Sync Error dialog box - Can't submit agent key](media/sql-database-troubleshoot-data-sync/sync-error-cant-submit-agent-key.png)
161+
![Sync Error dialog box - Can't submit agent key](./media/data-sync-agent/sync-error-cant-submit-agent-key.png)
162162

163163
- **Prerequisites**. Before you proceed, check the following prerequisites:
164164

@@ -312,15 +312,15 @@ SqlDataSyncAgentCommand.exe -action "updatecredential" -serverName localhost -da
312312

313313
For more info about SQL Data Sync, see the following articles:
314314

315-
- Overview - [Sync data across multiple cloud and on-premises databases with SQL Data Sync in Azure](sql-database-sync-data.md)
315+
- Overview - [Sync data across multiple cloud and on-premises databases with SQL Data Sync in Azure](../../sql-database/sql-database-sync-data.md)
316316
- Set up Data Sync
317-
- In the portal - [Tutorial: Set up SQL Data Sync to sync data between Azure SQL Database and SQL Server on-premises](sql-database-get-started-sql-data-sync.md)
317+
- In the portal - [Tutorial: Set up SQL Data Sync to sync data between Azure SQL Database and SQL Server on-premises](../../sql-database/sql-database-get-started-sql-data-sync.md)
318318
- With PowerShell
319-
- [Use PowerShell to sync between multiple Azure SQL databases](../azure-sql/database/scripts/sql-data-sync-sync-data-between-sql-databases.md)
320-
- [Use PowerShell to sync between an Azure SQL Database and a SQL Server on-premises database](../azure-sql/database/scripts/sql-data-sync-sync-data-between-azure-onprem.md)
321-
- Best practices - [Best practices for Azure SQL Data Sync](../azure-sql/database/sql-data-sync-best-practices.md)
322-
- Monitor - [Monitor SQL Data Sync with Azure Monitor logs](sql-database-sync-monitor-oms.md)
323-
- Troubleshoot - [Troubleshoot issues with Azure SQL Data Sync](sql-database-troubleshoot-data-sync.md)
319+
- [Use PowerShell to sync between multiple Azure SQL databases](scripts/sql-data-sync-sync-data-between-sql-databases.md)
320+
- [Use PowerShell to sync between an Azure SQL Database and a SQL Server on-premises database](scripts/sql-data-sync-sync-data-between-azure-onprem.md)
321+
- Best practices - [Best practices for Azure SQL Data Sync](sql-data-sync-best-practices.md)
322+
- Monitor - [Monitor SQL Data Sync with Azure Monitor logs](../../sql-database/sql-database-sync-monitor-oms.md)
323+
- Troubleshoot - [Troubleshoot issues with Azure SQL Data Sync](../../sql-database/sql-database-troubleshoot-data-sync.md)
324324
- Update the sync schema
325-
- With Transact-SQL - [Automate replication of schema changes with SQL Data Sync in Azure](sql-database-update-sync-schema.md)
326-
- With PowerShell - [Use PowerShell to update the sync schema in an existing sync group](../azure-sql/database/scripts/update-sync-schema-in-sync-group.md)
325+
- With Transact-SQL - [Automate replication of schema changes with SQL Data Sync in Azure](../../sql-database/sql-database-update-sync-schema.md)
326+
- With PowerShell - [Use PowerShell to update the sync schema in an existing sync group](scripts/update-sync-schema-in-sync-group.md)

0 commit comments

Comments
 (0)