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

Author: DennisLee-DennisLee

articles/event-grid/edge/delivery-retry.md

@@ -5,15 +5,15 @@ author: VidyaKukke
 manager: rajarv
 ms.author: vkukke
 ms.reviewer: spelluru
-ms.date: 10/06/2019
+ms.date: 10/29/2019
 ms.topic: article
 ms.service: event-grid
 services: event-grid
 ---
 
 # Delivery and retry
 
-Event Grid provides durable delivery. It tries to deliver each message at least once for each matching subscription immediately. If a subscriber's endpoint doesn't acknowledge receipt of an event or if there is a failure, Event Grid retries delivery based on a fixed **retry schedule** and **retry policy**.  Currently Event Grid module delivers an event at a time to the subscriber. The payload is however an array with a single event.
+Event Grid provides durable delivery. It tries to deliver each message at least once for each matching subscription immediately. If a subscriber's endpoint doesn't acknowledge receipt of an event or if there is a failure, Event Grid retries delivery based on a fixed **retry schedule** and **retry policy**.  By default, the Event Grid module delivers one event at a time to the subscriber. The payload is however an array with a single event. You can have the module deliver more than one event at a time by enabling the output batching feature. For details about this feature, see [output batching](delivery-output-batching.md).  
 
 > [!IMPORTANT]
 >There is no persistence support for event data. This means redeploying or restart of the Event Grid module will cause you to lose any events that aren't yet delivered.

articles/event-grid/edge/forward-events-event-grid-cloud.md

@@ -5,7 +5,7 @@ author: VidyaKukke
 manager: rajarv
 ms.author: vkukke
 ms.reviewer: spelluru
-ms.date: 10/06/2019
+ms.date: 10/29/2019
 ms.topic: article
 ms.service: event-grid
 services: event-grid
@@ -97,7 +97,7 @@ For example, if you created a topic named `testegcloudtopic` in West US, the val
    ```
 
    >[!NOTE]
-   > The **endpointUrl** specifies that the Event Grid topic URL in the cloud. The **sasKey** refers to Event Grid cloud topic's key. The value in **topicName** will be used to stamp all outgoing events to Event Grid. This can be useful when posting to an Event Grid domain topic. For more information about Event Grid domain topic, see [Event domains]](../event-domains.md)
+   > The **endpointUrl** specifies that the Event Grid topic URL in the cloud. The **sasKey** refers to Event Grid cloud topic's key. The value in **topicName** will be used to stamp all outgoing events to Event Grid. This can be useful when posting to an Event Grid domain topic. For more information about Event Grid domain topic, see [Event domains](../event-domains.md)
 
     For example,
 
@@ -193,5 +193,6 @@ For information on viewing events delivered by the cloud topic, see the [tutoria
 
 In this tutorial, you published an event on the edge and forwarded to Event Grid in the Azure cloud. Now that you know the basic steps to forward to Event Grid in cloud:
 
+* To troubleshoot issues with using Azure Event Grid on IoT Edge, see [Troubleshooting guide](troubleshoot.md).
 * Forward events to IoTHub by following this [tutorial](forward-events-iothub.md)
 * Forward events to Webhook in the cloud by following this [tutorial](pub-sub-events-webhook-cloud.md)

articles/event-grid/edge/forward-events-iothub.md

@@ -5,7 +5,7 @@ author: VidyaKukke
 manager: rajarv
 ms.author: vkukke
 ms.reviewer: spelluru
-ms.date: 10/06/2019
+ms.date: 10/29/2019
 ms.topic: article
 ms.service: event-grid
 services: event-grid
@@ -155,7 +155,9 @@ Update the edge hub's route to forward event subscription's events to be forward
 
 ## Setup IoT Hub route
 
-See the IoT Hub [routing tutorial](../../iot-hub/tutorial-routing.md) to set up a route from the IoT hub so that you can view the events forwarded from the Event Grid module.
+See the [IoT Hub routing tutorial](../../iot-hub/tutorial-routing.md) to set up a route from the IoT hub so that you can view events forwarded from the Event Grid module. Use `true` for the query to keep the tutorial simple.  
+
+
 
 ## Publish an event
 
@@ -200,6 +202,7 @@ See the IoT Hub [routing tutorial](../../iot-hub/tutorial-routing.md) for the st
 
 In this tutorial, you created an event grid topic, edge hub subscription, and published events. Now that you know the basic steps to forward to an edge hub, see the following articles:
 
+* To troubleshoot issues with using Azure Event Grid on IoT Edge, see [Troubleshooting guide](troubleshoot.md).
 * Use [edge hub](../../iot-edge/module-composition.md) route filters to partition events
 * Set up persistence of Event Grid module on [linux](persist-state-linux.md) or [Windows](persist-state-windows.md)
 * Follow [documentation](configure-client-auth.md) to configure client authentication

articles/event-grid/edge/persist-state-linux.md

@@ -35,7 +35,7 @@ This article provides the steps to deploy the Event Grid module with persistence
 ```
 
 >[!IMPORTANT]
->Do not change the second part of the bind value. It points to a specific location within the module. For the Event Grid module on Linux, it has to be **/app/metadata**.
+>Do not change the second part of the bind value. It points to a specific location within the module. For the Event Grid module on Linux, it has to be **/app/metadataDb**.
 
 For example, the following configuration will result in the creation of the volume **egmetadataDbVol** where metadata will be persisted.
 

articles/event-grid/edge/pub-sub-events-webhook-cloud.md

@@ -5,7 +5,7 @@ author: VidyaKukke
 manager: rajarv
 ms.author: vkukke
 ms.reviewer: spelluru
-ms.date: 10/06/2019
+ms.date: 10/29/2019
 ms.topic: article
 ms.service: event-grid
 services: event-grid
@@ -193,6 +193,7 @@ You can view the event delivered in the Azure portal under the **Monitor** optio
 
 In this tutorial, you created an event grid topic, subscription, and published events. Now that you know the basic steps, see the following articles:
 
+* To troubleshoot issues with using Azure Event Grid on IoT Edge, see [Troubleshooting guide](troubleshoot.md).
 * Create/update subscription with [filters](advanced-filtering.md).
 * Set up persistence of Event Grid module on [linux](persist-state-linux.md) or [Windows](persist-state-windows.md)
 * Follow [documentation](configure-client-auth.md) to configure client authentication

articles/event-grid/edge/pub-sub-events-webhook-local.md

@@ -5,7 +5,7 @@ author: VidyaKukke
 manager: rajarv
 ms.author: vkukke
 ms.reviewer: spelluru
-ms.date: 10/06/2019
+ms.date: 10/29/2019
 ms.topic: article
 ms.service: event-grid
 services: event-grid
@@ -76,6 +76,8 @@ A deployment manifest is a JSON document that describes which modules to deploy,
 
     >[!IMPORTANT]
     > In this tutorial, you will deploy the Event Grid module with client authentication disabled and allow HTTP subscribers. For production workloads, we recommend that you enable the client authentication and allow only HTTPs subscribers. For more information on how to configure Event Grid module securely, see [Security and authentication](security-authentication.md).
+    > 
+    > If you are using an Azure VM as an edge device, add an inbound port rule to allow inbound traffic on the port 4438. For instructions on adding the rule, see [How to open ports to a VM](../../virtual-machines/windows/nsg-quickstart-portal.md).
 
 
 ## Deploy Azure Function IoT Edge module
@@ -252,7 +254,7 @@ Subscribers can register for events published to a topic. To receive any event,
     On Windows, run the following command:
 
     ```sh
-    iotedge logs subscriber -f
+    docker -H npipe:////./pipe/iotedge_moby_engine container logs subscriber
     ```
 
    On Linux, run the following command:
@@ -294,6 +296,7 @@ Subscribers can register for events published to a topic. To receive any event,
 ## Next steps
 In this tutorial, you created an event grid topic, subscription, and published events. Now that you know the basic steps, see the following articles: 
 
+- To troubleshoot issues with using Azure Event Grid on IoT Edge, see [Troubleshooting guide](troubleshoot.md).
 - Create/update subscription with [filters](advanced-filtering.md).
 - Enable persistence of Event Grid module on [Linux](persist-state-linux.md) or [Windows](persist-state-windows.md)
 - Follow [documentation](configure-client-auth.md) to configure client authentication

articles/event-grid/edge/react-blob-storage-events-locally.md

@@ -162,7 +162,10 @@ This section shows you how to deploy the Azure Blob Storage module, which would
 5. Click **Save**
 6. Click **Next** to continue to the routes section
 
- ### Setup routes
+    > [!NOTE]
+    > If you are using an Azure VM as the edge device, add an inbound port rule to allow inbound traffic on the host ports used in this tutorial: 4438, 5888, 8080, and 11002. For instructions on adding the rule, see [How to open ports to a VM](../../virtual-machines/windows/nsg-quickstart-portal.md).
+
+### Setup routes
 
 Keep the default routes, and select **Next** to continue to the review section
 
@@ -179,7 +182,7 @@ Keep the default routes, and select **Next** to continue to the review section
 
    It may take a few moments for the module to be started on the device and then reported back to IoT Hub. Refresh the page to see an updated status.
 
-## Publish created and deleted Events
+## Publish BlobCreated and BlobDeleted events
 
 1. This module automatically creates topic **MicrosoftStorage**. Verify that it exists
     ```sh

articles/event-grid/edge/troubleshoot.md

@@ -22,7 +22,7 @@ To troubleshoot, you might need to access Event Grid module logs. To do this, on
 On Windows,
 
 ```sh
-docker -H npipe:////./pipe/notedly_moby_engine container logs eventgridmodule
+docker -H npipe:////./pipe/iotedge_moby_engine container logs eventgridmodule
 ```
 
 On Linux,

articles/media-services/latest/content-protection-overview.md

@@ -12,7 +12,7 @@ ms.workload: media
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 07/25/2019
+ms.date: 10/29/2019
 ms.author: juliako
 ms.custom: seodec18
 #Customer intent: As a developer who works on subsystems of online streaming/multiscreen solutions that need to deliver protected content, I want to make sure that delivered content is protected with DRM or AES-128.
@@ -105,8 +105,6 @@ A security token service (STS) issues JWT as the access token for back-end resou
 * Symmetric or asymmetric verification for signature verification
 * Key rollover support (if necessary)
 
-You can use [this STS tool](https://openidconnectweb.azurewebsites.net/DRMTool/Jwt) to test the STS. It supports all three types of verification keys: symmetric, asymmetric, or Azure Active Directory (Azure AD) with key rollover. 
-
 ## Streaming protocols and encryption types
 
 You can use Media Services to deliver your content encrypted dynamically with AES clear key or DRM encryption by using PlayReady, Widevine, or FairPlay. Currently, you can encrypt the HTTP Live Streaming (HLS), MPEG DASH, and Smooth Streaming formats. Each protocol supports the following encryption methods.

articles/networking/networking-partners-msp.md

@@ -30,6 +30,8 @@ Use the links in this section for more information about managed cloud networkin
 
 [BT](https://www.globalservices.bt.com/en/aboutus/news-press/bt-named-one-of-the-first-global-managed-service-providers-for-a-new-microsoft-azure-networking-virtual-wan-services/)
 
+[Colt](https://www.colt.net/why-colt/strategic-alliances/microsoft-partnership/msp/)
+
 [Dimension Data](https://www.dimensiondata.com/)
 
 [Equinix](https://www.equinix.com/)
@@ -44,14 +46,22 @@ Use the links in this section for more information about managed cloud networkin
 
 [KINX](https://www.kinx.net/service/cloud/?lang=en)
 
+[Macquarie Telecom](https://macquariecloudservices.com/azure-managed-services/)
+
 [Megaport](https://www.megaport.com/services/microsoft-expressroute/)
 
+[OmniClouds](https://omniclouds.com/services/)
+
 [Oncore Cloud Services]( https://www.oncore.cloud/services/ue-for-expressroute/)
 
 [Orixcom]( https://www.orixcom.com/cloud-solutions/)
 
+[Sejong Telecom](https://www.sejongtelecom.net/en/pages/service/cloud_ms)
+
 [Tata Communications](https://www.tatacommunications.com/about/our-alliances/microsoft-alliance/)
 
+[Tech Mahindra](https://networkservices.techmahindra.com/pages/default.aspx)
+
 [Vandis](https://www.vandis.com/microsoft-azure-practice/)
 
 [Vigilant IT](https://vigilant.it/manage-cloud-service/)