Merge pull request #198 from mdr-engineering/feature/ftd_MSOCI-1625_MigrateMooseToGC

Updates the splunk legacy hec to 1.10.20

prod/aws-us-gov/mdr-prod-c2/165-splunk-legacy-hec/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/legacy_hec?ref=v1.10.18"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/legacy_hec?ref=v1.10.20"
 }
 
 generate "provider-legacy" {

prod/env.hcl

@@ -97,6 +97,11 @@ locals {
       zone = "mdr.defpoint.com"
       zone_id = "Z2HYR9YEZ4KLDE"
     },
+    "legacy_public_internal" = {
+      # Weird name, but this is the 'private' copy of the public domain
+      zone = "mdr.defpoint.com"
+      zone_id = "Z2RGT77XQU1QBX"
+    },
   }
 
   aws_flowlogs_hec_token = "4a2cacb2-fea1-4328-8f25-9bef26333e91"
@@ -142,7 +147,7 @@ locals {
     "salt-master-legacy" = "10.80.101.170",
   }
   legacy_private_cname_dns = {
-    "iratemoses" = "internal-moose-internal-187462540.us-east-1.elb.amazonaws.com"
+    #"iratemoses" = "internal-moose-internal-187462540.us-east-1.elb.amazonaws.com"
   }
   legacy_public_dns = {
     #"proxy" = "35.153.103.164",
@@ -152,7 +157,7 @@ locals {
   }
   # cnames only
   legacy_public_cname_dns = {
-    "iratemoses" = "moose-external-1850541289.us-east-1.elb.amazonaws.com",
+    #"iratemoses" = "moose-external-1850541289.us-east-1.elb.amazonaws.com",
     "portal" = "portal-alb-prod-1353134871.us-east-1.elb.amazonaws.com"
   }
 }

test/aws-us-gov/mdr-test-c2/165-splunk-legacy-hec/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/legacy_hec?ref=v1.10.2"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/legacy_hec?ref=v1.10.20"
 }
 
 generate "provider-legacy" {
@@ -66,5 +66,6 @@ inputs = {
   vpc_cidr = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
   azs = dependency.vpc.outputs.azs
   public_subnets  = dependency.vpc.outputs.public_subnets
+  private_subnets = dependency.vpc.outputs.private_subnets
   elb_attachments = dependency.indexers.outputs.elb_attachments
 }

test/env.hcl

@@ -90,6 +90,11 @@ locals {
       zone = "mdr-test.defpoint.com"
       zone_id = "Z3E22S3CIP0UCO"
     },
+    "legacy_public_internal" = {
+      # Weird name, but this is the 'private' copy of the public domain
+      zone = "mdr-test.defpoint.com"
+      zone_id = "Z13C1OOJMG0BJ7"
+    },
   }
 
   aws_flowlogs_hec_token = "4a2cacb2-fea1-4328-8f25-9bef26333e91"
@@ -137,7 +142,7 @@ locals {
     "salt-master-legacy" = "10.96.101.161",
   }
   legacy_private_cname_dns = {
-    "iratemoses" = "internal-moose-internal-1036948608.us-east-1.elb.amazonaws.com."
+    #"iratemoses" = "internal-iratemoses-435580743.us-gov-east-1.elb.amazonaws.com",
   }
   # not many public entries, as the use of saml negates their usefulness
   legacy_public_dns = {
@@ -148,7 +153,7 @@ locals {
   }
   # cnames only
   legacy_public_cname_dns = {
-    "iratemoses" = "moose-external-1512880739.us-east-1.elb.amazonaws.com",
+    #"iratemoses" = "moose-legacy-hec-1138113830.us-gov-east-1.elb.amazonaws.com",
     "portal" = "portal-alb-test-868493124.us-east-1.elb.amazonaws.com"
   }
 }