Skip to content

Commit 52dc892

Browse files
ciaran28ciaran28
authored
Merge pull request #48 from ciaran28/main
Azure ML Integration
2 parents 3db28b7 + 28e95fe commit 52dc892

File tree

56 files changed

+1253
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1253
-252
lines changed

‎.azureDevOps/MLOps_Engineer/Infrastructure/Az_Resources/Az_AppInsights/Az_AppInsights.bicep‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,5 @@ resource appInsight 'Microsoft.Insights/components@2020-02-02' = {
4444

4545
}
4646
}
47+
48+
output azAppInsightsID string = appInsight.id

‎.azureDevOps/MLOps_Engineer/Infrastructure/Az_Resources/Az_DataLake/Az_DataLake.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ param location string
66
param containerNames array
77
param ShouldCreateContainers bool = true
88
param storageAccountName string
9-
param azDatabricksWorkspaceID string
109
param workspaceName string
1110
param resourceGroupName string
1211
param azKeyVaultName string
@@ -18,6 +17,7 @@ param azKeyVaultName string
1817
var varstorageAccountName = '${storageAccountName}${substring(uniqueString(resourceGroup().id), 0, 4)}'
1918

2019

20+
2121
// ################################################################################################################################################################//
2222
// Deploy Storage Account Per Environment
2323
// ################################################################################################################################################################//
@@ -54,7 +54,7 @@ resource azStorage 'Microsoft.Storage/storageAccounts@2021-08-01' = {
5454
// ################################################################################################################################################################//
5555
// output storagekey string = listKeys(resourceId('Microsoft.Storage/storageAccounts', name), '2021-08-01').keys[0].value
5656
output varstorageAccountName string = azStorage.name
57-
output azDatabricksWorkspaceID string = azDatabricksWorkspaceID
57+
output varstorageAccountID string = azStorage.id
5858
output workspaceName string = workspaceName
5959
output resourceGroupName string = resourceGroupName
6060
output azKeyVaultName string = azKeyVaultName

‎.azureDevOps/MLOps_Engineer/Infrastructure/Az_Resources/Az_Databricks/Az_Databricks.bicep‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Define Parameters
33
// ################################################################################################################################################################//
44

5+
param azMachineLearningWSId string
56
param location string
67
param workspaceName string
78
var varworkspaceName = '${workspaceName}-${substring(uniqueString(resourceGroup().id), 0, 4)}'
@@ -31,17 +32,25 @@ resource azDatabricksWS 'Microsoft.Databricks/workspaces@2021-04-01-preview' = {
3132
properties: {
3233
managedResourceGroupId: '${subscription().id}/resourceGroups/${managedResourceGroupName}'
3334
publicNetworkAccess: 'Enabled'
35+
parameters: {
36+
//amlWorkspaceId: {
37+
// value: azMachineLearningWSId
38+
//}
39+
40+
}
3441
authorizations: [
3542
{
3643
principalId: '0e3c30b0-dd4e-4937-96ca-3fe88bd8f259'
3744
roleDefinitionId: roleDefinitionUser
3845
}
3946
]
47+
4048
}
4149
sku: {
4250
name: pricingTier
4351
}
4452

53+
4554

4655
}
4756

‎.azureDevOps/MLOps_Engineer/Infrastructure/Az_Resources/Az_KeyVault/Az_KeyVault.bicep‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ resource azKeyVault 'Microsoft.KeyVault/vaults@2021-10-01' = {
2020
virtualNetworkRules: []
2121
}
2222
enableRbacAuthorization: true // if this is false then you cannot use RBAC assignments, on acl (below). If true acl (below) is ignored
23-
enableSoftDelete: false
23+
enableSoftDelete: true
2424
enabledForTemplateDeployment: true
2525
accessPolicies: [
2626
{
@@ -56,3 +56,4 @@ resource azKeyVault 'Microsoft.KeyVault/vaults@2021-10-01' = {
5656
}
5757

5858
output azKeyVaultName string = azKeyVault.name
59+
output azKeyVaultID string = azKeyVault.id

‎.azureDevOps/MLOps_Engineer/Infrastructure/Az_Resources/Az_Machine_Learning/Az_MachineLearning.bicep‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
param location string
2+
param azAppInsightsID string
3+
param azKeyVaultID string
4+
param amlwsname string
5+
param amlblobname string
6+
7+
var varamlblobname = '${amlblobname}${substring(uniqueString(resourceGroup().id), 0, 4)}'
8+
var varamlwsname = '${amlwsname}-${substring(uniqueString(resourceGroup().id), 0, 4)}'
9+
10+
resource amlBlob 'Microsoft.Storage/storageAccounts@2021-08-01' = {
11+
name: varamlblobname
12+
location: location
13+
kind: 'StorageV2'
14+
sku: {
15+
name: 'Standard_LRS'
16+
}
17+
properties: {
18+
allowBlobPublicAccess: true
19+
isHnsEnabled: false
20+
accessTier: 'Hot'
21+
}
22+
}
23+
24+
resource AzMachineLearning 'Microsoft.MachineLearningServices/workspaces@2022-12-01-preview' = {
25+
name: varamlwsname
26+
location: location
27+
identity: {
28+
type: 'SystemAssigned'
29+
}
30+
properties: {
31+
publicNetworkAccess: 'Enabled'
32+
applicationInsights: azAppInsightsID
33+
storageAccount: amlBlob.id
34+
keyVault: azKeyVaultID
35+
36+
}
37+
sku: {
38+
name: 'Enterprise'
39+
40+
}
41+
42+
}
43+
44+
output azMachineLearningWSId string = AzMachineLearning.id

‎.azureDevOps/MLOps_Engineer/Infrastructure/DBX_CICD_Deployment/Bicep_Params/Development/Bicep.parameters.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,13 @@
5656
"value": "appinsightsdev"
5757
},
5858
"storageAccountName": {
59-
"value": "adlsdev"
59+
"value": "adldev"
60+
},
61+
"amlwsname": {
62+
"value": "amldev"
63+
},
64+
"amlblobname": {
65+
"value": "amldev"
6066
}
6167
}
6268
}

‎.azureDevOps/MLOps_Engineer/Infrastructure/DBX_CICD_Deployment/Bicep_Params/PreProduction/Bicep.parameters.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@
5656
},
5757
"storageAccountName": {
5858
"value": "adlspreprod"
59+
},
60+
"amlwsname": {
61+
"value": "amlpreprd"
62+
},
63+
"amlblobname": {
64+
"value": "amlblobpreprod"
5965
}
6066
}
6167
}

‎.azureDevOps/MLOps_Engineer/Infrastructure/DBX_CICD_Deployment/Bicep_Params/Production/Bicep.parameters.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@
5656
},
5757
"storageAccountName": {
5858
"value": "adlsprod"
59+
},
60+
"amlwsname": {
61+
"value": "amlprod"
62+
},
63+
"amlblobname": {
64+
"value": "amlblobprod"
5965
}
6066
}
6167
}

‎.azureDevOps/MLOps_Engineer/Infrastructure/DBX_CICD_Deployment/Bicep_Params/Sandbox/Bicep.parameters.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"TemplateParamFilePath": {
6-
"value": ".github/MLOps_Engineer/Infrastructure/DBX_CICD_Deployment/Bicep_Params/Sandbox/Bicep.parameters.json"
6+
"value": ".azureDevOps/MLOps_Engineer/Infrastructure/DBX_CICD_Deployment/Bicep_Params/Sandbox/Bicep.parameters.json"
77
},
88
"TemplateFilePath": {
9-
"value": ".github/MLOps_Engineer/Infrastructure/DBX_CICD_Deployment/Main_DBX_CICD.bicep"
9+
"value": ".azureDevOps/MLOps_Engineer/Infrastructure/DBX_CICD_Deployment/Main_DBX_CICD.bicep"
1010
},
1111
"AZURE_DATABRICKS_APP_ID": {
1212
"value": "2ff814a6-3304-4ab8-85cb-cd0e6f879c1d"
@@ -57,6 +57,12 @@
5757
},
5858
"storageAccountName": {
5959
"value": "adlssandbox"
60+
},
61+
"amlwsname": {
62+
"value": "amlsandbox"
63+
},
64+
"amlblobname": {
65+
"value": "amlblobsandbox"
6066
}
6167
}
6268
}

‎.azureDevOps/MLOps_Engineer/Infrastructure/DBX_CICD_Deployment/Bicep_Params/UAT/Bicep.parameters.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@
5656
},
5757
"storageAccountName": {
5858
"value": "adlsuat"
59+
},
60+
"amlwsname": {
61+
"value": "amluat"
62+
},
63+
"amlblobname": {
64+
"value": "amlblobuat"
5965
}
6066
}
6167
}

0 commit comments

Comments
 (0)