Skip to content

Commit f6a06a7

Browse files
Merge pull request #111783 from BethWilke/branch122
Fixing task 1707219
2 parents 8176d11 + fbc2044 commit f6a06a7

9 files changed

+172
-181
lines changed

articles/automation/automation-update-azure-modules.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@ ms.topic: conceptual
1111

1212
To update the Azure modules in your Automation account you need to use the [Update Azure modules runbook](https://github.com/Microsoft/AzureAutomation-Account-Modules-Update), which is available as open source. To start using the **Update-AutomationAzureModulesForAccount** runbook to update your Azure modules, download it from the [Update Azure modules runbook repository](https://github.com/Microsoft/AzureAutomation-Account-Modules-Update) on GitHub. You can then import it into your Automation account or run it as a script. To learn how to import a runbook in your Automation account, see [Import a runbook](manage-runbooks.md#importing-a-runbook).
1313

14-
The most common AzureRM PowerShell modules are provided by default in each Automation account. The Azure team updates the Azure modules regularly, therefore to keep up to date you will want to use the [Update-AutomationAzureModulesForAccount](https://github.com/Microsoft/AzureAutomation-Account-Modules-Update) runbook to update the modules in your Automation accounts.
14+
The most common PowerShell modules are provided by default in each Automation account. The Azure team updates the Azure modules regularly. Therefore, to keep the modules in your Automation accounts up to date, you should use the [Update-AutomationAzureModulesForAccount](https://github.com/Microsoft/AzureAutomation-Account-Modules-Update) runbook.
1515

16-
Because modules are updated regularly by the product group, changes can occur with the included cmdlets. This action may negatively impact your runbooks depending on the type of change, such as renaming a parameter or deprecating a cmdlet entirely.
16+
Because modules are updated regularly by the product group, changes can occur with the included cmdlets. These changes, for example, renaming a parameter or deprecating a cmdlet entirely, can negatively affect your runbooks.
1717

18-
To avoid impacting your runbooks and the processes they automate, test and validate before proceeding. If you don't have a dedicated Automation account intended for this purpose, consider creating one so that you can test many different scenarios during the development of your runbooks. This testing should include iterative changes such as updating the PowerShell modules.
18+
To avoid impacting your runbooks and the processes they automate, test and validate before proceeding. If you don't have a dedicated Automation account intended for this purpose, consider creating one so that you can test many different scenarios during the development of your runbooks. This testing should include iterative changes, such as updating the PowerShell modules.
1919

2020
If you develop your scripts locally, it's recommended to have the same module versions locally that you have in your Automation account when testing to ensure you'll receive the same results. After the results are validated and you've applied any changes required, you can move the changes to production.
2121

2222
> [!NOTE]
2323
> A new Automation account might not contain the latest modules.
2424
2525
> [!NOTE]
26-
> You will not be able to delete global modules - modules that Automation provides out of the box.
26+
> You will not be able to delete global modules, which are modules that Automation provides out of the box.
2727
2828
>[!NOTE]
2929
>This article has been updated to use the new Azure PowerShell Az module. You can still use the AzureRM module, which will continue to receive bug fixes until at least December 2020. To learn more about the new Az module and AzureRM compatibility, see [Introducing the new Azure PowerShell Az module](https://docs.microsoft.com/powershell/azure/new-azureps-module-az?view=azps-3.5.0). For Az module installation instructions on your Hybrid Runbook Worker, see [Install the Azure PowerShell Module](https://docs.microsoft.com/powershell/azure/install-az-ps?view=azps-3.5.0).
3030
3131
## Considerations
3232

33-
The following are some considerations to take into account when using this process to update your Azure Modules:
33+
The following are some considerations to take into account when using this article to update your Azure Modules:
3434

35-
* The runbook described in this article supports updating the Azure, AzureRM, and Az modules by default. Review the [Update Azure modules runbook README](https://github.com/microsoft/AzureAutomation-Account-Modules-Update/blob/master/README.md) for more information on updating Az.Automation modules with this runbook. There are additional important factors that you need to take into account when using the `Az` modules in your Automation account. To learn more, see [Using Az modules in your Automation account](az-modules.md).
35+
* The runbook described in this article supports updating the Azure, AzureRM, and Az modules by default. Review the [Update Azure modules runbook README](https://github.com/microsoft/AzureAutomation-Account-Modules-Update/blob/master/README.md) for more information on updating Az.Automation modules with this runbook. There are additional important factors that you need to take into account when using the Az modules in your Automation account. To learn more, see [Using Az modules in your Automation account](az-modules.md).
3636

3737
* Before starting this runbook, make sure your Automation account has an [Azure Run As account credential](manage-runas-account.md) created.
3838

articles/automation/automation-update-management-deploy-template.md

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ ms.subservice: update-management
66
ms.topic: conceptual
77
author: mgoedtel
88
ms.author: magoedte
9-
ms.date: 04/15/2020
10-
9+
ms.date: 03/30/2020
1110
---
1211

1312
# Onboard Update Management solution using Azure Resource Manager template
@@ -16,19 +15,19 @@ You can use [Azure Resource Manager templates](../azure-resource-manager/templat
1615

1716
* Creation of a Azure Monitor Log Analytics workspace.
1817
* Creation of an Azure Automation account.
19-
* Links the Automation account to the Log Analytics workspace if not already linked.
20-
* Onboard the Azure Automation Update Management solution
18+
* Linking the Automation account to the Log Analytics workspace, if not already linked.
19+
* Onboarding the Azure Automation Update Management solution.
2120

2221
The template does not automate the onboarding of one or more Azure or non-Azure VMs.
2322

24-
>[!NOTE]
25-
>Creation of the Automation Run As account is not supported when using an Azure Resource Manager template. To create a Run As account manually from the portal or with PowerShell, see [Manage Run As account](manage-runas-account.md).
23+
If you already have a Log Analytics workspace and Automation account deployed in a supported region in your subscription, they are not linked. The workspace doesn't already have the Update Management solution deployed. Using this template successfully creates the link and deploys the Update Management solution.
2624

27-
If you already have a Log Analytics workspace and Automation account deployed in a supported region in your subscription, they are not linked, and the workspace doesn't already have the Update Management solution deployed, using this template successfully creates the link and deploys the Update Management solution.
25+
>[!NOTE]
26+
>This article has been updated to use the new Azure PowerShell Az module. You can still use the AzureRM module, which will continue to receive bug fixes until at least December 2020. To learn more about the new Az module and AzureRM compatibility, see [Introducing the new Azure PowerShell Az module](https://docs.microsoft.com/powershell/azure/new-azureps-module-az?view=azps-3.5.0). For Az module installation instructions on your Hybrid Runbook Worker, see [Install the Azure PowerShell Module](https://docs.microsoft.com/powershell/azure/install-az-ps?view=azps-3.5.0). For your Automation account, you can update your modules to the latest version using [How to update Azure PowerShell modules in Azure Automation](automation-update-azure-modules.md).
2827
2928
## API versions
3029

31-
The following table lists the API version for the resources used in this example.
30+
The following table lists the API versions for the resources used in this template.
3231

3332
| Resource | Resource type | API version |
3433
|:---|:---|:---|
@@ -38,18 +37,18 @@ The following table lists the API version for the resources used in this example
3837

3938
## Before using the template
4039

41-
If you choose to install and use PowerShell locally, this article requires the Azure PowerShell Az module. Run `Get-Module -ListAvailable Az` to find the version. If you need to upgrade, see [Install the Azure PowerShell module](/powershell/azure/install-az-ps). If you are running PowerShell locally, you also need to run `Connect-AzAccount` to create a connection with Azure. With Azure PowerShell, deployment uses [New-AzResourceGroupDeployment](/powershell/module/az.resources/new-azresourcegroupdeployment).
40+
If you choose to install and use PowerShell locally, this article requires the Azure PowerShell Az module. Run `Get-Module -ListAvailable Az` to find the version. If you need to upgrade, see [Install the Azure PowerShell module](/powershell/azure/install-az-ps). If you are running PowerShell locally, you also need to run [Connect-AzAccount](https://docs.microsoft.com/powershell/module/az.accounts/connect-azaccount?view=azps-3.7.0) to create a connection with Azure. With Azure PowerShell, deployment uses [New-AzResourceGroupDeployment](/powershell/module/az.resources/new-azresourcegroupdeployment).
4241

4342
If you choose to install and use the CLI locally, this article requires that you are running the Azure CLI version 2.1.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). With Azure CLI, this deployment uses [az group deployment create](https://docs.microsoft.com/cli/azure/group/deployment?view=azure-cli-latest#az-group-deployment-create).
4443

4544
The JSON template is configured to prompt you for:
4645

4746
* The name of the workspace
48-
* The region to create the workspace in
47+
* The region in which to create the workspace
4948
* The name of the Automation account
50-
* The region to create the account in
49+
* The region in which to create the account
5150

52-
The JSON template specifies a default value for the other parameters that would likely be used as a standard configuration in your environment. You can store the template in an Azure storage account for shared access in your organization. For further information about working with templates, see [Deploy resources with Resource Manager templates and Azure CLI](../azure-resource-manager/templates/deploy-cli.md).
51+
The JSON template specifies a default value for the other parameters that are likely to be used for a standard configuration in your environment. You can store the template in an Azure storage account for shared access in your organization. For further information about working with templates, see [Deploy resources with Resource Manager templates and Azure CLI](../azure-resource-manager/templates/deploy-cli.md).
5352

5453
The following parameters in the template are set with a default value for the Log Analytics workspace:
5554

@@ -58,11 +57,11 @@ The following parameters in the template are set with a default value for the Lo
5857
* capacity reservation - defaults to 100 GB
5958

6059
>[!WARNING]
61-
>If creating or configuring a Log Analytics workspace in a subscription that has opted into the new April 2018 pricing model, the only valid Log Analytics pricing tier is **PerGB2018**.
60+
>If creating or configuring a Log Analytics workspace in a subscription that has opted into the April 2018 pricing model, the only valid Log Analytics pricing tier is **PerGB2018**.
6261
>
6362
6463
>[!NOTE]
65-
>Before using this template, review [additional details](../azure-monitor/platform/template-workspace-configuration.md#create-a-log-analytics-workspace) to fully understand workspace configuration options such as access control mode, pricing tier, retention, and capacity reservation level. If you are new to Azure Monitor logs and have not deployed a workspace already, you should review the [workspace design](../azure-monitor/platform/design-logs-deployment.md) guidance to learn about access control, and an understanding of the design implementation strategies we recommend for your organization.
64+
>Before using this template, review [additional details](../azure-monitor/platform/template-workspace-configuration.md#create-a-log-analytics-workspace) to fully understand workspace configuration options, such as access control mode, pricing tier, retention, and capacity reservation level. If you are new to Azure Monitor logs and have not deployed a workspace already, you should review the [workspace design](../azure-monitor/platform/design-logs-deployment.md) guidance to learn about access control, and understand the design implementation strategies we recommend for your organization.
6665
6766
## Deploy template
6867

@@ -213,7 +212,7 @@ The following parameters in the template are set with a default value for the Lo
213212
"sku": {
214213
"name": "Basic"
215214
}
216-
}
215+
},
217216
},
218217
{
219218
"apiVersion": "2015-11-01-preview",
@@ -234,7 +233,7 @@ The following parameters in the template are set with a default value for the Lo
234233

235234
2. Edit the template to meet your requirements. Consider creating a [Resource Manager parameters file](../azure-resource-manager/templates/parameter-files.md) instead of passing parameters as inline values.
236235

237-
3. Save this file as deployUMSolutiontemplate.json to a local folder.
236+
3. Save this file to a local folder as **deployUMSolutiontemplate.json**.
238237

239238
4. You are ready to deploy this template. You can use either PowerShell or the Azure CLI. When you're prompted for a workspace and Automation account name, provide a name that is globally unique across all Azure subscriptions.
240239

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Use dynamic groups with Azure Update Management
2+
title: Use dynamic groups with Azure Automation Update Management
33
description: This article describes how dynamic groups work with Azure Automation Update Management.
44
services: automation
55
ms.subservice: update-management
@@ -8,11 +8,11 @@ ms.topic: conceptual
88
---
99
# Use dynamic groups with Update Management
1010

11-
Update Management provides the ability to target a dynamic group of Azure or non-Azure VMs for update deployments. These groups are evaluated at deployment time so you do not have to edit your deployment to add machines.
11+
Update Management allows you to target a dynamic group of Azure or non-Azure VMs for update deployments. These groups, defined by queries, are evaluated at deployment time so that you don't have to edit your deployment to add machines.
1212

1313
## Azure machines
1414

15-
These groups are defined by a query, when an update deployment begins, the members of that group are evaluated. Dynamic groups do not work with classic VMs. When defining your query, the following items can be used together to populate the dynamic group:
15+
Dynamic groups do not work with classic VMs. When defining your query, the following items can be used together to populate a dynamic group:
1616

1717
* Subscription
1818
* Resource groups
@@ -21,16 +21,16 @@ These groups are defined by a query, when an update deployment begins, the membe
2121

2222
![Select groups](./media/automation-update-management/select-groups.png)
2323

24-
To preview the results of a dynamic group, click the **Preview** button. This preview shows the group membership at that time, in this example, we are searching for machines with the tag **Role** is equal to **BackendServer**. If more machines have this tag added, they will be added to any future deployments against that group.
24+
To preview the results of a dynamic group, click **Preview**. The preview shows the group membership at the current time. In the example, we're searching for machines having the tag `Role` for the group **BackendServer**. If more machines have this tag added, they are added to any future deployments against that group.
2525

2626
![preview groups](./media/automation-update-management/preview-groups.png)
2727

2828
## Non-Azure machines
2929

30-
For non-Azure machines, saved searches also referred to as computer groups, are used to create the dynamic group. To learn how to create a saved search, see [Creating a computer group](../azure-monitor/platform/computer-groups.md#creating-a-computer-group). Once your group is created you can select it from the list of saved searches. Click **Preview** to preview the computers in the saved search at that time.
30+
For non-Azure machines, saved searches, also referred to as computer groups, are used to create the dynamic group. To learn how to create a saved search, see [Creating a computer group](../azure-monitor/platform/computer-groups.md#creating-a-computer-group). Once your group is created, you can select it from the list of saved searches. Click **Preview** to preview the computers in the saved search at that time.
3131

3232
![Select groups](./media/automation-update-management/select-groups-2.png)
3333

3434
## Next steps
3535

36-
After creating a dynamic group, you can [Create an Update Deployment](automation-tutorial-update-management.md)
36+
After creating a dynamic group, you can [Create an Update Deployment](automation-tutorial-update-management.md).

0 commit comments

Comments
 (0)