Skip to content

Commit eeb08d7

Browse files
authored
Merge pull request #115174 from MashaMSFT/move7
Move7
2 parents 575817b + a37ab7f commit eeb08d7

File tree

132 files changed

+481
-406
lines changed

Some content is hidden

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

132 files changed

+481
-406
lines changed

.openpublishing.redirection.json

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52446,6 +52446,81 @@
5244652446
"source_path": "articles/sql-database/sql-database-file-space-management.md",
5244752447
"redirect_url": "/azure/azure-sql/database/file-space-manage",
5244852448
"redirect_document_id": true
52449+
},
52450+
{
52451+
"source_path": "articles/sql-database/sql-database-firewall-configure.md",
52452+
"redirect_url": "/azure/azure-sql/database/firewall-configure",
52453+
"redirect_document_id": true
52454+
},
52455+
{
52456+
"source_path": "articles/sql-database/sql-database-gateway-migration.md",
52457+
"redirect_url": "/azure/azure-sql/database/gateway-migration",
52458+
"redirect_document_id": true
52459+
},
52460+
{
52461+
"source_path": "articles/sql-database/sql-database-get-started-sql-data-sync.md",
52462+
"redirect_url": "/azure/azure-sql/database/data-sync-sql-server-configure",
52463+
"redirect_document_id": true
52464+
},
52465+
{
52466+
"source_path": "articles/sql-database/sql-database-howto-single-database.md",
52467+
"redirect_url": "/azure/azure-sql/database/how-to-content-reference-guide",
52468+
"redirect_document_id": true
52469+
},
52470+
{
52471+
"source_path": "articles/sql-database/sql-database-hyperscale-performance-diagnostics.md",
52472+
"redirect_url": "/azure/azure-sql/database/hyperscale-performance-diagnostics",
52473+
"redirect_document_id": true
52474+
},
52475+
{
52476+
"source_path": "articles/sql-database/sql-database-implement-geo-distributed-database.md",
52477+
"redirect_url": "/azure/azure-sql/database/tutorial-geo-distributed-application-configure",
52478+
"redirect_document_id": true
52479+
},
52480+
{
52481+
"source_path": "articles/sql-database/sql-database-insights-alerts-portal.md",
52482+
"redirect_url": "/azure/azure-sql/database/alerts-insights-configure-portal",
52483+
"redirect_document_id": true
52484+
},
52485+
{
52486+
"source_path": "articles/sql-database/sql-database-long-term-backup-retention-configure.md",
52487+
"redirect_url": "/azure/azure-sql/database/long-term-backup-retention-configure",
52488+
"redirect_document_id": true
52489+
},
52490+
{
52491+
"source_path": "articles/sql-database/sql-database-long-term-retention.md",
52492+
"redirect_url": "/azure/azure-sql/database/long-term-retention-overview",
52493+
"redirect_document_id": true
52494+
},
52495+
{
52496+
"source_path": "articles/sql-database/sql-database-machine-learning-services-add-r-packages.md",
52497+
"redirect_url": "/azure/azure-sql/database/machine-learning-services-add-r-packages",
52498+
"redirect_document_id": true
52499+
},
52500+
{
52501+
"source_path": "articles/sql-database/sql-database-machine-learning-services-data-issues.md",
52502+
"redirect_url": "/azure/azure-sql/database/machine-learning-services-data-issues",
52503+
"redirect_document_id": true
52504+
},
52505+
{
52506+
"source_path": "articles/sql-database/sql-database-machine-learning-services-differences.md",
52507+
"redirect_url": "/azure/azure-sql/database/machine-learning-services-differences",
52508+
"redirect_document_id": true
52509+
},
52510+
{
52511+
"source_path": "articles/sql-database/sql-database-machine-learning-services-functions.md",
52512+
"redirect_url": "/azure/azure-sql/database/machine-learning-services-functions",
52513+
"redirect_document_id": true
52514+
},
52515+
{
52516+
"source_path": "articles/sql-database/sql-database-manage-after-migration.md",
52517+
"redirect_url": "/azure/azure-sql/database/manage-data-after-migrating-to-database",
52518+
"redirect_document_id": true
52519+
},
52520+
{
52521+
"source_path": "articles/sql-database/sql-database-machine-learning-services-overview.md",
52522+
"redirect_url": "/azure/azure-sql/database/machine-learning-services-overview",
52523+
"redirect_document_id": true
5244952524
}
5245052525
]
5245152526
}

articles/app-service/app-service-web-tutorial-connect-msi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ What you will learn:
4040

4141
This article continues where you left off in [Tutorial: Build an ASP.NET app in Azure with SQL Database](app-service-web-tutorial-dotnet-sqldatabase.md) or [Tutorial: Build an ASP.NET Core and SQL Database app in Azure App Service](app-service-web-tutorial-dotnetcore-sqldb.md). If you haven't already, follow one of the two tutorials first. Alternatively, you can adapt the steps for your own .NET app with SQL Database.
4242

43-
To debug your app using SQL Database as the back end, make sure that you've allowed client connection from your computer. If not, add the client IP by following the steps at [Manage server-level IP firewall rules using the Azure portal](../sql-database/sql-database-firewall-configure.md#use-the-azure-portal-to-manage-server-level-ip-firewall-rules).
43+
To debug your app using SQL Database as the back end, make sure that you've allowed client connection from your computer. If not, add the client IP by following the steps at [Manage server-level IP firewall rules using the Azure portal](../azure-sql/database/firewall-configure.md#use-the-azure-portal-to-manage-server-level-ip-firewall-rules).
4444

4545
[!INCLUDE [cloud-shell-try-it.md](../../includes/cloud-shell-try-it.md)]
4646

articles/app-service/app-service-web-tutorial-dotnetcore-sqldb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ When the server is created, the Azure CLI shows information similar to the follo
113113

114114
### Configure a server firewall rule
115115

116-
Create a [server-level firewall rule](../sql-database/sql-database-firewall-configure.md) using the [`az sql server firewall create`](/cli/azure/sql/server/firewall-rule?view=azure-cli-latest#az-sql-server-firewall-rule-create) command. When both starting IP and end IP are set to 0.0.0.0, the firewall is only opened for other Azure resources.
116+
Create a [server-level firewall rule](../azure-sql/database/firewall-configure.md) using the [`az sql server firewall create`](/cli/azure/sql/server/firewall-rule?view=azure-cli-latest#az-sql-server-firewall-rule-create) command. When both starting IP and end IP are set to 0.0.0.0, the firewall is only opened for other Azure resources.
117117

118118
```azurecli-interactive
119119
az sql server firewall-rule create --resource-group myResourceGroup --server <server-name> --name AllowAzureIps --start-ip-address 0.0.0.0 --end-ip-address 0.0.0.0

articles/app-service/containers/tutorial-dotnetcore-sqldb-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ When the server is created, the Azure CLI shows information similar to the follo
112112

113113
### Configure a server firewall rule
114114

115-
Create a [server-level firewall rule](../../sql-database/sql-database-firewall-configure.md) using the [`az sql server firewall create`](/cli/azure/sql/server/firewall-rule?view=azure-cli-latest#az-sql-server-firewall-rule-create) command. When both starting IP and end IP are set to 0.0.0.0, the firewall is only opened for other Azure resources.
115+
Create a [server-level firewall rule](../../azure-sql/database/firewall-configure.md) using the [`az sql server firewall create`](/cli/azure/sql/server/firewall-rule?view=azure-cli-latest#az-sql-server-firewall-rule-create) command. When both starting IP and end IP are set to 0.0.0.0, the firewall is only opened for other Azure resources.
116116

117117
```azurecli-interactive
118118
az sql server firewall-rule create --resource-group myResourceGroup --server <server-name> --name AllowAzureIps --start-ip-address 0.0.0.0 --end-ip-address 0.0.0.0

articles/azure-government/documentation-government-connect-ssms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ If you don't have an Azure Government subscription, create a [free account](http
3333

3434
Before you connect to Azure Government from SSMS, you must set up an Azure SQL Server firewall rule to allow your local IP address to access your computer that's running SQL Server.
3535

36-
Follow these steps to [Manage firewall rules by using the Azure portal](../sql-database/sql-database-firewall-configure.md#use-the-azure-portal-to-manage-server-level-ip-firewall-rules).
36+
Follow these steps to [Manage firewall rules by using the Azure portal](../azure-sql/database/firewall-configure.md#use-the-azure-portal-to-manage-server-level-ip-firewall-rules).
3737

3838
## Specify Azure Government as the environment to connect
3939

articles/azure-resource-manager/templates/template-tutorial-deploy-sql-extensions-bacpac.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ Use a generated password. See [Prerequisites](#prerequisites).
234234

235235
## Verify the deployment
236236

237-
To access the server from your client computer, you need to add an additional firewall rule. For more information, see [Create and manage IP firewall rules](../../sql-database/sql-database-firewall-configure.md#create-and-manage-ip-firewall-rules).
237+
To access the server from your client computer, you need to add an additional firewall rule. For more information, see [Create and manage IP firewall rules](../../azure-sql/database/firewall-configure.md#create-and-manage-ip-firewall-rules).
238238

239239
In the Azure portal, select the SQL database from the newly deployed resource group. Select **Query editor (preview)**, and then enter the administrator credentials. You'll see two tables imported into the database.
240240

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ The client performing the changes needs network access to the primary server. Al
135135

136136
### On the master of the primary server
137137

138-
1. Add the IP address to the allow list of the client performing the changes (for more information see, [Configure firewall](../../sql-database/sql-database-firewall-configure.md)).
138+
1. Add the IP address to the allow list of the client performing the changes (for more information see, [Configure firewall](firewall-configure.md)).
139139
1. Create a login dedicated to setup active geo-replication (and adjust the credentials as needed):
140140

141141
```sql
@@ -198,7 +198,7 @@ After the initial setup, the users, logins, and firewall rules created can be re
198198

199199
## Keeping credentials and firewall rules in sync
200200

201-
We recommend using [database-level IP firewall rules](../../sql-database/sql-database-firewall-configure.md) for geo-replicated databases so these rules can be replicated with the database to ensure all secondary databases have the same IP firewall rules as the primary. This approach eliminates the need for customers to manually configure and maintain firewall rules on servers hosting both the primary and secondary databases. Similarly, using [contained database users](../../sql-database/sql-database-manage-logins.md) for data access ensures both primary and secondary databases always have the same user credentials so during a failover, there is no disruptions due to mismatches with logins and passwords. With the addition of [Azure Active Directory](../../active-directory/fundamentals/active-directory-whatis.md), customers can manage user access to both primary and secondary databases and eliminating the need for managing credentials in databases altogether.
201+
We recommend using [database-level IP firewall rules](firewall-configure.md) for geo-replicated databases so these rules can be replicated with the database to ensure all secondary databases have the same IP firewall rules as the primary. This approach eliminates the need for customers to manually configure and maintain firewall rules on servers hosting both the primary and secondary databases. Similarly, using [contained database users](../../sql-database/sql-database-manage-logins.md) for data access ensures both primary and secondary databases always have the same user credentials so during a failover, there is no disruptions due to mismatches with logins and passwords. With the addition of [Azure Active Directory](../../active-directory/fundamentals/active-directory-whatis.md), customers can manage user access to both primary and secondary databases and eliminating the need for managing credentials in databases altogether.
202202

203203
## Upgrading or downgrading primary database
204204

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ https://techcommunity.microsoft.com/t5/DataCAT/Connect-to-Azure-SQL-Database-V12
7878

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

articles/sql-database/sql-database-insights-alerts-portal.md renamed to articles/azure-sql/database/alerts-insights-configure-portal.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.date: 05/04/2020
1919
This article shows you how to set up alerts for databases in Azure SQL Database and Azure Synapse (formerly Azure SQL Data Warehouse) using the Azure portal. Alerts can send you an email or call a web hook when some metric (for example database size or CPU usage) reaches the threshold. This article also provides best practices for setting alert periods.
2020

2121
> [!NOTE]
22-
> For SQL managed instance specific instructions, see [Create alerts for Azure SQL Managed Instance](sql-database-managed-instance-alerts.md).
22+
> For SQL managed instance specific instructions, see [Create alerts for Azure SQL Managed Instance](../../sql-database/sql-database-managed-instance-alerts.md).
2323
2424
You can receive an alert based on monitoring metrics for, or events on, your Azure services.
2525

@@ -34,35 +34,35 @@ You can configure an alert to do the following when it triggers:
3434

3535
You can configure and get information about alert rules using
3636

37-
* [Azure portal](../monitoring-and-diagnostics/insights-alerts-portal.md)
38-
* [PowerShell](../azure-monitor/platform/alerts-classic-portal.md)
39-
* [command-line interface (CLI)](../azure-monitor/platform/alerts-classic-portal.md)
37+
* [Azure portal](../../azure-monitor/platform/alerts-classic-portal.md)
38+
* [PowerShell](../../azure-monitor/platform/alerts-classic-portal.md)
39+
* [command-line interface (CLI)](../../azure-monitor/platform/alerts-classic-portal.md)
4040
* [Azure Monitor REST API](https://msdn.microsoft.com/library/azure/dn931945.aspx)
4141

4242
## Create an alert rule on a metric with the Azure portal
4343

4444
1. In the [portal](https://portal.azure.com/), locate the resource you are interested in monitoring and select it.
4545
2. Select **Alerts** in the Monitoring section. The text and icon may vary slightly for different resources.
4646

47-
![Monitoring](media/sql-database-insights-alerts-portal/Alerts.png)
47+
![Monitoring](./media/alerts-insights-configure-portal/Alerts.png)
4848

4949
3. Select the **New alert rule** button to open the **Create rule** page.
50-
![Create rule](media/sql-database-insights-alerts-portal/create-rule.png)
50+
![Create rule](./media/alerts-insights-configure-portal/create-rule.png)
5151

5252
4. In the **Condition** section, click **Add**.
53-
![Define condition](media/sql-database-insights-alerts-portal/create-rule.png)
53+
![Define condition](./media/alerts-insights-configure-portal/create-rule.png)
5454
5. In the **Configure signal logic** page, select a signal.
55-
![Select signal](media/sql-database-insights-alerts-portal/select-signal.png).
55+
![Select signal](./media/alerts-insights-configure-portal/select-signal.png).
5656
6. After selecting a signal, such as **CPU percentage**, the **Configure signal logic** page appears.
57-
![Configure signal logic](media/sql-database-insights-alerts-portal/configure-signal-logic.png)
57+
![Configure signal logic](./media/alerts-insights-configure-portal/configure-signal-logic.png)
5858
7. On this page, configure that threshold type, operator, aggregation type, threshold value, aggregation granularity, and frequency of evaluation. Then click **Done**.
5959
8. On the **Create rule**, select an existing **Action group** or create a new group. An action group enables you to define the action to be taken when an alert condition occurs.
60-
![Define action group](media/sql-database-insights-alerts-portal/action-group.png)
60+
![Define action group](./media/alerts-insights-configure-portal/action-group.png)
6161

6262
9. Define a name for the rule, provide an optional description, choose a severity level for the rule, choose whether to enable the rule upon rule creation, and then click **Create rule alert** to create the metric rule alert.
6363

6464
Within 10 minutes, the alert is active and triggers as previously described.
6565

6666
## Next steps
6767

68-
* Learn more about [configuring webhooks in alerts](../azure-monitor/platform/alerts-webhooks.md).
68+
* Learn more about [configuring webhooks in alerts](../../azure-monitor/platform/alerts-webhooks.md).

articles/azure-sql/database/connect-query-r.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ In this quickstart, you use R with Machine Learning Services to connect to an Az
2626

2727
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio).
2828
- An [Azure SQL Database](../../sql-database/sql-database-single-database-get-started.md)
29-
- [Machine Learning Services](../../sql-database/sql-database-machine-learning-services-overview.md) with R enabled.
29+
- [Machine Learning Services](machine-learning-services-overview.md) with R enabled.
3030
- [SQL Server Management Studio](/sql/ssms/sql-server-management-studio-ssms) (SSMS)
3131

3232
> [!IMPORTANT]
@@ -76,6 +76,6 @@ Get the connection information you need to connect to the Azure SQL Database. Yo
7676
## Next steps
7777

7878
- [Design your first Azure SQL Database](../../sql-database/sql-database-design-first-database.md)
79-
- [Azure SQL Database Machine Learning Services (with R)](../../sql-database/sql-database-machine-learning-services-overview.md)
79+
- [Azure SQL Database Machine Learning Services (with R)](machine-learning-services-overview.md)
8080
- [Create and run simple R scripts in Azure SQL Database Machine Learning Services (preview)](../../sql-database/sql-database-quickstart-r-create-script.md)
81-
- [Write advanced R functions in Azure SQL Database using Machine Learning Services (preview)](../../sql-database/sql-database-machine-learning-services-functions.md)
81+
- [Write advanced R functions in Azure SQL Database using Machine Learning Services (preview)](machine-learning-services-functions.md)

0 commit comments

Comments
 (0)