Skip to content

Commit 713a4bd

Browse files
committed
[BULK] - DocuTune - Fix code formatting issues
1 parent 4545f26 commit 713a4bd

8 files changed

+166
-157
lines changed

articles/service-fabric/service-fabric-cluster-config-upgrade-azure.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ Azure clusters can be configured through the JSON Resource Manager template. To
2929
4. Select **Edit** and update the `fabricSettings` JSON element and add a new element:
3030

3131
```json
32-
{
33-
"name": "Diagnostics",
34-
"parameters": [
35-
{
36-
"name": "MaxDiskQuotaInMB",
37-
"value": "65536"
38-
}
39-
]
40-
}
32+
{
33+
"name": "Diagnostics",
34+
"parameters": [
35+
{
36+
"name": "MaxDiskQuotaInMB",
37+
"value": "65536"
38+
}
39+
]
40+
}
4141
```
4242

4343
You can also customize cluster settings in one of the following ways with Azure Resource Manager:

articles/service-fabric/service-fabric-cluster-config-upgrade-windows-server.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ You can add, update, or remove settings in the `fabricSettings` section under th
2121
For example, the following JSON adds a new setting *MaxDiskQuotaInMB* to the *Diagnostics* section under `fabricSettings`:
2222

2323
```json
24-
{
25-
"name": "Diagnostics",
26-
"parameters": [
27-
{
28-
"name": "MaxDiskQuotaInMB",
29-
"value": "65536"
30-
}
31-
]
32-
}
24+
{
25+
"name": "Diagnostics",
26+
"parameters": [
27+
{
28+
"name": "MaxDiskQuotaInMB",
29+
"value": "65536"
30+
}
31+
]
32+
}
3333
```
3434

3535
After you've modified the settings in your ClusterConfig.json file, [test the cluster configuration](#test-the-cluster-configuration) and then [upgrade the cluster configuration](#upgrade-the-cluster-configuration) to apply the settings to your cluster.

articles/service-fabric/service-fabric-diagnostics-event-aggregation-wad.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -202,25 +202,26 @@ Logs from additional channels are also available for collection, here are some o
202202

203203
* Operational Channel - Base: Enabled by default, high-level operations performed by Service Fabric and the cluster, including events for a node coming up, a new application being deployed, or an upgrade rollback, etc. For a list of events, refer to [Operational Channel Events](./service-fabric-diagnostics-event-generation-operational.md).
204204

205-
```json
206-
scheduledTransferKeywordFilter: "4611686018427387904"
205+
```json
206+
"scheduledTransferKeywordFilter": "4611686018427387904"
207207
```
208+
208209
* Operational Channel - Detailed: This includes health reports and load balancing decisions, plus everything in the base operational channel. These events are generated by either the system or your code by using the health or load reporting APIs such as [ReportPartitionHealth](/previous-versions/azure/reference/mt645153(v=azure.100)) or [ReportLoad](/previous-versions/azure/reference/mt161491(v=azure.100)). To view these events in Visual Studio's Diagnostic Event Viewer add "Microsoft-ServiceFabric:4:0x4000000000000008" to the list of ETW providers.
209210

210-
```json
211-
scheduledTransferKeywordFilter: "4611686018427387912"
211+
```json
212+
"scheduledTransferKeywordFilter": "4611686018427387912"
212213
```
213214

214215
* Data and Messaging Channel - Base: Critical logs and events generated in the messaging (currently only the ReverseProxy) and data path, in addition to detailed operational channel logs. These events are request processing failures and other critical issues in the ReverseProxy, as well as requests processed. **This is our recommendation for comprehensive logging**. To view these events in Visual Studio's Diagnostic Event Viewer, add "Microsoft-ServiceFabric:4:0x4000000000000010" to the list of ETW providers.
215216

216-
```json
217-
scheduledTransferKeywordFilter: "4611686018427387928"
217+
```json
218+
"scheduledTransferKeywordFilter": "4611686018427387928"
218219
```
219220

220221
* Data & Messaging Channel - Detailed: Verbose channel that contains all the non-critical logs from data and messaging in the cluster and the detailed operational channel. For detailed troubleshooting of all reverse proxy events, refer to the [reverse proxy diagnostics guide](service-fabric-reverse-proxy-diagnostics.md). To view these events in Visual Studio's Diagnostic Event viewer, add "Microsoft-ServiceFabric:4:0x4000000000000020" to the list of ETW providers.
221222

222-
```json
223-
scheduledTransferKeywordFilter: "4611686018427387944"
223+
```json
224+
"scheduledTransferKeywordFilter": "4611686018427387944"
224225
```
225226

226227
>[!NOTE]
@@ -285,13 +286,13 @@ Update the `EtwEventSourceProviderConfiguration` section in the template.json fi
285286
For example, if your event source is named My-Eventsource, add the following code to place the events from My-Eventsource into a table named MyDestinationTableName.
286287

287288
```json
288-
{
289-
"provider": "My-Eventsource",
290-
"scheduledTransferPeriod": "PT5M",
291-
"DefaultEvents": {
292-
"eventDestination": "MyDestinationTableName"
293-
}
294-
}
289+
{
290+
"provider": "My-Eventsource",
291+
"scheduledTransferPeriod": "PT5M",
292+
"DefaultEvents": {
293+
"eventDestination": "MyDestinationTableName"
294+
}
295+
}
295296
```
296297

297298
To collect performance counters or event logs, modify the Resource Manager template by using the examples provided in [Create a Windows virtual machine with monitoring and diagnostics by using an Azure Resource Manager template](../virtual-machines/extensions/diagnostics-template.md?toc=/azure/virtual-machines/windows/toc.json). Then, republish the Resource Manager template.

articles/service-fabric/service-fabric-tutorial-standalone-create-service-fabric-cluster.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ Next, update the three ipAddress lines that occur in the file on lines 8, 15, an
3939
After updating the nodes, they appear as follows:
4040

4141
```json
42-
{
43-
"nodeName": "vm0",
44-
"ipAddress": "172.31.27.1",
45-
"nodeTypeRef": "NodeType0",
46-
"faultDomain": "fd:/dc1/r0",
47-
"upgradeDomain": "UD0"
48-
}
42+
{
43+
"nodeName": "vm0",
44+
"ipAddress": "172.31.27.1",
45+
"nodeTypeRef": "NodeType0",
46+
"faultDomain": "fd:/dc1/r0",
47+
"upgradeDomain": "UD0"
48+
}
4949
```
5050

5151
Then you need to update a couple of the properties. On line 34, you need to modify the connection string for the diagnostic store it should look like this `"connectionstring": "C:\\ProgramData\\SF\\DiagnosticsStore"`

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-mvss-custom-image.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,16 @@ In the scale set resource, add a `dependsOn` clause referring to the custom imag
9090
In the `imageReference` of the scale set `storageProfile`, instead of specifying the publisher, offer, sku, and version of a platform image, specify the `id` of the `Microsoft.Compute/images` resource:
9191

9292
```json
93-
"virtualMachineProfile": {
94-
"storageProfile": {
95-
"imageReference": {
96-
"id": "[resourceId('Microsoft.Compute/images', 'myCustomImage')]"
97-
}
98-
},
99-
"osProfile": {
93+
"virtualMachineProfile": {
94+
"storageProfile": {
95+
"imageReference": {
96+
"id": "[resourceId('Microsoft.Compute/images', omImage')]"
97+
}
98+
},
99+
"osProfile": {
100+
...
101+
}
102+
}
100103
```
101104

102105
In this example, use the `resourceId` function to get the resource ID of the image created in the same template. If you have created the managed disk image beforehand, you should provide the ID of that image instead. This ID must be of the form: `/subscriptions/<subscription-id>resourceGroups/<resource-group-name>/providers/Microsoft.Compute/images/<image-name>`.

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-mvss-start.md

Lines changed: 58 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -58,39 +58,41 @@ Next is the resources section of the template. Here, you define what you actuall
5858
All resources require `type`, `name`, `apiVersion`, and `location` properties. This example's first resource has type [Microsoft.Network/virtualNetwork](/azure/templates/microsoft.network/virtualnetworks), name `myVnet`, and apiVersion `2018-11-01`. (To find the latest API version for a resource type, see the [Azure Resource Manager template reference](/azure/templates/).)
5959

6060
```json
61-
{
62-
"type": "Microsoft.Network/virtualNetworks",
63-
"name": "myVnet",
64-
"apiVersion": "2018-11-01",
61+
{
62+
"type": "Microsoft.Network/virtualNetworks",
63+
"name": "myVnet",
64+
"apiVersion": "2018-11-01",
65+
}
6566
```
6667

6768
## Specify location
6869
To specify the location for the virtual network, use a [Resource Manager template function](../azure-resource-manager/templates/template-functions.md). This function must be enclosed in quotes and square brackets like this: `"[<template-function>]"`. In this case, use the `resourceGroup` function. It takes in no arguments and returns a JSON object with metadata about the resource group this deployment is being deployed to. The resource group is set by the user at the time of deployment. This value is then indexed into this JSON object with `.location` to get the location from the JSON object.
6970

7071
```json
71-
"location": "[resourceGroup().location]",
72+
"location": "[resourceGroup().location]",
7273
```
7374

7475
## Specify virtual network properties
7576
Each Resource Manager resource has its own `properties` section for configurations specific to the resource. In this case, specify that the virtual network should have one subnet using the private IP address range `10.0.0.0/16`. A scale set is always contained within one subnet. It cannot span subnets.
7677

7778
```json
78-
"properties": {
79-
"addressSpace": {
80-
"addressPrefixes": [
81-
"10.0.0.0/16"
82-
]
83-
},
84-
"subnets": [
85-
{
86-
"name": "mySubnet",
87-
"properties": {
88-
"addressPrefix": "10.0.0.0/16"
89-
}
90-
}
91-
]
92-
}
93-
},
79+
{
80+
"properties": {
81+
"addressSpace": {
82+
"addressPrefixes": [
83+
"10.0.0.0/16"
84+
]
85+
},
86+
"subnets": [
87+
{
88+
"name": "mySubnet",
89+
"properties": {
90+
"addressPrefix": "10.0.0.0/16"
91+
}
92+
}
93+
]
94+
}
95+
},
9496
```
9597

9698
## Add dependsOn list
@@ -99,50 +101,55 @@ In addition to the required `type`, `name`, `apiVersion`, and `location` propert
99101
In this case, there is only one element in the list, the virtual network from the previous example. You specify this dependency because the scale set needs the network to exist before creating any VMs. This way, the scale set can give these VMs private IP addresses from the IP address range previously specified in the network properties. The format of each string in the dependsOn list is `<type>/<name>`. Use the same `type` and `name` used previously in the virtual network resource definition.
100102

101103
```json
102-
{
103-
"type": "Microsoft.Compute/virtualMachineScaleSets",
104-
"name": "myScaleSet",
105-
"apiVersion": "2019-03-01",
106-
"location": "[resourceGroup().location]",
107-
"dependsOn": [
108-
"Microsoft.Network/virtualNetworks/myVnet"
109-
],
104+
{
105+
"type": "Microsoft.Compute/virtualMachineScaleSets",
106+
"name": "myScaleSet",
107+
"apiVersion": "2019-03-01",
108+
"location": "[resourceGroup().location]",
109+
"dependsOn": [
110+
"Microsoft.Network/virtualNetworks/myVnet"
111+
],
112+
...
113+
}
110114
```
115+
111116
## Specify scale set properties
117+
112118
Scale sets have many properties for customizing the VMs in the scale set. For a full list of these properties, see the [template reference](/azure/templates/microsoft.compute/virtualmachinescalesets). For this tutorial, only a few commonly used properties are set.
113119
### Supply VM size and capacity
114120
The scale set needs to know what size of VM to create ("sku name") and how many such VMs to create ("sku capacity"). To see which VM sizes are available, see the [VM Sizes documentation](../virtual-machines/sizes.md).
115121

116122
```json
117-
"sku": {
118-
"name": "Standard_A1",
119-
"capacity": 2
120-
},
123+
"sku": {
124+
"name": "Standard_A1",
125+
"capacity": 2
126+
},
121127
```
122128

123129
### Choose type of updates
124130
The scale set also needs to know how to handle updates on the scale set. Currently, there are three options, `Manual`, `Rolling` and `Automatic`. For more information on the differences between the two, see the documentation on [how to upgrade a scale set](./virtual-machine-scale-sets-upgrade-policy.md).
125131

126132
```json
127-
"properties": {
128-
"upgradePolicy": {
129-
"mode": "Manual"
130-
},
133+
"properties": {
134+
"upgradePolicy": {
135+
"mode": "Manual"
136+
},
137+
}
131138
```
132139

133140
### Choose VM operating system
134141
The scale set needs to know what operating system to put on the VMs. Here, create the VMs with a fully patched Ubuntu 16.04-LTS image.
135142

136143
```json
137-
"virtualMachineProfile": {
138-
"storageProfile": {
139-
"imageReference": {
140-
"publisher": "Canonical",
141-
"offer": "UbuntuServer",
142-
"sku": "16.04-LTS",
143-
"version": "latest"
144-
}
145-
},
144+
"virtualMachineProfile": {
145+
"storageProfile": {
146+
"imageReference": {
147+
"publisher": "Canonical",
148+
"offer": "UbuntuServer",
149+
"sku": "16.04-LTS",
150+
"version": "latest"
151+
}
152+
},
146153
```
147154

148155
### Specify computerNamePrefix
@@ -151,11 +158,11 @@ The scale set deploys multiple VMs. Instead of specifying each VM name, specify
151158
In the following snippet, use the parameters from before to set the administrator username and password for all VMs in the scale set. This process uses the `parameters` template function. This function takes in a string that specifies which parameter to refer to and outputs the value for that parameter.
152159

153160
```json
154-
"osProfile": {
155-
"computerNamePrefix": "vm",
156-
"adminUsername": "[parameters('adminUsername')]",
157-
"adminPassword": "[parameters('adminPassword')]"
158-
},
161+
"osProfile": {
162+
"computerNamePrefix": "vm",
163+
"adminUsername": "[parameters('adminUsername')]",
164+
"adminPassword": "[parameters('adminPassword')]"
165+
},
159166
```
160167

161168
### Specify VM network configuration

articles/virtual-machines/states-billing.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ The following table provides a description of each instance state and indicates
5454
Example of PowerState in JSON:
5555

5656
```json
57-
{
58-
"code": "PowerState/running",
59-
"level": "Info",
60-
"displayStatus": "VM running"
61-
}
57+
{
58+
"code": "PowerState/running",
59+
"level": "Info",
60+
"displayStatus": "VM running"
61+
}
6262
```
6363

6464
## Provisioning states

0 commit comments

Comments
 (0)