Merge pull request #101007 from spelluru/JSandPython

Only Python and JS

Author: tfosmark

.openpublishing.redirection.json

@@ -12565,6 +12565,11 @@
       "redirect_url": "/azure/event-hubs/event-hubs-node-get-started-send",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/event-hubs/event-hubs-python.md",
+      "redirect_url": "/azure/event-hubs/event-hubs-python-get-started-send",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/event-hubs/event-hubs-python-get-started-receive.md",
       "redirect_url": "/azure/event-hubs/event-hubs-python-get-started-send",

articles/event-hubs/TOC.yml

@@ -31,9 +31,9 @@
     - name: Java
       href: event-hubs-java-get-started-send.md
     - name: Python
-      href: event-hubs-python-get-started-send.md
+      href: get-started-python-send-v2.md
     - name: Node.js
-      href: event-hubs-node-get-started-send.md
+      href: get-started-node-send-v2.md
     - name: Go
       href: event-hubs-go-get-started-send.md
     - name: C (send only)
@@ -49,7 +49,7 @@
     - name: Use a Resource Manager template to enable Event Hubs Capture
       href: event-hubs-resource-manager-namespace-event-hub-enable-capture.md
     - name: Capture Event Hubs data using Python
-      href: event-hubs-capture-python.md
+      href: get-started-capture-python-v2.md
   - name: Stream into Event Hubs for Apache Kafka
     href: event-hubs-quickstart-kafka-enabled-event-hubs.md
   - name: Create a dedicated cluster
@@ -114,10 +114,22 @@
       href: event-hubs-get-connection-string.md
     - name: Exchange events between applications using different protocols
       href: event-hubs-exchange-events-different-protocols.md
-    - name: .NET programming guide
-      href: event-hubs-programming-guide.md
-    - name: Send, receive, and capture events using Python
-      href: event-hubs-python.md
+    - name: Programming guides
+      items:
+      - name: Python
+        href: https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/eventhub/azure-eventhub/README.md
+      - name: JavaScript
+        href: https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/eventhubs/azure-messaging-eventhubs/README.md
+      - name: .NET programming guide
+        href: event-hubs-programming-guide.md
+    - name: Read captured data using Python (legacy)
+      href: event-hubs-capture-python.md
+    - name: Send and receive events (legacy)
+      items:
+      - name: Python (legacy)
+        href: event-hubs-python-get-started-send.md
+      - name: Node.js (legacy)    
+        href: event-hubs-node-get-started-send.md
   - name: Process data
     items:
     - name: Process data using Azure Stream Analytics 
@@ -193,7 +205,15 @@
     - name: Microsoft.Azure.Management.EventHub
       href: /dotnet/api/microsoft.azure.management.eventhub
   - name: Node.js
-    href: /javascript/api/overview/azure/event-hub?view=azure-node-latest
+    items: 
+    - name: Migrate from version 2 to version 5
+      href: https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/eventhub/event-hubs/migrationguide.md
+    - name: API reference
+      href: /javascript/api/overview/azure/event-hub?view=azure-node-latest
+  - name: Python
+    items:
+    - name: Migrate from version 1 to version 5
+      href: https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/eventhub/azure-eventhub/migration_guide.md
   - name: REST
     href: /rest/api/eventhub
   - name: Resource Manager template

articles/event-hubs/event-hubs-capture-python.md

@@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: quickstart
 ms.custom: seodec18
-ms.date: 11/05/2019
+ms.date: 01/08/2020
 ms.author: shvija
 
 ---
@@ -25,6 +25,9 @@ Capture is a feature of Azure Event Hubs. You can use Capture to automatically d
 
 This walkthrough uses the [Azure Python SDK](https://azure.microsoft.com/develop/python/) to demonstrate the Capture feature. The *sender.py* program sends simulated environmental telemetry to Event Hubs in JSON format. The event hub uses the Capture feature to write this data to Blob storage in batches. The *capturereader.py* app reads these blobs, creates an append file for each of your devices, and writes the data to *.csv* files on each device.
 
+> [!IMPORTANT]
+> This quickstart uses version 1 of the Azure Event Hubs Python SDK. If you are new to Azure Event Hubs, use version 5 of the Python SDK. For a quickstart that uses version 5 of the Python SDK, see [this article](get-started-capture-python-v2.md). If you need to migrate existing code from version 1 to version 5, see the [migration guide](https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/eventhub/azure-eventhub/migration_guide.md).
+
 In this walkthrough, you: 
 
 > [!div class="checklist"]

articles/event-hubs/event-hubs-node-get-started-send.md

@@ -9,9 +9,10 @@ ms.service: event-hubs
 ms.workload: core
 ms.topic: quickstart
 ms.custom: seodec18
-ms.date: 11/05/2019
+ms.date: 01/08/2020
 ms.author: spelluru
 
+
 ---
 
 # Quickstart: Send events to or receive events from Azure Event Hubs using Node.js
@@ -20,6 +21,9 @@ Azure Event Hubs is a Big Data streaming platform and event ingestion service th
 
 This tutorial describes how to create Node.js applications to send events to or receive events from an event hub.
 
+> [!IMPORTANT]
+> This quickstart uses version 2 of the Azure Event Hubs Java Script SDK. If you are new to Azure Event Hubs, use version 5 of the Java Script SDK. For a quickstart that uses version 5 of the Java Script SDK, see [this article](get-started-node-send-v2.md). If you need to migrate existing code from version 2 to version 5, see the [migration guide](https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/eventhub/event-hubs/migrationguide.md).
+
 > [!NOTE]
 > You can download this quickstart as a sample from the [GitHub](https://github.com/Azure/azure-event-hubs-node/tree/master/client), replace `EventHubConnectionString` and `EventHubName` strings with your event hub values, and run it. Alternatively, you can follow the steps in this tutorial to create your own.
 
@@ -34,11 +38,11 @@ To complete this tutorial, you need the following prerequisites:
 
 
 ### Install npm package
-To install the [npm package for Event Hubs](https://www.npmjs.com/package/@azure/event-hubs), open a command prompt that has `npm` in its path, change the directory
+To install the [npm package for Event Hubs](https://www.npmjs.com/package/@azure/event-hubs@2), open a command prompt that has `npm` in its path, change the directory
 to the folder where you want to have your samples and then run this command
 
 ```shell
-npm install @azure/event-hubs
+npm install @azure/event-hubs@2
 ```
 
 To install the [npm package for Event Processor Host](https://www.npmjs.com/package/@azure/event-processor-host), run the below command instead
@@ -55,7 +59,7 @@ This section shows you how to create a Node.js application that sends events to
 2. Create a file called `send.js` and paste the below code into it. Get the connection string for the event hub namespace by following instructions from the article: [Get connection string](event-hubs-get-connection-string.md#get-connection-string-from-the-portal). 
 
     ```javascript
-    const { EventHubClient } = require("@azure/event-hubs");
+    const { EventHubClient } = require("@azure/event-hubs@2");
 
     // Connection string - primary key of the Event Hubs namespace. 
     // For example: Endpoint=sb://myeventhubns.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -94,7 +98,7 @@ of the default consumer group in an event hub.
 1. Open your favorite editor, such as [Visual Studio Code](https://code.visualstudio.com). 
 2. Create a file called `receive.js` and paste the below code into it.
     ```javascript
-    const { EventHubClient, delay } = require("@azure/event-hubs");
+    const { EventHubClient, delay } = require("@azure/event-hubs@2");
 
     // Connection string - primary key of the Event Hubs namespace. 
     // For example: Endpoint=sb://myeventhubns.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

articles/event-hubs/event-hubs-python-get-started-send.md

@@ -8,7 +8,7 @@ manager: femila
 ms.service: event-hubs
 ms.workload: core
 ms.topic: quickstart
-ms.date: 11/05/2019
+ms.date: 01/08/2020
 ms.author: shvija
 
 ---
@@ -19,6 +19,10 @@ Azure Event Hubs is a Big Data streaming platform and event ingestion service th
 
 This quickstart shows how to create Python applications that send events to and receive events from an event hub. 
 
+> [!IMPORTANT]
+> This quickstart uses version 1 of the Azure Event Hubs Python SDK. If you are new to Azure Event Hubs, use version 5 of the Python SDK. For a quickstart that uses version 5 of the Python SDK, see [this article](get-started-python-send-v2.md). To migrate existing code from version 1 to version 5, see the [migration guide](https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/eventhub/azure-eventhub/migration_guide.md).
+
+
 > [!NOTE]
 > Instead of working through the quickstart, you can download and run the [sample apps](https://github.com/Azure/azure-event-hubs-python/tree/master/examples) from GitHub. Replace the `EventHubConnectionString` and `EventHubName` strings with your event hub values.