зеркало из https://github.com/Azure/missionlz.git
Added Workload to Tier3 UI & Fixed LAW diagnostic logs (#1044)
* Updated diag logging for LAW * Added inputs for workload * GitHub Action: Build Bicep to JSON --------- Co-authored-by: github-actions <github-actions@github.com>
This commit is contained in:
Jason Masten
GitHub
Родитель
458f3c9f09
Коммит
df0e7c6354
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -4,8 +4,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "9708587224602662941"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "7231398820336929499"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -272,8 +272,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "1283486214672349634"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "4043054769176836480"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -828,8 +828,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "10432608483393344913"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "11580563852245464992"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -1013,8 +1013,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "11578255285976861685"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "16981911414796661053"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -1143,8 +1143,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "7255054464077859150"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "13007482851565428861"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -1279,8 +1279,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "17262762423710705329"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "15250750281746986897"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -1387,8 +1387,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "12935581119437417634"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "17152995037494078504"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -1470,8 +1470,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "18262399193161292353"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "8470734590353387928"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -1573,8 +1573,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "13830033528097307473"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "4604600344009608460"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -1650,8 +1650,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "2265853539539159849"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "12920788887150549633"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -1799,8 +1799,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "5158151637829725698"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "3137630721293344936"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -1852,8 +1852,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "4225396596043462595"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "17390826727171662541"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -1926,8 +1926,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "15781764977326733963"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "1031623525996139958"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -1979,8 +1979,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "4225396596043462595"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "17390826727171662541"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -2087,8 +2087,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "12584527779015666762"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "1841441769041268305"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -2167,8 +2167,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "12300580845424356573"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "7405834931933819304"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -2418,8 +2418,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "16629693514867638495"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "7625943238700140088"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -2498,8 +2498,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "6383470207031311407"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "12311612567285718476"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -2593,8 +2593,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "6007785905664733866"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "13565568332021378537"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -2741,8 +2741,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "15276628086161283630"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "6660778048819495354"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -2848,8 +2848,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "6116693144339389145"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "12908544435848997555"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -3106,8 +3106,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "11049517654822149634"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "7523124167390698300"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -3178,8 +3178,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "11148640012050316356"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "4966252766778833703"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -3268,8 +3268,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "11931053519285250235"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "505841804747422350"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -3342,8 +3342,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "12049539018034280966"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "1055200934770590443"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -3420,8 +3420,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "13356625654141484072"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "11627959113425338284"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -3511,8 +3511,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "379956182717650153"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "12217068430353603455"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -3568,8 +3568,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "9464536540108620518"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "5750015592710669395"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -3744,8 +3744,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "6383470207031311407"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "12311612567285718476"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -3829,8 +3829,8 @@
|
|||
"metadata": {
|
||||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.27.1.19265",
|
||||
"templateHash": "4615387508967890473"
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "17254696147980897511"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
|
|||
|
|
@ -144,6 +144,30 @@
|
|||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "workloadName",
|
||||
"type": "Microsoft.Common.TextBox",
|
||||
"label": "Workload Name",
|
||||
"toolTip": "Input a 10 character workload name for the resource group and resource names created with this solution. The workload should represent the name of the service the tier 3 deployment will support.",
|
||||
"placeholder": "Example: tier3",
|
||||
"constraints": {
|
||||
"required": true,
|
||||
"regex": "^[a-z0-9A-Z]{1,10}$",
|
||||
"validationMessage": "The value must be 1 - 10 characters in length and must be alphanumeric."
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "workloadShortName",
|
||||
"type": "Microsoft.Common.TextBox",
|
||||
"label": "Workload Short Name",
|
||||
"toolTip": "Input a 3 character workload short name for the resource group and resource names created with this solution. The workload short name should be an abbreviation of the workload name.",
|
||||
"placeholder": "Example: t3",
|
||||
"constraints": {
|
||||
"required": true,
|
||||
"regex": "^[a-z0-9A-Z]{1,3}$",
|
||||
"validationMessage": "The value must be 1 - 3 characters in length and must be alphanumeric."
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -407,7 +431,9 @@
|
|||
"policy": "[if(steps('compliance').policySection.deployPolicy, steps('compliance').policySection.policy, '')]",
|
||||
"subnetAddressPrefix": "[steps('networking').networking.subnetAddressCidrRange]",
|
||||
"tags": "[steps('tags').tags]",
|
||||
"virtualNetworkAddressPrefix": "[steps('networking').networking.virtualNetworkAddressCidrRange]"
|
||||
"virtualNetworkAddressPrefix": "[steps('networking').networking.virtualNetworkAddressCidrRange]",
|
||||
"workloadName": "[steps('basics').naming.workloadName]",
|
||||
"workloadShortName": "[steps('basics').naming.workloadShortName]"
|
||||
},
|
||||
"kind": "Subscription",
|
||||
"location": "[steps('basics').scope.location.name]",
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "3062331425262079203"
|
||||
"templateHash": "15328188546614556383"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -6986,7 +6986,7 @@
|
|||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "4137052730409380446"
|
||||
"templateHash": "4240331160697686852"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -7156,7 +7156,7 @@
|
|||
"_generator": {
|
||||
"name": "bicep",
|
||||
"version": "0.28.1.47646",
|
||||
"templateHash": "5224308046834771366"
|
||||
"templateHash": "8594084510137329954"
|
||||
}
|
||||
},
|
||||
"parameters": {
|
||||
|
|
@ -7183,12 +7183,7 @@
|
|||
"properties": {
|
||||
"workspaceId": "[resourceId('Microsoft.OperationalInsights/workspaces', parameters('logAnalyticsWorkspaceName'))]",
|
||||
"storageAccountId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('diagnosticStorageAccountName'))]",
|
||||
"logs": [
|
||||
{
|
||||
"category": "Audit",
|
||||
"enabled": true
|
||||
}
|
||||
],
|
||||
"logs": "[if(equals(environment().name, 'AzureCloud'), createArray(createObject('category', 'Audit', 'enabled', true())), createArray())]",
|
||||
"metrics": [
|
||||
{
|
||||
"category": "AllMetrics",
|
||||
|
|
|
|||
|
|
@ -23,12 +23,12 @@ resource diagnosticSetting 'Microsoft.Insights/diagnosticSettings@2017-05-01-pre
|
|||
properties: {
|
||||
workspaceId: logAnalyticsWorkspace.id
|
||||
storageAccountId: stg.id
|
||||
logs: [
|
||||
logs: environment().name == 'AzureCloud' ? [
|
||||
{
|
||||
category: 'Audit'
|
||||
enabled: true
|
||||
}
|
||||
]
|
||||
] : []
|
||||
metrics: [
|
||||
{
|
||||
category: 'AllMetrics'
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче