Skip to content

Commit d007770

Browse files
ramon-tomas-cramon-tomas-c
committed
Update ARM template
1 parent 9fc4bfe commit d007770

2 files changed

Lines changed: 104 additions & 49 deletions

File tree

‎deploy/az/servicefabric/WindowsContainers/servicefabricdeploy.json‎

Lines changed: 94 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,24 @@
154154
"description": "Name for the storage account that contains support logs from the cluster"
155155
}
156156
},
157+
"applicationDiagnosticsStorageAccountType": {
158+
"type": "string",
159+
"allowedValues": [
160+
"Standard_LRS",
161+
"Standard_GRS"
162+
],
163+
"defaultValue": "Standard_LRS",
164+
"metadata": {
165+
"description": "Replication option for the application diagnostics storage account"
166+
}
167+
},
168+
"applicationDiagnosticsStorageAccountName": {
169+
"type": "string",
170+
"defaultValue": "[toLower(concat(uniqueString(resourceGroup().id), '3' ))]",
171+
"metadata": {
172+
"description": "Name for the storage account that contains application diagnostics data from the cluster"
173+
}
174+
},
157175
"nt0InstanceCount": {
158176
"type": "int",
159177
"defaultValue": 1,
@@ -168,14 +186,7 @@
168186
},
169187
"vmNodeType0Size": {
170188
"type": "string",
171-
"defaultValue": "Standard_D1_v2"
172-
},
173-
"SFReverseProxyPort": {
174-
"type": "int",
175-
"defaultValue": 19081,
176-
"metadata": {
177-
"description": "Endpoint for Service Fabric Reverse proxy"
178-
}
189+
"defaultValue": "Standard_D2_v2"
179190
}
180191
},
181192
"variables": {
@@ -218,6 +229,22 @@
218229
"clusterName": "[parameters('clusterName')]"
219230
}
220231
},
232+
{
233+
"apiVersion": "[variables('storageApiVersion')]",
234+
"type": "Microsoft.Storage/storageAccounts",
235+
"name": "[parameters('applicationDiagnosticsStorageAccountName')]",
236+
"location": "[parameters('computeLocation')]",
237+
"dependsOn": [],
238+
"properties": {},
239+
"kind": "Storage",
240+
"sku": {
241+
"name": "[parameters('applicationDiagnosticsStorageAccountType')]"
242+
},
243+
"tags": {
244+
"resourceType": "Service Fabric",
245+
"clusterName": "[parameters('clusterName')]"
246+
}
247+
},
221248
{
222249
"apiVersion": "[variables('vNetApiVersion')]",
223250
"type": "Microsoft.Network/virtualNetworks",
@@ -323,25 +350,6 @@
323350
},
324351
"protocol": "tcp"
325352
}
326-
},
327-
{
328-
"name": "LBSFReverseProxyRule",
329-
"properties": {
330-
"backendAddressPool": {
331-
"id": "[variables('lbPoolID0')]"
332-
},
333-
"backendPort": "[parameters('SFReverseProxyPort')]",
334-
"enableFloatingIP": "false",
335-
"frontendIPConfiguration": {
336-
"id": "[variables('lbIPConfig0')]"
337-
},
338-
"frontendPort": "[parameters('SFReverseProxyPort')]",
339-
"idleTimeoutInMinutes": "5",
340-
"probe": {
341-
"id": "[concat(variables('lbID0'),'/probes/SFReverseProxyProbe')]"
342-
},
343-
"protocol": "tcp"
344-
}
345353
}
346354
],
347355
"probes": [
@@ -362,16 +370,7 @@
362370
"port": "[parameters('nt0fabricHttpGatewayPort')]",
363371
"protocol": "tcp"
364372
}
365-
},
366-
{
367-
"name": "SFReverseProxyProbe",
368-
"properties": {
369-
"intervalInSeconds": 5,
370-
"numberOfProbes": 2,
371-
"port": "[parameters('SFReverseProxyPort')]",
372-
"protocol": "tcp"
373-
}
374-
}
373+
}
375374
],
376375
"inboundNatPools": [
377376
{
@@ -426,7 +425,8 @@
426425
"[concat('Microsoft.Storage/storageAccounts/', variables('uniqueStringArray0')[3])]",
427426
"[concat('Microsoft.Storage/storageAccounts/', variables('uniqueStringArray0')[4])]",
428427
"[concat('Microsoft.Network/loadBalancers/', concat('LB','-', parameters('clusterName'),'-',parameters('vmNodeType0Name')))]",
429-
"[concat('Microsoft.Storage/storageAccounts/', parameters('supportLogStorageAccountName'))]"
428+
"[concat('Microsoft.Storage/storageAccounts/', parameters('supportLogStorageAccountName'))]",
429+
"[concat('Microsoft.Storage/storageAccounts/', parameters('applicationDiagnosticsStorageAccountName'))]"
430430
],
431431
"properties": {
432432
"overprovision": "[parameters('overProvision')]",
@@ -456,6 +456,58 @@
456456
},
457457
"typeHandlerVersion": "1.0"
458458
}
459+
},
460+
{
461+
"name": "[concat('VMDiagnosticsVmExt','_vmNodeType0Name')]",
462+
"properties": {
463+
"type": "IaaSDiagnostics",
464+
"autoUpgradeMinorVersion": true,
465+
"protectedSettings": {
466+
"storageAccountName": "[parameters('applicationDiagnosticsStorageAccountName')]",
467+
"storageAccountKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('applicationDiagnosticsStorageAccountName')),'2015-05-01-preview').key1]",
468+
"storageAccountEndPoint": "https://core.windows.net/"
469+
},
470+
"publisher": "Microsoft.Azure.Diagnostics",
471+
"settings": {
472+
"WadCfg": {
473+
"DiagnosticMonitorConfiguration": {
474+
"overallQuotaInMB": "50000",
475+
"EtwProviders": {
476+
"EtwEventSourceProviderConfiguration": [
477+
{
478+
"provider": "Microsoft-ServiceFabric-Actors",
479+
"scheduledTransferKeywordFilter": "1",
480+
"scheduledTransferPeriod": "PT5M",
481+
"DefaultEvents": {
482+
"eventDestination": "ServiceFabricReliableActorEventTable"
483+
}
484+
},
485+
{
486+
"provider": "Microsoft-ServiceFabric-Services",
487+
"scheduledTransferPeriod": "PT5M",
488+
"DefaultEvents": {
489+
"eventDestination": "ServiceFabricReliableServiceEventTable"
490+
}
491+
}
492+
],
493+
"EtwManifestProviderConfiguration": [
494+
{
495+
"provider": "cbd93bc2-71e5-4566-b3a7-595d8eeca6e8",
496+
"scheduledTransferLogLevelFilter": "Information",
497+
"scheduledTransferKeywordFilter": "4611686018427387904",
498+
"scheduledTransferPeriod": "PT5M",
499+
"DefaultEvents": {
500+
"eventDestination": "ServiceFabricSystemEventTable"
501+
}
502+
}
503+
]
504+
}
505+
}
506+
},
507+
"StorageAccount": "[parameters('applicationDiagnosticsStorageAccountName')]"
508+
},
509+
"typeHandlerVersion": "1.5"
510+
}
459511
}
460512
]
461513
},
@@ -535,9 +587,12 @@
535587
"[concat('Microsoft.Storage/storageAccounts/', parameters('supportLogStorageAccountName'))]"
536588
],
537589
"properties": {
590+
"addonFeatures": [
591+
"DnsService"
592+
],
538593
"clientCertificateCommonNames": [],
539594
"clientCertificateThumbprints": [],
540-
"clusterCodeVersion": "5.6.231.9494",
595+
"clusterCodeVersion": "5.7.207.9494",
541596
"clusterState": "Default",
542597
"diagnosticsStorageAccountConfig": {
543598
"blobEndpoint": "[reference(concat('Microsoft.Storage/storageAccounts/', parameters('supportLogStorageAccountName')), variables('storageApiVersion')).primaryEndpoints.blob]",
@@ -547,9 +602,6 @@
547602
"tableEndpoint": "[reference(concat('Microsoft.Storage/storageAccounts/', parameters('supportLogStorageAccountName')), variables('storageApiVersion')).primaryEndpoints.table]"
548603
},
549604
"fabricSettings": [],
550-
"addonFeatures": [
551-
"DnsService"
552-
],
553605
"managementEndpoint": "[concat('http://',reference(concat(parameters('lbIPName'),'-','0')).dnsSettings.fqdn,':',parameters('nt0fabricHttpGatewayPort'))]",
554606
"nodeTypes": [
555607
{

‎deploy/az/servicefabric/WindowsContainers/servicefabricdeploy.parameters.json‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,28 @@
1818
"value": "YourPassword"
1919
},
2020
"nicName": {
21-
"value": "NIC-eshoponservicefabric"
21+
"value": "NIC-eshopsfwin"
2222
},
2323
"publicIPAddressName": {
24-
"value": "eshoponservicefabric-PubIP"
24+
"value": "eshopsfwin-PubIP"
2525
},
2626
"dnsName": {
27-
"value": "eshoponservicefabric"
27+
"value": "eshopsfwin"
2828
},
2929
"virtualNetworkName": {
30-
"value": "VNet-eshoponservicefabric"
30+
"value": "VNet-eshopsfwin"
3131
},
3232
"lbName": {
33-
"value": "LB-eshoponservicefabric"
33+
"value": "LB-eshopsfwin"
3434
},
3535
"lbIPName": {
36-
"value": "LBIP-eshoponservicefabric"
36+
"value": "LBIP-eshopsfwin"
37+
},
38+
"applicationDiagnosticsStorageAccountName": {
39+
"value": "sfdgeshopsfwin6744"
3740
},
3841
"supportLogStorageAccountName": {
39-
"value": "sflogseshoponservice3296"
42+
"value": "sflogseshopsfwin3480"
4043
},
4144
"vmImageSku": {
4245
"value": "2016-Datacenter-with-Containers"

0 commit comments

Comments
 (0)