Skip to content

Commit b57d979

Browse files
authored
Merge pull request #79211 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents c88f8aa + 4fd89f6 commit b57d979

9 files changed

+23
-18
lines changed

articles/application-gateway/application-gateway-autoscaling-zone-redundant.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ For more pricing information, see the [pricing page](https://azure.microsoft.com
6666
An Application Gateway Standard_v2 is provisioned without autoscaling in manual scaling mode with fixed capacity of five instances.
6767

6868
Fixed price = 744(hours) * $0.20 = $148.8 <br>
69-
Capacity units = 744 (hours) 10 capacity unit per instance * five instances * $0.008 per capacity unit hour = $297.6
69+
Capacity units = 744 (hours) * 10 capacity unit per instance * 5 instances * $0.008 per capacity unit hour = $297.6
7070

7171
Total price = $148.8 + $297.6 = $446.4
7272

@@ -147,4 +147,4 @@ An Azure PowerShell script is available in the PowerShell gallery to help you mi
147147
- [Quickstart: Direct web traffic with Azure Application Gateway - Azure portal](quick-create-portal.md)
148148
- [Create an autoscaling, zone redundant application gateway with a reserved virtual IP address using Azure PowerShell](tutorial-autoscale-ps.md)
149149
- Learn more about [Application Gateway](overview.md).
150-
- Learn more about [Azure Firewall](../firewall/overview.md).
150+
- Learn more about [Azure Firewall](../firewall/overview.md).

articles/application-gateway/configuration-overview.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ For this scenario, use NSGs on the Application Gateway subnet. Put the following
6767

6868
For the v1 SKU, user-defined routes (UDRs) are supported on the Application Gateway subnet, as long as they don't alter end-to-end request/response communication. For example, you can set up a UDR in the Application Gateway subnet to point to a firewall appliance for packet inspection. But you must make sure that the packet can reach its intended destination after inspection. Failure to do so might result in incorrect health-probe or traffic-routing behavior. This includes learned routes or default 0.0.0.0/0 routes that are propagated by Azure ExpressRoute or VPN gateways in the virtual network.
6969

70-
For the v2 SKU, UDRs aren't supported on the Application Gateway subnet. For more information, see [Azure Application Gateway v2 SKU](application-gateway-autoscaling-zone-redundant.md#differences-with-v1-sku).
70+
For the v2 SKU, UDRs are not supported on the Application Gateway subnet. For more information, see [Azure Application Gateway v2 SKU](application-gateway-autoscaling-zone-redundant.md#differences-with-v1-sku).
71+
72+
> [!NOTE]
73+
> UDRs are not supported for the v2 SKU. If you require UDRs you should continue to deploy v1 SKU.
7174
7275
> [!NOTE]
7376
> Using UDRs on the Application Gateway subnet causes the health status in the [back-end health view](https://docs.microsoft.com/azure/application-gateway/application-gateway-diagnostics#back-end-health) to appear as "Unknown." It also causes generation of Application Gateway logs and metrics to fail. We recommend that you don't use UDRs on the Application Gateway subnet so that you can view the back-end health, logs, and metrics.

articles/cosmos-db/tutorial-setup-ci-cd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Now that the extension is installed, sign in to your Azure DevOps account and fi
4444
3. Finally, select the desired template for the build pipeline. We'll select the **ASP.NET** template in this tutorial.
4545

4646
> [!NOTE]
47-
> The agent pool to be selected for this CI should have Docker for Windows installed unless the installation is done manually in a prior task as a part of the CI. See [Microsoft hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml) article for a selection of agent pools; we recommend to start with `Hosted VS2017` or `Hosted VS2019`.
47+
> The agent pool to be selected for this CI should have Docker for Windows installed unless the installation is done manually in a prior task as a part of the CI. See [Microsoft hosted agents](https://docs.microsoft.com/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml) article for a selection of agent pools; we recommend to start with `Hosted VS2017` or `Hosted VS2019`.
4848
4949
Now we have a build pipeline that we can set up to use the Azure Cosmos DB emulator build task.
5050

articles/event-grid/overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ For full details on the capabilities of each handler as well as related articles
5252
* [Logic Apps](event-handlers.md#logic-apps)
5353
* [Microsoft Flow](https://preview.flow.microsoft.com/connectors/shared_azureeventgrid/azure-event-grid/)
5454
* [Queue Storage](event-handlers.md#queue-storage)
55+
* [Service Bus](event-handlers.md#service-bus-queue-preview) (Preview)
5556
* [WebHooks](event-handlers.md#webhooks)
5657

5758
## Concepts

articles/service-fabric/service-fabric-how-to-publish-linux-app-vs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.date: 5/20/2019
1717
ms.author: pepogors
1818

1919
---
20-
# Use Visual Studio to create and and publish .Net Core applications targeting a remote Linux Service Fabric cluster
20+
# Use Visual Studio to create and publish .Net Core applications targeting a remote Linux Service Fabric cluster
2121
With Visual Studio tooling you can develop and publish Service Fabric .Net Core applications targeting a Linux Service Fabric cluster. The SDK version must be 3.4 or above to deploy a .Net Core application targeting Linux Service Fabric clusters from Visual Studio.
2222

2323
> [!Note]

articles/service-fabric/service-fabric-understand-and-troubleshoot-with-system-health-reports.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ For cluster running Service Fabric version 6.5 or higher:
8181
For Service Fabric cluster on Azure, after the seed node goes down, Service Fabric will try to change it to a non-seed node automatically. To make this happen, make sure the number of non-seed nodes in the primary node type is greater or equal to the number of Down seed nodes. If necessary, add more nodes to the primary node type to achieve this.
8282
Depending on the cluster status, it may take some time to fix the issue. Once this is done, the warning report is automatically cleared.
8383

84-
For Service Fabric standalone cluster, to clear the warning report, all the seed nodes need to become healthy. Depending on why seed nodes are unhealthy, different actions need to be taken: if the seed node is Down, users need to bring that seed node up; if the seed node is Removed or Unknown, this seed node [needs to be removed from the cluster](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-windows-server-add-remove-nodes).
84+
For Service Fabric standalone cluster, to clear the warning report, all the seed nodes need to become healthy. Depending on why seed nodes are unhealthy, different actions need to be taken: if the seed node is Down, users need to bring that seed node up; if the seed node is Removed or Unknown, this seed node [needs to be removed from the cluster](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-windows-server-add-remove-nodes).
8585
The warning report is automatically cleared when all seed nodes become healthy.
8686

8787
For cluster running Service Fabric version older than 6.5:
8888
In this case, the warning report needs to be cleared manually. **Users should make sure all the seed nodes become healthy before clearing the report**: if the seed node is Down, users need to bring that seed node up;if the seed node is Removed or Unknown, that seed node needs to be removed from the cluster.
89-
After all the seed nodes become healthy, use following command from Powershell to [clear the warning report](https://docs.microsoft.com/en-us/powershell/module/servicefabric/send-servicefabricclusterhealthreport):
89+
After all the seed nodes become healthy, use following command from Powershell to [clear the warning report](https://docs.microsoft.com/powershell/module/servicefabric/send-servicefabricclusterhealthreport):
9090

9191
```powershell
9292
PS C:\> Send-ServiceFabricClusterHealthReport -SourceId "System.FM" -HealthProperty "SeedNodeStatus" -HealthState OK

articles/virtual-machines/extensions/oms-windows.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,18 @@ The Log Analytics agent extension for Windows supports following versions of the
3434
- Windows Server 2008 R2, 2012, 2012 R2, 2016, version 1709 and 1803
3535

3636
### Agent and VM Extension version
37-
The following table provides a mapping of the version of the Azure Monitor VM extension and Log Analytics agent bundle for each release.
37+
The following table provides a mapping of the version of the Windows Azure Monitor VM extension and Log Analytics agent bundle for each release.
3838

39-
| Azure Monitor Linux VM extension version | Log Analytics Agent bundle version | Release Date | Release Notes |
39+
| Log Analytics Windows agent bundle version | Azure Monitor Windows VM extension version | Release Date | Release Notes |
4040
|--------------------------------|--------------------------|--------------------------|--------------------------|
41-
| 8.0.11049.0 | 1.0.11049.1 | Feb 2017 | |
42-
| 8.0.11072.0 | 1.0.11072.1 | Sept 2017 | |
43-
| 8.0.11081.0 | 1.0.11081.5 | Nov 2017 | |
44-
| 8.0.11103.0 | n/a | April 2018 | |
45-
| 8.0.11136.0 | n/a | Sept 2018 | <ul><li> Added support for detecting resource ID change on VM move </li><li> Added Support for reporting resource ID when using non-extension install </li></ul>|
46-
| 10.19.10006.0 | n/a | Dec 2018 | <ul><li> Minor stabilization fixes </li></ul> |
47-
| 10.19.13515.0 | 1.0.13515.1 | March 2019 | <ul><li>Minor stabilization fixes </li></ul> |
41+
| 10.20.18001 | 1.0.18001 | June 2019 | <ul><li> Minor bug fixes and stabilization improvements </li><li> Added ability to disable default credentials when making proxy connection (support for WINHTTP_AUTOLOGON_SECURITY_LEVEL_HIGH) </li></ul>|
42+
| 10.19.13515 | 1.0.13515 | March 2019 | <ul><li>Minor stabilization fixes </li></ul> |
43+
| 10.19.10006 | n/a | Dec 2018 | <ul><li> Minor stabilization fixes </li></ul> |
44+
| 8.0.11136 | n/a | Sept 2018 | <ul><li> Added support for detecting resource ID change on VM move </li><li> Added Support for reporting resource ID when using non-extension install </li></ul>|
45+
| 8.0.11103 | n/a | April 2018 | |
46+
| 8.0.11081 | 1.0.11081 | Nov 2017 | |
47+
| 8.0.11072 | 1.0.11072 | Sept 2017 | |
48+
| 8.0.11049 | 1.0.11049 | Feb 2017 | |
4849

4950
### Azure Security Center
5051

articles/virtual-machines/linux/using-cloud-init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ The following example creates a VM named *centos74* and creates SSH keys if they
7575
az vm create \
7676
--resource-group myResourceGroup \
7777
--name centos74 \
78-
--image OpenLogic:CentOS:7-CI:latest \
78+
--image OpenLogic:CentOS-CI:7-CI:latest \
7979
--custom-data cloud-init.txt \
8080
--generate-ssh-keys
8181
```

articles/vpn-gateway/vpn-gateway-about-skus-legacy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This article contains information about the legacy (old) virtual network gateway
2626

2727
[!INCLUDE [Legacy gateway SKUs](../../includes/vpn-gateway-gwsku-legacy-include.md)]
2828

29-
You can view legacy gateway pricing in the **Virtual Network Gateways** section, which is located in on the [ExpressRoute pricing page](https://azure.microsoft.com/en-us/pricing/details/expressroute).
29+
You can view legacy gateway pricing in the **Virtual Network Gateways** section, which is located in on the [ExpressRoute pricing page](https://azure.microsoft.com/pricing/details/expressroute).
3030

3131
## <a name="agg"></a>Estimated aggregate throughput by SKU
3232

0 commit comments

Comments
 (0)