Skip to content
This repository was archived by the owner on Oct 12, 2023. It is now read-only.

Commit 88c17ba

Browse files
jorgecotillojorgecotillo
authored
Major module update (#39)
* added diagnostic storage account * added retrieval of sas token from an arm template * added sas properties * enabled azure security center deployment * added solutions to log analytics plus datastores * added storage account v2 template * added storage account templates * updated diagnostic storage account output parameters * added IaaSDiagnostic wad settings * enabled service endpoint on shared services network * renamed module names * updated archetype module versions * updated archetype module versions * fixed invalid parameters * updated shared services archetype * updated adds extension names * added app rule and network rule collections to allow for log analytics egress access from VMs * added virtual network module and updated app rule collection * updated security center - workspace pricing tier * enabled security center log analytics auto provisioning * enabled update management * added diagnostic settings to automation account * added linux schedules * modified shared services test archetype based on latest modifications * added azure backup log analytics solution and whitelisted linux package managers * updated palo alto module versions * fixed bootstrap file encoding * removed unused parameter * added 1.0 version as default module version * added cdn and made storage account template more generic * modified templates to use common diagnostic storage account * added diagnostic storage account * updated ntier iaas deployment * Added storage-account v2.0 * Added placeholders for policy,rbac and script folders in storage-account v2.0 * Updated the comments in the test scripts for storage-account module * added v2 of storage account deployment * added placeholder for scripts folder * Changed the path logic to be os agnostic * removed tokens from v2.0 storage parameters file * Update to path concatenation logic applied * updated sql server template * added sql server cloudwitness service endpoint * updated azure firewall rules and increase vmapp-lb size * updated ntier iaas archetypes to use latest log analytics module * updated ntier SQL Cluster IP * updated aks, sap, cloud break and squid modules to use single diagnostic storage account * modified sqldb to be ISO compliant * fixed deployment of single diagnostic storage * reduced number of integration tests. integration tests help test the python orchestration * updated aks archetype file name * added update management tag on linux jumpbox * updated templates based on feedback * fix deployment name, converted to string * forced rebuild
1 parent efccb48 commit 88c17ba

File tree

141 files changed

+18248
-38847
lines changed

Some content is hidden

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

141 files changed

+18248
-38847
lines changed

Diff for: ‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ legacy_mgmt_settings_real.py
4141
vdc_settings_real.py
4242
app_creds_real.py
4343
**/archetype.json
44+
**/archetypes.json
4445

4546
# User-specific files
4647
*.suo
@@ -74,3 +75,4 @@ src/build
7475
# Azure deployment credentials
7576
*.pubxml
7677
archetypes/aks/archetypes.json
78+
archetypes/shared-services/archetype.test.devops.json

Diff for: ‎archetypes/aks/archetypes.test.json renamed to ‎archetypes/aks/archetype.test.json

+120-68
Large diffs are not rendered by default.

Diff for: ‎archetypes/cloudbreak/archetype.test.json

+147-47
Large diffs are not rendered by default.

Diff for: ‎archetypes/ntier-iaas/archetype.test.json

+128-23
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717
"shared-services": {
1818
"subscription-id": "00000000-0000-0000-0000-000000000000",
1919
"deployment-name": "ssvcs",
20-
"adds": {
21-
"vm-ip-address-start": "10.4.0.46"
22-
},
2320
"active-directory": {
2421
"domain-admin-user": "contoso",
25-
"domain-name": "contoso.com"
22+
"domain-name": "contoso.com",
23+
"vm-ip-address-start": "10.4.0.46"
2624
},
2725
"network": {
2826
"network-virtual-appliance": {
@@ -38,8 +36,8 @@
3836
},
3937
"workload": {
4038
"subscription-id": "00000000-0000-0000-0000-000000000000",
41-
"deployment-name": "iaas",
42-
"region":"Central US",
39+
"deployment-name": "ntier",
40+
"region":"West US 2",
4341
"vm-configuration": {
4442
"local-admin-user": "admin-user",
4543
"enable-encryption": false,
@@ -60,20 +58,26 @@
6058
"log-analytics": {
6159
"region": "West US 2"
6260
},
61+
"automation-account": {
62+
"region": "West US 2"
63+
},
6364
"network": {
6465
"enable-ddos-protection": false
6566
}
6667
}
6768
},
6869
"orchestration": {
6970
"modules-to-deploy":[
71+
"diagnostic-storage-account",
7072
"la",
73+
"automation-account",
74+
"security-center",
7175
"nsg",
7276
"workload-net",
77+
"enable-service-endpoint-on-diagnostic-storage-account",
7378
"kv",
7479
"vmapp-web-lb",
7580
"vmapp-biz-lb",
76-
"app-gateway",
7781
"sqlserver-alwayson"
7882
],
7983
"module-validation-dependencies": [
@@ -84,13 +88,44 @@
8488
"custom-scripts": "file(scripts)",
8589
"modules": [
8690
{
87-
"module": "workload-net",
88-
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-net-rg",
91+
"module": "diagnostic-storage-account",
92+
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-diagnostics-rg",
93+
"source": {
94+
"version": "1.0",
95+
"template-path": "file(modules/storage-account/1.0)",
96+
"parameters-path": "file(modules/storage-account/1.0)"
97+
},
98+
"dependencies": []
99+
},
100+
{
101+
"module": "la",
102+
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-diagnostics-rg",
89103
"source": {
90104
"version": "1.0"
91105
},
92106
"dependencies": [
93-
"nsg"
107+
"diagnostic-storage-account"
108+
]
109+
},
110+
{
111+
"module": "automation-account",
112+
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-diagnostics-rg",
113+
"source": {
114+
"version": "1.0"
115+
},
116+
"dependencies": [
117+
"la",
118+
"diagnostic-storage-account"
119+
]
120+
},
121+
{
122+
"module": "security-center",
123+
"create-resource-group": false,
124+
"source": {
125+
"version": "1.0"
126+
},
127+
"dependencies": [
128+
"la"
94129
]
95130
},
96131
{
@@ -100,7 +135,31 @@
100135
"version": "1.0"
101136
},
102137
"dependencies": [
103-
"la"
138+
"la",
139+
"diagnostic-storage-account"
140+
]
141+
},
142+
{
143+
"module": "workload-net",
144+
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-net-rg",
145+
"source": {
146+
"version": "1.0"
147+
},
148+
"dependencies": [
149+
"nsg"
150+
]
151+
},
152+
{
153+
"module": "enable-service-endpoint-on-diagnostic-storage-account",
154+
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-diagnostics-rg",
155+
"source": {
156+
"version": "1.0",
157+
"template-path": "file(modules/storage-account/1.0)",
158+
"parameters-path": "file(modules/storage-account/1.0/azureDeploy.enable-serviceEndpoint.parameters.json)"
159+
},
160+
"dependencies": [
161+
"workload-net",
162+
"diagnostic-storage-account"
104163
]
105164
},
106165
{
@@ -110,7 +169,9 @@
110169
"version": "1.0"
111170
},
112171
"dependencies": [
113-
"la"
172+
"workload-net",
173+
"la",
174+
"diagnostic-storage-account"
114175
]
115176
},
116177
{
@@ -122,7 +183,8 @@
122183
"dependencies": [
123184
"kv",
124185
"workload-net",
125-
"la"
186+
"la",
187+
"diagnostic-storage-account"
126188
]
127189
},
128190
{
@@ -134,7 +196,8 @@
134196
"dependencies": [
135197
"kv",
136198
"workload-net",
137-
"la"
199+
"la",
200+
"diagnostic-storage-account"
138201
]
139202
},
140203
{
@@ -148,7 +211,8 @@
148211
"dependencies": [
149212
"kv",
150213
"workload-net",
151-
"la"
214+
"la",
215+
"diagnostic-storage-account"
152216
]
153217
},
154218
{
@@ -162,7 +226,8 @@
162226
"dependencies": [
163227
"kv",
164228
"workload-net",
165-
"la"
229+
"la",
230+
"diagnostic-storage-account"
166231
]
167232
},
168233
{
@@ -174,7 +239,8 @@
174239
"dependencies": [
175240
"kv",
176241
"workload-net",
177-
"la"
242+
"la",
243+
"diagnostic-storage-account"
178244
]
179245
},
180246
{
@@ -202,10 +268,8 @@
202268
"shared-services":{
203269
"subscription-id": "${general.shared-services.subscription-id}",
204270
"deployment-name": "${general.shared-services.deployment-name}",
205-
"adds": {
206-
"vm-ip-address-start": "${general.shared-services.adds.vm-ip-address-start}"
207-
},
208271
"active-directory": {
272+
"vm-ip-address-start": "${general.shared-services.active-directory.vm-ip-address-start}",
209273
"domain-admin-user": "${general.shared-services.active-directory.domain-admin-user}",
210274
"domain-name": "${general.shared-services.active-directory.domain-name}"
211275
},
@@ -258,7 +322,34 @@
258322
"log-analytics": {
259323
"region": "${general.workload.log-analytics.region}"
260324
},
261-
"keyvault": "${general.workload.keyvault}",
325+
"automation-account": {
326+
"region": "${general.workload.automation-account.region}"
327+
},
328+
"keyvault": {
329+
"secrets": "${general.workload.keyvault.secrets}",
330+
"network-acls": {
331+
"bypass": "AzureServices",
332+
"defaultAction": "Deny",
333+
"virtualNetworkRules": [
334+
{
335+
"subnet": "${workload.network.subnets[0].name}"
336+
}
337+
],
338+
"ipRules": []
339+
}
340+
},
341+
"storage-account": {
342+
"network-acls": {
343+
"bypass": "AzureServices",
344+
"defaultAction": "Deny",
345+
"virtualNetworkRules": [
346+
{
347+
"subnet": "${workload.network.subnets[0].name}"
348+
}
349+
],
350+
"ipRules": []
351+
}
352+
},
262353
"network": {
263354
"address-prefix": "10.4.2.0/24",
264355
"enable-ddos-protection": "${general.workload.network.enable-ddos-protection}",
@@ -496,11 +587,25 @@
496587
"address-prefix": "10.4.2.0/27",
497588
"network-security-group": "${workload.network.network-security-groups[0].name}",
498589
"user-defined-route": "${workload.network.user-defined-routes[0].name}",
499-
"service-endpoints": []
590+
"service-endpoints": [
591+
{
592+
"service": "Microsoft.EventHub"
593+
},
594+
{
595+
"service": "Microsoft.Sql"
596+
},
597+
{
598+
"service": "Microsoft.KeyVault"
599+
},
600+
{
601+
"service": "Microsoft.Storage"
602+
}
603+
]
500604
}
501605
],
502606
"dns-servers": [
503-
"${shared-services.adds.vm-ip-address-start}"
607+
"${shared-services.active-directory.vm-ip-address-start}",
608+
"next-ip(${shared-services.active-directory.vm-ip-address-start}, 1)"
504609
]
505610
}
506611
}

Diff for: ‎archetypes/on-premises/archetype.test.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"on-premises": {
99
"subscription-id": "00000000-0000-0000-0000-000000000000",
1010
"deployment-name": "onprem",
11-
"region": "Central US",
11+
"region": "West US 2",
1212
"active-directory": {
1313
"AD-sitename": "Cloud-Site",
1414
"cloud-zone": "contosocloud.com",
@@ -26,7 +26,7 @@
2626
},
2727
"shared-services": {
2828
"subscription-id": "00000000-0000-0000-0000-000000000000",
29-
"deployment-name": "cus-ss"
29+
"deployment-name": "ssvcs"
3030
}
3131
},
3232
"orchestration": {

0 commit comments

Comments
 (0)