Skip to content

Commit 13489af

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into vnettitleseofeb2020
2 parents 38c42af + 9144302 commit 13489af

23 files changed

+166
-70
lines changed

articles/active-directory/index.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,21 @@ conceptualContent:
5555
url: ./manage-apps/index.yml
5656
text: See more
5757

58+
- title: Application and HR provisioning
59+
links:
60+
- url: ./app-provisioning/user-provisioning.md
61+
itemType: overview
62+
text: What is application provisioning?
63+
- url: ./app-provisioning/how-provisioning-works.md
64+
itemType: concept
65+
text: How application provisioning works
66+
- url: ./app-provisioning/plan-cloud-hr-provision.md
67+
itemType: how-to-guide
68+
text: Plan a cloud HR provisioning deployment
69+
footerLink:
70+
url: ./app-provisioning/index.yml
71+
text: See more
72+
5873
- title: Authentication
5974
links:
6075
- url: ./authentication/concept-mfa-howitworks.md

articles/azure-functions/set-runtime-version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ A function app runs on a specific version of the Azure Functions runtime. There
1414

1515
Azure Functions lets you target a specific version of the runtime by using the `FUNCTIONS_EXTENSION_VERSION` application setting in a function app. The function app is kept on the specified major version until you explicitly choose to move to a new version.
1616

17-
If you specify only the major version, the function app is automatically updated to new minor versions of the runtime when they become available. New minor versions do not introduce breaking changes. If you specify a minor version (for example, "2.0.12345"), the function app is pinned to that specific version until you explicitly change it.
17+
If you specify only the major version, the function app is automatically updated to new minor versions of the runtime when they become available. New minor versions shouldn't introduce breaking changes. If you specify a minor version (for example, "2.0.12345"), the function app is pinned to that specific version until you explicitly change it.
1818

1919
> [!NOTE]
2020
> If you pin to a specific version of Azure Functions, and then try to publish to Azure using Visual Studio, a dialog window will pop up prompting you to update to the latest version or cancel the publish. To avoid this, add the `<DisableFunctionExtensionVersionUpdate>true</DisableFunctionExtensionVersionUpdate>` property in your `.csproj` file.
19.4 KB
Loading

articles/cosmos-db/performance-tips-async-java.md

Lines changed: 110 additions & 28 deletions
Large diffs are not rendered by default.

articles/cosmos-db/plan-manage-costs.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Plan and manage costs for Azure Cosmos DB
33
description: Learn how to plan for and manage costs for Azure Cosmos DB by using cost analysis in Azure portal.
44
author: SnehaGunda
55
ms.author: sngun
6+
ms.custom: subject-cost-optimization
67
ms.service: cosmos-db
78
ms.topic: conceptual
89
ms.date: 02/02/2020

articles/hdinsight/hdinsight-autoscale-clusters.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ author: hrasheed-msft
55
ms.author: hrasheed
66
ms.reviewer: jasonh
77
ms.service: hdinsight
8-
ms.custom: hdinsightactive
98
ms.topic: conceptual
10-
ms.date: 10/22/2019
9+
ms.custom: hdinsightactive
10+
ms.date: 02/11/2020
1111
---
1212

1313
# Automatically scale Azure HDInsight clusters
1414

1515
> [!Important]
16-
> The Autoscale feature only works for Spark, Hive, LLAP and HBase clusters created after May 8th 2019.
16+
> The Autoscale feature only works for Apache Spark, ApacheHive, LLAP and Apache HBase clusters created after May 8th 2019.
1717
18-
Azure HDInsights cluster Autoscale feature automatically scales the number of worker nodes in a cluster up and down. Other types of nodes in the cluster can't be scaled currently. During the creation of a new HDInsight cluster, a minimum and maximum number of worker nodes can be set. Autoscale then monitors the resource requirements of the analytics load and scales the number of worker nodes up or down. There's no additional charge for this feature.
18+
Azure HDInsight's cluster Autoscale feature automatically scales the number of worker nodes in a cluster up and down. Other types of nodes in the cluster can't be scaled currently. During the creation of a new HDInsight cluster, a minimum and maximum number of worker nodes can be set. Autoscale then monitors the resource requirements of the analytics load and scales the number of worker nodes up or down. There's no additional charge for this feature.
1919

2020
## Cluster compatibility
2121

@@ -40,12 +40,14 @@ Schedule-based scaling changes the number of nodes in your cluster based on cond
4040

4141
Autoscale continuously monitors the cluster and collects the following metrics:
4242

43-
* **Total Pending CPU**: The total number of cores required to start execution of all pending containers.
44-
* **Total Pending Memory**: The total memory (in MB) required to start execution of all pending containers.
45-
* **Total Free CPU**: The sum of all unused cores on the active worker nodes.
46-
* **Total Free Memory**: The sum of unused memory (in MB) on the active worker nodes.
47-
* **Used Memory per Node**: The load on a worker node. A worker node on which 10 GB of memory is used, is considered under more load than a worker with 2 GB of used memory.
48-
* **Number of Application Masters per Node**: The number of Application Master (AM) containers running on a worker node. A worker node that is hosting two AM containers, is considered more important than a worker node that is hosting zero AM containers.
43+
|Metric|Description|
44+
|---|---|
45+
|Total Pending CPU|The total number of cores required to start execution of all pending containers.|
46+
|Total Pending Memory|The total memory (in MB) required to start execution of all pending containers.|
47+
|Total Free CPU|The sum of all unused cores on the active worker nodes.|
48+
|Total Free Memory|The sum of unused memory (in MB) on the active worker nodes.|
49+
|Used Memory per Node|The load on a worker node. A worker node on which 10 GB of memory is used, is considered under more load than a worker with 2 GB of used memory.|
50+
|Number of Application Masters per Node|The number of Application Master (AM) containers running on a worker node. A worker node that is hosting two AM containers, is considered more important than a worker node that is hosting zero AM containers.|
4951

5052
The above metrics are checked every 60 seconds. Autoscale makes scale-up and scale-down decisions based on these metrics.
5153

@@ -71,11 +73,9 @@ Based on the number of AM containers per node and the current CPU and memory req
7173

7274
### Create a cluster with load-based Autoscaling
7375

74-
To use Autoscale on a cluster, the **Enable autoscale** option must be enabled when the cluster is created.
75-
76-
To enable the Autoscale feature with load-based scaling, complete the following steps as part of the normal cluster creation process:
76+
To use Autoscale on a cluster, the **Enable autoscale** option must be enabled when the cluster is created. To enable the Autoscale feature with load-based scaling, complete the following steps as part of the normal cluster creation process:
7777

78-
1. On the **Configuration + pricing** tab, check the **Enable autoscale** checkbox.
78+
1. On the **Configuration + pricing** tab, select the **Enable autoscale** checkbox.
7979
1. Select **Load-based** under **Autoscale type**.
8080
1. Enter the desired values for the following properties:
8181

@@ -85,7 +85,7 @@ To enable the Autoscale feature with load-based scaling, complete the following
8585

8686
![Enable worker node load-based autoscale](./media/hdinsight-autoscale-clusters/azure-portal-cluster-configuration-pricing-autoscale.png)
8787

88-
The initial number of worker nodes must fall between the minimum and maximum, inclusive. This value defines the initial size of the cluster when it's created. The minimum number of worker nodes should be set to three or more. . Scaling your cluster to fewer than three nodes can result in it getting stuck in safe mode because of insufficient file replication. See [Getting stuck in safe mode]( https://docs.microsoft.com/ azure/hdinsight/hdinsight-scaling-best-practices#getting-stuck-in-safe-mode) for more information.
88+
The initial number of worker nodes must fall between the minimum and maximum, inclusive. This value defines the initial size of the cluster when it's created. The minimum number of worker nodes should be set to three or more. Scaling your cluster to fewer than three nodes can result in it getting stuck in safe mode because of insufficient file replication. For more information, see [Getting stuck in safe mode](./hdinsight-scaling-best-practices.md#getting-stuck-in-safe-mode).
8989

9090
### Create a cluster with schedule-based Autoscaling
9191

@@ -94,7 +94,7 @@ To enable the Autoscale feature with schedule-based scaling, complete the follow
9494
1. On the **Configuration + pricing** tab, check the **Enable autoscale** checkbox.
9595
1. Enter the **Number of nodes** for **Worker node**, which controls the limit for scaling up the cluster.
9696
1. Select the option **Schedule-based** under **Autoscale type**.
97-
1. Click **Configure** to open the **Autoscale configuration** window.
97+
1. Select **Configure** to open the **Autoscale configuration** window.
9898
1. Select your timezone and then click **+ Add condition**
9999
1. Select the days of the week that the new condition should apply to.
100100
1. Edit the time the condition should take effect and the number of nodes that the cluster should be scaled to.
@@ -185,7 +185,7 @@ You can create an HDInsight cluster with schedule-based Autoscaling an Azure Res
185185

186186
#### Using the Azure portal
187187

188-
To enable Autoscale on a running cluster, select **Cluster size** under **Settings**. Then click **Enable autoscale**. Select the type of Autoscale that you want and enter the options for load-based or schedule-based scaling. Finally, click **Save**.
188+
To enable Autoscale on a running cluster, select **Cluster size** under **Settings**. Then select **Enable autoscale**. Select the type of Autoscale that you want and enter the options for load-based or schedule-based scaling. Finally, select **Save**.
189189

190190
![Enable worker node schedule-based autoscale running cluster](./media/hdinsight-autoscale-clusters/azure-portal-settings-autoscale.png)
191191

@@ -214,7 +214,7 @@ Consider the following factors before making a decision on which mode to choose:
214214
* Enable Autoscale during cluster creation.
215215
* The minimum number of nodes should be at least three.
216216
* Load variance: does the load of the cluster follow a consistent pattern at specific times, on specific days. If not, load based scheduling is a better option.
217-
* SLA requirements: Autoscale scaling is reactive instead of predictive. Will there be a sufficient delay between when the load starts to increase and when the cluster needs to be at its target size? If there are strict SLA requirements and the load is a fixed known pattern, schedule based is a better option.
217+
* SLA requirements: Autoscale scaling is reactive instead of predictive. Will there be a sufficient delay between when the load starts to increase and when the cluster needs to be at its target size? If there are strict SLA requirements and the load is a fixed known pattern, 'schedule based' is a better option.
218218

219219
### Consider the latency of scale up or scale down operations
220220

@@ -228,7 +228,7 @@ The running jobs will continue to run and finish. The pending jobs will wait to
228228

229229
### Minimum cluster size
230230

231-
Do not scale your cluster down to fewer than three nodes. Scaling your cluster to fewer than three nodes can result in it getting stuck in safe mode because of insufficient file replication. See [Getting stuck in safe mode]( https://docs.microsoft.com/ azure/hdinsight/hdinsight-scaling-best-practices#getting-stuck-in-safe-mode) for more information.
231+
Don't scale your cluster down to fewer than three nodes. Scaling your cluster to fewer than three nodes can result in it getting stuck in safe mode because of insufficient file replication. For more information, see [Getting stuck in safe mode](./hdinsight-scaling-best-practices.md#getting-stuck-in-safe-mode).
232232

233233
## Monitoring
234234

@@ -240,24 +240,24 @@ The cluster status listed in the Azure portal can help you monitor Autoscale act
240240

241241
All of the cluster status messages that you might see are explained in the list below.
242242

243-
| Cluster status | Explanation |
243+
| Cluster status | Description |
244244
|---|---|
245245
| Running | The cluster is operating normally. All of the previous Autoscale activities have completed successfully. |
246246
| Updating | The cluster Autoscale configuration is being updated. |
247247
| HDInsight configuration | A cluster scale up or scale down operation is in progress. |
248248
| Updating Error | HDInsight encountered issues during the Autoscale configuration update. Customers can choose to either retry the update or disable autoscale. |
249249
| Error | Something is wrong with the cluster, and it isn't usable. Delete this cluster and create a new one. |
250250

251-
To view the current number of nodes in your cluster, go to the **Cluster size** chart on the **Overview** page for your cluster, or click **Cluster size** under **Settings**.
251+
To view the current number of nodes in your cluster, go to the **Cluster size** chart on the **Overview** page for your cluster, or select **Cluster size** under **Settings**.
252252

253253
### Operation history
254254

255255
You can view the cluster scale-up and scale-down history as part of the cluster metrics. You can also list all scaling actions over the past day, week, or other period of time.
256256

257-
Select **Metrics** under **Monitoring**. Then click **Add metric** and **Number of Active Workers** from the **Metric** dropdown box. Click the button in the upper right to change the time range.
257+
Select **Metrics** under **Monitoring**. Then select **Add metric** and **Number of Active Workers** from the **Metric** dropdown box. Select the button in the upper right to change the time range.
258258

259259
![Enable worker node schedule-based autoscale metric](./media/hdinsight-autoscale-clusters/hdinsight-autoscale-clusters-chart-metric.png)
260260

261261
## Next steps
262262

263-
* Read about best practices for scaling clusters manually in [Scaling best practices](hdinsight-scaling-best-practices.md)
263+
Read about best practices for scaling clusters manually in [Scaling best practices](hdinsight-scaling-best-practices.md)

articles/load-balancer/load-balancer-outbound-connections.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Azure Load Balancer and related resources are explicitly defined when you're usi
3838
| SKUs | Scenario | Method | IP protocols | Description |
3939
| --- | --- | --- | --- | --- |
4040
| Standard, Basic | [1. VM with Public IP address (with or without Load Balancer)](#ilpip) | SNAT, port masquerading not used | TCP, UDP, ICMP, ESP | Azure uses the public IP assigned to the IP configuration of the instance's NIC. The instance has all ephemeral ports available. When using Standard Load Balancer, you should use [outbound rules](load-balancer-outbound-rules-overview.md) to explicitly define outbound connectivity |
41-
| Standard, Basic | [2. Public Load Balancer associated with a VM (no Public IP address on the instance)](#lb) | SNAT with port masquerading (PAT) using the Load Balancer frontends | TCP, UDP |Azure shares the public IP address of the public Load Balancer frontends with multiple private IP addresses. Azure uses ephemeral ports of the frontends to PAT. |
41+
| Standard, Basic | [1. VM with an Instance Level Public IP address (with or without Load Balancer)](#ilpip) | SNAT, port masquerading not used | TCP, UDP, ICMP, ESP | Azure uses the public IP assigned to the IP configuration of the instance's NIC. The instance has all ephemeral ports available. When using Standard Load Balancer, [outbound rules](load-balancer-outbound-rules-overview.md) are not supported if a public IP is assigned to the Virtual Machine |
4242
| none or Basic | [3. Standalone VM (no Load Balancer, no Public IP address)](#defaultsnat) | SNAT with port masquerading (PAT) | TCP, UDP | Azure automatically designates a public IP address for SNAT, shares this public IP address with multiple private IP addresses of the availability set, and uses ephemeral ports of this public IP address. This scenario is a fallback for the preceding scenarios. We don't recommend it if you need visibility and control. |
4343

4444
If you don't want a VM to communicate with endpoints outside Azure in public IP address space, you can use network security groups (NSGs) to block access as needed. The section [Preventing outbound connectivity](#preventoutbound) discusses NSGs in more detail. Guidance on designing, implementing, and managing a virtual network without any outbound access is outside the scope of this article.

articles/storage/files/storage-files-scale-targets.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ To help you plan your deployment for each of the stages, below are the results o
8383
| Number of objects | 25 million objects |
8484
| Dataset Size| ~4.7 TiB |
8585
| Average File Size | ~200 KiB (Largest File: 100 GiB) |
86-
| Upload Throughput | 20 objects per second |
86+
| Upload Throughput | 20 objects per second per sync group |
8787
| Namespace Download Throughput* | 400 objects per second |
8888

8989
*When a new server endpoint is created, the Azure File Sync agent does not download any of the file content. It first syncs the full namespace and then triggers background recall to download the files, either in their entirety or, if cloud tiering is enabled, to the cloud tiering policy set on the server endpoint.
@@ -93,7 +93,7 @@ To help you plan your deployment for each of the stages, below are the results o
9393
| Number of objects synced| 125,000 objects (~1% churn) |
9494
| Dataset Size| 50 GiB |
9595
| Average File Size | ~500 KiB |
96-
| Upload Throughput | 20 objects per second |
96+
| Upload Throughput | 20 objects per second per sync group |
9797
| Full Download Throughput* | 60 objects per second |
9898

9999
*If cloud tiering is enabled, you are likely to observe better performance as only some of the file data is downloaded. Azure File Sync only downloads the data of cached files when they are changed on any of the endpoints. For any tiered or newly created files, the agent does not download the file data, and instead only syncs the namespace to all the server endpoints. The agent also supports partial downloads of tiered files as they are accessed by the user.

articles/vpn-gateway/point-to-site-vpn-client-configuration-azure-cert.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ You can generate client configuration files using PowerShell, or by using the Az
4141

4242
### <a name="zipps"></a>Generate files using PowerShell
4343

44-
[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
4544

4645
1. When generating VPN client configuration files, the value for '-AuthenticationMethod' is 'EapTls'. Generate the VPN client configuration files using the following command:
4746

articles/vpn-gateway/point-to-site-vpn-client-configuration-radius.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ The configuration workflow for P2S RADIUS authentication is as follows:
3434
3535
To use the sections in this article, first decide which type of authentication you want to use: username/password, certificate, or other types of authentication. Each section has steps for Windows, Mac OS X, and Linux (limited steps available at this time).
3636

37-
[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
3837

3938
## <a name="adeap"></a>Username/password authentication
4039

0 commit comments

Comments
 (0)