Skip to content

Commit 000de1d

Browse files
authored
Merge pull request #79258 from MicrosoftDocs/master
Merge master to live 6:44 AM
2 parents f77fcb4 + 8c1175f commit 000de1d

File tree

116 files changed

+1436
-1176
lines changed

Some content is hidden

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

116 files changed

+1436
-1176
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37258,6 +37258,16 @@
3725837258
"redirect_url": "/azure/azure-monitor/platform/activity-log-collect-tenants",
3725937259
"redirect_document_id": false
3726037260
},
37261+
{
37262+
"source_path": "articles/azure-monitor/platform/oms-portal-transition.md",
37263+
"redirect_url": "/azure/azure-monitor/overview",
37264+
"redirect_document_id": false
37265+
},
37266+
{
37267+
"source_path": "articles/azure-monitor/platform/oms-portal-faq.md",
37268+
"redirect_url": "/azure/azure-monitor/overview",
37269+
"redirect_document_id": false
37270+
},
3726137271
{
3726237272
"source_path": "articles/analysis-services/analysis-services-import-pbix.md",
3726337273
"redirect_url": "/azure/analysis-services/analysis-services-overview",

articles/active-directory-b2c/tutorial-add-identity-providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ After you create the application for the identity provider that you want to add,
102102
For example, `https://login.microsoftonline.com/contoso.onmicrosoft.com/.well-known/openid-configuration`.
103103
104104
8. For **Client ID**, enter the application ID that you previously recorded and for **Client secret**, enter the key value that you previously recorded.
105-
9. Optionally, enter a value for **Domain_hint**. For example, `ContosoAD`.
105+
9. Optionally, enter a value for **Domain_hint**. For example, `ContosoAD`. Domain hints(https://docs.microsoft.com/en-us/azure/active-directory/manage-apps/configure-authentication-for-federated-users-portal) are directives that are included in the authentication request from an application. They can be used to accelerate the user to their federated IdP sign-in page. Or they can be used by a multi-tenant application to accelerate the user straight to the branded Azure AD sign-in page for their tenant.
106106
10. Click **OK**.
107107
11. Select **Map this identity provider's claims** and set the following claims:
108108
3.32 KB
Loading
4.61 KB
Loading

articles/active-directory/saas-apps/replicon-tutorial.md

Lines changed: 79 additions & 121 deletions
Large diffs are not rendered by default.

articles/advisor/advisor-overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ You can access Advisor recommendations as *Owner*, *Contributor*, or *Reader* of
5656

5757
### What resources does Advisor provide recommendations for?
5858

59-
Advisor provides recommendations for virtual machines, availability sets, application gateways, App Services, SQL servers, and Azure Cache for Redis.
59+
Advisor provides recommendations for Application Gateway, App Services, availability sets, Azure Cache, Azure Data Factory, Azure Database for MySQL, Azure Database for PostgreSQL, Azure Database for MariaDB, Azure ExpressRoute, Azure Cosmos DB, Azure public IP addresses, SQL Data Warehouse, SQL servers, storage accounts, Traffic Manager profiles, and virtual machines.
60+
61+
Azure Advisor also includes your recommendations from [Azure Security Center](https://docs.microsoft.com/azure/security-center/security-center-recommendations) which may include recommendations for additional resource types.
6062

6163
### Can I postpone or dismiss a recommendation?
6264

articles/aks/azure-ad-integration.md

Lines changed: 104 additions & 81 deletions
Large diffs are not rendered by default.

articles/api-management/api-management-using-with-internal-vnet.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ With Azure Virtual Networks, Azure API Management can manage APIs not accessible
2323
* External
2424
* Internal
2525

26-
When API Management deploys in internal virtual network mode, all the service endpoints (gateway, the Developer portal, the Azure portal, direct management, and Git) are only visible inside a virtual network that you control the access to. None of the service endpoints are registered on the public DNS server.
26+
When API Management deploys in internal virtual network mode, all the service endpoints (the proxy gateway, the Developer portal, direct management, and Git) are only visible within a virtual network that you control the access to. None of the service endpoints are registered on the public DNS server.
27+
28+
> [!NOTE]
29+
> Because there are no DNS entries for the service endpoints, these endpoints will not be accessible until [DNS is configured](#apim-dns-configuration) for the virtual network.
2730
2831
Using API Management in internal mode, you can achieve the following scenarios:
2932

@@ -113,10 +116,12 @@ If you use a custom DNS server in a virtual network, you can also create A DNS r
113116
2. Then you can create records in your DNS server to access the endpoints that are only accessible from within your virtual network.
114117

115118
## <a name="routing"> </a> Routing
116-
+ A load balanced private virtual IP address from the subnet range will be reserved and used to access the API Management service endpoints from within the vnet.
117-
+ A load balanced public IP address (VIP) will also be reserved to provide access to the management service endpoint only over port 3443.
118-
+ An IP address from a subnet IP range (DIP) will be used to access resources within the vnet and a public IP address (VIP) will be used to access resources outside the vnet.
119-
+ Load balanced public and private IP addresses can be found on the Overview/Essentials blade in the Azure portal.
119+
120+
* A load balanced *private* virtual IP address from the subnet range will be reserved and used to access the API Management service endpoints from within the virtual network. This *private* IP address can be found on the Overview blade for the service in the Azure portal. This address must be registered with the DNS servers used by the virtual network.
121+
* A load balanced *public* IP address (VIP) will also be reserved to provide access to the management service endpoint over port 3443. This *public* IP address can be found on the Overview blade for the service in the Azure portal. The *public* IP address is used only for control plane traffic to the `management` endpoint over port 3443 and can be locked down to the [ApiManagement][ServiceTags] servicetag.
122+
* IP addresses from the subnet IP range (DIP) will be assigned to each VM in the service and will used to access resources within the virtual network. A public IP address (VIP) will be used to access resources outside the virtual network. If IP restriction lists are used to secure resources within the virtual network, the entire range for the subnet where the API Management service is deployed must specified to grant or restrict access from the service.
123+
* The load balanced public and private IP addresses can be found on the Overview blade in the Azure portal.
124+
* The IP addresses assigned for public and private access may change if the service is removed from and then added back into the virtual network. If this happens, it may be necessary to update DNS registrations, routing rules, and IP restriction lists within the virtual network.
120125

121126
## <a name="related-content"> </a>Related content
122127
To learn more, see the following articles:

articles/app-service-mobile/app-service-mobile-xamarin-forms-get-started.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,7 @@ To complete this tutorial, you need the following:
4343

4444
The Visual Studio Tools for Xamarin are required to open the solution, see the [Xamarin installation instructions][Install Xamarin]. If the tools are already installed, follow these steps to download and open the solution:
4545

46-
### Visual Studio
47-
48-
1. Go to the [Azure portal](https://portal.azure.com/).
49-
50-
2. On the settings blade for your Mobile App, click **Quickstart** (under Deployment) > **Xamarin.Forms**. Under step 3, click **Create a new app** if it's not already selected. Next click the **Download** button.
51-
52-
This action downloads a project that contains a client application that's connected to your mobile app. Save the compressed project file to your local computer, and make a note of where you save it.
53-
54-
3. Extract the project that you downloaded, and then open it in Visual Studio.
55-
56-
4. Follow the instructions below to run the Android or Windows projects; and if there is a networked Mac computer available, the iOS project.
57-
58-
### Visual Studio for Mac
46+
### Visual Studio (Windows and Mac)
5947

6048
1. Go to the [Azure portal](https://portal.azure.com/) and navigate to the mobile app that you created. On the `Overview` blade, look for the URL which is the public endpoint for your mobile app. Example - the sitename for my app name "test123" will be https://test123.azurewebsites.net.
6149

@@ -170,4 +158,4 @@ Please note that all the support packages referenced in your Android project mus
170158
[12]: ./media/app-service-mobile-xamarin-forms-get-started/mobile-quickstart-startup-windows.png
171159

172160
<!-- URLs. -->
173-
[Install Xamarin]: https://docs.microsoft.com/xamarin/cross-platform/get-started/installation/
161+
[Install Xamarin]: https://docs.microsoft.com/xamarin/cross-platform/get-started/installation/

articles/application-gateway/migrate-v1-v2.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: vhorne
66
ms.service: application-gateway
77
ms.topic: article
8-
ms.date: 6/5/2019
8+
ms.date: 6/12/2019
99
ms.author: victorh
1010
---
1111

@@ -91,7 +91,7 @@ To run the script:
9191
$appgw.Id
9292
```
9393
94-
* **subnetAddressRange: [String]: Required** - This is the IP address space that you have allocated (or want to allocate) for a new subnet that contains your new v2 gateway. This must be specified in the CIDR notation. For example: 10.0.0.0/24. You do not need to create this subnet in advance. The script creates it for you if it doesn't exist.
94+
* **subnetAddressRange: [String]: Required** - This is the IP address space that you've allocated (or want to allocate) for a new subnet that contains your new v2 gateway. This must be specified in the CIDR notation. For example: 10.0.0.0/24. You don't need to create this subnet in advance. The script creates it for you if it doesn't exist.
9595
* **appgwName: [String]: Optional**. This is a string you specify to use as the name for the new Standard_v2 or WAF_v2 gateway. If this parameter isn't supplied, the name of your existing v1 gateway will be used with the suffix *_v2* appended.
9696
* **sslCertificates: [PSApplicationGatewaySslCertificate]: Optional**. A comma-separated list of PSApplicationGatewaySslCertificate objects that you create to represent the SSL certs from your v1 gateway must be uploaded to the new v2 gateway. For each of your SSL certs configured for your Standard v1 or WAF v1 gateway, you can create a new PSApplicationGatewaySslCertificate object via the `New-AzApplicationGatewaySslCertificate` command shown here. You need the path to your SSL Cert file and the password.
9797
@@ -112,11 +112,11 @@ To run the script:
112112
113113
To create a list of PSApplicationGatewayTrustedRootCertificate objects, see [New-AzApplicationGatewayTrustedRootCertificate](https://docs.microsoft.com/powershell/module/Az.Network/New-AzApplicationGatewayTrustedRootCertificate?view=azps-2.1.0&viewFallbackFrom=azps-2.0.0).
114114
* **privateIpAddress: [String]: Optional**. A specific private IP address that you want to associate to your new v2 gateway. This must be from the same VNet that you allocate for your new v2 gateway. If this isn't specified, the script allocates a private IP address for your v2 gateway.
115-
* **publicIpResourceId: [String]: Optional**. The resourceId of a public IP address resource in your subscription that you want to allocate to the new v2 gateway. If this is not specified, the script allocates a new public IP in the same resource group. The name is the v2 gateway’s name with *-IP* appended.
115+
* **publicIpResourceId: [String]: Optional**. The resourceId of a public IP address (standard SKU) resource in your subscription that you want to allocate to the new v2 gateway. If this isn't specified, the script allocates a new public IP in the same resource group. The name is the v2 gateway’s name with *-IP* appended.
116116
* **validateMigration: [switch]: Optional**. Use this parameter if you want the script to do some basic configuration comparison validations after the v2 gateway creation and the configuration copy. By default, no validation is done.
117-
* **enableAutoScale: [switch]: Optional**. Use this parameter if you want the script to enable AutoScaling on the new v2 gateway after it is created. By default, AutoScaling is disabled. You can always manually enable it later on the newly created v2 gateway.
117+
* **enableAutoScale: [switch]: Optional**. Use this parameter if you want the script to enable AutoScaling on the new v2 gateway after it's created. By default, AutoScaling is disabled. You can always manually enable it later on the newly created v2 gateway.
118118
119-
1. Run the script using the appropriate parameters.
119+
1. Run the script using the appropriate parameters. It may take five to seven minutes to finish.
120120
121121
**Example**
122122
@@ -171,7 +171,11 @@ No. The Azure PowerShell script only migrates the configuration. Actual traffic
171171

172172
### Is the new v2 gateway created by the Azure PowerShell script sized appropriately to handle all of the traffic that is currently served by my v1 gateway?
173173

174-
The Azure PowerShell script creates a new v2 gateway with an appropriate size to handle the traffic on your existing V1 gateway. Autoscaling is disabled by default, but you can enable AutoScaling when you run the script.
174+
The Azure PowerShell script creates a new v2 gateway with an appropriate size to handle the traffic on your existing v1 gateway. Autoscaling is disabled by default, but you can enable AutoScaling when you run the script.
175+
176+
### I configured my v1 gateway to send logs to Azure storage. Does the script replicate this configuration for v2 as well?
177+
178+
No. The script doesn't replicate this configuration for v2. You must add the log configuration separately to the migrated v2 gateway.
175179

176180
### I ran into some issues with using this script. How can I get help?
177181

0 commit comments

Comments
 (0)