Skip to content

Commit 086cce0

Browse files
MGoedtelMGoedtel
committed
updated JSON template
1 parent 8c9654c commit 086cce0

File tree

2 files changed

+90
-89
lines changed

2 files changed

+90
-89
lines changed

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

Lines changed: 82 additions & 80 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: 02/27/2020
9+
ms.date: 03/30/2020
1010

1111
---
1212

@@ -52,6 +52,7 @@ The following parameters in the template are set with a default value for the Lo
5252

5353
* sku - defaults to the new Per-GB pricing tier released in the April 2018 pricing model
5454
* data retention - defaults to thirty days
55+
* capacity reservation - defaults to 100 GB
5556

5657
>[!WARNING]
5758
>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**.
@@ -67,89 +68,89 @@ The following parameters in the template are set with a default value for the Lo
6768
```json
6869
{
6970
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
70-
"contentVersion": "1.0.0.0",
71-
"parameters": {
72-
"workspaceName": {
73-
"type": "string",
74-
"metadata": {
75-
"description": "Workspace name"
76-
}
77-
},
78-
"pricingTier": {
79-
"type": "string",
80-
"allowedValues": [
81-
"pergb2018",
82-
"Free",
83-
"Standalone",
84-
"PerNode",
85-
"Standard",
86-
"Premium"
87-
],
88-
"defaultValue": "pergb2018",
89-
"metadata": {
90-
"description": "Pricing tier: perGB2018 or legacy tiers (Free, Standalone, PerNode, Standard or Premium) which are not available to all customers."
91-
}
92-
},
93-
"dataRetention": {
94-
"type": "int",
95-
"defaultValue": 30,
96-
"minValue": 7,
97-
"maxValue": 730,
98-
"metadata": {
99-
"description": "Number of days of retention. Workspaces in the legacy Free pricing tier can only have 7 days."
100-
}
101-
},
102-
"immediatePurgeDataOn30Days": {
103-
"type": "bool",
104-
"defaultValue": "[bool('false')]",
105-
"metadata": {
106-
"description": "If set to true when changing retention to 30 days, older data will be immediately deleted. Use this with extreme caution. This only applies when retention is being set to 30 days."
107-
}
108-
},
109-
"location": {
110-
"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-
],
137-
"metadata": {
138-
"description": "Specifies the location in which to create the workspace."
139-
}
140-
},
71+
"contentVersion": "1.0.0.0",
72+
"parameters": {
73+
"workspaceName": {
74+
"type": "string",
75+
"metadata": {
76+
"description": "Workspace name"
77+
}
78+
},
79+
"sku": {
80+
"type": "string",
81+
"allowedValues": [
82+
"pergb2018",
83+
"Free",
84+
"Standalone",
85+
"PerNode",
86+
"Standard",
87+
"Premium"
88+
],
89+
"defaultValue": "pergb2018",
90+
"metadata": {
91+
"description": "Pricing tier: perGB2018 or legacy tiers (Free, Standalone, PerNode, Standard or Premium) which are not available to all customers."
92+
}
93+
},
94+
"dataRetention": {
95+
"type": "int",
96+
"defaultValue": 30,
97+
"minValue": 7,
98+
"maxValue": 730,
99+
"metadata": {
100+
"description": "Number of days of retention. Workspaces in the legacy Free pricing tier can only have 7 days."
101+
}
102+
},
103+
"immediatePurgeDataOn30Days": {
104+
"type": "bool",
105+
"defaultValue": "[bool('false')]",
106+
"metadata": {
107+
"description": "If set to true when changing retention to 30 days, older data will be immediately deleted. Use this with extreme caution. This only applies when retention is being set to 30 days."
108+
}
109+
},
110+
"location": {
111+
"type": "string",
112+
"allowedValues": [
113+
"australiacentral",
114+
"australiaeast",
115+
"australiasoutheast",
116+
"brazilsouth",
117+
"canadacentral",
118+
"centralindia",
119+
"centralus",
120+
"eastasia",
121+
"eastus",
122+
"eastus2",
123+
"francecentral",
124+
"japaneast",
125+
"koreacentral",
126+
"northcentralus",
127+
"northeurope",
128+
"southafricanorth",
129+
"southcentralus",
130+
"southeastasia",
131+
"uksouth",
132+
"ukwest",
133+
"westcentralus",
134+
"westeurope",
135+
"westus",
136+
"westus2"
137+
],
138+
"metadata": {
139+
"description": "Specifies the location in which to create the workspace."
140+
}
141+
},
141142
"automationAccountName": {
142143
"type": "string",
143144
"metadata": {
144145
"description": "Automation account name"
145146
}
146147
},
147-
"automationAccountLocation": {
148-
"type": "string",
149-
"metadata": {
150-
"description": "Specify the location in which to create the Automation account."
151-
}
152-
}
148+
"automationAccountLocation": {
149+
"type": "string",
150+
"metadata": {
151+
"description": "Specify the location in which to create the Automation account."
152+
}
153+
}
153154
},
154155
"variables": {
155156
"Updates": {
@@ -164,7 +165,8 @@ The following parameters in the template are set with a default value for the Lo
164165
"apiVersion": "2017-03-15-preview",
165166
"location": "[parameters('location')]",
166167
"properties": {
167-
"sku": {
168+
"sku": {
169+
"Name": "[parameters('sku')]"
168170
"name": "CapacityReservation",
169171
"capacityReservationLevel": 100
170172
},
@@ -209,7 +211,7 @@ The following parameters in the template are set with a default value for the Lo
209211
"name": "Basic"
210212
}
211213
},
212-
},
214+
},
213215
{
214216
"apiVersion": "2015-11-01-preview",
215217
"type": "Microsoft.OperationalInsights/workspaces/linkedServices",

‎articles/azure-monitor/platform/template-workspace-configuration.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ For capacity reservation, you define a selected capacity reservation for ingesti
127127
"location": "[parameters('location')]",
128128
"properties": {
129129
"sku": {
130-
"name": "[parameters('pricingTier')]"
130+
"name": "[parameters('pricingTier')]"
131131
},
132132
"retentionInDays": 120,
133133
"features": {
@@ -141,16 +141,15 @@ For capacity reservation, you define a selected capacity reservation for ingesti
141141
}
142142
```
143143

144-
> [Information]
145-
> for capacity reservation settings, use these properties under "sku":
146-
147-
> "name": "CapacityReservation",
148-
149-
> "capacityReservationLevel": 100
150-
144+
>[Information]
145+
>for capacity reservation settings, use these properties under "sku":
146+
>"name": "CapacityReservation",
147+
>"capacityReservationLevel": 100
151148

152149
2. Edit the template to meet your requirements. Review [Microsoft.OperationalInsights/workspaces template](https://docs.microsoft.com/azure/templates/microsoft.operationalinsights/workspaces) reference to learn what properties and values are supported.
150+
153151
3. Save this file as **deploylaworkspacetemplate.json** to a local folder.
152+
154153
4. You are ready to deploy this template. You use either PowerShell or the command line to create the workspace, specifying the workspace name and location as part of the command. The workspace name must be globally unique across all Azure subscriptions.
155154

156155
* For PowerShell use the following commands from the folder containing the template:
@@ -274,7 +273,7 @@ The following template sample illustrates how to:
274273
"metadata": {
275274
"description": "The custom log name"
276275
}
277-
}
276+
}
278277
},
279278
"variables": {
280279
"Updates": {

0 commit comments

Comments
 (0)