Skip to content

Commit 09299e8

Browse files
author
Dana Sindona
committed
Merge conflicts
2 parents 2a07170 + 77e6399 commit 09299e8

File tree

107 files changed

+631
-525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+631
-525
lines changed

articles/automation/TOC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
displayName: troubleshoot
4343
- name: Process Automation
4444
items:
45+
- name: Runbook execution in Azure Automation
46+
href: automation-runbook-execution.md
47+
displayName: fair share, activity log
4548
- name: Hybrid Runbook Worker Overview
4649
href: automation-hybrid-runbook-worker.md
4750
- name: Runbook gallery
@@ -111,9 +114,6 @@
111114
- name: Runbook output
112115
href: automation-runbook-output-and-messages.md
113116
displayName: message streams, progress records, preference
114-
- name: Track a runbook job
115-
href: automation-runbook-execution.md
116-
displayName: fair share, activity log
117117
- name: Error handling in graphical runbooks
118118
href: automation-runbook-graphical-error-handling.md
119119
- name: Hybrid Runbook Worker

articles/automation/automation-runbook-execution.md

Lines changed: 33 additions & 27 deletions
Large diffs are not rendered by default.
Lines changed: 51 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
title: Azure Automation runbook types
3-
description: Describes the different types of runbooks that you can use in Azure Automation and considerations that you should take into account when determining which type to use.
3+
description: Describes the different types of runbooks that you can use in Azure Automation and considerations for determining which type to use.
44
services: automation
55
ms.subservice: process-automation
66
ms.date: 03/05/2019
77
ms.topic: conceptual
88
---
99
# Azure Automation runbook types
1010

11-
The Azure Automation process automation service supports several types of runbooks. The types are briefly defined in the following table and described in more detail in the sections below. To learn about the process automation environment, see [Runbook execution in Azure Automation](automation-runbook-execution.md).
11+
The Azure Automation process automation service supports several types of runbooks, as defined in the following table. To learn about the process automation environment, see [Runbook execution in Azure Automation](automation-runbook-execution.md).
1212

1313
| Type | Description |
1414
|:--- |:--- |
@@ -18,31 +18,34 @@ The Azure Automation process automation service supports several types of runboo
1818
| [PowerShell Workflow](#powershell-workflow-runbooks)|Text runbook based on Windows PowerShell Workflow scripting. |
1919
| [Python](#python-runbooks) |Text runbook based on Python scripting. |
2020

21-
## Graphical runbooks
21+
Take into account the following considerations when determining which type to use for a particular runbook.
22+
23+
* You can't convert runbooks from graphical to text type, or the other way around.
24+
* There are limitations when using runbooks of different types as child runbooks. For more information, see [Child runbooks in Azure Automation](automation-child-runbooks.md).
2225

23-
You can create and edit graphical and graphical PowerShell Workflow runbooks using the graphical editor in the Azure portal. However, you can't create or edit this type of runbook with another tool.
26+
## Graphical runbooks
2427

25-
A graphical runbook has the following main features:
28+
You can create and edit graphical and graphical PowerShell Workflow runbooks using the graphical editor in the Azure portal. However, you can't create or edit this type of runbook with another tool. Main features of graphical runbooks:
2629

27-
* Can be exported to a file in your Automation account and then imported into another Automation account.
28-
* Generates PowerShell code.
29-
* Can be converted to or from a graphical PowerShell Workflow runbook during import.
30+
* Can be exported to files in your Automation account and then imported into another Automation account.
31+
* Generate PowerShell code.
32+
* Can be converted to or from graphical PowerShell Workflow runbooks during import.
3033

3134
### Advantages
3235

33-
* Uses visual insert-link-configure authoring model.
34-
* Focuses on how data flows through the process.
35-
* Visually represents management processes.
36-
* Includes other runbooks as child runbooks to create high-level workflows.
37-
* Encourages modular programming.
36+
* Use visual insert-link-configure authoring model.
37+
* Focus on how data flows through the process.
38+
* Visually represent management processes.
39+
* Include other runbooks as child runbooks to create high-level workflows.
40+
* Encourage modular programming.
3841

3942
### Limitations
4043

41-
* Can't be created or edited outside of the Azure portal.
44+
* Can't create or edit outside the Azure portal.
4245
* Might require a code activity containing PowerShell code to execute complex logic.
43-
* Can't be converted to one of the [text formats](automation-runbook-types.md), nor can a text runbook be converted to graphical format.
44-
* Doesn't allow you to view or directly edit the PowerShell code that the graphical workflow creates. You can view the code you create in any code activities.
45-
* Doesn't run on a Linux Hybrid Runbook Worker. See [Automate resources in your datacenter or cloud by using Hybrid Runbook Worker](automation-hybrid-runbook-worker.md).
46+
* Can't convert to one of the [text formats](automation-runbook-types.md), nor can you convert a text runbook to graphical format.
47+
* Can't view or directly edit PowerShell code that the graphical workflow creates. You can view the code you create in any code activities.
48+
* Can't run runbooks on a Linux Hybrid Runbook Worker. See [Automate resources in your datacenter or cloud by using Hybrid Runbook Worker](automation-hybrid-runbook-worker.md).
4649

4750
## PowerShell runbooks
4851

@@ -51,69 +54,62 @@ PowerShell runbooks are based on Windows PowerShell. You directly edit the code
5154
### Advantages
5255

5356
* Implement all complex logic with PowerShell code without the additional complexities of PowerShell Workflow.
54-
* Runbook starts faster than PowerShell Workflow runbooks since it doesn't need to be compiled before running.
55-
* Can run in Azure or on both Linux and Windows Hybrid Runbook Workers
57+
* Start faster than PowerShell Workflow runbooks, since they don't need to be compiled before running.
58+
* Run in Azure and on Hybrid Runbook Workers for both Windows and Linux.
5659

5760
### Limitations
5861

59-
* Must be familiar with PowerShell scripting.
60-
* Can't use [parallel processing](automation-powershell-workflow.md#parallel-processing) to execute multiple actions in parallel.
61-
* Can't use [checkpoints](automation-powershell-workflow.md#checkpoints) to resume runbook if there is an error.
62-
* PowerShell Workflow runbooks and Graphical runbooks can only be included as child runbooks by using the Start-AzureAutomationRunbook cmdlet, which creates a new job.
62+
* You must be familiar with PowerShell scripting.
63+
* Runbooks can't use [parallel processing](automation-powershell-workflow.md#parallel-processing) to execute multiple actions in parallel.
64+
* Runbooks can't use [checkpoints](automation-powershell-workflow.md#checkpoints) to resume runbook if there's an error.
65+
* You can include only PowerShell Workflow runbooks and graphical runbooks as child runbooks by using the [Start-AzAutomationRunbook](https://docs.microsoft.com/powershell/module/az.automation/start-azautomationrunbook?view=azps-3.7.0) cmdlet, which creates a new job.
6366

64-
### Known Issues
67+
### Known issues
6568

66-
Following are current known issues with PowerShell runbooks.
69+
The following are current known issues with PowerShell runbooks:
6770

68-
* PowerShell runbooks cannot retrieve an unencrypted [variable asset](automation-variables.md) with a null value.
69-
* PowerShell runbooks can't retrieve a [variable asset](automation-variables.md) with *~* in the name.
70-
* Get-Process in a loop in a PowerShell runbook may crash after about 80 iterations.
71-
* A PowerShell runbook may fail if it attempts to write a large amount of data to the output stream at once. You can typically work around this issue by outputting just the information you need when working with large objects. For example, instead of outputting something like *Get-Process*, you can output just the required fields with *Get-Process | Select ProcessName, CPU*.
71+
* PowerShell runbooks can't retrieve an unencrypted [variable asset](automation-variables.md) with a null value.
72+
* PowerShell runbooks can't retrieve a variable asset with `*~*` in the name.
73+
* A [Get-Process](https://docs.microsoft.com/powershell/module/microsoft.powershell.management/get-process?view=powershell-7) operation in a loop in a PowerShell runbook can crash after about 80 iterations.
74+
* A PowerShell runbook can fail if it tries to write a large amount of data to the output stream at once. You can typically work around this issue by having the runbook output just the information needed to work with large objects. For example, instead of using `Get-Process` with no limitations, you can have the cmdlet output just the required parameters as in `Get-Process | Select ProcessName, CPU`.
7275

7376
## PowerShell Workflow runbooks
7477

75-
PowerShell Workflow runbooks are text runbooks based on [Windows PowerShell Workflow](automation-powershell-workflow.md). You directly edit the code of the runbook using the text editor in the Azure portal. You can also use any offline text editor and [import the runbook](manage-runbooks.md) into Azure Automation.
78+
PowerShell Workflow runbooks are text runbooks based on [Windows PowerShell Workflow](automation-powershell-workflow.md). You directly edit the code of the runbook using the text editor in the Azure portal. You can also use any offline text editor and [import the runbook](manage-runbooks.md) into Azure Automation.
7679

7780
### Advantages
7881

7982
* Implement all complex logic with PowerShell Workflow code.
80-
* Use [checkpoints](automation-powershell-workflow.md#checkpoints) to resume runbook if there is an error.
81-
* Use [parallel processing](automation-powershell-workflow.md#parallel-processing) to perform multiple actions in parallel.
82-
* Can include other Graphical runbooks and PowerShell Workflow runbooks as child runbooks to create high-level workflows.
83+
* Use [checkpoints](automation-powershell-workflow.md#checkpoints) to resume operation if there's an error.
84+
* Use [parallel processing](automation-powershell-workflow.md#parallel-processing) to do multiple actions in parallel.
85+
* Can include other graphical runbooks and PowerShell Workflow runbooks as child runbooks to create high-level workflows.
8386

8487
### Limitations
8588

86-
* Author must be familiar with PowerShell Workflow.
87-
* Runbook must deal with the additional complexity of PowerShell Workflow such as [deserialized objects](automation-powershell-workflow.md#code-changes).
88-
* Runbook takes longer to start than PowerShell runbooks since it needs to be compiled before running.
89-
* PowerShell runbooks can only be included as child runbooks by using the Start-AzureAutomationRunbook cmdlet, which creates a new job.
90-
* Can't run on a Linux Hybrid Runbook Worker.
89+
* You must be familiar with PowerShell Workflow.
90+
* Runbooks must deal with the additional complexity of PowerShell Workflow, such as [deserialized objects](automation-powershell-workflow.md#code-changes).
91+
* Runbooks take longer to start than PowerShell runbooks since they must be compiled before running.
92+
* You can only include PowerShell runbooks as child runbooks by using the `Start-AzAutomationRunbook` cmdlet.
93+
* Runbooks can't run on a Linux Hybrid Runbook Worker.
9194

9295
## Python runbooks
9396

94-
Python runbooks compile under Python 2. You can directly edit the code of the runbook using the text editor in the Azure portal, or with an offline text editor and [import the runbook](manage-runbooks.md) into Azure Automation.
97+
Python runbooks compile under Python 2. You can directly edit the code of the runbook using the text editor in the Azure portal. You can also use an offline text editor and [import the runbook](manage-runbooks.md) into Azure Automation.
9598

9699
### Advantages
97100

98-
* Utilize the robust Python libraries.
99-
* Can run in Azure or on both Linux Hybrid Runbook Workers. Windows Hybrid Runbook Workers are supported with [python2.7](https://www.python.org/downloads/release/latest/python2) installed.
101+
* Use the robust Python libraries.
102+
* Can run in Azure or on Linux Hybrid Runbook Workers. Windows Hybrid Runbook Workers are supported with [python2.7](https://www.python.org/downloads/release/latest/python2) installed.
100103

101104
### Limitations
102105

103-
* Must be familiar with Python scripting.
104-
* Only Python 2 is supported at the moment, meaning Python 3 specific functions will fail.
105-
* To use third-party libraries, you must [import the package](python-packages.md) into the Automation account for it to be used.
106-
107-
## Considerations
108-
109-
Take into account the following additional considerations when determining which type to use for a particular runbook.
110-
111-
* You can't convert runbooks from graphical to textual type or the other way around.
112-
* There are limitations using runbooks of different types as a child runbook. For more information, see [Child runbooks in Azure Automation](automation-child-runbooks.md).
106+
* You must be familiar with Python scripting.
107+
* Only Python 2 is supported presently. Any Python 3-specific functions fail.
108+
* To use third-party libraries, you must [import the packages](python-packages.md) into the Automation account.
113109

114110
## Next steps
115111

116-
* To learn more about Graphical runbook authoring, see [Graphical authoring in Azure Automation](automation-graphical-authoring-intro.md)
117-
* To understand the differences between PowerShell and PowerShell workflows for runbooks, see [Learning Windows PowerShell Workflow](automation-powershell-workflow.md)
118-
* For more information on how to create or import a Runbook, see [Creating or Importing a Runbook](manage-runbooks.md)
119-
* For more information on PowerShell, including language reference and learning modules, refer to the [PowerShell Docs](https://docs.microsoft.com/powershell/scripting/overview).
112+
* To learn more about graphical runbook authoring, see [Graphical authoring in Azure Automation](automation-graphical-authoring-intro.md).
113+
* To understand the differences between PowerShell and PowerShell workflows for runbooks, see [Learning Windows PowerShell Workflow](automation-powershell-workflow.md).
114+
* For more information on how to create or import a runbook, see [Manage runbooks in Azure Automation](manage-runbooks.md).
115+
* To find out more about PowerShell, including language reference and learning modules, refer to the [PowerShell Docs](https://docs.microsoft.com/powershell/scripting/overview).

articles/azure-cache-for-redis/cache-remove-tls-10-11.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Most applications use Redis client libraries to handle communication with their
4848
Redis .NET clients use the earliest TLS version by default on .NET Framework 4.5.2 or earlier, and use the latest TLS version on .NET Framework 4.6 or later. If you're using an older version of .NET Framework, you can enable TLS 1.2 manually:
4949

5050
* **StackExchange.Redis:** Set `ssl=true` and `sslprotocols=tls12` in the connection string.
51-
* **ServiceStack.Redis:** Follow the [ServiceStack.Redis instructions](https://github.com/ServiceStack/ServiceStack.Redis/pull/247).
51+
* **ServiceStack.Redis:** Follow the [ServiceStack.Redis instructions](https://github.com/ServiceStack/ServiceStack.Redis#servicestackredis-ssl-support).
5252

5353
### .NET Core
5454

articles/azure-databricks/what-is-azure-databricks.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: jasonh
77
ms.service: azure-databricks
88
ms.workload: big-data
99
ms.topic: overview
10-
ms.date: 05/08/2019
10+
ms.date: 04/10/2020
1111
ms.author: mamccrea
1212
ms.custom: mvc
1313
---
@@ -81,6 +81,11 @@ Azure Databricks provides enterprise-grade Azure security, including Azure Activ
8181
* Azure Databricks roles-based access enables fine-grained user permissions for notebooks, clusters, jobs, and data.
8282
* Enterprise-grade SLAs.
8383

84+
> [!IMPORTANT]
85+
>
86+
> Azure Databricks is a Microsoft Azure first-party service that is deployed on the Global Azure Public Cloud infrastructure. All communications between components of the service, including between the public IPs in the control plane and the customer data plane, remain within the Microsoft Azure network backbone. See also [Microsoft global network](https://docs.microsoft.com/azure/networking/microsoft-global-network).
87+
88+
8489
## Integration with Azure services
8590

8691
Azure Databricks integrates deeply with Azure databases and stores: SQL Data Warehouse, Cosmos DB, Data Lake Store, and Blob Storage.

articles/azure-portal/azure-portal-safelist-urls.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ services: azure-portal
55
keywords:
66
author: mgblythe
77
ms.author: mblythe
8-
ms.date: 01/29/2020
8+
ms.date: 04/10/2020
99
ms.topic: conceptual
1010

1111
ms.service: azure-portal
1212
manager: mtillman
1313
---
14+
1415
# Safelist the Azure portal URLs on your firewall or proxy server
1516

1617
You can configure on-premises security devices to bypass security restrictions for the Azure portal URLs. This configuration can improve performance and connectivity between your local- or wide-area network and the Azure cloud.
@@ -75,13 +76,3 @@ The URL endpoints to safelist for the Azure portal are specific to the Azure clo
7576
> Traffic to these endpoints uses standard TCP ports for HTTP (80) and HTTPS (443).
7677
>
7778
>
78-
## Next steps
79-
80-
Need to safelist IP addresses? Download the list of Microsoft Azure datacenter IP ranges for your cloud:
81-
82-
* [Worldwide](https://www.microsoft.com/download/details.aspx?id=56519)
83-
* [U.S. Government](https://www.microsoft.com/download/details.aspx?id=57063)
84-
* [Germany](https://www.microsoft.com/download/details.aspx?id=57064)
85-
* [China](https://www.microsoft.com/download/details.aspx?id=57062)
86-
87-
Other Microsoft services use additional URLs and IP addresses for connectivity. To optimize network connectivity for Microsoft 365 services, see [Set up your network for Office 365](/office365/enterprise/set-up-network-for-office-365).

articles/azure-resource-manager/management/tag-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Tag resources, resource groups, and subscriptions for logical organization
33
description: Shows how to apply tags to organize Azure resources for billing and managing.
44
ms.topic: conceptual
5-
ms.date: 04/01/2020
5+
ms.date: 04/10/2020
66
---
77
# Use tags to organize your Azure resources and management hierarchy
88

0 commit comments

Comments
 (0)