Skip to content

Commit d7dc60d

Browse files
authored
Merge pull request #112734 from MGoedtel/task1711582
task1711582
2 parents 44818cb + cbcec14 commit d7dc60d

File tree

3 files changed

+22
-62
lines changed

3 files changed

+22
-62
lines changed

articles/automation/automation-create-account-template.md

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

1111
---
1212

@@ -45,8 +45,6 @@ The JSON template is configured to prompt you for:
4545
* The name of the Automation account
4646
* The region to create the account in
4747

48-
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).
49-
5048
The following parameters in the template are set with a default value for the Log Analytics workspace:
5149

5250
* sku - defaults to the new Per-GB pricing tier released in the April 2018 pricing model
@@ -57,8 +55,15 @@ The following parameters in the template are set with a default value for the Lo
5755
>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**.
5856
>
5957
60-
>[!NOTE]
61-
>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.
58+
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).
59+
60+
It is important to understand the following configuration details if you are new to Azure Automation and Azure Monitor, in order to avoid errors when attempting to create, configure, and use a Log Analytics workspace linked to your new Automation account.
61+
62+
* 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.
63+
64+
* Because only certain regions are supported for linking a Log Analytics workspace and an Automation account in your subscription, review [Workspace mappings](how-to/region-mappings.md) to specify the supported regions inline or in a parameters file.
65+
66+
* 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.
6267

6368
## Deploy template
6469

@@ -108,32 +113,6 @@ The following parameters in the template are set with a default value for the Lo
108113
},
109114
"location": {
110115
"type": "string",
111-
"allowedValues": [
112-
"australiacentral",
113-
"australiaeast",
114-
"australiasoutheast",
115-
"brazilsouth",
116-
"canadacentral",
117-
"centralindia",
118-
"centralus",
119-
"eastasia",
120-
"eastus",
121-
"eastus2",
122-
"francecentral",
123-
"japaneast",
124-
"koreacentral",
125-
"northcentralus",
126-
"northeurope",
127-
"southafricanorth",
128-
"southcentralus",
129-
"southeastasia",
130-
"uksouth",
131-
"ukwest",
132-
"westcentralus",
133-
"westeurope",
134-
"westus",
135-
"westus2"
136-
],
137116
"metadata": {
138117
"description": "Specifies the location in which to create the workspace."
139118
}

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

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.subservice: update-management
66
ms.topic: conceptual
77
author: mgoedtel
88
ms.author: magoedte
9-
ms.date: 03/30/2020
9+
ms.date: 04/24/2020
1010
---
1111

1212
# Onboard Update Management solution using Azure Resource Manager template
@@ -57,11 +57,18 @@ The following parameters in the template are set with a default value for the Lo
5757
* capacity reservation - defaults to 100 GB
5858

5959
>[!WARNING]
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**.
60+
>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**.
6161
>
6262
63-
>[!NOTE]
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.
63+
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).
64+
65+
It is important to understand the following configuration details if you are new to Azure Automation and Azure Monitor, in order to avoid errors when attempting to create, configure, and use a Log Analytics workspace linked to your new Automation account.
66+
67+
* 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.
68+
69+
* Because only certain regions are supported for linking a Log Analytics workspace and an Automation account in your subscription, review [Workspace mappings](how-to/region-mappings.md) to specify the supported regions inline or in a parameters file.
70+
71+
* 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.
6572

6673
## Deploy template
6774

@@ -111,32 +118,6 @@ The following parameters in the template are set with a default value for the Lo
111118
},
112119
"location": {
113120
"type": "string",
114-
"allowedValues": [
115-
"australiacentral",
116-
"australiaeast",
117-
"australiasoutheast",
118-
"brazilsouth",
119-
"canadacentral",
120-
"centralindia",
121-
"centralus",
122-
"eastasia",
123-
"eastus",
124-
"eastus2",
125-
"francecentral",
126-
"japaneast",
127-
"koreacentral",
128-
"northcentralus",
129-
"northeurope",
130-
"southafricanorth",
131-
"southcentralus",
132-
"southeastasia",
133-
"uksouth",
134-
"ukwest",
135-
"westcentralus",
136-
"westeurope",
137-
"westus",
138-
"westus2"
139-
],
140121
"metadata": {
141122
"description": "Specifies the location in which to create the workspace."
142123
}

articles/automation/how-to/region-mappings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ manager: carmonm
1515

1616
When enabling Update Management, Change Tracking and Inventory, or Start/Stop VMs during off-hours, only certain regions are supported for linking a Log Analytics workspace and an Automation account in your subscription. This mapping only applies to the Automation account and the Log Analytics workspace. The Log Analytics workspace and Automation account must be in the same subscription, but can be in different resource groups deployed to the same region.
1717

18-
For further information, see [Log Analytics workspace and Automation account](../azure-monitor/insights/solutions.md#log-analytics- workspace-and-automation-account).
18+
For further information, see [Log Analytics workspace and Automation account](../../azure-monitor/insights/solutions.md#log-analytics-workspace-and-automation-account).
1919

2020
## Supported mappings
2121

0 commit comments

Comments
 (0)