Skip to content

Commit d9cd51c

Browse files
authored
Merge pull request #113713 from MicrosoftDocs/master
Merge master to live, 4 AM
2 parents 291b297 + e9e78a1 commit d9cd51c

File tree

82 files changed

+1578
-53
lines changed

Some content is hidden

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

82 files changed

+1578
-53
lines changed

articles/active-directory/develop/sample-v2-code.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following samples illustrate web applications that sign in users. Some sampl
4949

5050
| Platform | Only signs in users | Signs in users and calls Microsoft Graph |
5151
| -------- | ------------------- | --------------------------------- |
52-
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core 2.2 | [ASP.NET Core WebApp signs-in users tutorial](https://aka.ms/aspnetcore-webapp-sign-in) | Same sample in the [ASP.NET Core web app calls Microsoft Graph](https://aka.ms/aspnetcore-webapp-call-msgraph) phase |
52+
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core | [ASP.NET Core WebApp signs-in users tutorial](https://aka.ms/aspnetcore-webapp-sign-in) | Same sample in the [ASP.NET Core web app calls Microsoft Graph](https://aka.ms/aspnetcore-webapp-call-msgraph) phase |
5353
| ![This image shows the ASP.NET logo](media/sample-v2-code/logo_NETframework.png)</p> ASP.NET | [ASP.NET Quickstart](https://github.com/AzureAdQuickstarts/AppModelv2-WebApp-OpenIDConnect-DotNet) </p> [dotnet-webapp-openidconnect-v2](https://github.com/azure-samples/active-directory-dotnet-webapp-openidconnect-v2) | [dotnet-admin-restricted-scopes-v2](https://github.com/azure-samples/active-directory-dotnet-admin-restricted-scopes-v2) </p> |[msgraph-training-aspnetmvcapp](https://github.com/microsoftgraph/msgraph-training-aspnetmvcapp)
5454
| ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | | [ms-identity-java-webapp](https://github.com/Azure-Samples/ms-identity-java-webapp) |
5555
| ![This image shows the Python logo](media/sample-v2-code/logo_python.png) | | [ms-identity-python-webapp](https://github.com/Azure-Samples/ms-identity-python-webapp) |
@@ -59,7 +59,7 @@ The following samples illustrate web applications that sign in users. Some sampl
5959

6060
The following samples show public client applications (desktop or mobile applications) that access the Microsoft Graph API, or your own web API in the name of a user. All these client applications use Microsoft Authentication Library (MSAL).
6161

62-
| Client application | Platform | Flow/Grant | Calls Microsoft Graph | Calls an ASP.NET Core 2.0 web API |
62+
| Client application | Platform | Flow/Grant | Calls Microsoft Graph | Calls an ASP.NET Core web API |
6363
| ------------------ | -------- | ----------| ---------- | ------------------------- |
6464
| Desktop (WPF) | ![This image shows the .NET/C# logo](media/sample-v2-code/logo_NET.png) | [interactive](msal-authentication-flows.md#interactive)| [dotnet-desktop-msgraph-v2](https://github.com/azure-samples/active-directory-dotnet-desktop-msgraph-v2) | [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi) |
6565
| Desktop (Console) | ![This image shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NET.png) | [Integrated Windows Authentication](msal-authentication-flows.md#integrated-windows-authentication) | [dotnet-iwa-v2](https://github.com/azure-samples/active-directory-dotnet-iwa-v2) | |
@@ -101,7 +101,7 @@ The following samples show how to protect a web API with the Microsoft identity
101101

102102
| Platform | Sample |
103103
| -------- | ------------------- |
104-
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core 2.2 | ASP.NET Core web API (service) of [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi-calls-msgraph) |
104+
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core | ASP.NET Core web API (service) of [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi-calls-msgraph) |
105105
| ![This image shows the ASP.NET logo](media/sample-v2-code/logo_NET.png)</p>ASP.NET MVC | Web API (service) of [ms-identity-aspnet-webapi-onbehalfof](https://github.com/Azure-Samples/ms-identity-aspnet-webapi-onbehalfof) |
106106
| ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | Web API (service) of [ms-identity-java-webapi](https://github.com/Azure-Samples/ms-identity-java-webapi) |
107107
| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png) | Web API (service) of [active-directory-javascript-nodejs-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-nodejs-webapi-v2) |
@@ -113,7 +113,7 @@ The following samples show how to protect an Azure Function using HttpTrigger an
113113

114114
| Platform | Sample |
115115
| -------- | ------------------- |
116-
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core 2.2 | ASP.NET Core web API (service) Azure Function of [dotnet-native-aspnetcore-v2](https://github.com/Azure-Samples/ms-identity-dotnet-webapi-azurefunctions) |
116+
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core | ASP.NET Core web API (service) Azure Function of [dotnet-native-aspnetcore-v2](https://github.com/Azure-Samples/ms-identity-dotnet-webapi-azurefunctions) |
117117
| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png)</p>NodeJS | Web API (service) of [NodeJS and passport-azure-ad](https://github.com/Azure-Samples/ms-identity-nodejs-webapi-azurefunctions) |
118118
| ![This image shows the Python logo](media/sample-v2-code/logo_python.png)</p>Python | Web API (service) of [Python](https://github.com/Azure-Samples/ms-identity-python-webapi-azurefunctions) |
119119
| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png)</p>NodeJS | Web API (service) of [NodeJS and passport-azure-ad using on behalf of](https://github.com/Azure-Samples/ms-identity-nodejs-webapi-onbehalfof-azurefunctions) |

articles/active-directory/users-groups-roles/groups-settings-v2-cmdlets.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ To verify that the module is ready to use, use the following command:
4646

4747
Now you can start using the cmdlets in the module. For a full description of the cmdlets in the Azure AD module, please refer to the online reference documentation for [Azure Active Directory PowerShell Version 2](/powershell/azure/install-adv2?view=azureadps-2.0).
4848

49+
> [!NOTE]
50+
> The Azure AD PowerShell cmdlets does not work with the new Powershell 7 as it is based on .net Core. We are aware and this is in the process of getting updated. As of now we suggest to use the Windows Powershell 5.x Module to be used for Azure AD powershell operations.
51+
52+
4953
## Connect to the directory
5054

5155
Before you can start managing groups using Azure AD PowerShell cmdlets, you must connect your PowerShell session to the directory you want to manage. Use the following command:

articles/azure-monitor/platform/data-sources-performance-counters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Following is the default configuration for performance metrics.
171171
</source>
172172

173173
## Data collection
174-
Azure Monitor collects all specified performance counters at their specified sample interval on all agents that have that counter installed. The data is not aggregated, and the raw data is available in all log query views for the duration specified by your subscription.
174+
Azure Monitor collects all specified performance counters at their specified sample interval on all agents that have that counter installed. The data is not aggregated, and the raw data is available in all log query views for the duration specified by your log analytics workspace.
175175

176176
## Performance record properties
177177
Performance records have a type of **Perf** and have the properties in the following table.
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
title: Concepts - Identity and access
3+
description: Learn about the identity and access concepts of Azure VMware Solution (AVS)
4+
ms.topic: conceptual
5+
ms.date: 05/04/2020
6+
---
7+
8+
# Azure VMware Solution (AVS) identity concepts
9+
10+
A vCenter server and NSX-T manager are provisioned when a private cloud is deployed. You use vCenter to manage virtual machine workloads and NSX-T manager to extend the private cloud software-defined network.
11+
12+
Access and identity management use CloudAdmin group privileges for vCenter and restricted administrator rights for NSX-T manager. This policy ensures that your private cloud platform can be upgraded automatically. This delivers the newest features and patches on a regular basis. See the [private cloud upgrades concepts article][concepts-upgrades] for more details on private cloud upgrades.
13+
14+
## vCenter access and identity
15+
16+
Privileges in vCenter are provided through the CloudAdmin group. That group can be managed locally in vCenter, or through integration of vCenter LDAP single sign-on with Azure Active Directory. You're provided with the ability to enable that integration after you deploy a private cloud.
17+
18+
The CloudAdmin and CloudGlobalAdmin privileges are shown in the table below.
19+
20+
| Privilege Set | CloudAdmin | CloudGlobalAdmin | Comment |
21+
| :--- | :---: | :---: | :--: |
22+
| Alarms | A CloudAdmin user has all Alarms privileges for alarms in the Compute-ResourcePool and VMs. | -- | -- |
23+
| Auto Deploy | -- | -- | Microsoft does host management. |
24+
| Certificates | -- | -- | Microsoft does certificate management. |
25+
| Content Library | A CloudAdmin user has privileges to create and use files in a Content Library. | Enabled with SSO. | Microsoft will distribute files in the Content Library to ESXi hosts. |
26+
| Datacenter | -- | -- | Microsoft does all data center operations. |
27+
| Datastore | Datastore.AllocateSpace, Datastore.Browse, Datastore.Config, Datastore.DeleteFile, Datastore.FileManagement, Datastore.UpdateVirtualMachineMetadata | -- | -- |
28+
| ESX Agent Manager | -- | -- | Microsoft does all operations. |
29+
| Folder | A CloudAdmin user has all Folder privileges. | -- | -- |
30+
| Global | Global.CancelTask, Global.GlobalTag, Global.Health, Global.LogEvent, Global.ManageCustomFields, Global.ServiceManagers, Global.SetCustomField, Global.SystemTag | | |
31+
| Host | Host.Hbr.HbrManagement | -- | Microsoft does all other Host operations. |
32+
| InventoryService | InventoryService.Tagging | -- | -- |
33+
| Network | Network.Assign | | Microsoft does all other Network operations. |
34+
| Permissions | -- | -- | Microsoft does all Permissions operations. |
35+
| Profile-driven Storage | -- | -- | Microsoft does all Profile operations. |
36+
| Resource | A CloudAdmin user has all Resource privileges. | -- | -- |
37+
| Scheduled Task | A CloudAdmin user has all ScheduleTask privileges. | -- | -- |
38+
| Sessions | Sessions.GlobalMessage, Sessions.ValidateSession | -- | Microsoft does all other Sessions operations. |
39+
| Storage Views | StorageViews.View | -- | Microsoft does all other Storage View operations (Configure Service). |
40+
| Tasks | -- | -- | Microsoft manages extensions that manage tasks. |
41+
| vApp | A CloudAdmin user has all vApp privileges. | -- | -- |
42+
| Virtual Machine | A CloudAdmin user has all VirtualMachine privileges. | -- | -- |
43+
| vService | A CloudAdmin user has all vService privileges. | -- | -- |
44+
45+
## NSX-T Manager access and identity
46+
47+
You access NSX-T Manager using the "administrator" account. That account has full privileges and enables you to create and manage T1 routers, logical switches, and all services. The full privileges in NSX-T also provide you with access to the NSX-T T0 router. A change to the T0 router could result in degraded network performance or a loss of access to a private cloud. To meet support requirements, it's required that you open an support request in the Azure portal to request any changes to your NSX-T T0 router.
48+
49+
## Next steps
50+
51+
The next step is to learn about [private cloud upgrade concepts][concepts-upgrades].
52+
53+
<!-- LINKS - external -->
54+
55+
<!-- LINKS - internal -->
56+
[concepts-upgrades]: ./concepts-upgrades.md
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
---
2+
title: Concepts - Network interconnectivity
3+
description: Learn about key aspects and use cases of networking and interconnectivity in Azure VMware Solution (AVS)
4+
ms.topic: conceptual
5+
ms.date: 05/04/2020
6+
---
7+
8+
# Azure VMware Solution (AVS) Preview networking and interconnectivity concepts
9+
10+
Network interconnectivity between your Azure VMware Solution (AVS) private clouds and on-premises environments or virtual networks in Azure enables you to access and use your private cloud. A few key networking and interconnectivity concepts that establish the basis of interconnectivity are described in this article.
11+
12+
A useful perspective on interconnectivity is to consider the two types of AVS private cloud implementations. The implementations with basic Azure-only interconnectivity and the implementations with full on-premises to private cloud interconnectivity.
13+
14+
The use cases for AVS private clouds include:
15+
- new VMware VM workloads in the cloud
16+
- VM workload bursting to the cloud
17+
- VM workload migration to the cloud
18+
- disaster recovery
19+
- consumption of Azure services
20+
21+
All use cases for the AVS service are enabled with on-premises to private cloud connectivity. The basic interconnectivity model is best suited for AVS evaluations or implementations that don't require access from on-premises environments.
22+
23+
The two types of AVS private cloud interconnectivity are described in the sections below. The most basic interconnectivity is "Azure virtual network connectivity", and it enables you to manage and use your private cloud with only a single virtual network in Azure. The interconnectivity described in "On-premises connectivity" extends the virtual network connectivity to also include interconnectivity between on-premises environments and AVS private clouds.
24+
25+
## Azure virtual network interconnectivity
26+
27+
The basic network interconnectivity that is established at the time of a private cloud deployment is shown in the diagram below. It shows the logical, ExpressRoute-based networking between a virtual network in Azure and a private cloud. The interconnectivity fulfills three of the primary use cases:
28+
- Inbound access to management networks where vCenter server and NSX-T manager are located.
29+
- Accessible from VMs within your Azure subscription, not from your on-premises systems.
30+
- Outbound access from VMs to Azure services.
31+
- Inbound access and consumption of workloads running a private cloud.
32+
33+
![Basic virtual network -to- private cloud connectivity](./media/concepts/adjacency-overview-drawing-single.png)
34+
35+
The ExpressRoute circuit in this virtual network to private cloud scenario is established when you create a connection from a virtual network in your subscription to the ExpressRoute circuit of your private cloud. The peering uses an authorization key and a circuit ID that you request in the Azure portal. The ExpressRoute connection that is established through the peering is a private, one-to-one connection between your private cloud and the virtual network. You can manage your private cloud, consume workloads in your private cloud, and access Azure services over that ExpressRoute connection.
36+
37+
When you deploy an AVS private cloud, a single /22 private network address space is required. This address space shouldn't overlap with address spaces used in other virtual networks in your subscription. Within this address space, management, provisioning, and vMotion networks are provisioned automatically. The routing is BGP-based and it's automatically provisioned and enabled by default for each private cloud deployment.
38+
39+
When a private cloud is deployed, you're provided with the IP addresses for vCenter and NSX-T Manager. To access those management interfaces, you'll create additional resources in a virtual network in your subscription. The procedures for creating those resources and establishing ExpressRoute private peering are provided in the tutorials.
40+
41+
You design the private cloud logical networking and implement it with NSX-T. The private cloud comes with pre-provisioned NSX-T. A Tier-0 Gateway & Tier-1 Gateway is pre-provisioned for the you. You can create a segment and attach it to the existing Tier-1 gateway or attach to a new Tier-1 gateway that you can define. NSX-T logical networking components provide East-West connectivity between workloads and also provide North-South connectivity to the internet and Azure services.
42+
43+
## On-premises interconnectivity
44+
45+
You can also connect on-premises environments to your AVS private clouds. This type of interconnectivity is an extension to the basic interconnectivity described in the previous section.
46+
47+
![virtual network and on-premises full private cloud connectivity](./media/concepts/adjacency-overview-drawing-double.png)
48+
49+
To establish full interconnectivity to a private cloud, you use the Azure portal to enable ExpressRoute Global Reach between a private cloud ExpressRoute circuit and an on-premises ExpressRoute circuit. This configuration extends the basic connectivity to include access to private clouds from on-premises environments.
50+
51+
An on-premises to Azure virtual network ExpressRoute circuit is required to connect from on-premises environments to your private cloud in Azure. This ExpressRoute circuit is in your subscription and isn't part of a private cloud deployment. The on-premises ExpressRoute circuit is beyond the scope of this document. If you require on-premises connectivity to your private cloud, you can use one of your existing ExpressRoute circuits or purchase one in the Azure portal.
52+
53+
Once linked with Global Reach, the two ExpressRoute circuits will route network traffic between your on-premises environments and your private cloud. The on-premises to private cloud interconnectivity is shown in the preceding diagram. The interconnectivity represented in the diagram enables the following use cases:
54+
55+
- Hot/Cold Cross-vCenter vMotion
56+
- On-Premise to AVS private cloud management access
57+
58+
To enable full connectivity, an Authorization Key and private peering ID for Global Reach can be requested in the Azure portal. You use the key and ID to establish Global Reach between an ExpressRoute circuit in your subscription and the ExpressRoute circuit for your new private cloud. The [tutorial for creating a private cloud](tutorial-create-private-cloud.md) provides you with the procedures for requesting and using the key and ID.
59+
60+
The routing requirements of the solution require you to plan private cloud network address spaces so that you avoid overlaps with other virtual networks and on-premises networks. AVS private clouds require a minimum of a `/22` CIDR network address block for subnets, shown below. This network complements your on-premises networks. In order to connect to on-premises environments and virtual networks, this must be a non-overlapping network address block.
61+
62+
Example `/22` CIDR network address block: `10.10.0.0/22`
63+
64+
The subnets:
65+
66+
| Network usage | Subnet | Example |
67+
| ------------------------- | ------ | -------------- |
68+
| Private cloud management | `/24` | `10.10.0.0/24` |
69+
| vMotion network | `/24` | `10.10.1.0/24` |
70+
| VM workloads | `/24` | `10.10.2.0/24` |
71+
| ExpressRoute peering | `/24` | `10.10.3.8/30` |
72+
73+
## Next steps
74+
75+
The next step is to learn about [private cloud storage concepts](concepts-storage.md).
76+
77+
<!-- LINKS - external -->
78+
[enable Global Reach]: https://docs.microsoft.com/azure/expressroute/expressroute-howto-set-global-reach
79+
80+
<!-- LINKS - internal -->
81+

0 commit comments

Comments
 (0)