Merge pull request #111927 from MGoedtel/task1709132

updating tutorial articles

Author: ttorble

.openpublishing.redirection.json

@@ -7856,6 +7856,26 @@
       "redirect_url": "/azure/automation/source-control-integration",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/automation/automation-first-runbook-graphical.md",
+      "redirect_url": "/azure/automation/learn/automation-tutorial-runbook-graphical",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/automation-first-runbook-textual.md",
+      "redirect_url": "/azure/automation/learn/automation-tutorial-runbook-textual",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/automation-first-runbook-textual-powershell.md",
+      "redirect_url": "/azure/automation/learn/automation-tutorial-runbook-textual-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/automation-first-runbook-textual-python2.md",
+      "redirect_url": "/azure/automation/learn/automation-tutorial-runbook-textual-python2",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/automation/oms-solution-updatemgmt-sccmintegration.md",
       "redirect_url": "/azure/automation/updatemgmt-mecmintegration",

articles/automation/TOC.yml

@@ -17,13 +17,13 @@
 - name: Tutorials
   items:
     - name: Create a Graphical runbook
-      href: automation-first-runbook-graphical.md
+      href: learn/automation-tutorial-runbook-graphical.md
     - name: Create a PowerShell runbook
-      href: automation-first-runbook-textual-powershell.md
+      href: learn/automation-tutorial-runbook-textual-powershell.md
     - name: Create a PowerShell workflow runbook
-      href: automation-first-runbook-textual.md
+      href: learn/automation-tutorial-runbook-textual.md
     - name: Create a Python runbook
-      href: automation-first-runbook-textual-python2.md
+      href: learn/automation-tutorial-runbook-textual-python2.md
 - name: Concepts
   items:
     - name: Runbook execution overview
@@ -62,6 +62,8 @@
           href: shared-resources/certificates.md
         - name: Connections
           href: automation-connections.md
+        - name: Credentials
+          href: shared-resources/credentials.md
         - name: PowerShell modules
           items:
             - name: Manage modules in Azure Automation

articles/automation/automation-first-runbook-graphical.md renamed to articles/automation/learn/automation-tutorial-runbook-graphical.md

@@ -1,20 +1,21 @@
 ---
-title: My first Python runbook in Azure Automation
-description: Tutorial that walks you through the creation, testing, and publishing of a simple Python runbook.
+title: Create a Python runbook in Azure Automation
+description: Tutorial showing how to create, test, and publish a simple Python runbook.
 services: automation
 ms.subservice: process-automation
-ms.date: 03/19/2019
-ms.topic: conceptual
+ms.date: 04/19/2020
+ms.topic: tutorial
 ---
-# My first Python runbook
 
-> [!div class="op_single_selector"]
-> - [Graphical](automation-first-runbook-graphical.md)
-> - [PowerShell](automation-first-runbook-textual-powershell.md)
-> - [PowerShell Workflow](automation-first-runbook-textual.md)
-> - [Python](automation-first-runbook-textual-python2.md)
+# Tutorial: Create a Python runbook
 
-This tutorial walks you through the creation of a [Python runbook](automation-runbook-types.md#python-runbooks) in Azure Automation. You start with a simple runbook that you test and publish. Then you modify the runbook to actually manage Azure resources, in this case starting an Azure virtual machine. Lastly, you make the runbook more robust by adding runbook parameters.
+This tutorial walks you through the creation of a [Python runbook](../automation-runbook-types.md#python-runbooks) in Azure Automation. Python runbooks compile under Python 2. You can directly edit the code of the runbook using the text editor in the Azure portal.
+
+> [!div class="checklist"]
+> * Create a simple Python runbook
+> * Test and publish the runbook
+> * Run and track the status of the runbook job
+> * Update the runbook to start an Azure virtual machine with runbook parameters
 
 > [!NOTE]
 > Using a webhook to start a Python runbook is not supported.
@@ -24,7 +25,7 @@ This tutorial walks you through the creation of a [Python runbook](automation-ru
 To complete this tutorial, you need the following:
 
 - Azure subscription. If you don't have one yet, you can [activate your MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) or sign up for a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
-- [Automation account](automation-offering-get-started.md) to hold the runbook and authenticate to Azure resources. This account must have permission to start and stop the virtual machine.
+- [Automation account](../automation-offering-get-started.md) to hold the runbook and authenticate to Azure resources. This account must have permission to start and stop the virtual machine.
 - An Azure virtual machine. You stop and start this machine so it should not be a production VM.
 
 ## Create a new runbook
@@ -33,13 +34,17 @@ You start by creating a simple runbook that outputs the text *Hello World*.
 
 1. In the Azure portal, open your Automation account.
 
-    The Automation account page gives you a quick view of the resources in this account. You should already have some assets. Most of those assets are the modules that are automatically included in a new Automation account. You should also have the Credential asset that's mentioned in the [prerequisites](#prerequisites).<br>
+    The Automation account page gives you a quick view of the resources in this account. You should already have some assets. Most of those assets are the modules that are automatically included in a new Automation account. You should also have the Credential asset that's mentioned in the [prerequisites](#prerequisites).
+
+2. Select **Runbooks** under **Process Automation** to open the list of runbooks.
+
+3. Select **Add a runbook** to create a new runbook.
 
-1. Select **Runbooks** under **Process Automation** to open the list of runbooks.
-1. Select **Add a runbook** to create a new runbook.
-1. Give the runbook the name **MyFirstRunbook-Python**.
-1. Select **Python 2** for **Runbook type**.
-1. Click **Create** to create the runbook and open the textual editor.
+4. Give the runbook the name **MyFirstRunbook-Python**.
+
+5. Select **Python 2** for **Runbook type**.
+
+6. Click **Create** to create the runbook and open the textual editor.
 
 ## Add code to the runbook
 
@@ -56,11 +61,15 @@ Click **Save** to save the runbook.
 Before you publish the runbook to make it available in production, you want to test it to make sure that it works properly. When you test a runbook, you run its Draft version and view its output interactively.
 
 1. Click **Test pane** to open the Test pane.
-1. Click **Start** to start the test. This should be the only enabled option.
-1. A [runbook job](automation-runbook-execution.md) is created and its status displayed.
+
+2. Click **Start** to start the test. This should be the only enabled option.
+
+3. A [runbook job](../automation-runbook-execution.md) is created and its status displayed.
    The job status starts as Queued, indicating that it is waiting for a runbook worker in the cloud to come available. It moves to Starting when a worker claims the job, and then Running when the runbook actually starts running.
-1. When the runbook job completes, its output is displayed. In this case, you should see `Hello World`.
-1. Close the Test pane to return to the canvas.
+
+4. When the runbook job completes, its output is displayed. In this case, you should see `Hello World`.
+
+5. Close the Test pane to return to the canvas.
 
 ## Publish and start the runbook
 
@@ -69,18 +78,30 @@ When you publish a runbook, you overwrite the existing published version with th
 In this case, you don't have a published version yet because you just created the runbook.
 
 1. Click **Publish** to publish the runbook and then **Yes** when prompted.
-1. If you scroll left to view the runbook on the **Runbooks** page, you should see an **Authoring Status** of **Published**.
-1. Scroll back to the right to view the pane for **MyFirstRunbook-Python**.
+
+2. If you scroll left to view the runbook on the **Runbooks** page, you should see an **Authoring Status** of **Published**.
+
+3. Scroll back to the right to view the pane for **MyFirstRunbook-Python**.
+
    The options across the top allow you to start the runbook, view the runbook, or schedule it to start at some time in the future.
-2. Click **Start** and then click **OK** when the Start Runbook blade opens.
-3. A Job pane is opened for the runbook job that you created. You can close this pane, but let's leave it open so that you can watch the job's progress.
-1. The job status is shown in **Job Summary** and matches the statuses that you saw when you tested the runbook.
-2. Once the runbook status shows Completed, click **Output**. The Output pane is opened, where you can see `Hello World`.
-3. Close the Output pane.
-4. Click **All Logs** to open the Streams pane for the runbook job. You should only see `Hello World` in the Output stream. However, this pane can show other streams for a runbook job, such as Verbose and Error, if the runbook writes to them.
-5. Close the Streams pane and the Job pane to return to the MyFirstRunbook-Python pane.
-6. Click **Jobs** to open the Jobs page for this runbook. This page lists all jobs created by this runbook. You should only see one job listed since you only ran the job once.
-7. You can click this job to open the same Job pane that you viewed when you started the runbook. This pane allows you to go back in time and view the details of any job that was created for a particular runbook.
+
+4. Click **Start** and then click **OK** when the Start Runbook blade opens.
+
+5. A Job pane is opened for the runbook job that you created. You can close this pane, but let's leave it open so that you can watch the job's progress.
+
+6. The job status is shown in **Job Summary** and matches the statuses that you saw when you tested the runbook.
+
+7. Once the runbook status shows Completed, click **Output**. The Output pane is opened, where you can see `Hello World`.
+
+8. Close the Output pane.
+
+9. Click **All Logs** to open the Streams pane for the runbook job. You should only see `Hello World` in the Output stream. However, this pane can show other streams for a runbook job, such as Verbose and Error, if the runbook writes to them.
+
+10. Close the Streams pane and the Job pane to return to the MyFirstRunbook-Python pane.
+
+11. Click **Jobs** to open the Jobs page for this runbook. This page lists all jobs created by this runbook. You should only see one job listed since you only ran the job once.
+
+12. You can click this job to open the same Job pane that you viewed when you started the runbook. This pane allows you to go back in time and view the details of any job that was created for a particular runbook.
 
 ## Add authentication to manage Azure resources
 
@@ -162,11 +183,9 @@ Test and run the runbook again to see that it starts the VM.
 
 ## Use input parameters
 
-The runbook currently uses hard-coded values for the names of the resource group and the VM.
-Now let's add code that gets these values from input parameters.
+The runbook currently uses hard-coded values for the names of the resource group and the VM. Now let's add code that gets these values from input parameters.
 
-You use the `sys.argv` variable to get the parameter values.
-Add the following code to the runbook immediately after the other `import` statements:
+You use the `sys.argv` variable to get the parameter values. Add the following code to the runbook immediately after the other `import` statements:
 
 ```python
 import sys
@@ -175,8 +194,7 @@ resource_group_name = str(sys.argv[1])
 vm_name = str(sys.argv[2])
 ```
 
-This imports the `sys` module, and creates two variables to hold the Resource Group and VM names.
-Notice that the element of the argument list, `sys.argv[0]`, is the name of the script, and is not input by the user.
+This imports the `sys` module, and creates two variables to hold the Resource Group and VM names. Notice that the element of the argument list, `sys.argv[0]`, is the name of the script, and is not input by the user.
 
 Now you can modify the last two lines of the runbook to use the input parameter values instead of using hard-coded values:
 
@@ -186,18 +204,15 @@ async_vm_start = compute_client.virtual_machines.start(
 async_vm_start.wait()
 ```
 
-When you start a Python runbook (either on the Test pane or as a published runbook),
-you can enter the values for parameters in the Start Runbook page under **Parameters**.
+When you start a Python runbook (either on the Test pane or as a published runbook), you can enter the values for parameters in the Start Runbook page under **Parameters**.
 
-After you start entering a value in the first box, a second appears, and so on,
-so that you can enter as many parameter values as necessary.
+After you start entering a value in the first box, a second appears, and so on, so that you can enter as many parameter values as necessary.
 
 The values are available to the script in the `sys.argv` array as in the code you just added.
 
-Enter the name of your resource group as the value for the first parameter,
-and the name of the VM to start as the value of the second parameter.
+Enter the name of your resource group as the value for the first parameter, and the name of the VM to start as the value of the second parameter.
 
-![Enter parameter values](media/automation-first-runbook-textual-python/runbook-python-params.png)
+![Enter parameter values](../media/automation-tutorial-runbook-textual-python/runbook-python-params.png)
 
 Click **OK** to start the runbook. The runbook runs and starts the VM that you specified.
 
@@ -227,9 +242,9 @@ except Exception as detail:
 
 ## Next steps
 
-- To get started with PowerShell runbooks, see [My first PowerShell runbook](automation-first-runbook-textual-powershell.md).
-- To get started with Graphical runbooks, see [My first graphical runbook](automation-first-runbook-graphical.md).
-- To get started with PowerShell workflow runbooks, see [My first PowerShell workflow runbook](automation-first-runbook-textual.md).
-- To know more about runbook types, their advantages and limitations, see [Azure Automation runbook types](automation-runbook-types.md).
+- To get started with PowerShell runbooks, see [Create a PowerShell runbook](automation-tutorial-runbook-textual-powershell.md).
+- To get started with Graphical runbooks, see [Create a graphical runbook](automation-tutorial-runbook-graphical.md).
+- To get started with PowerShell workflow runbooks, see [Create a PowerShell workflow runbook](automation-tutorial-runbook-textual.md).
+- To know more about runbook types, their advantages and limitations, see [Azure Automation runbook types](../automation-runbook-types.md).
 - To learn about developing for Azure with Python, see [Azure for Python developers](/azure/python/).
 - To view sample Python 2 runbooks, see the [Azure Automation GitHub](https://github.com/azureautomation/runbooks/tree/master/Utility/Python).