Skip to content

Commit d8289ae

Browse files
authored
Merge pull request #115366 from MashaMSFT/move16
Move16
2 parents 0367992 + c377b8c commit d8289ae

File tree

627 files changed

+2194
-1960
lines changed

Some content is hidden

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

627 files changed

+2194
-1960
lines changed

.openpublishing.redirection.json

Lines changed: 277 additions & 37 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Use Azure AD B2C to facilitate identity verification and proofing by collecting
5959

6060
![A diagram showing the user flow for third-party identity proofing](./media/overview/scenario-idproofing.png)
6161

62-
These are just some of the things you can do with Azure AD B2C as your business-to-customer identity platform. The following sections of this overview walk you through a demo application that uses Azure AD B2C. You're also welcome to move on directly to a more in-depth [technical overview of Azure AD B2C](technical-overview.md).
62+
These are just some of the things you can do with Azure AD B2C as your business-to-customer identity platform. The following sections of this overview walk you through a demo application that uses Azure AD B2C. You're also welcome to move on directly to a more in-depth [technical overview of Azure AD B2C](../azure-sql/database/sql-database-paas-overview.md).
6363

6464
## Example: WoodGrove Groceries
6565

@@ -122,7 +122,7 @@ If you'd like to jump right into the code to see how the WoodGrove Groceries app
122122
Now that you have an idea of what Azure AD B2C is and some of the scenarios it can help with, dig a little deeper into its features and technical aspects.
123123

124124
> [!div class="nextstepaction"]
125-
> [Azure AD B2C technical overview >](technical-overview.md)
125+
> [Azure AD B2C technical overview >](../azure-sql/database/sql-database-paas-overview.md)
126126
127127
<!-- LINKS - External -->
128128
[woodgrove]: https://aka.ms/ciamdemo

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Administrators can assign a Conditional Access policy to the following cloud app
3333
- [Office 365 (preview)](#office-365-preview)
3434
- Azure Analysis Services
3535
- Azure DevOps
36-
- [Azure SQL Database and Data Warehouse](../../azure-sql/database/conditional-access-confugre.md)
36+
- [Azure SQL Database and Data Warehouse](../../azure-sql/database/conditional-access-configure.md)
3737
- Dynamics CRM Online
3838
- Microsoft Application Insights Analytics
3939
- [Microsoft Azure Information Protection](/azure/information-protection/faqs#i-see-azure-information-protection-is-listed-as-an-available-cloud-app-for-conditional-accesshow-does-this-work)

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](../azure-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/sql-database-paas-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/app-service/app-service-web-tutorial-dotnetcore-sqldb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ az sql server firewall-rule create --name AllowLocalClient --server <mysql_serve
130130

131131
### Create a database in Azure SQL Database
132132

133-
Create a database with an [S0 performance level](../azure-sql/database/dtu-service-tiers.md) in the server using the [`az sql db create`](/cli/azure/sql/db?view=azure-cli-latest#az-sql-db-create) command.
133+
Create a database with an [S0 performance level](../azure-sql/database/service-tiers-dtu.md) in the server using the [`az sql db create`](/cli/azure/sql/db?view=azure-cli-latest#az-sql-db-create) command.
134134

135135
```azurecli-interactive
136136
az sql db create --resource-group myResourceGroup --server <server-name> --name coreDB --service-objective S0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ az sql server firewall-rule create --name AllowLocalClient --server <mysql_serve
129129

130130
### Create a database in Azure SQL Database
131131

132-
Create a database with an [S0 performance level](../../azure-sql/database/dtu-service-tiers.md) in the server using the [`az sql db create`](/cli/azure/sql/db?view=azure-cli-latest#az-sql-db-create) command.
132+
Create a database with an [S0 performance level](../../azure-sql/database/service-tiers-dtu.md) in the server using the [`az sql db create`](/cli/azure/sql/db?view=azure-cli-latest#az-sql-db-create) command.
133133

134134
```azurecli-interactive
135135
az sql db create --resource-group myResourceGroup --server <server-name> --name coreDB --service-objective S0

articles/azure-functions/functions-scenario-database-table-cleanup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ If this is your first experience working with C# Functions, you should read the
1717

1818
+ Complete the steps in the article [Create your first function using Visual Studio](functions-create-your-first-function-visual-studio.md) to create a local function app that targets version 2.x or a later version of the runtime. You must also have published your project to a function app in Azure.
1919

20-
+ This article demonstrates a Transact-SQL command that executes a bulk cleanup operation in the **SalesOrderHeader** table in the AdventureWorksLT sample database. To create the AdventureWorksLT sample database, complete the steps in the article [Create an Azure SQL database in the Azure portal](../sql-database/quickstart-create-single-database.md).
20+
+ This article demonstrates a Transact-SQL command that executes a bulk cleanup operation in the **SalesOrderHeader** table in the AdventureWorksLT sample database. To create the AdventureWorksLT sample database, complete the steps in the article [Create an Azure SQL database in the Azure portal](../azure-sql/database/single-database-create-quickstart.md).
2121

2222
+ You must add a [server-level firewall rule](../sql-database/sql-database-get-started-portal-firewall.md) for the public IP address of the computer you use for this quickstart. This rule is required to be able access the SQL database instance from your local computer.
2323

2424
## Get connection information
2525

26-
You need to get the connection string for the database you created when you completed [Create an Azure SQL database in the Azure portal](../sql-database/quickstart-create-single-database.md).
26+
You need to get the connection string for the database you created when you completed [Create an Azure SQL database in the Azure portal](../azure-sql/database/single-database-create-quickstart.md).
2727

2828
1. Sign in to the [Azure portal](https://portal.azure.com/).
2929

articles/azure-government/documentation-government-compute.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ For details on this service and how to use it, see [Azure Virtual Machine Scale
4949
The only variation is the [available sizes of Virtual Machines in Azure Government](https://azure.microsoft.com/regions/services/).
5050

5151
## Batch
52-
For details on this service and how to use it, see [Azure Batch documentation](../batch/batch-technical-overview.md).
52+
For details on this service and how to use it, see [Azure Batch documentation](../azure-sql/database/sql-database-paas-overview.md).
5353

5454
### Variations
5555
The URLs for accessing and managing the Batch service are different:

articles/azure-monitor/insights/azure-sql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Use the process described in [Add Azure Monitor solutions from the Solutions Gal
5959

6060
Once you have created Azure SQL Analytics solution in your workspace, you need to **configure each** resource that you want to monitor to stream its diagnostics telemetry to Azure SQL Analytics. Follow detailed instructions on this page:
6161

62-
- Enable Azure Diagnostics for your Azure SQL database to [stream diagnostics telemetry to Azure SQL Analytics](../../azure-sql/database/configure-streaming-export-metrics-diagnostic-telemtry-logging.md).
62+
- Enable Azure Diagnostics for your Azure SQL database to [stream diagnostics telemetry to Azure SQL Analytics](../../azure-sql/database/metrics-diagnostic-telemtry-logging-streaming-export-configure.md).
6363

6464
The above page also provides instructions on enabling support for monitoring multiple Azure subscriptions from a single Azure SQL Analytics workspace as a single pane of glass.
6565

@@ -167,7 +167,7 @@ Once the new role is created, assign this role to each user that you need to gra
167167

168168
## Analyze data and create alerts
169169

170-
Data analysis in Azure SQL Analytics is based on [Log Analytics language](../log-query/get-started-queries.md) for your custom querying and reporting. Find description of the available data collected from database resource for custom querying in [metrics and logs available](../../azure-sql/database/configure-streaming-export-metrics-diagnostic-telemtry-logging.md#metrics-and-logs-available).
170+
Data analysis in Azure SQL Analytics is based on [Log Analytics language](../log-query/get-started-queries.md) for your custom querying and reporting. Find description of the available data collected from database resource for custom querying in [metrics and logs available](../../azure-sql/database/metrics-diagnostic-telemtry-logging-streaming-export-configure.md#metrics-and-logs-available).
171171

172172
Automated alerting in Azure SQL Analytics is based on writing a Log Analytics query that triggers an alert upon a condition met. Find below several examples on Log Analytics queries upon which alerting can be set up in Azure SQL Analytics.
173173

articles/azure-monitor/platform/diagnostic-logs-schema.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ The schema for resource diagnostic logs varies depending on the resource and log
7272
| Recovery Services | [Data Model for Azure Backup](../../backup/backup-azure-reports-data-model.md)|
7373
| Search |[Enabling and using Search Traffic Analytics](../../search/search-traffic-analytics.md) |
7474
| Service Bus |[Azure Service Bus logs](../../service-bus-messaging/service-bus-diagnostic-logs.md) |
75-
| SQL Database | [Azure SQL Database logging](../../azure-sql/database/configure-streaming-export-metrics-diagnostic-telemtry-logging.md) |
75+
| SQL Database | [Azure SQL Database logging](../../azure-sql/database/metrics-diagnostic-telemtry-logging-streaming-export-configure.md) |
7676
| Stream Analytics |[Job logs](../../stream-analytics/stream-analytics-job-diagnostic-logs.md) |
7777
| Traffic Manager | [Traffic Manager Log schema](../../traffic-manager/traffic-manager-diagnostic-logs.md) |
7878
| Virtual Networks | Schema not available. |
7979
| Virtual Network Gateways | Schema not available. |
8080

8181
## Supported log categories per resource type
8282

83-
Some categories may only be supported for specific types of resources. This is list of all that are available in some form. For example, Microsoft.Sql/servers/databases categories aren't available for all types of databases. For more information, see [information on SQL Database diagnostic logging](../../azure-sql/database/configure-streaming-export-metrics-diagnostic-telemtry-logging.md).
83+
Some categories may only be supported for specific types of resources. This is list of all that are available in some form. For example, Microsoft.Sql/servers/databases categories aren't available for all types of databases. For more information, see [information on SQL Database diagnostic logging](../../azure-sql/database/metrics-diagnostic-telemtry-logging-streaming-export-configure.md).
8484

8585
|Resource Type|Category|Category Display Name|
8686
|---|---|---|

0 commit comments

Comments
 (0)