Skip to content

Commit b773c70

Browse files
author
Jill Grant
authored
Merge pull request #253098 from alexbuckgit/alexbuckgit/docutune-autopr-20230927-234151-7917831-ignore-build
[BULK] - DocuTune - Fix code formatting issues (part 3)
2 parents a1b9489 + 7fc633b commit b773c70

8 files changed

+202
-184
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>`.

0 commit comments

Comments
 (0)