Skip to content

Commit 9ec03dc

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into work01
2 parents e375716 + e6e51c9 commit 9ec03dc

33 files changed

+290
-232
lines changed

articles/active-directory/saas-apps/amazon-web-service-tutorial.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ In this tutorial, you configure and test Azure AD SSO in a test environment.
7171

7272
To configure the integration of Amazon Web Services (AWS) into Azure AD, you need to add Amazon Web Services (AWS) from the gallery to your list of managed SaaS apps.
7373

74-
1. Sign in to the [Azure portal](https://portal.azure.com) using either a work or school account, or a personal Microsoft account.
75-
1. On the left navigation pane, select the **Azure Active Directory** service.
76-
1. Navigate to **Enterprise Applications** and then select **All Applications**.
77-
1. To add new application, select **New application**.
74+
1. Sign in to the [Azure portal](https://portal.azure.com) using a work account, school account, or personal Microsoft account.
75+
1. In the Azure portal, search for and select **Azure Active Directory**.
76+
1. Within the Azure Active Directory overview menu, choose **Enterprise Applications** > **All applications**.
77+
1. Select **New application** to add an application.
7878
1. In the **Add from the gallery** section, type **Amazon Web Services (AWS)** in the search box.
7979
1. Select **Amazon Web Services (AWS)** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
8080

@@ -120,7 +120,8 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
120120

121121
In this section, you'll create a test user in the Azure portal called B.Simon.
122122

123-
1. From the left pane in the Azure portal, select **Azure Active Directory**, select **Users**, and then select **All users**.
123+
1. In the Azure portal, search for and select **Azure Active Directory**.
124+
1. Within the Azure Active Directory overview menu, choose **Users** > **All users**.
124125
1. Select **New user** at the top of the screen.
125126
1. In the **User** properties, follow these steps:
126127
1. In the **Name** field, enter `B.Simon`.
@@ -132,8 +133,9 @@ In this section, you'll create a test user in the Azure portal called B.Simon.
132133

133134
In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Amazon Web Services (AWS).
134135

135-
1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
136-
1. In the applications list, select **Amazon Web Services (AWS)**.
136+
1. In the Azure portal, search for and select **Azure Active Directory**.
137+
1. Within the Azure Active Directory overview menu, choose **Enterprise Applications** > **All applications**.
138+
1. In the application list, select **Amazon Web Services (AWS)**.
137139
1. In the app's overview page, find the **Manage** section and select **Users and groups**.
138140

139141
![The "Users and groups" link](common/users-groups-blade.png)

articles/azure-monitor/insights/container-insights-analyze.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ The main differences in monitoring a Windows Server cluster with Azure Monitor f
1919

2020
- Memory RSS metric isn't available for Windows node and containers.
2121
- Disk storage capacity information isn't available for Windows nodes.
22+
- Container logs isn't available for containers running in Windows nodes.
2223
- Live logs support is available with the exception of Windows container logs.
2324
- Only pod environments are monitored, not Docker environments.
2425
- With the preview release, a maximum of 30 Windows Server containers are supported. This limitation doesn't apply to Linux containers.

articles/azure-monitor/insights/container-insights-overview.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ Azure Monitor for containers delivers a comprehensive monitoring experience usin
3232
* Understand the behavior of the cluster under average and heaviest loads. This knowledge can help you identify capacity needs and determine the maximum load that the cluster can sustain.
3333
* Configure alerts to proactively notify you or record it when CPU and memory utilization on nodes or containers exceed your thresholds, or when a health state change occurs in the cluster at the infrastructure or nodes health rollup.
3434
* Integrate with [Prometheus](https://prometheus.io/docs/introduction/overview/) to view application and workload metrics it collects from nodes and Kubernetes using [queries](container-insights-log-search.md) to create custom alerts, dashboards, and detailed perform detailed analysis.
35-
36-
>[!NOTE]
37-
>Support for Prometheus is a feature in public preview at this time.
38-
>
39-
4035
* Monitor container workloads [deployed to AKS Engine](https://github.com/microsoft/OMS-docker/tree/aks-engine) on-premises and [AKS Engine on Azure Stack](https://docs.microsoft.com/azure-stack/user/azure-stack-kubernetes-aks-engine-overview?view=azs-1908).
4136
* Monitor container workloads [deployed to Azure Red Hat OpenShift](../../openshift/intro-openshift.md).
4237

articles/azure-monitor/learn/tutorial-metrics-explorer.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ ms.author: bwren
1111
---
1212

1313
# Tutorial: Create a metrics chart in Azure Monitor
14-
Metrics explorer is a feature of Azure Monitor in the Azure portal that allows you to create charts from metric values, visually correlate trends, and investigate spikes and dips in metric values. Use the metrics explorer to investigate the health and utilization of your Azure resources.
14+
Metrics explorer is a feature of Azure Monitor in the Azure portal that allows you to create charts from metric values, visually correlate trends, and investigate spikes and dips in metric values. Use the metrics explorer to investigate the health and utilization of your Azure resources or to plot charts from custom metrics.
1515

1616
In this tutorial, you learn how to:
1717

1818
> [!div class="checklist"]
19-
> * Add a metric value to a chart
20-
> * Perform different aggregations on metric values
19+
> * Select a metric for which you want to plot a chart
20+
> * Perform different aggregations of metric values
2121
> * Modify the time range and granularity for the chart
2222
2323
## Prerequisites
@@ -29,7 +29,7 @@ To complete this tutorial you need an Azure resource to monitor. You can use any
2929
Log in to the Azure portal at [https://portal.azure.com](https://portal.azure.com).
3030

3131
## Open metrics explorer and select a scope
32-
You can open metrics explorer either from the Azure Monitor menu or from a resource's menu in the Azure portal. Metric values from all resources are available regardless of which option you use.
32+
You can open metrics explorer either from the Azure Monitor menu or from a resource's menu in the Azure portal. Metrics from all resources are available regardless of which option you use.
3333

3434
1. Select **Metrics** from the **Azure Monitor** menu or from the **Monitoring** section of a resource's menu.
3535

articles/dms/tutorial-sql-server-azure-sql-online.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: dms
1111
ms.workload: data-services
1212
ms.custom: "seo-lt-2019"
1313
ms.topic: article
14-
ms.date: 09/22/2019
14+
ms.date: 01/07/2020
1515
---
1616

1717
# Tutorial: Migrate SQL Server to a single database or pooled database in Azure SQL Database online using DMS
@@ -20,6 +20,7 @@ You can use the Azure Database Migration Service to migrate the databases from a
2020

2121
In this tutorial, you learn how to:
2222
> [!div class="checklist"]
23+
>
2324
> - Assess your on-premises database by using the Data Migration Assistant.
2425
> - Migrate the sample schema by using the Data Migration Assistant.
2526
> - Create an instance of the Azure Database Migration Service.
@@ -50,24 +51,24 @@ To complete this tutorial, you need to:
5051
> If you use SQL Server Integration Services (SSIS) and want to migrate the catalog database for your SSIS projects/packages (SSISDB) from SQL Server to Azure SQL Database, the destination SSISDB will be created and managed automatically on your behalf when you provision SSIS in Azure Data Factory (ADF). For more information about migrating SSIS packages, see the article [Migrate SQL Server Integration Services packages to Azure](https://docs.microsoft.com/azure/dms/how-to-migrate-ssis-packages).
5152
5253
- Download and install the [Data Migration Assistant](https://www.microsoft.com/download/details.aspx?id=53595) (DMA) v3.3 or later.
53-
- Create an Azure Virtual Network (VNet) for the Azure Database Migration Service by using the Azure Resource Manager deployment model, which provides site-to-site connectivity to your on-premises source servers by using either [ExpressRoute](https://docs.microsoft.com/azure/expressroute/expressroute-introduction) or [VPN](https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-about-vpngateways). For more information about creating a VNet, see the [Virtual Network Documentation](https://docs.microsoft.com/azure/virtual-network/), and especially the quickstart articles with step-by-step details.
54+
- Create a Microsoft Azure Virtual Network for the Azure Database Migration Service by using the Azure Resource Manager deployment model, which provides site-to-site connectivity to your on-premises source servers by using either [ExpressRoute](https://docs.microsoft.com/azure/expressroute/expressroute-introduction) or [VPN](https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-about-vpngateways). For more information about creating a virtual network, see the [Virtual Network Documentation](https://docs.microsoft.com/azure/virtual-network/), and especially the quickstart articles with step-by-step details.
5455

5556
> [!NOTE]
56-
> During VNet setup, if you use ExpressRoute with network peering to Microsoft, add the following service [endpoints](https://docs.microsoft.com/azure/virtual-network/virtual-network-service-endpoints-overview) to the subnet in which the service will be provisioned:
57+
> During virtual network setup, if you use ExpressRoute with network peering to Microsoft, add the following service [endpoints](https://docs.microsoft.com/azure/virtual-network/virtual-network-service-endpoints-overview) to the subnet in which the service will be provisioned:
5758
> - Target database endpoint (for example, SQL endpoint, Cosmos DB endpoint, and so on)
5859
> - Storage endpoint
5960
> - Service bus endpoint
6061
>
6162
> This configuration is necessary because the Azure Database Migration Service lacks internet connectivity.
6263
63-
- Ensure that your VNet Network Security Group rules don't block the following inbound communication ports to Azure Database Migration Service: 443, 53, 9354, 445, 12000. For more detail on Azure VNet NSG traffic filtering, see the article [Filter network traffic with network security groups](https://docs.microsoft.com/azure/virtual-network/virtual-networks-nsg).
64+
- Ensure that your virtual network Network Security Group rules don't block the following inbound communication ports to Azure Database Migration Service: 443, 53, 9354, 445, 12000. For more detail on Azure Virtual Network NSG traffic filtering, see the article [Filter network traffic with network security groups](https://docs.microsoft.com/azure/virtual-network/virtual-networks-nsg).
6465
- Configure your [Windows Firewall for database engine access](https://docs.microsoft.com/sql/database-engine/configure-windows/configure-a-windows-firewall-for-database-engine-access).
6566
- Open your Windows firewall to allow the Azure Database Migration Service to access the source SQL Server, which by default is TCP port 1433.
6667
- If you're running multiple named SQL Server instances using dynamic ports, you may wish to enable the SQL Browser Service and allow access to UDP port 1434 through your firewalls so that the Azure Database Migration Service can connect to a named instance on your source server.
6768
- When using a firewall appliance in front of your source database(s), you may need to add firewall rules to allow the Azure Database Migration Service to access the source database(s) for migration.
68-
- Create a server-level [firewall rule](https://docs.microsoft.com/azure/sql-database/sql-database-firewall-configure) for the Azure SQL Database server to allow the Azure Database Migration Service access to the target databases. Provide the subnet range of the VNet used for the Azure Database Migration Service.
69+
- Create a server-level [firewall rule](https://docs.microsoft.com/azure/sql-database/sql-database-firewall-configure) for the Azure SQL Database server to allow the Azure Database Migration Service access to the target databases. Provide the subnet range of the virtual network used for the Azure Database Migration Service.
6970
- Ensure that the credentials used to connect to source SQL Server instance have [CONTROL SERVER](https://docs.microsoft.com/sql/t-sql/statements/grant-server-permissions-transact-sql) permissions.
70-
- Ensure that the credentials used to connect to target Azure SQL Database instance have CONTROL DATABASE permission on the target Azure SQL databases.
71+
- Ensure that the credentials used to connect to the target Azure SQL Database instance have CONTROL DATABASE permission on the target Azure SQL Database instances.
7172
- The source SQL Server version must be SQL Server 2005 and above. To determine the version that you SQL Server instance is running, see the article [How to determine the version, edition, and update level of SQL Server and its components](https://support.microsoft.com/help/321185/how-to-determine-the-version-edition-and-update-level-of-sql-server-an).
7273
- Database(s) must be in either Bulk-logged or Full recovery mode. To determine the recovery model configured for your SQL Server instance, see the article [View or Change the Recovery Model of a Database (SQL Server)](https://docs.microsoft.com/sql/relational-databases/backup-restore/view-or-change-the-recovery-model-of-a-database-sql-server?view=sql-server-2017).
7374
- Make sure to take the Full database backups for the databases. To create a Full database backup, see the article [How to: Create a Full Database Backup (Transact-SQL)](https://docs.microsoft.com/previous-versions/sql/sql-server-2008-r2/ms191304(v=sql.105)).
@@ -224,11 +225,11 @@ To migrate the **AdventureWorks2012** schema to a single database or pooled data
224225
225226
4. Select the location in which you want to create the instance of the Azure Database Migration Service.
226227
227-
5. Select an existing VNet or create a new one.
228+
5. Select an existing virtual network or create a new one.
228229
229-
The VNet provides the Azure Database Migration Service with access to the source SQL Server and the target Azure SQL Database instance.
230+
The virtual network provides the Azure Database Migration Service with access to the source SQL Server and the target Azure SQL Database instance.
230231
231-
For more information about how to create a VNet in the Azure portal, see the article [Create a virtual network using the Azure portal](https://aka.ms/DMSVnet).
232+
For more information about how to create a virtual network in the Azure portal, see the article [Create a virtual network using the Azure portal](https://aka.ms/DMSVnet).
232233
233234
6. Select a pricing tier.
234235
@@ -337,7 +338,6 @@ After the initial Full load is completed, the databases are marked **Ready to cu
337338
338339
## Next steps
339340
340-
- [SQL migration using Azure Data Migration Service (DMS)](https://www.microsoft.com/handsonlabs/SelfPacedLabs/?storyGuid=3b671509-c3cd-4495-8e8f-354acfa09587) hands-on lab.
341341
- For information about known issues and limitations when performing online migrations to Azure SQL Database, see the article [Known issues and workarounds with Azure SQL Database online migrations](known-issues-azure-sql-online.md).
342342
- For information about the Azure Database Migration Service, see the article [What is the Azure Database Migration Service?](https://docs.microsoft.com/azure/dms/dms-overview).
343343
- For information about Azure SQL Database, see the article [What is the Azure SQL Database service?](https://docs.microsoft.com/azure/sql-database/sql-database-technical-overview).

0 commit comments

Comments
 (0)