Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ds-qsrt1721270

Author: davidsmatlak

.openpublishing.publish.config.json

@@ -26,7 +26,7 @@
     "[email protected]"
   ],
   "sync_notification_subscribers": [
-    "tysonn@microsoft.com"
+    "angrobe_extended_dir@microsoft.com"
   ],
   "branches_to_filter": [],
   "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",

articles/azure-arc/kubernetes/connect-cluster.md

@@ -21,7 +21,7 @@ Verify you have the following requirements ready:
 
 * A Kubernetes cluster that is up and running
 * You'll need access with kubeconfig, and cluster-admin access. 
-* The user or service principal used with `az login` and `az connectedk8s connect` commands must have the 'Read' and 'Write' permissions on the 'Microsoft.Kubernetes/connectedclusters' resource type.
+* The user or service principal used with `az login` and `az connectedk8s connect` commands must have the 'Read' and 'Write' permissions on the 'Microsoft.Kubernetes/connectedclusters' resource type. The "Azure Arc for Kubernetes Onboarding" role having these permissions can be used for role assignments on the user or service principal used with Azure CLI for onboarding.
 * Latest version of the *connectedk8s* and *k8sconfiguration* extensions
 
 ## Supported regions

articles/azure-arc/kubernetes/toc.yml

@@ -14,12 +14,12 @@
       href: use-gitops-connected-cluster.md
     - name: Use GitOps with Helm
       href: use-gitops-with-helm.md
+    - name: Use Azure Policy
+      href: use-azure-policy.md
     - name: Azure Monitor for containers
       href: deploy-azure-monitor-for-containers.md
     - name: Install Azure Policy add-on
       href: ../../governance/policy/concepts/policy-for-kubernetes.md?toc=/azure/azure-arc/kubernetes/toc.json
-    - name: Use Azure Policy
-      href: use-azure-policy.md
     - name: Deploy IoT workloads
       href: deploy-azure-iot-edge-workloads.md
     - name: Onboarding service principal

articles/azure-arc/kubernetes/use-azure-policy.md

@@ -60,4 +60,4 @@ After the policy assignment is created, for any new `connectedCluster` resource
 
 ## Next steps
 
-* [Use Azure Policy to govern cluster configuration](./use-azure-policy.md)
+* [Set up Azure Monitor for Containers with Arc enabled Kubernetes clusters](./deploy-azure-monitor-for-containers.md)

articles/azure-arc/kubernetes/use-gitops-connected-cluster.md

@@ -36,7 +36,7 @@ The example repository is structured around the persona of a cluster operator wh
 **ConfigMap:** `team-a/endpoints`
 
 The `config-agent` polls Azure for new or updated `sourceControlConfiguration` every 30 seconds.  This is the maximum time it will take for the `config-agent` to pick up a new or updated configuration.
-If you are associating a private repository, assure that you also complete the steps in [Apply configuration from a private git repository](https://github.com/Azure/azure-arc-kubernetes-preview/blob/master/docs/use-gitops-in-connected-cluster.md#apply-configuration-from-a-private-git-repository)
+If you are associating a private repository, assure that you also complete the steps in [Apply configuration from a private git repository](#apply-configuration-from-a-private-git-repository)
 
 ### Using Azure CLI
 
@@ -141,9 +141,9 @@ Options supported in  --operator-params
 
 * If enableHelmOperator is true, then operatorInstanceName + operatorNamespace strings cannot exceed 47 characters combined.  If you fail to adhere to this limit then you will get this error:
 
-```console
-{"OperatorMessage":"Error: {failed to install chart from path [helm-operator] for release [<operatorInstanceName>-helm-<operatorNamespace>]: err [release name \"<operatorInstanceName>-helm-<operatorNamespace>\" exceeds max length of 53]} occurred while doing the operation : {Installing the operator} on the config","ClusterState":"Installing the operator"}
-```
+   ```console
+   {"OperatorMessage":"Error: {failed to install chart from path [helm-operator] for release [<operatorInstanceName>-helm-<operatorNamespace>]: err [release name \"<operatorInstanceName>-helm-<operatorNamespace>\" exceeds max length of 53]} occurred while doing the operation : {Installing the operator} on the config","ClusterState":"Installing the operator"}
+   ```
 
 For more info see [Flux documentation](https://aka.ms/FluxcdReadme).
 

articles/azure-functions/functions-cli-samples.md

@@ -1,7 +1,6 @@
 ---
 title: Azure CLI Samples - Azure Functions 
 description: Azure CLI Samples - Azure Functions
-author: syntaxc4
 
 ms.assetid: 577d2f13-de4d-40d2-9dfc-86ecc79f3ab0
 ms.topic: sample
@@ -17,9 +16,9 @@ The following table includes links to bash scripts for Azure Functions that use
 
 | Create app | Description |
 |---|---|
-| [Create a function app for serverless execution](scripts/functions-cli-create-serverless.md) | Creates a function app in a Consumption plan.  |
-| [Create a serverless Python function app](scripts/functions-cli-create-serverless-python.md) | Create a function app in a dedicated App Service plan. |
-| [Create a function app in a scalable Premium plan](scripts/functions-cli-create-premium-plan.md) | Create a function app in a dedicated App Service plan. |
+| [Create a function app for serverless execution](scripts/functions-cli-create-serverless.md) | Create a function app in a Consumption plan.  |
+| [Create a serverless Python function app](scripts/functions-cli-create-serverless-python.md) | Create a Python function app in a Consumption plan. |
+| [Create a function app in a scalable Premium plan](scripts/functions-cli-create-premium-plan.md) | Create a function app in a Premium plan. |
 | [Create a function app in a dedicated (App Service) plan](scripts/functions-cli-create-app-service-plan.md) | Create a function app in a dedicated App Service plan. |
 
 | Integrate | Description|

articles/azure-monitor/app/kubernetes-codeless.md

@@ -1,6 +1,6 @@
 ---
 title: Monitor applications on Azure Kubernetes Service (AKS) with Application Insights - Azure Monitor | Microsoft Docs
-description: Azure Monitor seamlessly integrates with your application running on Kubernetes, and allows you to monitor you spot the problems with your apps in no time.
+description: Azure Monitor seamlessly integrates with your application running on Kubernetes, and allows you to spot the problems with your apps in no time.
 ms.topic: conceptual
 author: MS-jgol
 ms.author: jgol

articles/azure-monitor/app/monitor-functions.md

@@ -0,0 +1,44 @@
+---
+title: Monitor applications running on Azure Functions with Application Insights - Azure Monitor | Microsoft Docs
+description: Azure Monitor seamlessly integrates with your application running on Azure Functions, and allows you to monitor the performance and spot the problems with your apps in no time.
+ms.topic: conceptual
+author: MS-jgol
+ms.author: jgol
+ms.date: 05/20/2020
+
+---
+
+# Monitoring Azure Functions with Azure Monitor Application Insights
+
+[Azure Functions](https://docs.microsoft.com/azure/azure-functions/functions-overview) offers built-in integration with Azure Application Insights to monitor functions. 
+
+Application Insights collects log, performance, and error data, and automatically detects performance anomalies. Application Insights includes powerful analytics tools to help you diagnose issues and to understand how your functions are used. When you have the visibility into your application data, you can continuously improve performance and usability. You can even use Application Insights during local function app project development. 
+
+The required Application Insights instrumentation is built into Azure Functions. The only thing you need is a valid instrumentation key to connect your function app to an Application Insights resource. The instrumentation key should be added to your application settings when your function app resource is created in Azure. If your function app doesn't already have this key, you can set it manually. For more information read more about [monitoring Azure Functions](https://docs.microsoft.com/azure/azure-functions/functions-monitoring?tabs=cmd).
+
+## Distributed tracing for Java applications (public preview)
+
+
+> [!IMPORTANT]
+> This feature is currently in public preview for Java Azure Functions. For Consumption plan it has a cold start implication of 8-9 seconds.
+
+If your applications are written in Java you can view richer data from your functions applications, including, requests, dependencies, logs, and metrics. The additional data also lets you see and diagnose end-to-end transactions and see the application map, which aggregates many transactions to show a topological view of how the systems interact, and what the average performance and error rates are.
+
+The end-to-end diagnostics and the application map provide visibility into one single transaction/request. Together these two features are very helpful for finding the root cause of reliability issues and performance bottlenecks on a per request basis.
+
+### How to enable distributed tracing for Java Function apps?
+
+Navigate to the functions app Overview blade, go to configurations. Under Application Settings, click "+ New application setting". Add the following two application settings with below values, then click Save on the upper left. DONE!
+
+```
+XDT_MicrosoftApplicationInsights_Java -> 1
+ApplicationInsightsAgent_EXTENSION_VERSION -> ~2
+```
+
+## Next Steps
+
+* Read more instructions and information about monitoring [Monitoring Azure Functions](https://docs.microsoft.com/azure/azure-functions/functions-monitoring)
+* Get an overview of [Distributed Tracing](https://docs.microsoft.com/azure/azure-monitor/app/distributed-tracing)
+* See what [Application Map](https://docs.microsoft.com/azure/azure-monitor/app/app-map?tabs=net) can do for your business
+* Read about [requests and dependencies for Java apps](https://docs.microsoft.com/azure/azure-monitor/app/java-in-process-agent)
+* Learn more about [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/overview) and [Application Insights](https://docs.microsoft.com/azure/azure-monitor/app/app-insights-overview)

articles/azure-monitor/platform/manage-cost-storage.md

@@ -11,7 +11,7 @@ ms.service: azure-monitor
 ms.workload: na
 ms.tgt_pltfrm: na
 ms.topic: conceptual
-ms.date: 05/12/2020
+ms.date: 05/21/2020
 ms.author: bwren
 ms.subservice: 
 ---
@@ -88,14 +88,20 @@ You can also [set the pricing tier via Azure Resource Manager](https://docs.micr
 
 ## Legacy pricing tiers
 
-Subscriptions who had a Log Analytics workspace or Application Insights resource in it before April 2, 2018, or are linked to an Enterprise Agreement that started prior to February 1, 2019, will continue to have access to use the legacy pricing tiers: **Free**, **Standalone (Per GB)** and **Per Node (OMS)**.  Workspaces in the Free pricing tier will have daily data ingestion limited to 500 MB (except for security data types collected by Azure Security Center) and the data retention is limited to 7 days. The Free pricing tier is intended only for evaluation purposes. Workspaces in the Standalone or Per Node pricing tiers have user-configurable retention from 30 to 730 days.
+Subscriptions who had a Log Analytics workspace or Application Insights resource in it before April 2, 2018, or are linked to an Enterprise Agreement that started prior to February 1, 2019, will continue to have access to use the legacy pricing tiers: **Free**, **Standalone (Per GB)** and **Per Node (OMS)**.  Workspaces in the Free pricing tier will have daily data ingestion limited to 500 MB (except for security data types collected by [Azure Security Center](https://docs.microsoft.com/azure/security-center/)) and the data retention is limited to 7 days. The Free pricing tier is intended only for evaluation purposes. Workspaces in the Standalone or Per Node pricing tiers have user-configurable retention from 30 to 730 days.
 
 The Per Node pricing tier charges per monitored VM (node) on an hour granularity. For each monitored node, the workspace is allocated 500 MB of data per day that is not billed. This allocation is aggregated at the workspace level. Data ingested above the aggregate daily data allocation is billed per GB as data overage. Note that on your bill, the service will be **Insight and Analytics** for Log Analytics usage if the workspace is in the Per Node pricing tier. 
 
 > [!TIP]
 > If your workspace has access to the **Per Node** pricing tier, but you're wondering whether it would be cost less in a Pay-As-You-Go tier, you can [use the query below](#evaluating-the-legacy-per-node-pricing-tier) to easily get a recommendation. 
 
-Workspaces created prior to April 2016 can also access the original **Standard** and **Premium** pricing tiers which have fixed data retention of 30 and 365 days respectively. New workspaces cannot be created in the **Standard** or **Premium** pricing tiers, and if a workspace is moved out of these tiers, it cannot be moved back. 
+Workspaces created prior to April 2016 can also access the original **Standard** and **Premium** pricing tiers which have fixed data retention of 30 and 365 days respectively. New workspaces cannot be created in the **Standard** or **Premium** pricing tiers, and if a workspace is moved out of these tiers, it cannot be moved back.
+
+There are also some behaviors between the use of legacy Log Analytics tiers and how usage is billed for [Azure Security Center](https://docs.microsoft.com/azure/security-center/). 
+
+1. If the workspace is in the legacy Standard or Premium tier, Azure Security Center will be billed only for Log Analytics data ingestion, not per node.
+2. If the workspace is in the legacy Per Node tier, Azure Security Center will be billed using the current [Azure Security Center node-based pricing model](https://azure.microsoft.com/pricing/details/security-center/). 
+3. In other pricing tiers (including Capacity Reservations), if Azure Security Center was enabled before June 19, 2017, Azure Security Center will be billed only for Log Analytics data ingestion. Otherwise Azure Security Center will be billed using the current Azure Security Center node-based pricing model.
 
 More details of pricing tier limitations are available [here](https://docs.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits#log-analytics-workspaces).
 
@@ -121,7 +127,7 @@ When the retention is lowered, there is a several day grace period before the ol
 The retention can also be [set via Azure Resource Manager](https://docs.microsoft.com/azure/azure-monitor/platform/template-workspace-configuration#configure-a-log-analytics-workspace) using the `retentionInDays` parameter. Additionally, if you set the data retention to 30 days, you can trigger an immediate purge of older data using the `immediatePurgeDataOn30Days` parameter, which may be useful for compliance-related scenarios. This functionality is only exposed via Azure Resource Manager. 
 
 
-Two data types -- `Usage` and `AzureActivity` -- are retained for 90 days by default, and there is no charge for for this 90 day retention. These data types are also free from data ingestion charges. 
+Two data types -- `Usage` and `AzureActivity` -- are retained for a minimum of 90 days by default, and there is no charge for for this 90 day retention. If the workspace retention is increased above 90 days, the retention of these data types will also be increased.  These data types are also free from data ingestion charges. 
 
 Data types from workspace-based Application Insights resources (`AppAvailabilityResults`, `AppBrowserTimings`, `AppDependencies`, `AppExceptions`, `AppEvents`, `AppMetrics`, `AppPageViews`, `AppPerformanceCounters`, `AppRequests`, `AppSystemEvents` and `AppTraces`) are also retained for 90 days by default, and there is no charge for for this 90 day retention. Their retention can be adjust using the retention by data type functionality. 
 

articles/azure-monitor/toc.yml

@@ -238,7 +238,7 @@
         href: app/cloudservices.md
       - name: Azure Functions
         displayname: functions, monitor functions, automation
-        href: ../azure-functions/functions-monitoring.md
+        href: app/monitor-functions.md
       - name: Azure Kubernetes Service
         href: app/kubernetes-codeless.md
       - name: Standalone - any environment