Azure
/
data-management-zone
зеркало из https://github.com/Azure/data-management-zone.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

updated shir deployment

This commit is contained in:
Marvin Buss 2020-11-25 15:14:21 +01:00
Родитель a6703ce7b7
Коммит 483fd61813
7 изменённых файлов: 78 добавлений и 216 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

90
infra/DataFactory/deploy.dataFactory.json
Просмотреть файл

@ -15,40 +15,6 @@
"description": "Specifies the name of the data factory."
}
},
"dataFactoryGitAccount": {
"type": "string",
"metadata": {
"description": "Specifies the account name for the repository connection."
}
},
"dataFactoryGitRepo": {
"type": "string",
"metadata": {
"description": "Specifies the repo name for the repository connection."
}
},
"dataFactoryGitCollaborationBranch": {
"type": "string",
"metadata": {
"description": "Specifies the collaboration branch name for the repository connection."
}
},
"dataFactoryGitRootFolder": {
"type": "string",
"metadata": {
"description": "Specifies the root folder in the branch for the repository connection."
}
},
"dataFactoryGitType": {
"type": "string",
"allowedValues": [
"FactoryGitHubConfiguration",
"FactoryVSTSConfiguration"
],
"metadata": {
"description": "Specifies the type of git connection."
}
},
"subnetId": {
"type": "string",
"metadata": {
@ -65,14 +31,10 @@
"variables": {
"location": "[parameters('location')]",
"dataFactoryName": "[parameters('dataFactoryName')]",
"dataFactoryGitAccount": "[parameters('dataFactoryGitAccount')]",
"dataFactoryGitRepo": "[parameters('dataFactoryGitRepo')]",
"dataFactoryGitCollaborationBranch": "[parameters('dataFactoryGitCollaborationBranch')]",
"dataFactoryGitRootFolder": "[parameters('dataFactoryGitRootFolder')]",
"dataFactoryGitType": "[parameters('dataFactoryGitType')]",
"subnetId": "[parameters('subnetId')]",
"privateDnsZoneResourceGroupId": "[parameters('privateDnsZoneResourceGroupId')]",
"privateDnsZoneResourceGroupName": "[last(split(variables('privateDnsZoneResourceGroupId'), '/'))]",
"privateEndpointName": "[concat(variables('dataFactoryName'), '-private-endpoint')]"
"templateUri": "https://raw.githubusercontent.com/Azure/data-hub/main/infra/PrivateEndpoint/deploy.privateEndpoint.json?token=AIHRGTX24ZRZSACX3ANKGMK7NGJ3W"
},
"resources": [
@ -85,13 +47,6 @@
"type": "SystemAssigned"
},
"properties": {
// "repoConfiguration": {
// "accountName": "[variables('dataFactoryGitAccount')]",
// "repositoryName": "[variables('dataFactoryGitRepo')]",
// "collaborationBranch": "[variables('dataFactoryGitCollaborationBranch')]",
// "rootFolder": "[variables('dataFactoryGitRootFolder')]",
// "type": "[variables('dataFactoryGitType')]"
// },
"globalParameters": {
}
},
@ -132,6 +87,49 @@
}
}
}
},
{
"type": "Microsoft.Network/privateEndpoints",
"apiVersion": "2020-05-01",
"name": "[variables('privateEndpointName')]",
"location": "[variables('location')]",
"properties": {
"privateLinkServiceConnections": [
{
"name": "[variables('privateEndpointName')]",
"properties": {
"privateLinkServiceId": "[variables('privateLinkServiceResourceId')]",
"groupIds": [
"[variables('privateLinkServiceGroupId')]"
]
}
}
],
"manualPrivateLinkServiceConnections": [
],
"subnet": {
"id": "[variables('subnetId')]"
}
}
},
{
"name": "[concat(variables('privateEndpointName'), '/aRecord')]",
"type": "Microsoft.Network/privateEndpoints/privateDnsZoneGroups",
"apiVersion": "2020-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/privateEndpoints', variables('privateEndpointName'))]"
],
"location": "[variables('privateEndpointLocation')]",
"properties": {
"privateDnsZoneConfigs": [
{
"name": "[concat(variables('privateEndpointName'), '-aRecord')]",
"properties": {
"privateDnsZoneId": "[variables('privateDnsZoneId')]"
}
}
]
}
}
],
"outputs": {}

15
infra/DataFactory/params.dataFactory001.json
Просмотреть файл

@ -8,21 +8,6 @@
"dataFactoryName": {
"value": "dh-datafactory001"
},
"dataFactoryGitAccount": {
"value": ""
},
"dataFactoryGitRepo": {
"value": ""
},
"dataFactoryGitCollaborationBranch": {
"value": ""
},
"dataFactoryGitRootFolder": {
"value": ""
},
"dataFactoryGitType": {
"value": "FactoryGitHubConfiguration"
},
"subnetId": {
"value": "/subscriptions/feab2d15-66b4-438b-accf-51f889b30ec3/resourceGroups/dh-network/providers/Microsoft.Network/virtualNetworks/dh-vnet/subnets/dh-privatelink-subnet"
},

21
infra/SelfHostedIntegrationRuntime/deploy.shir.json
Просмотреть файл

@ -55,16 +55,16 @@
"description": "Specifies the ID of the existing data factory for which an integration runtime should be created."
}
},
"storageAccountContainerId": {
"storageAccountId": {
"type": "string",
"metadata": {
"description": "Specifies the ID of the existing storage account where the powershell script is stored."
}
},
"storageAccountKey": {
"storageAccountContainerName": {
"type": "string",
"metadata": {
"description": "Specifies the ID of the existing storage account where the powershell script is stored."
"description": "Specifies the name of the storage account container name where the powershell script is stored."
}
}
},
@ -78,11 +78,10 @@
"vmssAdminPassword": "[parameters('vmssAdminPassword')]",
"dataFactoryId": "[parameters('dataFactoryId')]",
"dataFactoryName": "[last(split(variables('dataFactoryId'), '/'))]",
"dataFactorySelfHostedIntegrationRuntimeName": "datahubSelfHostedIntegrationRuntimeNew",
"storageAccountContainerId": "[parameters('storageAccountContainerId')]",
"storageAccountName": "[split(variables('storageAccountContainerId'), '/')[8]]",
"storageAccountContainerName": "[last(split(variables('storageAccountContainerId'), '/'))]",
"storageAccountKey": "[parameters('storageAccountKey')]",
"dataFactorySelfHostedIntegrationRuntimeName": "[concat('datahubSelfHostedIntegrationRuntime', variables('vmssName'))]",
"storageAccountId": "[parameters('storageAccountId')]",
"storageAccountName": "[last(split(variables('storageAccountId'), '/'))]",
"storageAccountContainerName": "[parameters('storageAccountContainerName')]",
"subnetId": "[parameters('subnetId')]"
},
"resources": [
@ -261,13 +260,13 @@
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
"[concat('https://', variables('storageAccountName'), '.blob.core.windows.net/', variables('storageAccountContainerName'), '/gatewayInstall.ps1')]"
"[concat('https://', variables('storageAccountName'), '.blob.core.windows.net/', variables('storageAccountContainerName'), '/installSHIRGateway.ps1')]"
]
},
"protectedSettings": {
"commandToExecute": "[concat('powershell.exe -ExecutionPolicy Unrestricted -File gatewayInstall.ps1 ', listAuthKeys(resourceId('Microsoft.DataFactory/factories/integrationRuntimes', variables('dataFactoryName'), variables('dataFactorySelfHostedIntegrationRuntimeName')), '2018-06-01').authKey1)]",
"commandToExecute": "[concat('powershell.exe -ExecutionPolicy Unrestricted -File installSHIRGateway.ps1 ', listAuthKeys(resourceId('Microsoft.DataFactory/factories/integrationRuntimes', variables('dataFactoryName'), variables('dataFactorySelfHostedIntegrationRuntimeName')), '2018-06-01').authKey1)]",
"storageAccountName": "[variables('storageAccountName')]",
"storageAccountKey": "[variables('storageAccountKey')]"
"storageAccountKey": "[listkeys(variables('storageAccountId'), '2020-08-01-preview').keys[0].value]"
}
}
}

0
infra/SelfHostedIntegrationRuntime/gatewayInstall.ps1 → infra/SelfHostedIntegrationRuntime/installSHIRGateway.ps1
Просмотреть файл

29
infra/SelfHostedIntegrationRuntime/params.shir001.json
Просмотреть файл

@ -6,7 +6,7 @@
"value": "northeurope"
},
"vmssName": {
"value": "dhSHIRnew"
"value": "dhSHIR001"
},
"vmssSkuTier": {
"value": "Standard"
@ -15,34 +15,19 @@
"value": "Standard_A1_v2"
},
"vmssAdminUsername": {
"reference": {
"keyVault": {
"id": "/subscriptions/feab2d15-66b4-438b-accf-51f889b30ec3/resourceGroups/dh-mgmt/providers/Microsoft.KeyVault/vaults/dh-keyvault001"
},
"secretName": "vmssAdminUsername"
}
"value": "VmssMainUser"
},
"vmssAdminPassword": {
"reference": {
"keyVault": {
"id": "/subscriptions/feab2d15-66b4-438b-accf-51f889b30ec3/resourceGroups/dh-mgmt/providers/Microsoft.KeyVault/vaults/dh-keyvault001"
},
"secretName": "vmssAdminPassword"
}
"value": "<your-secure-password>"
},
"dataFactoryId": {
"value": "/subscriptions/feab2d15-66b4-438b-accf-51f889b30ec3/resourceGroups/dh-mgmt/providers/Microsoft.DataFactory/factories/dh-datafactory001"
},
"storageAccountContainerId": {
"value": "/subscriptions/feab2d15-66b4-438b-accf-51f889b30ec3/resourceGroups/dh-mgmt/providers/Microsoft.Storage/storageAccounts/datahubstorage001/blobServices/default/containers/scripts"
"storageAccountId": {
"value": "/subscriptions/feab2d15-66b4-438b-accf-51f889b30ec3/resourceGroups/dh-mgmt/providers/Microsoft.Storage/storageAccounts/datahubstorage001"
},
"storageAccountKey": {
"reference": {
"keyVault": {
"id": "/subscriptions/feab2d15-66b4-438b-accf-51f889b30ec3/resourceGroups/dh-mgmt/providers/Microsoft.KeyVault/vaults/dh-keyvault001"
},
"secretName": "storageAccountKey"
}
"storageAccountContainerName": {
"value": "scripts"
},
"subnetId": {
"value": "/subscriptions/feab2d15-66b4-438b-accf-51f889b30ec3/resourceGroups/dh-network/providers/Microsoft.Network/virtualNetworks/dh-vnet/subnets/dh-subnet"

136
infra/Storage/deploy.storage.json
Просмотреть файл

@ -31,12 +31,6 @@
"metadata": {
"description": "Specifies the SKU of the storage account."
}
},
"keyVaultId": {
"type": "string",
"metadata": {
"description": "Specifies the resource id of the key vault to store the storage access key."
}
}
},
"functions": [],
@ -44,14 +38,12 @@
"location": "[parameters('location')]",
"storageAccountName": "[parameters('storageAccountName')]",
"storageAccountType": "[parameters('storageAccountType')]",
"containerName": "scripts",
"keyVaultId": "[parameters('keyVaultId')]",
"keyVaultName": "[last(split(variables('keyVaultId'), '/'))]"
"containerName": "scripts"
},
"resources": [
{
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "2019-06-01",
"apiVersion": "2020-08-01-preview",
"name": "[variables('storageAccountName')]",
"location": "[variables('location')]",
"identity": {
@ -95,136 +87,42 @@
},
"accessTier": "Hot",
"supportsHttpsTrafficOnly": true,
"isHnsEnabled": true,
"isHnsEnabled": false,
"largeFileSharesState": "Disabled",
"minimumTlsVersion": "TLS1_2",
"allowBlobPublicAccess": false
// "routingPreference": {
// "routingChoice": "MicrosoftRouting",
// "publishMicrosoftEndpoints": false,
// "publishInternetEndpoints": false
// }
"allowBlobPublicAccess": false,
"routingPreference": {
"routingChoice": "MicrosoftRouting",
"publishMicrosoftEndpoints": false,
"publishInternetEndpoints": false
}
},
"resources": [
{
"type": "managementPolicies",
"apiVersion": "2019-06-01",
"name": "default",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]"
],
"properties": {
"policy": {
"rules": [
{
"enabled": true,
"name": "default",
"type": "Lifecycle",
"definition": {
"actions": {
"baseBlob": {
"tierToCool": {
"daysAfterModificationGreaterThan": 90
}
// "tierToArchive": {
// "daysAfterModificationGreaterThan": 365
// }
}
// "snapshot": {
// "delete": {
// "daysAfterCreationGreaterThan": 90
// }
// }
},
"filters": {
"prefixMatch": [
],
"blobTypes": [
"blockBlob"
]
}
}
}
]
}
}
},
{
"type": "blobServices",
"apiVersion": "2019-06-01",
"name": "default",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]"
],
"properties": {
// "deleteRetentionPolicy": {
// "enabled": true,
// "days": 7
// }
// "isVersioningEnabled": true,
// "automaticSnapshotPolicyEnabled": true,
// "changeFeed": {
// "enabled": true
// }
}
},
{
"type": "blobServices/containers",
"apiVersion": "2019-06-01",
"apiVersion": "2020-08-01-preview",
"name": "[concat('default/', variables('containerName'))]",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]"
],
"properties": {
"publicAccess": "None"
"publicAccess": "None",
"metadata": {}
}
}
]
},
{
"name": "SecretDeployment",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2019-10-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]"
],
"properties": {
"expressionEvaluationOptions": {
"scope": "outer"
},
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {},
"variables": {},
"resources": [
{
"type": "Microsoft.KeyVault/vaults/secrets",
"name": "[concat(variables('keyVaultName'), '/storageAccountKey')]",
"apiVersion": "2019-09-01",
"properties": {
"contentType": "text/plain",
"value": "[listkeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2019-06-01').keys[0].value]",
"attributes": {
"enabled": true
}
}
}
],
"outputs": {}
}
},
"subscriptionId": "[split(variables('keyVaultId'), '/')[2]]",
"resourceGroup": "[split(variables('keyVaultId'), '/')[4]]"
}
],
"outputs": {
"storageAccountId": {
"type": "string",
"value": "[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]"
},
"storageAccountName": {
"type": "string",
"value": "[variables('storageAccountName')]"
},
"containerName": {
"storageAccountContainerName": {
"type": "string",
"value": "[variables('containerName')]"
}

3
infra/Storage/params.storage001.json
Просмотреть файл

@ -10,9 +10,6 @@
},
"storageAccountType": {
"value": "Standard_LRS"
},
"keyVaultId": {
"value": "/subscriptions/feab2d15-66b4-438b-accf-51f889b30ec3/resourceGroups/dh-mgmt/providers/Microsoft.KeyVault/vaults/dh-keyvault001"
}
}
}