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

Major module update #39

Merged
merged 64 commits into from
May 7, 2019
Merged

Major module update #39

Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
2d156d0
added diagnostic storage account
jorgecotillo Apr 5, 2019
b2bf066
added retrieval of sas token from an arm template
jorgecotillo Apr 5, 2019
8bd5051
added sas properties
jorgecotillo Apr 5, 2019
92d0a19
Merge branch 'master' into jcotillo/module-updates
jorgecotillo Apr 9, 2019
6ec85dc
enabled azure security center deployment
jorgecotillo Apr 9, 2019
8ea85ff
merged from master
jorgecotillo Apr 9, 2019
32b6235
added solutions to log analytics plus datastores
jorgecotillo Apr 12, 2019
74adf2a
added storage account v2 template
jorgecotillo Apr 12, 2019
c6fa37f
added storage account templates
jorgecotillo Apr 12, 2019
38193ba
updated diagnostic storage account output parameters
jorgecotillo Apr 12, 2019
ce2a138
added IaaSDiagnostic wad settings
jorgecotillo Apr 12, 2019
1a31931
enabled service endpoint on shared services network
jorgecotillo Apr 12, 2019
edb9ded
renamed module names
jorgecotillo Apr 13, 2019
def7c93
updated archetype module versions
jorgecotillo Apr 13, 2019
ed2dba3
updated archetype module versions
jorgecotillo Apr 13, 2019
72da20e
fixed invalid parameters
jorgecotillo Apr 13, 2019
35b2a90
updated shared services archetype
jorgecotillo Apr 13, 2019
9bddff1
updated adds extension names
jorgecotillo Apr 13, 2019
57f42b7
added app rule and network rule collections to allow for log analytic…
jorgecotillo Apr 13, 2019
cedfc21
added virtual network module and updated app rule collection
jorgecotillo Apr 14, 2019
ca3e6d4
updated security center - workspace pricing tier
jorgecotillo Apr 15, 2019
98d69eb
enabled security center log analytics auto provisioning
jorgecotillo Apr 15, 2019
c314393
enabled update management
jorgecotillo Apr 15, 2019
b2e818f
added diagnostic settings to automation account
jorgecotillo Apr 15, 2019
9c3f8cb
added linux schedules
jorgecotillo Apr 15, 2019
88121a8
modified shared services test archetype based on latest modifications
jorgecotillo Apr 15, 2019
e5aa7bd
added azure backup log analytics solution and whitelisted linux packa…
jorgecotillo Apr 15, 2019
ab86b3b
updated palo alto module versions
jorgecotillo-fork Apr 16, 2019
9c1a1eb
fixed bootstrap file encoding
jorgecotillo-fork Apr 16, 2019
13868f0
removed unused parameter
jorgecotillo Apr 16, 2019
b8a0bb3
added 1.0 version as default module version
jorgecotillo Apr 17, 2019
2a1642d
added cdn and made storage account template more generic
jorgecotillo Apr 17, 2019
9912af5
modified templates to use common diagnostic storage account
jorgecotillo Apr 18, 2019
c2fd8a3
added diagnostic storage account
jorgecotillo Apr 23, 2019
ae95ab2
updated ntier iaas deployment
jorgecotillo Apr 24, 2019
2a06b3c
Added storage-account v2.0
senthilkungumaraj Apr 24, 2019
80b4f25
Added placeholders for policy,rbac and script folders in storage-acco…
senthilkungumaraj Apr 24, 2019
9daccf2
Updated the comments in the test scripts for storage-account module
senthilkungumaraj Apr 24, 2019
6035e74
added v2 of storage account deployment
jorgecotillo Apr 24, 2019
8ba34e6
Merge branch 'jcotillo/module-updates' of https://github.com/Azure/vd…
jorgecotillo Apr 24, 2019
cb62e7f
added placeholder for scripts folder
jorgecotillo Apr 24, 2019
fd0326b
Changed the path logic to be os agnostic
senthilkungumaraj Apr 24, 2019
778ec93
Merge branch 'jcotillo/module-updates' of https://github.com/Azure/vd…
senthilkungumaraj Apr 24, 2019
f1fc96d
removed tokens from v2.0 storage parameters file
jorgecotillo Apr 24, 2019
0de36e4
Merge branch 'jcotillo/module-updates' of https://github.com/Azure/vd…
jorgecotillo Apr 24, 2019
cf2a8ca
Update to path concatenation logic applied
senthilkungumaraj Apr 24, 2019
aeba5fb
Merge branch 'jcotillo/module-updates' of https://github.com/Azure/vd…
senthilkungumaraj Apr 24, 2019
7aa79b5
updated sql server template
jorgecotillo Apr 25, 2019
01fed52
added sql server cloudwitness service endpoint
jorgecotillo Apr 25, 2019
4da3247
Merge branch 'jcotillo/module-updates' of https://github.com/Azure/vd…
jorgecotillo Apr 25, 2019
5b03384
updated azure firewall rules and increase vmapp-lb size
jorgecotillo Apr 25, 2019
e3dbefd
updated ntier iaas archetypes to use latest log analytics module
jorgecotillo Apr 27, 2019
e90ef28
updated ntier SQL Cluster IP
jorgecotillo Apr 28, 2019
0e2a32e
updated aks, sap, cloud break and squid modules to use single diagnos…
jorgecotillo Apr 28, 2019
dec7dfe
modified sqldb to be ISO compliant
jorgecotillo Apr 28, 2019
c5b45e8
fixed deployment of single diagnostic storage
jorgecotillo Apr 29, 2019
0f3412a
Merge branch 'master' of https://github.com/Azure/vdc
jorgecotillo Apr 30, 2019
bbb8727
reduced number of integration tests. integration tests help test the …
jorgecotillo May 3, 2019
1aed6e4
updated aks archetype file name
jorgecotillo May 3, 2019
32f2202
merged from master
jorgecotillo May 3, 2019
247ef9c
added update management tag on linux jumpbox
jorgecotillo May 3, 2019
dfae7d8
updated templates based on feedback
jorgecotillo-fork May 6, 2019
102128d
fix deployment name, converted to string
jorgecotillo-fork May 7, 2019
84971b0
forced rebuild
jorgecotillo-fork May 7, 2019
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,4 @@ src/build
# Azure deployment credentials
*.pubxml
archetypes/aks/archetypes.json
archetypes/shared-services/archetype.test.devops.json
188 changes: 120 additions & 68 deletions archetypes/aks/archetypes.test.json → archetypes/aks/archetype.test.json
View file
Open in desktop

Large diffs are not rendered by default.

194 changes: 147 additions & 47 deletions archetypes/cloudbreak/archetype.test.json
View file
Open in desktop

Large diffs are not rendered by default.

151 changes: 128 additions & 23 deletions archetypes/ntier-iaas/archetype.test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
"shared-services": {
"subscription-id": "00000000-0000-0000-0000-000000000000",
"deployment-name": "ssvcs",
"adds": {
"vm-ip-address-start": "10.4.0.46"
},
"active-directory": {
"domain-admin-user": "contoso",
"domain-name": "contoso.com"
"domain-name": "contoso.com",
"vm-ip-address-start": "10.4.0.46"
},
"network": {
"network-virtual-appliance": {
Expand All @@ -38,8 +36,8 @@
},
"workload": {
"subscription-id": "00000000-0000-0000-0000-000000000000",
"deployment-name": "iaas",
"region":"Central US",
"deployment-name": "ntier",
"region":"West US 2",
"vm-configuration": {
"local-admin-user": "admin-user",
"enable-encryption": false,
Expand All @@ -60,20 +58,26 @@
"log-analytics": {
"region": "West US 2"
},
"automation-account": {
"region": "West US 2"
},
"network": {
"enable-ddos-protection": false
}
}
},
"orchestration": {
"modules-to-deploy":[
"diagnostic-storage-account",
"la",
"automation-account",
"security-center",
"nsg",
"workload-net",
"enable-service-endpoint-on-diagnostic-storage-account",
"kv",
"vmapp-web-lb",
"vmapp-biz-lb",
"app-gateway",
"sqlserver-alwayson"
],
"module-validation-dependencies": [
Expand All @@ -84,13 +88,44 @@
"custom-scripts": "file(scripts)",
"modules": [
{
"module": "workload-net",
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-net-rg",
"module": "diagnostic-storage-account",
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-diagnostics-rg",
"source": {
"version": "1.0",
"template-path": "file(modules/storage-account/1.0)",
"parameters-path": "file(modules/storage-account/1.0)"
},
"dependencies": []
},
{
"module": "la",
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-diagnostics-rg",
"source": {
"version": "1.0"
},
"dependencies": [
"nsg"
"diagnostic-storage-account"
]
},
{
"module": "automation-account",
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-diagnostics-rg",
"source": {
"version": "1.0"
},
"dependencies": [
"la",
"diagnostic-storage-account"
]
},
{
"module": "security-center",
"create-resource-group": false,
"source": {
"version": "1.0"
},
"dependencies": [
"la"
]
},
{
Expand All @@ -100,7 +135,31 @@
"version": "1.0"
},
"dependencies": [
"la"
"la",
"diagnostic-storage-account"
]
},
{
"module": "workload-net",
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-net-rg",
"source": {
"version": "1.0"
},
"dependencies": [
"nsg"
]
},
{
"module": "enable-service-endpoint-on-diagnostic-storage-account",
"resource-group-name": "${general.organization-name}-${workload.deployment-name}-diagnostics-rg",
"source": {
"version": "1.0",
"template-path": "file(modules/storage-account/1.0)",
"parameters-path": "file(modules/storage-account/1.0/azureDeploy.enable-serviceEndpoint.parameters.json)"
},
"dependencies": [
"workload-net",
"diagnostic-storage-account"
]
},
{
Expand All @@ -110,7 +169,9 @@
"version": "1.0"
},
"dependencies": [
"la"
"workload-net",
"la",
"diagnostic-storage-account"
]
},
{
Expand All @@ -122,7 +183,8 @@
"dependencies": [
"kv",
"workload-net",
"la"
"la",
"diagnostic-storage-account"
]
},
{
Expand All @@ -134,7 +196,8 @@
"dependencies": [
"kv",
"workload-net",
"la"
"la",
"diagnostic-storage-account"
]
},
{
Expand All @@ -148,7 +211,8 @@
"dependencies": [
"kv",
"workload-net",
"la"
"la",
"diagnostic-storage-account"
]
},
{
Expand All @@ -162,7 +226,8 @@
"dependencies": [
"kv",
"workload-net",
"la"
"la",
"diagnostic-storage-account"
]
},
{
Expand All @@ -174,7 +239,8 @@
"dependencies": [
"kv",
"workload-net",
"la"
"la",
"diagnostic-storage-account"
]
},
{
Expand Down Expand Up @@ -202,10 +268,8 @@
"shared-services":{
"subscription-id": "${general.shared-services.subscription-id}",
"deployment-name": "${general.shared-services.deployment-name}",
"adds": {
"vm-ip-address-start": "${general.shared-services.adds.vm-ip-address-start}"
},
"active-directory": {
"vm-ip-address-start": "${general.shared-services.active-directory.vm-ip-address-start}",
"domain-admin-user": "${general.shared-services.active-directory.domain-admin-user}",
"domain-name": "${general.shared-services.active-directory.domain-name}"
},
Expand Down Expand Up @@ -258,7 +322,34 @@
"log-analytics": {
"region": "${general.workload.log-analytics.region}"
},
"keyvault": "${general.workload.keyvault}",
"automation-account": {
"region": "${general.workload.automation-account.region}"
},
"keyvault": {
"secrets": "${general.workload.keyvault.secrets}",
"network-acls": {
"bypass": "AzureServices",
"defaultAction": "Deny",
"virtualNetworkRules": [
{
"subnet": "${workload.network.subnets[0].name}"
}
],
"ipRules": []
}
},
"storage-account": {
"network-acls": {
"bypass": "AzureServices",
"defaultAction": "Deny",
"virtualNetworkRules": [
{
"subnet": "${workload.network.subnets[0].name}"
}
],
"ipRules": []
}
},
"network": {
"address-prefix": "10.4.2.0/24",
"enable-ddos-protection": "${general.workload.network.enable-ddos-protection}",
Expand Down Expand Up @@ -496,11 +587,25 @@
"address-prefix": "10.4.2.0/27",
"network-security-group": "${workload.network.network-security-groups[0].name}",
"user-defined-route": "${workload.network.user-defined-routes[0].name}",
"service-endpoints": []
"service-endpoints": [
{
"service": "Microsoft.EventHub"
},
{
"service": "Microsoft.Sql"
},
{
"service": "Microsoft.KeyVault"
},
{
"service": "Microsoft.Storage"
}
]
}
],
"dns-servers": [
"${shared-services.adds.vm-ip-address-start}"
"${shared-services.active-directory.vm-ip-address-start}",
"next-ip(${shared-services.active-directory.vm-ip-address-start}, 1)"
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions archetypes/on-premises/archetype.test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"on-premises": {
"subscription-id": "00000000-0000-0000-0000-000000000000",
"deployment-name": "onprem",
"region": "Central US",
"region": "West US 2",
"active-directory": {
"AD-sitename": "Cloud-Site",
"cloud-zone": "contosocloud.com",
Expand All @@ -26,7 +26,7 @@
},
"shared-services": {
"subscription-id": "00000000-0000-0000-0000-000000000000",
"deployment-name": "cus-ss"
"deployment-name": "ssvcs"
}
},
"orchestration": {
Expand Down
Loading