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

Author: roygara

.openpublishing.redirection.json

@@ -3258,11 +3258,6 @@
       "redirect_url": "/azure/iot-edge/how-to-register-device",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/iot-edge/how-to-install-production-certificates.md",
-      "redirect_url": "/azure/iot-edge/how-to-manage-device-certificates",
-      "redirect_document_id": true
-    },
     {
       "source_path": "articles/cognitive-services/cognitive-services-recommendations-quick-start.md",
       "redirect_url": "/azure/cognitive-services/recommendations/overview",

articles/active-directory/manage-apps/application-proxy-deployment-plan.md

@@ -64,7 +64,7 @@ The following core requirements must be met in order to configure and implement
 
 * **Service limits**: To protect against overconsumption of resources by individual tenants there are throttling limits set per application and tenant. To see these limits refer to [Azure AD service limits and restrictions](https://docs.microsoft.com/azure/active-directory/users-groups-roles/directory-service-limits-restrictions). These throttling limits are based on a benchmark far above typical usage volume and provides ample buffer for a majority of deployments.
 
-* **Public certificate**: If you are using custom domain names, you must procure a public certificate issued by a non-Microsoft trusted certificate authority. Depending on your organizational requirements, getting a certificate can take some time and we recommend beginning the process as early as possible. Azure Application Proxy supports standard, [wildcard](application-proxy-wildcard.md), or SAN-based certificates.
+* **Public certificate**: If you are using custom domain names, you must procure a SSL certificate. Depending on your organizational requirements, getting a certificate can take some time and we recommend beginning the process as early as possible. Azure Application Proxy supports standard, [wildcard](application-proxy-wildcard.md), or SAN-based certificates. For more details see [Configure custom domains with Azure AD Application Proxy](application-proxy-configure-custom-domain.md).
 
 * **Domain requirements**: Single sign-on to your published applications using Kerberos Constrained Delegation (KCD) requires that the server running the Connector and the server running the app are domain joined and part of the same domain or trusting domains.
 For detailed information on the topic, see [KCD for single sign-on](application-proxy-configure-single-sign-on-with-kcd.md) with Application Proxy. The connector service runs in the context of the local system and should not be configured to use a custom identity.

articles/aks/use-cosmosdb-osba-mongo-app.md

@@ -188,7 +188,7 @@ You can use [Azure Dev Spaces](../dev-spaces/azure-dev-spaces.md) to deploy the
 
 To enable Azure Dev Spaces in your AKS cluster:
 
-```cmd
+```azurecli
 az aks enable-addons --addons http_application_routing -g MyResourceGroup -n MyAKS
 az aks use-dev-spaces -g MyResourceGroup -n MyAKS
 ```
@@ -203,7 +203,7 @@ This command generates several artifacts, including a *charts/* folder, which is
 
 Create a file at the root of your project named *Dockerfile* with this content:
 
-```Dockerfile
+```dockerfile
 FROM openjdk:8-jdk-alpine
 EXPOSE 8080
 WORKDIR /app

articles/app-service/app-service-web-app-cloning.md

@@ -1,12 +1,12 @@
 ---
 title: Clone app with PowerShell
 description: Learn how to clone your App Service app to a new app using PowerShell. A variety of cloning scenarios are covered, including Traffic Manager integration.
-author: ahmedelnably
+author: georgewallace
 
 ms.assetid: f9a5cfa1-fbb0-41e6-95d1-75d457347a35
 ms.topic: article
 ms.date: 01/14/2016
-ms.author: aelnably
+ms.author: gwallace
 ms.custom: seodec18
 
 ---

articles/app-service/app-service-web-restore-snapshots.md

@@ -1,12 +1,12 @@
 ---
 title: Restore app from a snapshot
 description: Learn how to restore your app from a snapshot. Recover from unexpected data loss in Premium tier with the automatic shadow copies.
-author: ahmedelnably
+author: georgewallace
 
 ms.assetid: 4164f9b5-f735-41c6-a2bb-71f15cdda417
 ms.topic: article
 ms.date: 04/04/2018
-ms.author: aelnably
+ms.author: gwallace
 ms.reviewer: nicking
 ms.custom: seodec18
 

articles/app-service/containers/app-service-linux-cli.md

@@ -2,11 +2,11 @@
 title: Manage custom Linux containers with CLI
 description: Learn how to manage custom Linux containers in Azure App Service from the command line. Automate app provisioning or maintenance.
 keywords: azure app service, web app, cli, linux, oss
-author: ahmedelnably
+author: georgewallace
 
 ms.topic: article
 ms.date: 08/22/2017
-ms.author: aelnably
+ms.author: gwallace
 ms.custom: seodec18
 
 ---

articles/azure-databricks/databricks-extract-load-sql-data-warehouse.md

@@ -221,7 +221,7 @@ In the cell, press **SHIFT + ENTER** to run the code.
     ```
    You see an output similar to the following snippet:
 
-   ```bash
+   ```output
    +---------------------+---------+---------+------+-------------+----------+---------+-------+--------------------+------+--------+-------------+---------+--------------------+------+-------------+------+
    |               artist|     auth|firstName|gender|itemInSession|  lastName|   length|  level|            location|method|    page| registration|sessionId|                song|status|           ts|userId|
    +---------------------+---------+---------+------+-------------+----------+---------+-------+--------------------+------+--------+-------------+---------+--------------------+------+-------------+------+
@@ -247,7 +247,7 @@ The raw sample data **small_radio_json.json** file captures the audience for a r
 
    You receive output as shown in the following snippet:
 
-   ```bash
+   ```output
    +---------+----------+------+--------------------+-----+
    |firstname|  lastname|gender|            location|level|
    +---------+----------+------+--------------------+-----+
@@ -283,7 +283,7 @@ The raw sample data **small_radio_json.json** file captures the audience for a r
 
    You receive output as shown in the following snippet.
 
-   ```bash
+   ```output
    +---------+----------+------+--------------------+-----------------+
    |firstname|  lastname|gender|            location|subscription_type|
    +---------+----------+------+--------------------+-----------------+

articles/azure-government/documentation-government-k8.md

@@ -47,7 +47,7 @@ This article describes how to deploy a Kubernetes cluster to Azure Government us
 
     Via Azure CLI:
 
-    ```bash
+    ```azurecli
     az cloud set --n AzureUSGovernment
     az login
     az account list

articles/azure-monitor/app/opencensus-python.md

@@ -129,11 +129,20 @@ Here are the exporters that OpenCensus provides mapped to the types of telemetry
         main()
     ```
 
-4. Now when you run the Python script, you should still be prompted to enter values, but only the value is being printed in the shell. The created `SpanData` will be sent to Azure Monitor. You can find the emitted span data under `dependencies`.
+4. Now when you run the Python script, you should still be prompted to enter values, but only the value is being printed in the shell. The created `SpanData` will be sent to Azure Monitor. You can find the emitted span data under `dependencies`. For more details on outgoing requests, see OpenCensus Python [dependencies](https://docs.microsoft.com/azure/azure-monitor/app/opencensus-python-dependency).
+For more details on incoming requests, see OpenCensus Python [requests](https://docs.microsoft.com/azure/azure-monitor/app/opencensus-python-request).
 
-5. For information on sampling in OpenCensus, take a look at [sampling in OpenCensus](sampling.md#configuring-fixed-rate-sampling-for-opencensus-python-applications).
+#### Sampling
 
-6. For details on telemetry correlation in your trace data, take a look at OpenCensus [telemetry correlation](https://docs.microsoft.com/azure/azure-monitor/app/correlation#telemetry-correlation-in-opencensus-python).
+For information on sampling in OpenCensus, take a look at [sampling in OpenCensus](sampling.md#configuring-fixed-rate-sampling-for-opencensus-python-applications).
+
+#### Trace correlation
+
+For details on telemetry correlation in your trace data, take a look at OpenCensus Python [telemetry correlation](https://docs.microsoft.com/azure/azure-monitor/app/correlation#telemetry-correlation-in-opencensus-python).
+
+#### Modify telemetry
+
+For details on how to modify tracked telemetry before it is sent to Azure Monitor, see OpenCensus Python [telemetry processors](https://docs.microsoft.com/azure/azure-monitor/app/api-filtering-sampling#opencensus-python-telemetry-processors).
 
 ### Metrics
 
@@ -238,6 +247,32 @@ Here are the exporters that OpenCensus provides mapped to the types of telemetry
 
 4. The exporter will send metric data to Azure Monitor at a fixed interval. The default is every 15 seconds. We're tracking a single metric, so this metric data, with whatever value and time stamp it contains, will be sent every interval. You can find the data under `customMetrics`.
 
+#### Standard metrics
+
+By default, the metrics exporter will send a set of standard metrics to Azure Monitor. You can disable this by setting the `enable_standard_metrics` flag to `False` in the constructor of the metrics exporter.
+
+    ```python
+    ...
+    exporter = metrics_exporter.new_metrics_exporter(
+      enable_standard_metrics=False,
+      connection_string='InstrumentationKey=<your-instrumentation-key-here>')
+    ...
+    ```
+Below is a list of standard metrics that are currently sent:
+
+- Available Memory (bytes)
+- CPU Processor Time (percentage)
+- Incoming Request Rate (per second)
+- Incoming Request Average Execution Time (milliseconds)
+- Outgoing Request Rate (per second)
+- Process CPU Usage (percentage)
+- Process Private Bytes (bytes)
+
+You should be able to see these metrics in `performanceCounters`. Incoming request rate would be under `customMetrics`.
+#### Modify telemetry
+
+For details on how to modify tracked telemetry before it is sent to Azure Monitor, see OpenCensus Python [telemetry processors](https://docs.microsoft.com/azure/azure-monitor/app/api-filtering-sampling#opencensus-python-telemetry-processors).
+
 ### Logs
 
 1. First, let's generate some local log data.
@@ -357,8 +392,17 @@ Here are the exporters that OpenCensus provides mapped to the types of telemetry
     except Exception:
     logger.exception('Captured an exception.', extra=properties)
     ```
+#### Sampling
+
+For information on sampling in OpenCensus, take a look at [sampling in OpenCensus](sampling.md#configuring-fixed-rate-sampling-for-opencensus-python-applications).
+
+#### Log correlation
+
+For details on how to enrich your logs with trace context data, see OpenCensus Python [logs integration](https://docs.microsoft.com/azure/azure-monitor/app/correlation#log-correlation).
+
+#### Modify telemetry
 
-7. For details on how to enrich your logs with trace context data, see OpenCensus Python [logs integration](https://docs.microsoft.com/azure/azure-monitor/app/correlation#log-correlation).
+For details on how to modify tracked telemetry before it is sent to Azure Monitor, see OpenCensus Python [telemetry processors](https://docs.microsoft.com/azure/azure-monitor/app/api-filtering-sampling#opencensus-python-telemetry-processors).
 
 ## View your data with queries
 

articles/azure-monitor/insights/vminsights-enable-at-scale-powershell.md

@@ -95,7 +95,7 @@ To use the Azure CLI, you first need to install and use the CLI locally. You mus
 
         The configuration change can take a few minutes to finish. When it's finished, a message displays that's similar to the following and includes the result:
 
-        ```powershell
+        ```output
         provisioningState       : Succeeded
         ```
 
@@ -109,7 +109,7 @@ To use the Azure CLI, you first need to install and use the CLI locally. You mus
 
         The configuration change can take a few minutes to finish. When it's finished, a message is displayed that's similar to the following and includes the result:
 
-        ```azurecli
+        ```output
         provisioningState       : Succeeded
         ```
 
@@ -150,7 +150,7 @@ New-AzResourceGroupDeployment -Name OnboardCluster -ResourceGroupName <ResourceG
 ```
 The configuration change can take a few minutes to finish. When it's finished, a message displays that's similar to the following and includes the result:
 
-```powershell
+```output
 provisioningState       : Succeeded
 ```
 
@@ -166,7 +166,7 @@ az group deployment create --resource-group <ResourceGroupName> --template-file
 
 The output resembles the following:
 
-```azurecli
+```output
 provisioningState       : Succeeded
 ```