Skip to content

Commit

Permalink
strong versioning of API
Browse files Browse the repository at this point in the history
  • Loading branch information
@krnese
krnese committed Aug 18, 2016
1 parent 7d1b19f commit 3737a33
Showing 1 changed file with 14 additions and 20 deletions.
34 changes: 14 additions & 20 deletions service-fabric-oms/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,6 @@
"applicationDiagnosticsStorageAccountName": "[toLower(concat(uniqueString(resourceGroup().id), '3' ))]",
"solution": "[Concat('ServiceFabric', '(', parameters('omsWorkspacename'), ')')]",
"solutionName": "ServiceFabric",
"vmssApiVersion": "2016-03-30",
"lbApiVersion": "2015-06-15",
"omsApiVersion": "2015-11-01-preview",
"vNetApiVersion": "2015-06-15",
"storageApiVersion": "2015-06-15",
"publicIPApiVersion": "2015-06-15",
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
"subnet0Ref": "[concat(variables('vnetID'),'/subnets/',variables('subnet0Name'))]",
"lbID0": "[resourceId('Microsoft.Network/loadBalancers', concat('LB','-', parameters('clusterName'),'-',parameters('vmNodeType0Name')))]",
Expand All @@ -166,7 +160,7 @@
},
"resources": [
{
"apiVersion": "[variables('storageApiVersion')]",
"apiVersion": "2015-06-15",
"type": "Microsoft.Storage/storageAccounts",
"name": "[variables('supportLogStorageAccountName')]",
"location": "[parameters('computeLocation')]",
Expand All @@ -179,7 +173,7 @@
}
},
{
"apiVersion": "[variables('storageApiVersion')]",
"apiVersion": "2015-06-15",
"type": "Microsoft.Storage/storageAccounts",
"name": "[variables('applicationDiagnosticsStorageAccountName')]",
"location": "[parameters('computeLocation')]",
Expand All @@ -192,7 +186,7 @@
}
},
{
"apiVersion": "[variables('vNetApiVersion')]",
"apiVersion": "2015-06-15",
"type": "Microsoft.Network/virtualNetworks",
"name": "[variables('virtualNetworkName')]",
"location": "[parameters('computeLocation')]",
Expand All @@ -217,7 +211,7 @@
}
},
{
"apiVersion": "[variables('publicIPApiVersion')]",
"apiVersion": "2015-06-15",
"type": "Microsoft.Network/publicIPAddresses",
"name": "[concat(variables('lbIPName'),'-','0')]",
"location": "[parameters('computeLocation')]",
Expand All @@ -233,7 +227,7 @@
}
},
{
"apiVersion": "[variables('lbApiVersion')]",
"apiVersion": "2015-06-15",
"type": "Microsoft.Network/loadBalancers",
"name": "[concat('LB','-', parameters('clusterName'),'-',parameters('vmNodeType0Name'))]",
"location": "[parameters('computeLocation')]",
Expand Down Expand Up @@ -338,7 +332,7 @@
}
},
{
"apiVersion": "[variables('storageApiVersion')]",
"apiVersion": "2015-06-15",
"type": "Microsoft.Storage/storageAccounts",
"name": "[variables('uniqueStringArray0')[copyIndex()]]",
"location": "[parameters('computeLocation')]",
Expand All @@ -355,7 +349,7 @@
}
},
{
"apiVersion": "[variables('vmssApiVersion')]",
"apiVersion": "2016-03-30",
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[parameters('vmNodeType0Name')]",
"location": "[parameters('computeLocation')]",
Expand Down Expand Up @@ -384,8 +378,8 @@
"type": "ServiceFabricNode",
"autoUpgradeMinorVersion": false,
"protectedSettings": {
"StorageAccountKey1": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('supportLogStorageAccountName')),'2015-05-01-preview').key1]",
"StorageAccountKey2": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('supportLogStorageAccountName')),'2015-05-01-preview').key2]"
"StorageAccountKey1": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('supportLogStorageAccountName')),'2015-06-15').key1]",
"StorageAccountKey2": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('supportLogStorageAccountName')),'2015-06-15').key2]"
},
"publisher": "Microsoft.Azure.ServiceFabric",
"settings": {
Expand All @@ -404,7 +398,7 @@
"autoUpgradeMinorVersion": true,
"protectedSettings": {
"storageAccountName": "[variables('applicationDiagnosticsStorageAccountName')]",
"storageAccountKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('applicationDiagnosticsStorageAccountName')),'2015-05-01-preview').key1]",
"storageAccountKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('applicationDiagnosticsStorageAccountName')),'2015-06-15').key1]",
"storageAccountEndPoint": "https://core.windows.net/"
},
"publisher": "Microsoft.Azure.Diagnostics",
Expand Down Expand Up @@ -567,7 +561,7 @@
}
},
{
"apiVersion": "[variables('omsApiVersion')]",
"apiVersion": "2015-11-01-preview",
"location": "[parameters('omsRegion')]",
"name": "[parameters('omsWorkspacename')]",
"type": "Microsoft.OperationalInsights/workspaces",
Expand All @@ -578,7 +572,7 @@
},
"resources": [
{
"apiVersion": "[variables('omsApiVersion')]",
"apiVersion": "2015-11-01-preview",
"name": "[concat(variables('applicationDiagnosticsStorageAccountName'),parameters('omsWorkspacename'))]",
"type": "storageinsightconfigs",
"dependsOn": [
Expand All @@ -593,14 +587,14 @@
],
"storageAccount": {
"id": "[resourceId('Microsoft.Storage/storageaccounts/', variables('applicationDiagnosticsStorageAccountName'))]",
"key": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('applicationDiagnosticsStorageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value]"
"key": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('applicationDiagnosticsStorageAccountName')),'2015-06-15').key1.value]"
}
}
}
]
},
{
"apiVersion": "[variables('omsApiVersion')]",
"apiVersion": "2015-11-01-preview",
"location": "[parameters('omsRegion')]",
"name": "[variables('solution')]",
"type": "Microsoft.OperationsManagement/solutions",
Expand Down

0 comments on commit 3737a33

Please sign in to comment.