Skip to content

Commit f12220c

Browse files
authored
Merge pull request #113090 from BethWilke/branch204
Branch204
2 parents ff633d0 + 86c6c8d commit f12220c

File tree

10 files changed

+275
-265
lines changed

10 files changed

+275
-265
lines changed

articles/automation/change-tracking-file-contents.md

Lines changed: 143 additions & 34 deletions
Large diffs are not rendered by default.

articles/automation/change-tracking.md

Lines changed: 109 additions & 213 deletions
Large diffs are not rendered by default.

articles/automation/graphical-runbook-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.topic: conceptual
1313

1414
## Prerequisites
1515

16-
Import the `Microsoft.Azure.Automation.GraphicalRunbook.Model` package into your project.
16+
Import the `Microsoft.Azure.Management.Automation.GraphicalRunbook.Model` package into your project.
1717

1818
## Create a runbook object instance
1919

articles/automation/python-packages.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ Once a package has been imported, it's listed on the Python 2 packages page in y
2626

2727
## Import packages with dependencies
2828

29-
Azure automation doesn't resolve dependencies for python packages during the import process. There are two ways to import a package with all its dependencies. Only one of the following steps needs to be used to import the packages into your Automation account.
29+
Azure automation doesn't resolve dependencies for Python packages during the import process. There are two ways to import a package with all its dependencies. Only one of the following steps needs to be used to import the packages into your Automation account.
3030

3131
### Manually download
3232

33-
On a Windows 64-bit machine with [python2.7](https://www.python.org/downloads/release/latest/python2) and [pip](https://pip.pypa.io/en/stable/) installed, run the following command to download a package and all its dependencies:
33+
On a Windows 64-bit machine with [Python2.7](https://www.python.org/downloads/release/latest/python2) and [pip](https://pip.pypa.io/en/stable/) installed, run the following command to download a package and all its dependencies:
3434

3535
```cmd
3636
C:\Python27\Scripts\pip2.7.exe download -d <output dir> <package name>
@@ -40,7 +40,7 @@ Once the packages are downloaded, you can import them into your automation accou
4040

4141
### Runbook
4242

43-
Import the python runbook [Import Python 2 packages from pypi into Azure Automation account](https://gallery.technet.microsoft.com/scriptcenter/Import-Python-2-packages-57f7d509) from the gallery into your Automation account. Make sure the Run Settings are set to **Azure** and start the runbook with the parameters. The runbook requires a Run As account for the Automation account to work. For each parameter make sure you start it with the switch as seen in the following list and image:
43+
To obtain a runbook, [import Python 2 packages from pypi into Azure Automation account](https://gallery.technet.microsoft.com/scriptcenter/Import-Python-2-packages-57f7d509) from the gallery into your Automation account. Make sure the Run Settings are set to **Azure** and start the runbook with the parameters. The runbook requires a Run As account for the Automation account to work. For each parameter make sure you start it with the switch as seen in the following list and image:
4444

4545
* -s \<subscriptionId\>
4646
* -g \<resourceGroup\>
@@ -79,7 +79,7 @@ for group in groups:
7979

8080
## Develop and test runbooks offline
8181

82-
To develop and test your Python 2 runbooks offline, you can use the [Azure Automation python emulated assets](https://github.com/azureautomation/python_emulated_assets) module on GitHub. This module allows you to reference your shared resources such as credentials, variables, connections, and certificates.
82+
To develop and test your Python 2 runbooks offline, you can use the [Azure Automation Python emulated assets](https://github.com/azureautomation/python_emulated_assets) module on GitHub. This module allows you to reference your shared resources such as credentials, variables, connections, and certificates.
8383

8484
## Next steps
8585

articles/automation/shared-resources/modules.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ Azure Automation allows you to import PowerShell modules to enable cmdlets in ru
1616

1717
* [Azure PowerShell Az.Automation](/powershell/azure/new-azureps-module-az?view=azps-1.1.0)
1818
* [Azure PowerShell AzureRM.Automation](https://docs.microsoft.com/powershell/module/azurerm.automation/?view=azurermps-6.13.0)
19-
* Internal `Orchestrator.AssetManagement.Cmdlets` module for the Log Analytics agent for Windows
2019
* Other PowerShell modules
20+
* Internal `Orchestrator.AssetManagement.Cmdlets` module
21+
* Python 2 modules
2122
* Custom modules that you create
2223

2324
When you create an Automation account, Azure Automation imports some modules by default. See [Default modules](#default-modules).
@@ -91,9 +92,13 @@ Note that the internal cmdlets differ in naming from the Az and AzureRM cmdlets.
9192

9293
We recommend that you use Az or AzureRM cmdlets for manipulating Azure Automation resources outside the context of a runbook.
9394

94-
## Module supporting Get-AutomationPSCredential
95+
## Orchestrator.AssetManagement.Cmdlets module
9596

96-
The `Get-AutomationPSCredential` cmdlet is part of the module `Orchestrator.AssetManagement.Cmdlets`. This cmdlet returns a `PSCredential` object, which is expected by most PowerShell cmdlets that work with credentials. To find out more about the use of credentials in Azure Automation, see [Credential assets in Azure Automation](credentials.md).
97+
Azure Automation supports the internal `Orchestrator.AssetManagement.Cmdlets` module for the Log Analytics agent for Windows, installed by default. The `Get-AutomationPSCredential` cmdlet in this module is commonly used in runbooks to retrieve a `PSCredential` object, which is expected by most PowerShell cmdlets that work with credentials. To find out more about the use of credentials in Azure Automation, see [Credential assets in Azure Automation](credentials.md).
98+
99+
## Python modules
100+
101+
You can create Python 2 runbooks in Azure Automation. For Python module information, see [Manage Python 2 packages in Azure Automation](../python-packages.md).
97102

98103
## Migrating to Az modules
99104

@@ -112,7 +117,7 @@ Importing an Az module into your Automation account doesn't automatically import
112117
* When a runbook invokes a cmdlet from a module
113118
* When a runbook imports the module explicitly with the [Import-Module](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/import-module?view=powershell-7) cmdlet
114119
* When a runbook imports another dependent module
115-
120+
116121
#### Testing for your runbooks and DSC configurations prior to module migration
117122

118123
Be sure to test all runbooks and DSC configurations carefully in a separate Automation account before migrating to the Az modules.

articles/automation/troubleshoot/runbooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Connect-AzAccount : Method 'get_SerializationSettings' in type
167167
'Microsoft.Azure.Commands.ResourceManager.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
168168
does not have an implementation.
169169
At line:16 char:1
170-
+ Connect-AZAccount -ServicePrincipal -Tenant $Conn.TenantID -Appl ...
170+
+ Connect-AzAccount -ServicePrincipal -Tenant $Conn.TenantID -Appl ...
171171
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
172172
+ CategoryInfo : NotSpecified: (:) [Connect-AzAccount], TypeLoadException
173173
+ FullyQualifiedErrorId : System.TypeLoadException,Microsoft.Azure.Commands.Profile.ConnectAzAccountCommand

articles/azure-monitor/insights/solutions-inventory.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ ms.date: 06/26/2018
1010
---
1111

1212
# Inventory and data collection details for monitoring solutions in Azure
13-
[Monitoring solutions](solutions.md) leverage services in Azure to provide additional insight into the operation of a particular application or service. Monitoring solutions typically collect log data and provide queries and views to analyze collected data. You can add monitoring solutions to Azure Monitor for any applications and services that you use. They are typically available at no cost but collect data that could invoke usage charges.
13+
[Monitoring solutions](solutions.md) use services in Azure to gain knowledge of the operation of a particular application or service. Monitoring solutions typically collect log data and provide queries and views to analyze collected data. You can add monitoring solutions to Azure Monitor for any applications and services that you use. They're typically available at no cost but collect data that could invoke usage charges.
1414

15-
This article includes a list of [montioring solutions](solutions.md) available from Microsoft with links to their detailed documentation. It also provides information on their method and frequency of data collection into Azure Monitor. You can use the information in this article to identify the different solutions available and to understand the data flow and connection requirements for different monitoring solutions.
15+
This article includes a list of [monitoring solutions](solutions.md) available from Microsoft with links to their detailed documentation. It also provides information on their method and frequency of data collection into Azure Monitor. You can use the information in this article to identify the different solutions available and to understand the data flow and connection requirements for different monitoring solutions.
1616

1717
[!INCLUDE [azure-monitor-log-analytics-rebrand](../../../includes/azure-monitor-log-analytics-rebrand.md)]
1818

@@ -22,11 +22,11 @@ The following table lists the [monitoring solutions](solutions.md) in Azure prov
2222

2323
Explanations of the columns are as follows:
2424

25-
- **Microsoft monitoring agent** - Agent used on Windows and Linux to run managements pack from SCOM and monitoring solutions from Azure. In this configuration, the agent is connected directly to Azure Monitor without being connected to an Operations Manager management group.
25+
- **Microsoft monitoring agent** - Agent used on Windows and Linux to run managements pack from Microsoft System Center - Operations Manager (OM) and monitoring solutions from Azure. In this configuration, the agent is connected directly to Azure Monitor without being connected to an Operations Manager management group.
2626
- **Operations Manager** - Identical agent as Microsoft monitoring agent. In this configuration, it's [connected to an Operations Manager management group](../platform/om-agents.md) that's connected to Azure Monitor.
27-
- **Azure Storage** - Solution collects data from an Azure storage account.
27+
- **Azure Storage** - Solution collects data from an Azure Storage account.
2828
- **Operations Manager required?** - A connected Operations Manager management group is required for data collection by the monitoring solution.
29-
- **Operations Manager agent data sent via management group** - If the agent is [connected to a SCOM management group](../platform/om-agents.md), then data is sent to Azure Monitor from the management server. In this case, the agent doesn't need to connect directly to Azure Monitor. If this box isn't selected, then data is sent from the agent directly to Azure Monitor even if the agent is connected to a SCOM management group. It will need to be able to communicate to Azure Monitor through the [Log Analytics gateway](../platform/gateway.md).
29+
- **Operations Manager agent data sent via management group** - If the agent is [connected to an OM management group](../platform/om-agents.md), then data is sent to Azure Monitor from the management server. In this case, the agent doesn't need to connect directly to Azure Monitor. If this box isn't selected, then data is sent from the agent directly to Azure Monitor even if the agent is connected to an OM management group. It will need to be able to communicate to Azure Monitor through the [Log Analytics gateway](../platform/gateway.md).
3030
- **Collection frequency** - Specifies the frequency that data is collected by the monitoring solution.
3131

3232

@@ -49,8 +49,8 @@ Explanations of the columns are as follows:
4949
| [Azure SQL Analytics (Preview)](azure-sql.md) | Windows | | | | | | 1 minute |
5050
| [Backup](https://azure.microsoft.com/resources/templates/101-backup-oms-monitoring/) | Azure | | | | | | on notification |
5151
| [Capacity and Performance (Preview)](capacity-performance.md) |Windows |&#8226; |&#8226; | | |&#8226; |on arrival |
52-
| [Change Tracking](../../automation/change-tracking.md) |Windows |&#8226; |&#8226; | | |&#8226; |[varies](../../automation/change-tracking.md#change-tracking-data-collection-details) |
53-
| [Change Tracking](../../automation/change-tracking.md) |Linux |&#8226; | | | | |[varies](../../automation/change-tracking.md#change-tracking-data-collection-details) |
52+
| [Change Tracking](../../automation/change-tracking.md) |Windows |&#8226; |&#8226; | | |&#8226; |[varies](../../automation/change-tracking.md#change-tracking-and-inventory-data-collection) |
53+
| [Change Tracking](../../automation/change-tracking.md) |Linux |&#8226; | | | | |[varies](../../automation/change-tracking.md#change-tracking-and-inventory-data-collection) |
5454
| [Containers](containers.md) | Windows and Linux | &#8226; | &#8226; | | | | 3 minutes |
5555
| [Key Vault Analytics](azure-key-vault.md) |Windows | | | | | |on notification |
5656
| [Malware Assessment](../../security-center/security-center-install-endpoint-protection.md) |Windows |&#8226; |&#8226; | | |&#8226; |hourly |
@@ -62,7 +62,7 @@ Explanations of the columns are as follows:
6262
| [SQL Assessment](sql-assessment.md) |Windows |&#8226; |&#8226; | | |&#8226; |7 days |
6363
| [SurfaceHub](surface-hubs.md) |Windows |&#8226; | | | | |on arrival |
6464
| [System Center Operations Manager Assessment (Preview)](scom-assessment.md) | Windows | &#8226; | &#8226; | | | &#8226; | seven days |
65-
| [Update Management](../../automation/automation-update-management.md) | Windows |&#8226; |&#8226; | | |&#8226; |at least 2 times per day and 15 minutes after installing an update |
65+
| [Update Management](../../automation/automation-update-management.md) | Windows |&#8226; |&#8226; | | |&#8226; |at least two times per day and 15 minutes after installing an update |
6666
| [Upgrade Readiness](https://docs.microsoft.com/windows/deployment/upgrade/upgrade-readiness-get-started) | Windows | &#8226; | | | | | 2 days |
6767
| [VMware Monitoring (Deprecated)](vmware.md) | Linux | &#8226; | | | | | 3 minutes |
6868
| [Wire Data 2.0 (Preview)](wire-data.md) |Windows (2012 R2 / 8.1 or later) |&#8226; |&#8226; | | | | 1 minute |

0 commit comments

Comments
 (0)