Skip to content

Standardize variable and parameter names #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hansuuuuuuuuuu wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Standardize variable and parameter names #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
917fa49
camelCase workspace config
Hansuuuuuuuuuu Apr 20, 2021
a8f7774
camelCase existing VM and Arc VM
Hansuuuuuuuuuu Apr 20, 2021
7ee7238
camelCase Existing VM variables
Hansuuuuuuuuuu Apr 20, 2021
02462a7
camelCase Existing VMSS
Hansuuuuuuuuuu Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceParameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"WorkspaceResourceId": {
"workspaceResourceId": {
"value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.OperationalInsights/workspaces/<WorkspaceName>"
},
"WorkspaceLocation": {
"workspaceLocation": {
"value": "<WorkspaceLocation>"
}
}
Expand Down
17 changes: 8 additions & 9 deletions OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"WorkspaceResourceId": {
"workspaceResourceId": {
"type": "String",
"metadata": {
"description": "Workspace Resource ID."
}
},
"WorkspaceLocation": {
"workspaceLocation": {
"type": "String",
"metadata": {
"description": "Workspace Location."
}
}
},
"variables": {},
"resources": [
{
"type": "Microsoft.Resources/deployments",
Expand All @@ -32,13 +31,13 @@
{
"apiVersion": "2015-11-01-preview",
"type": "Microsoft.OperationsManagement/solutions",
"location": "[parameters('WorkspaceLocation')]",
"name": "[concat('VMInsights', '(', split(parameters('WorkspaceResourceId'),'/')[8], ')')]",
"location": "[parameters('workspaceLocation')]",
"name": "[concat('VMInsights', '(', split(parameters('workspaceResourceId'),'/')[8], ')')]",
"properties": {
"workspaceResourceId": "[parameters('WorkspaceResourceId')]"
"workspaceResourceId": "[parameters('workspaceResourceId')]"
},
"plan": {
"name": "[concat('VMInsights', '(', split(parameters('WorkspaceResourceId'),'/')[8], ')')]",
"name": "[concat('VMInsights', '(', split(parameters('workspaceResourceId'),'/')[8], ')')]",
"product": "[concat('OMSGallery/', 'VMInsights')]",
"promotionCode": "",
"publisher": "Microsoft"
Expand All @@ -47,8 +46,8 @@
]
}
},
"subscriptionId": "[split(parameters('WorkspaceResourceId'),'/')[2]]",
"resourceGroup": "[split(parameters('WorkspaceResourceId'),'/')[4]]"
"subscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]",
"resourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]"
}
],
"outputs": {}
Expand Down
6 changes: 3 additions & 3 deletions OnbordingTemplates/ExistingArcVmOnboarding/ExistingArcVmOnboardingParameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"VmLocation": {
"vmLocation": {
"value": "<VirtualMachineLocation>"
},
"VmResourceId": {
"vmResourceId": {
"value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.HybridCompute/machines/<VirtualMachineName>"
},
"osType": {
"value": "<OSType>"
},
"WorkspaceResourceId": {
"workspaceResourceId": {
"value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.OperationalInsights/workspaces/<WorkspaceName>"
}
}
Expand Down
42 changes: 21 additions & 21 deletions OnbordingTemplates/ExistingArcVmOnboarding/ExistingArcVmOnboardingTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"VmLocation": {
"vmLocation": {
"type": "String",
"metadata": {
"description": "The Virtual Machine Location."
}
},
"VmResourceId": {
"vmResourceId": {
"type": "String",
"metadata": {
"description": "VM Resource ID."
Expand All @@ -20,60 +20,60 @@
"description": "OS Type, Example: Linux / Windows"
}
},
"WorkspaceResourceId": {
"workspaceResourceId": {
"type": "String",
"metadata": {
"description": "Workspace Resource ID."
}
}
},
"variables": {
"VmName": "[split(parameters('VmResourceId'),'/')[8]]",
"DaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
"DaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
"MmaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OMSAgentForLinux')]",
"MmaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OmsAgentForLinux')]"
"vmName": "[split(parameters('vmResourceId'),'/')[8]]",
"daExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
"daExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
"mmaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OMSAgentForLinux')]",
"mmaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OmsAgentForLinux')]"
},
"resources": [
{
"type": "Microsoft.HybridCompute/machines",
"apiVersion": "2020-03-11-preview",
"name": "[variables('VmName')]",
"location": "[parameters('VmLocation')]",
"name": "[variables('vmName')]",
"location": "[parameters('vmLocation')]",
"resources": [
{
"type": "extensions",
"apiVersion": "2020-03-11-preview",
"name": "[variables('DaExtensionName')]",
"location": "[parameters('VmLocation')]",
"name": "[variables('daExtensionName')]",
"location": "[parameters('vmLocation')]",
"dependsOn": [
"[concat('Microsoft.HybridCompute/machines/', variables('VmName'))]"
"[concat('Microsoft.HybridCompute/machines/', variables('vmName'))]"
],
"properties": {
"publisher": "Microsoft.Azure.Monitoring.DependencyAgent",
"type": "[variables('DaExtensionType')]",
"type": "[variables('daExtensionType')]",
"autoUpgradeMinorVersion": true,
"settings": {}
}
},
{
"type": "extensions",
"apiVersion": "2020-03-11-preview",
"name": "[variables('MmaExtensionName')]",
"location": "[parameters('VmLocation')]",
"name": "[variables('mmaExtensionName')]",
"location": "[parameters('vmLocation')]",
"dependsOn": [
"[concat('Microsoft.HybridCompute/machines/', variables('VmName'))]"
"[concat('Microsoft.HybridCompute/machines/', variables('vmName'))]"
],
"properties": {
"publisher": "Microsoft.EnterpriseCloud.Monitoring",
"type": "[variables('MmaExtensionType')]",
"type": "[variables('mmaExtensionType')]",
"settings": {
"workspaceId": "[reference(parameters('WorkspaceResourceId'), '2015-03-20').customerId]",
"azureResourceId": "[parameters('VmResourceId')]",
"workspaceId": "[reference(parameters('workspaceResourceId'), '2015-03-20').customerId]",
"azureResourceId": "[parameters('vmResourceId')]",
"stopOnMultipleConnections": "true"
},
"protectedSettings": {
"workspaceKey": "[listKeys(parameters('WorkspaceResourceId'), '2015-03-20').primarySharedKey]"
"workspaceKey": "[listKeys(parameters('workspaceResourceId'), '2015-03-20').primarySharedKey]"
}
}
}
Expand Down
50 changes: 25 additions & 25 deletions OnbordingTemplates/ExistingVmOnboarding/ExistingVmOnboardingTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"VmResourceId": {
"vmResourceId": {
"type": "String",
"metadata": {
"description": "VM Resource ID."
}
},
"VmLocation": {
"vmLocation": {
"type": "String",
"metadata": {
"description": "The Virtual Machine Location."
Expand All @@ -20,64 +20,64 @@
"description": "OS Type, Example: Linux / Windows"
}
},
"WorkspaceResourceId": {
"workspaceResourceId": {
"type": "String",
"metadata": {
"description": "Workspace Resource ID."
}
}
},
"variables": {
"VmName": "[split(parameters('VmResourceId'),'/')[8]]",
"DaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
"DaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
"DaExtensionVersion": "9.5",
"MmaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OMSAgentForLinux')]",
"MmaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OmsAgentForLinux')]",
"MmaExtensionVersion": "[if(equals(toLower(parameters('osType')), 'windows'), '1.0', '1.4')]"
"vmName": "[split(parameters('vmResourceId'),'/')[8]]",
"daExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
"daExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
"daExtensionVersion": "9.5",
"mmaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OMSAgentForLinux')]",
"mmaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OmsAgentForLinux')]",
"mmaExtensionVersion": "[if(equals(toLower(parameters('osType')), 'windows'), '1.0', '1.4')]"
},
"resources": [
{
"type": "Microsoft.Compute/virtualMachines",
"apiVersion": "2018-10-01",
"name": "[variables('VmName')]",
"location": "[parameters('VmLocation')]",
"name": "[variables('vmName')]",
"location": "[parameters('vmLocation')]",
"resources": [
{
"type": "extensions",
"apiVersion": "2019-12-01",
"name": "[variables('DaExtensionName')]",
"location": "[parameters('VmLocation')]",
"name": "[variables('daExtensionName')]",
"location": "[parameters('vmLocation')]",
"dependsOn": [
"[concat('Microsoft.Compute/VirtualMachines/', variables('VmName'))]"
"[concat('Microsoft.Compute/VirtualMachines/', variables('vmName'))]"
],
"properties": {
"publisher": "Microsoft.Azure.Monitoring.DependencyAgent",
"type": "[variables('DaExtensionType')]",
"typeHandlerVersion": "[variables('DaExtensionVersion')]",
"type": "[variables('daExtensionType')]",
"typeHandlerVersion": "[variables('daExtensionVersion')]",
"autoUpgradeMinorVersion": true
}
},
{
"type": "extensions",
"apiVersion": "2018-10-01",
"name": "[variables('MmaExtensionName')]",
"location": "[parameters('VmLocation')]",
"name": "[variables('mmaExtensionName')]",
"location": "[parameters('vmLocation')]",
"dependsOn": [
"[concat('Microsoft.Compute/VirtualMachines/', variables('VmName'))]"
"[concat('Microsoft.Compute/VirtualMachines/', variables('vmName'))]"
],
"properties": {
"publisher": "Microsoft.EnterpriseCloud.Monitoring",
"type": "[variables('MmaExtensionType')]",
"typeHandlerVersion": "[variables('MmaExtensionVersion')]",
"type": "[variables('mmaExtensionType')]",
"typeHandlerVersion": "[variables('mmaExtensionVersion')]",
"autoUpgradeMinorVersion": "true",
"settings": {
"workspaceId": "[reference(parameters('WorkspaceResourceId'), '2015-03-20').customerId]",
"azureResourceId": "[parameters('VmResourceId')]",
"workspaceId": "[reference(parameters('workspaceResourceId'), '2015-03-20').customerId]",
"azureResourceId": "[parameters('vmResourceId')]",
"stopOnMultipleConnections": "true"
},
"protectedSettings": {
"workspaceKey": "[listKeys(parameters('WorkspaceResourceId'), '2015-03-20').primarySharedKey]"
"workspaceKey": "[listKeys(parameters('workspaceResourceId'), '2015-03-20').primarySharedKey]"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions OnbordingTemplates/ExistingVmssOnboarding/ExistingVmssOnboardingParameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"VmssResourceId": {
"vmssResourceId": {
"value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.Compute/virtualMachines/<VirtualMachineScaleSetName>"
},
"VmssLocation": {
"vmssLocation": {
"value": "<VirtualMachineScaleSetLocation>"
},
"OsType": {
"osType": {
"value": "<OSType>"
},
"WorkspaceResourceId": {
"workspaceResourceId": {
"value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.OperationalInsights/workspaces/<WorkspaceName>"
}
}
Expand Down
Loading