Skip to content

Commit a170b69

Browse files
authored
Merge pull request #95983 from MicrosoftDocs/master
11/14 AM Publish
2 parents a22cb7e + fcced08 commit a170b69

File tree

172 files changed

+1868
-575
lines changed

Some content is hidden

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

172 files changed

+1868
-575
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4776,6 +4776,16 @@
47764776
"redirect_url": "/azure/app-service-mobile",
47774777
"redirect_document_id": false
47784778
},
4779+
{
4780+
"source_path": "articles/application-gateway/tutorial-external-site-redirect-powershell.md",
4781+
"redirect_url": "/azure/application-gateway/redirect-external-site-powershell",
4782+
"redirect_document_id": false
4783+
},
4784+
{
4785+
"source_path": "articles/application-gateway/application-gateway-multi-site-overview.md",
4786+
"redirect_url": "/azure/application-gateway/multiple-site-overview",
4787+
"redirect_document_id": false
4788+
},
47794789
{
47804790
"source_path": "articles/application-gateway/application-gateway-crs-rulegroups-rules.md",
47814791
"redirect_url": "/azure/web-application-firewall/ag/application-gateway-crs-rulegroups-rules",

articles/active-directory/manage-apps/what-is-single-sign-on.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-mgmt
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 07/17/2019
11+
ms.date: 11/14/2019
1212
ms.author: mimart
1313
ms.reviewer: arvindh, japere
1414

@@ -93,6 +93,8 @@ Password-based single sign-on is supported for any cloud-based application that
9393
> Internet Explorer is on limited support and no longer receives new software updates. Microsoft Edge is the recommended browser.
9494
9595
- Microsoft Edge on Windows 10 Anniversary Edition or later
96+
- Microsoft Edge for iOS and Android
97+
- Intune Managed Browser
9698
- Chrome on Windows 7 or later, and on MacOS X or later
9799
- Firefox 26.0 or later on Windows XP SP2 or later, and on Mac OS X 10.6 or later
98100

articles/aks/ssh.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ SCALE_SET_NAME=$(az vmss list --resource-group $CLUSTER_RESOURCE_GROUP --query [
4141

4242
The above example assigns the name of the cluster resource group for the *myAKSCluster* in *myResourceGroup* to *CLUSTER_RESOURCE_GROUP*. The example then uses *CLUSTER_RESOURCE_GROUP* to list the scale set name and assign it to *SCALE_SET_NAME*.
4343

44-
> [!NOTE]
45-
> SSH keys can currently only be added to Linux nodes using the Azure CLI. If you want to connect to a Windows Server node using SSH, use the SSH keys provided when you created the AKS cluster and skip the next set of commands for adding your SSH public key. You will still need the IP address of the node you wish to troubleshoot, which is shown in the final command of this section. Alternatively, you can [connect to Windows Server nodes using remote desktop protocol (RDP) connections][aks-windows-rdp] instead of using SSH.
44+
> [!IMPORTANT]
45+
> At this time, you should only update your SSH keys for your virtual machine scale set-based AKS clusters using the Azure CLI.
46+
>
47+
> For Linux nodes, SSH keys can currently only be added using the Azure CLI. If you want to connect to a Windows Server node using SSH, use the SSH keys provided when you created the AKS cluster and skip the next set of commands for adding your SSH public key. You will still need the IP address of the node you wish to troubleshoot, which is shown in the final command of this section. Alternatively, you can [connect to Windows Server nodes using remote desktop protocol (RDP) connections][aks-windows-rdp] instead of using SSH.
4648
4749
To add your SSH keys to the nodes in a virtual machine scale set, use the [az vmss extension set][az-vmss-extension-set] and [az vmss update-instances][az-vmss-update-instances] commands.
4850

articles/app-service/environment/management-addresses.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: app-service
1111
ms.workload: na
1212
ms.tgt_pltfrm: na
1313
ms.topic: article
14-
ms.date: 07/25/2019
14+
ms.date: 11/13/2019
1515
ms.author: ccompy
1616
ms.custom: seodec18
1717
---
@@ -27,7 +27,7 @@ The addresses noted below can be configured in a route table to avoid asymmetric
2727

2828
| Region | Addresses |
2929
|--------|-----------|
30-
| All public regions | 13.64.115.203, 13.66.140.0, 13.67.8.128, 13.69.64.128, 13.69.227.128, 13.70.73.128, 13.71.170.64, 13.71.194.129, 13.75.127.117, 13.77.50.128, 13.89.171.0, 13.94.141.115, 13.94.143.126, 13.94.149.179, 20.36.106.128, 20.36.114.64, 23.100.226.236, 23.102.135.246, 23.102.188.65, 40.69.106.128, 40.70.146.128, 40.71.13.64, 40.74.100.64, 40.78.194.128, 40.79.130.64, 40.83.120.64, 40.83.121.56, 40.83.125.161, 40.90.240.166, 40.91.126.196, 40.112.242.192, 40.119.4.111, 40.124.47.188, 51.140.146.64, 51.140.210.128, 52.151.25.45, 52.162.80.89, 52.162.106.192, 52.165.152.214, 52.165.153.122, 52.165.154.193, 52.165.158.140, 52.174.22.21, 52.178.177.147, 52.178.184.149, 52.178.190.65, 52.178.195.197, 52.187.56.50, 52.187.59.251, 52.187.63.19, 52.187.63.37, 52.224.105.172, 52.225.177.153, 52.231.18.64, 52.231.146.128, 65.52.14.230, 65.52.172.237, 65.52.193.203, 70.37.57.58, 70.37.89.222, 104.43.242.137, 104.44.129.141, 104.44.129.243, 104.44.129.255, 104.44.134.255, 104.208.54.11, 104.211.81.64, 104.211.146.128, 104.214.49.0, 157.55.176.93, 157.55.208.185, 191.233.203.64, 191.236.154.88 |
30+
| All public regions | 13.64.115.203, 13.66.140.0, 13.67.8.128, 13.69.64.128, 13.69.227.128, 13.70.73.128, 13.71.170.64, 13.71.194.129, 13.75.34.192, 13.75.127.117, 13.77.50.128, 13.78.109.0, 13.89.171.0, 13.94.141.115, 13.94.143.126, 13.94.149.179, 20.36.106.128, 20.36.114.64, 23.100.226.236, 23.102.135.246, 23.102.188.65, 40.69.106.128, 40.70.146.128, 40.71.13.64, 40.74.100.64, 40.78.194.128, 40.79.130.64, 40.79.178.128, 40.83.120.64, 40.83.121.56, 40.83.125.161, 40.90.240.166, 40.91.126.196, 40.112.242.192, 40.119.4.111, 40.124.47.188, 51.140.146.64, 51.140.210.128, 52.151.25.45, 52.162.80.89, 52.162.106.192, 52.165.152.214, 52.165.153.122, 52.165.154.193, 52.165.158.140, 52.174.22.21, 52.178.177.147, 52.178.184.149, 52.178.190.65, 52.178.195.197, 52.187.56.50, 52.187.59.251, 52.187.63.19, 52.187.63.37, 52.224.105.172, 52.225.177.153, 52.231.18.64, 52.231.146.128, 65.52.14.230, 65.52.172.237, 65.52.193.203, 70.37.57.58, 70.37.89.222, 104.43.242.137, 104.44.129.141, 104.44.129.243, 104.44.129.255, 104.44.134.255, 104.208.54.11, 104.211.81.64, 104.211.146.128, 104.214.49.0, 157.55.176.93, 157.55.208.185, 191.233.203.64, 191.236.154.88 |
3131
| Microsoft Azure Government | 23.97.29.209, 13.72.53.37, 13.72.180.105, 23.97.0.17, 23.97.16.184 |
3232

3333
## Configuring a Network Security Group
@@ -43,7 +43,7 @@ The management addresses can be placed in a route table with a next hop of inter
4343
$rg = "resource group name"
4444
$rt = "route table name"
4545
$location = "azure location"
46-
$managementAddresses = "13.64.115.203", "13.66.140.0", "13.67.8.128", "13.69.64.128", "13.69.227.128", "13.70.73.128", "13.71.170.64", "13.71.194.129", "13.75.127.117", "13.77.50.128", "13.89.171.0", "13.94.141.115", "13.94.143.126", "13.94.149.179", "20.36.106.128", "20.36.114.64", "23.100.226.236", "23.102.135.246", "23.102.188.65", "40.69.106.128", "40.70.146.128", "40.71.13.64", "40.74.100.64", "40.78.194.128", "40.79.130.64", "40.83.120.64", "40.83.121.56", "40.83.125.161", "40.90.240.166", "40.91.126.196", "40.112.242.192", "40.119.4.111", "40.124.47.188", "51.140.146.64", "51.140.210.128", "52.151.25.45", "52.162.80.89", "52.162.106.192", "52.165.152.214", "52.165.153.122", "52.165.154.193", "52.165.158.140", "52.174.22.21", "52.178.177.147", "52.178.184.149", "52.178.190.65", "52.178.195.197", "52.187.56.50", "52.187.59.251", "52.187.63.19", "52.187.63.37", "52.224.105.172", "52.225.177.153", "52.231.18.64", "52.231.146.128", "65.52.14.230", "65.52.172.237", "65.52.193.203", "70.37.57.58", "70.37.89.222", "104.43.242.137", "104.44.129.141", "104.44.129.243", "104.44.129.255", "104.44.134.255", "104.208.54.11", "104.211.81.64", "104.211.146.128", "104.214.49.0", "157.55.176.93", "157.55.208.185", "191.233.203.64", "191.236.154.88"
46+
$managementAddresses = "13.64.115.203", "13.66.140.0", "13.67.8.128", "13.69.64.128", "13.69.227.128", "13.70.73.128", "13.71.170.64", "13.71.194.129", "13.75.34.192", "13.75.127.117", "13.77.50.128", "13.78.109.0", "13.89.171.0", "13.94.141.115", "13.94.143.126", "13.94.149.179", "20.36.106.128", "20.36.114.64", "23.100.226.236", "23.102.135.246", "23.102.188.65", "40.69.106.128", "40.70.146.128", "40.71.13.64", "40.74.100.64", "40.78.194.128", "40.79.130.64", "40.79.178.128", "40.83.120.64", "40.83.121.56", "40.83.125.161", "40.90.240.166", "40.91.126.196", "40.112.242.192", "40.119.4.111", "40.124.47.188", "51.140.146.64", "51.140.210.128", "52.151.25.45", "52.162.80.89", "52.162.106.192", "52.165.152.214", "52.165.153.122", "52.165.154.193", "52.165.158.140", "52.174.22.21", "52.178.177.147", "52.178.184.149", "52.178.190.65", "52.178.195.197", "52.187.56.50", "52.187.59.251", "52.187.63.19", "52.187.63.37", "52.224.105.172", "52.225.177.153", "52.231.18.64", "52.231.146.128", "65.52.14.230", "65.52.172.237", "65.52.193.203", "70.37.57.58", "70.37.89.222", "104.43.242.137", "104.44.129.141", "104.44.129.243", "104.44.129.255", "104.44.134.255", "104.208.54.11", "104.211.81.64", "104.211.146.128", "104.214.49.0", "157.55.176.93", "157.55.208.185", "191.233.203.64", "191.236.154.88"
4747

4848
az network route-table create --name $rt --resource-group $rg --location $location
4949
foreach ($ip in $managementAddresses) {

articles/app-service/manage-scale-up.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This article shows you how to scale your app in Azure App Service. There are two
2424
like dedicated virtual machines (VMs), custom domains and certificates, staging slots, autoscaling, and more. You scale up by changing the pricing tier of the
2525
App Service plan that your app belongs to.
2626
* [Scale out](https://en.wikipedia.org/wiki/Scalability#Horizontal_and_vertical_scaling): Increase the number of VM instances that run your app.
27-
You can scale out to as many as 20 instances, depending on your pricing tier. [App Service Environments](environment/intro.md)
27+
You can scale out to as many as 30 instances, depending on your pricing tier. [App Service Environments](environment/intro.md)
2828
in **Isolated** tier further increases your scale-out count to 100 instances. For more information about scaling out, see
2929
[Scale instance count manually or automatically](../monitoring-and-diagnostics/insights-how-to-scale.md). There, you find out how
3030
to use autoscaling, which is to scale instance count automatically based on predefined rules and schedules.

articles/application-gateway/application-gateway-multi-site-overview.md

Lines changed: 0 additions & 119 deletions
This file was deleted.

articles/application-gateway/create-web-app.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
---
2-
title: Protect web apps with Azure Application Gateway - PowerShell
2+
title: Configure App Service using PowerShell
3+
titleSuffix: Azure Application Gateway
34
description: This article provides guidance on how to configure web apps as back end hosts on an existing or new application gateway.
45
services: application-gateway
56
author: vhorne
67
ms.service: application-gateway
78
ms.topic: article
8-
ms.date: 10/16/2018
9+
ms.date: 11/15/2019
910
ms.author: victorh
1011
---
1112

12-
# Configure App Service with Application Gateway
13+
# Configure App Service with Application Gateway using PowerShell
1314

1415
Application gateway allows you to have an App Service app or other multi-tenant service as a back-end pool member. In this article, you learn to configure an App Service app with Application Gateway. The first example shows you how to configure an existing application gateway to use a web app as a back-end pool member. The second example shows you how to create a new application gateway with a web app as a back-end pool member.
1516

0 commit comments

Comments
 (0)