Skip to content

Commit a1b9489

Browse files
author
Jill Grant
authored
Merge pull request #253097 from alexbuckgit/alexbuckgit/docutune-autopr-20230927-234151-7914660-ignore-build
[BULK] - DocuTune - Fix code formatting issues (part 2)
2 parents ae7e9b0 + 83b757a commit a1b9489

File tree

8 files changed

+186
-185
lines changed

8 files changed

+186
-185
lines changed

articles/devtest-labs/devtest-lab-vm-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ You can also call the DevTest Labs REST API to get the properties of existing la
186186
In training, demo, and trial scenarios, you can avoid unnecessary costs by deleting VMs automatically on a certain date. You can set the VM `expirationDate` property when you create a VM. The PowerShell VM creation script earlier in this article sets an expiration date under `properties`:
187187

188188
```json
189-
"expirationDate" = "2022-12-01"
189+
"expirationDate": "2022-12-01"
190190
```
191191

192192
You can also set expiration dates on existing VMs by using PowerShell. The following PowerShell script sets an expiration date for an existing lab VM if it doesn't already have an expiration date:

articles/devtest-labs/resource-group-control.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,22 @@ Invoke the script by using the following command. ResourceGroup.ps1 is the file
7171
If you're using an Azure Resource Manager template to create a lab, use the **vmCreationResourceGroupId** property in the lab properties section of your template, as shown in the following example:
7272

7373
```json
74-
{
75-
"type": "microsoft.devtestlab/labs",
76-
"name": "[parameters('lab_name')]",
77-
"apiVersion": "2018-10-15-preview",
78-
"location": "eastus",
79-
"tags": {},
80-
"scale": null,
81-
"properties": {
82-
"vmCreationResourceGroupId": "/subscriptions/<SubscriptionID>/resourcegroups/<ResourceGroupName>",
83-
"labStorageType": "Premium",
84-
"premiumDataDisks": "Disabled",
85-
"provisioningState": "Succeeded",
86-
"uniqueIdentifier": "000000000f-0000-0000-0000-00000000000000"
87-
},
88-
"dependsOn": []
89-
},
74+
{
75+
"type": "microsoft.devtestlab/labs",
76+
"name": "[parameters('lab_name')]",
77+
"apiVersion": "2018-10-15-preview",
78+
"location": "eastus",
79+
"tags": {},
80+
"scale": null,
81+
"properties": {
82+
"vmCreationResourceGroupId": "/subscriptions/<SubscriptionID>/resourcegroups/<ResourceGroupName>",
83+
"labStorageType": "Premium",
84+
"premiumDataDisks": "Disabled",
85+
"provisioningState": "Succeeded",
86+
"uniqueIdentifier": "000000000f-0000-0000-0000-00000000000000"
87+
},
88+
"dependsOn": []
89+
},
9090
```
9191

9292

articles/firewall/snat-private-range.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -201,20 +201,21 @@ You can use the following JSON to configure auto-learn. Azure Firewall must be a
201201
Use the following JSON to associate an Azure Route Server:
202202

203203
```json
204-
"type": "Microsoft.Network/azureFirewalls",
205-
"apiVersion": "2022-11-01",
206-
"name": "[parameters('azureFirewalls_testFW_name')]",
207-
"location": "eastus",
208-
"properties": {
209-
"sku": {
210-
"name": "AZFW_VNet",
211-
"tier": "Standard"
212-
},
213-
"threatIntelMode": "Alert",
214-
"additionalProperties": {
215-
"Network.RouteServerInfo.RouteServerID": "[parameters'virtualHubs_TestRouteServer_externalid')]"
216-
},
217-
204+
"type": "Microsoft.Network/azureFirewalls",
205+
"apiVersion": "2022-11-01",
206+
"name": "[parameters('azureFirewalls_testFW_name')]",
207+
"location": "eastus",
208+
"properties": {
209+
"sku": {
210+
"name": "AZFW_VNet",
211+
"tier": "Standard"
212+
},
213+
"threatIntelMode": "Alert",
214+
"additionalProperties": {
215+
"Network.RouteServerInfo.RouteServerID": "[parameters'virtualHubs_TestRouteServer_externalid')]"
216+
},
217+
...
218+
}
218219
```
219220

220221
### Configure using Azure PowerShell

articles/machine-learning/how-to-create-compute-instance.md

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

articles/payment-hsm/create-different-vnet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ To see the newly created network interfaces, use the [az network nic show](/cli/
221221
The output contains this line:
222222

223223
```json
224-
"privateIPAllocationMethod": "Dynamic",
224+
"privateIPAllocationMethod": "Dynamic",
225225
```
226226

227227
# [Azure PowerShell](#tab/azure-powershell)
@@ -311,7 +311,7 @@ To view the properties of a network interface, use the [az network nic show](/cl
311311
The output contains this line:
312312

313313
```json
314-
"privateIPAllocationMethod": "Static",
314+
"privateIPAllocationMethod": "Static",
315315
```
316316

317317
# [Azure PowerShell](#tab/azure-powershell)

articles/payment-hsm/create-payment-hsm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ To see the newly created network interfaces, use the [az network nic show](/cli/
210210
The output contains this line:
211211

212212
```json
213-
"privateIPAllocationMethod": "Dynamic",
213+
"privateIPAllocationMethod": "Dynamic",
214214
```
215215

216216
# [Azure PowerShell](#tab/azure-powershell)
@@ -300,7 +300,7 @@ To view the properties of a network interface, use the [az network nic show](/cl
300300
The output contains this line:
301301

302302
```json
303-
"privateIPAllocationMethod": "Static",
303+
"privateIPAllocationMethod": "Static",
304304
```
305305

306306
# [Azure PowerShell](#tab/azure-powershell)

articles/search/cognitive-search-skill-keyphrases.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ For the example above, the output of your skill will be written to a new node in
8989

9090
#### document/myKeyPhrases
9191
```json
92-
[
93-
"world’s glaciers",
94-
"huge rivers of ice",
95-
"Canadian Rockies",
96-
"iconic landscapes",
97-
"Mount Everest region",
98-
"Continued warming"
99-
]
92+
[
93+
"world’s glaciers",
94+
"huge rivers of ice",
95+
"Canadian Rockies",
96+
"iconic landscapes",
97+
"Mount Everest region",
98+
"Continued warming"
99+
]
100100
```
101101

102102
You may use "document/myKeyPhrases" as input into other skills, or as a source of an [output field mapping](cognitive-search-output-field-mapping.md).

articles/service-fabric/how-to-managed-cluster-modify-node-type.md

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -180,17 +180,16 @@ To adjust the node count for a node type using an ARM Template, adjust the `vmIn
180180
> The managed cluster provider will block scale adjustments and return an error if the scaling request violates required minimums.
181181
182182
```json
183-
{
184-
"apiVersion": "[variables('sfApiVersion')]",
185-
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
186-
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
187-
"location": "[resourcegroup().location]",
188-
"properties": {
189-
...
190-
"vmInstanceCount": "[parameters('nodeTypeVmInstanceCount')]",
191-
...
192-
}
193-
}
183+
{
184+
"apiVersion": "[variables('sfApiVersion')]",
185+
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
186+
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
187+
"location": "[resourcegroup().location]",
188+
"properties": {
189+
...
190+
"vmInstanceCount": "[parameters('nodeTypeVmInstanceCount')]",
191+
...
192+
}
194193
}
195194
```
196195

@@ -281,20 +280,19 @@ To modify the OS image used for a node type using an ARM Template, adjust the `v
281280
* The Service Fabric managed cluster resource apiVersion should be **2021-05-01** or later.
282281

283282
```json
284-
{
285-
"apiVersion": "[variables('sfApiVersion')]",
286-
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
287-
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
288-
"location": "[resourcegroup().location]",
289-
"properties": {
290-
...
291-
"vmImagePublisher": "[parameters('vmImagePublisher')]",
292-
"vmImageOffer": "[parameters('vmImageOffer')]",
293-
"vmImageSku": "[parameters('vmImageSku')]",
294-
"vmImageVersion": "[parameters('vmImageVersion')]",
295-
...
296-
}
297-
}
283+
{
284+
"apiVersion": "[variables('sfApiVersion')]",
285+
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
286+
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
287+
"location": "[resourcegroup().location]",
288+
"properties": {
289+
...
290+
"vmImagePublisher": "[parameters('vmImagePublisher')]",
291+
"vmImageOffer": "[parameters('vmImageOffer')]",
292+
"vmImageSku": "[parameters('vmImageSku')]",
293+
"vmImageVersion": "[parameters('vmImageVersion')]",
294+
...
295+
}
298296
}
299297
```
300298

@@ -328,18 +326,18 @@ To adjust the placement properties for a node type using an ARM Template, adjust
328326
* The Service Fabric managed cluster resource apiVersion should be **2021-05-01** or later.
329327

330328
```json
331-
{
332-
"apiVersion": "[variables('sfApiVersion')]",
333-
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
334-
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
335-
"location": "[resourcegroup().location]",
336-
"properties": {
337-
"placementProperties": {
338-
"PremiumSSD": "true",
339-
"NodeColor": "green",
340-
"SomeProperty": "5"
341-
}
342-
}
329+
{
330+
"apiVersion": "[variables('sfApiVersion')]",
331+
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
332+
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
333+
"location": "[resourcegroup().location]",
334+
"properties": {
335+
"placementProperties": {
336+
"PremiumSSD": "true",
337+
"NodeColor": "green",
338+
"SomeProperty": "5"
339+
}
340+
}
343341
}
344342
```
345343

@@ -359,20 +357,21 @@ Set-AzServiceFabricManagedNodeType -ResourceGroupName $rgName -ClusterName $clus
359357
To modify the VM SKU size used for a node type using an ARM Template, adjust the `vmSize` property with the new value and do a cluster deployment for the setting to take effect. The managed cluster provider will reimage each instance by upgrade domain. For a list of SKU options, please refer to the [VM sizes - Azure Virtual Machines | Microsoft Learn](../virtual-machines/sizes.md).
360358

361359
```json
362-
{
363-
"apiVersion": "[variables('sfApiVersion')]",
364-
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
365-
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
366-
"location": "[resourcegroup().location]",
367-
"properties": {
368-
...
369-
"vmSize": "[parameters('vmImageVersion')]",
370-
...
371-
}
372-
}
360+
{
361+
"apiVersion": "[variables('sfApiVersion')]",
362+
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
363+
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
364+
"location": "[resourcegroup().location]",
365+
"properties": {
366+
...
367+
"vmSize": "[parameters('vmImageVersion')]",
368+
...
369+
}
373370
}
374371
```
372+
375373
## Configure multiple managed disks
374+
376375
Service Fabric managed clusters by default configure one managed disk. By configuring the following optional property and values, you can add more managed disks to node types within a cluster. You are able to specify the drive letter, disk type, and size per disk.
377376

378377
Configure more managed disks by declaring `additionalDataDisks` property and required parameters in your Resource Manager template as follows:
@@ -384,20 +383,20 @@ Configure more managed disks by declaring `additionalDataDisks` property and req
384383
* The Service Fabric managed cluster resource apiVersion should be **2022-01-01** or later.
385384

386385
```json
387-
{
388-
"apiVersion": "[variables('sfApiVersion')]",
389-
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
390-
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
391-
"location": "[resourcegroup().location]",
392-
"properties": {
393-
"additionalDataDisks": {
394-
"lun": "1",
395-
"diskSizeGB": "50",
396-
"diskType": "Standard_LRS",
397-
"diskLetter": "S"
398-
}
399-
}
400-
}
386+
{
387+
"apiVersion": "[variables('sfApiVersion')]",
388+
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
389+
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
390+
"location": "[resourcegroup().location]",
391+
"properties": {
392+
"additionalDataDisks": {
393+
"lun": "1",
394+
"diskSizeGB": "50",
395+
"diskType": "Standard_LRS",
396+
"diskLetter": "S"
397+
}
398+
}
399+
}
401400
```
402401

403402
See [full list of parameters available](/azure/templates/microsoft.servicefabric/2021-11-01-preview/managedclusters)
@@ -410,16 +409,17 @@ Service Fabric managed clusters by default configure a Service Fabric data disk
410409
* The Service Fabric managed cluster resource apiVersion should be **2022-01-01** or later.
411410

412411
```json
413-
{
414-
"apiVersion": "[variables('sfApiVersion')]",
415-
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
416-
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
417-
"location": "[resourcegroup().location]",
418-
"properties": {
419-
"dataDiskLetter": "S"
420-
}
421-
}
422-
}
412+
{
413+
{
414+
"apiVersion": "[variables('sfApiVersion')]",
415+
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
416+
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
417+
"location": "[resourcegroup().location]",
418+
"properties": {
419+
"dataDiskLetter": "S"
420+
}
421+
}
422+
}
423423
```
424424

425425
## Next steps

0 commit comments

Comments
 (0)