Bläddra i källkod

Adds a splunk_prefix variable and a "client" tag to accounts

Fred Damstra 4 år sedan
förälder
incheckning
47a726ef84

+ 3 - 1
000-skeleton/account.hcl

@@ -15,7 +15,9 @@ locals {
   splunk_asg_sizes   = [ 1, 1, 1 ] # How many indexers in each site
   
   
-  account_tags = { } 
+  account_tags = {
+    "Client": local.splunk_prefix,
+  } 
   c2_account_standards_path = "../../mdr-TODO-c2/005-account-standards-c2" # TODO: Subsitute with test or prod
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation

+ 5 - 2
common/aws-us-gov/afs-mdr-common-services-gov/account.hcl

@@ -5,8 +5,11 @@ locals {
   account_alias  = "afs-mdr-common-services-gov"
   aws_account_id = "701290387780"
   instance_termination_protection = true # set to true for production!
-  
-  account_tags = { } 
+  splunk_prefix = "moose"
+
+  account_tags = {
+    "Client": local.splunk_prefix
+  }
   c2_account_standards_path = "../../../../prod/aws-us-gov/mdr-prod-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation

+ 5 - 2
common/aws/legacy-mdr-root/account.hcl

@@ -4,7 +4,10 @@ locals {
   account_name   = "legacy-mdr-root"
   account_alias  = ""
   aws_account_id = "350838957895"
-  
-  account_tags = { } 
+  splunk_prefix = "moose"
+
+  account_tags = {
+    "Client": local.splunk_prefix
+  }
   c2_account_standards_path = "../../../../prod/aws/mdr-prod-c2/005-account-standards-c2"
 }

+ 5 - 2
common/aws/mdr-common-services/account.hcl

@@ -5,8 +5,11 @@ locals {
   account_alias  = "afs-mdr-common-services"
   aws_account_id = "471284459109"
   instance_termination_protection = true # set to true for production!
-  
-  account_tags = { } 
+  splunk_prefix = "moose"
+
+  account_tags = {
+    "Client": local.splunk_prefix
+  }
   c2_account_standards_path = "../../../../prod/aws/mdr-prod-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation

+ 4 - 1
prod/aws-us-gov/mdr-prod-c2/account.hcl

@@ -5,8 +5,11 @@ locals {
   account_alias  = "afs-mdr-prod-c2-gov"
   aws_account_id = "721817724804"
   instance_termination_protection = true # set to true for production!
+  splunk_prefix = "moose"
   
-  account_tags = { } 
+  account_tags = { 
+    "Client": local.splunk_prefix
+  } 
   c2_account_standards_path = "../../mdr-prod-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation

+ 5 - 2
prod/aws/legacy-mdr-prod/account.hcl

@@ -5,8 +5,11 @@ locals {
   account_alias  = "" # No alias for legacy accounts
   aws_account_id = "477548533976"
   instance_termination_protection = true
-  
-  account_tags = { } 
+  splunk_prefix = "moose"
+
+  account_tags = {
+    "Client": local.splunk_prefix
+  }
   c2_account_standards_path = "../../mdr-prod-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation

+ 5 - 2
prod/aws/mdr-prod-c2/account.hcl

@@ -5,8 +5,11 @@ locals {
   account_alias  = "afs-mdr-prod-c2"
   aws_account_id = "045312110490"
   instance_termination_protection = true # set to true for production!
-  
-  account_tags = { } 
+  splunk_prefix = "moose"
+
+  account_tags = {
+    "Client": local.splunk_prefix
+  }
   c2_account_standards_path = "../../mdr-prod-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation

+ 1 - 0
test/aws-us-gov/mdr-test-c2/160-splunk-indexer-cluster/.tfswitch.toml

@@ -0,0 +1 @@
+../../../../.tfswitch.toml

+ 4 - 1
test/aws-us-gov/mdr-test-c2/account.hcl

@@ -69,7 +69,10 @@ locals {
     },
   }
   
-  account_tags = { } 
+  account_tags = {
+    "Client": local.splunk_prefix,
+  } 
+
   c2_account_standards_path = "../../mdr-test-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation

+ 5 - 2
test/aws-us-gov/mdr-test-malware/account.hcl

@@ -5,8 +5,11 @@ locals {
   account_alias  = "afs-mdr-test-malware-gov"
   aws_account_id = "876942499057"
   instance_termination_protection = false # set to true for production!
-  
-  account_tags = { }
+  splunk_prefix = "moose"
+
+  account_tags = {
+    "Client": local.splunk_prefix
+  }
   c2_account_standards_path = "../../mdr-test-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation

+ 3 - 2
test/aws-us-gov/mdr-test-modelclient/account.hcl

@@ -12,8 +12,9 @@ locals {
   splunk_legacy_cidr = [ ] # Should not be needed for new customers
   splunk_asg_sizes   = [ 1, 1, 1 ] # How many indexers in each site
   
-  
-  account_tags = { } 
+  account_tags = {
+    "Client": local.splunk_prefix
+  } 
   c2_account_standards_path = "../../mdr-test-c2/005-account-standards-c2" # Subsitute with test or prod
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation

+ 5 - 2
test/aws/legacy-mdr-test/account.hcl

@@ -5,8 +5,11 @@ locals {
   account_alias  = "" # No alias for legacy
   aws_account_id = "527700175026"
   instance_termination_protection = true # set to true for production!
-  
-  account_tags = { } 
+  splunk_prefix = "moose"
+
+  account_tags = {
+    "Client": local.splunk_prefix
+  }
   c2_account_standards_path = "../../mdr-test-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation

+ 5 - 2
test/aws/mdr-test-c2/account.hcl

@@ -5,8 +5,11 @@ locals {
   account_alias  = "afs-mdr-test-c2"
   aws_account_id = "816914342178"
   instance_termination_protection = false # set to true for production!
-  
-  account_tags = { } 
+  splunk_prefix = "moose"
+
+  account_tags = {
+    "Client": local.splunk_prefix
+  }
   c2_account_standards_path = "../../mdr-test-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation

+ 5 - 2
test/aws/mdr-test-modelclient/account.hcl

@@ -4,8 +4,11 @@ locals {
   account_name   = "afs-mdr-test-modelclient"
   account_alias  = "afs-mdr-test-modelclient"
   aws_account_id = "449047653882"
-  
-  account_tags = { } 
+  splunk_prefix = "modelclient"
+
+  account_tags = {
+    "Client": local.splunk_prefix
+  }
   c2_account_standards_path = "../../mdr-test-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation