Pārlūkot izejas kodu

Merge pull request #453 from mdr-engineering/feature/ftd_MSOCI-1921_DocumentReservations

Adds Reservation Tags to Reserved Instances in Prod
Frederick Damstra 3 gadi atpakaļ
vecāks
revīzija
91c6b09a90
20 mainītis faili ar 150 papildinājumiem un 20 dzēšanām
  1. 6 1
      prod/aws-us-gov/mdr-prod-c2/023-dns-resolver-instance-2/terragrunt.hcl
  2. 6 1
      prod/aws-us-gov/mdr-prod-c2/023-dns-resolver-instance/terragrunt.hcl
  3. 6 1
      prod/aws-us-gov/mdr-prod-c2/070-instance-bastion/terragrunt.hcl
  4. 6 1
      prod/aws-us-gov/mdr-prod-c2/071-instance-salt-master/terragrunt.hcl
  5. 6 1
      prod/aws-us-gov/mdr-prod-c2/080-instance-repo-server/terragrunt.hcl
  6. 12 1
      prod/aws-us-gov/mdr-prod-c2/090-instance-github/terragrunt.hcl
  7. 6 1
      prod/aws-us-gov/mdr-prod-c2/090-instance-mailrelay/terragrunt.hcl
  8. 6 1
      prod/aws-us-gov/mdr-prod-c2/090-instance-teleport/terragrunt.hcl
  9. 18 1
      prod/aws-us-gov/mdr-prod-c2/090-instance-vault/terragrunt.hcl
  10. 6 1
      prod/aws-us-gov/mdr-prod-c2/150-splunk-cluster-master/terragrunt.hcl
  11. 18 1
      prod/aws-us-gov/mdr-prod-c2/160-splunk-indexer-cluster/terragrunt.hcl
  12. 6 1
      prod/aws-us-gov/mdr-prod-c2/170-splunk-searchhead/terragrunt.hcl
  13. 6 1
      prod/aws-us-gov/mdr-prod-c2/190-splunk-fm-shared-search/terragrunt.hcl
  14. 6 1
      prod/aws-us-gov/mdr-prod-c2/190-splunk-mc/terragrunt.hcl
  15. 6 1
      prod/aws-us-gov/mdr-prod-c2/200-customer-portal/terragrunt.hcl
  16. 6 1
      prod/aws-us-gov/mdr-prod-c2/220-instance-jira/terragrunt.hcl
  17. 6 1
      prod/aws-us-gov/mdr-prod-c2/250-phantom/terragrunt.hcl
  18. 6 1
      prod/aws-us-gov/mdr-prod-c2/270-nessus-security-center/terragrunt.hcl
  19. 6 1
      prod/aws-us-gov/mdr-prod-c2/275-nessus-security-managers/terragrunt.hcl
  20. 6 1
      prod/aws-us-gov/mdr-prod-c2/275-nessus-security-scanners/terragrunt.hcl

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/023-dns-resolver-instance-2/terragrunt.hcl

@@ -19,7 +19,7 @@ dependency "vpc_system_services" {
 # 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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/dns/resolver_instance?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/dns/resolver_instance?ref=v3.1.1"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -36,6 +36,11 @@ inputs = {
     Purpose = "DNS Resolver 2"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "t3a.xlarge"
+    Reservation_Expiration = "2022-10-15"
+  }
   subnet_id = dependency.vpc_system_services.outputs.public_subnets[1]
   vpc_id = dependency.vpc_system_services.outputs.vpc_id
   reverse_enabled = true # Set to 'true' on second run

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/023-dns-resolver-instance/terragrunt.hcl

@@ -19,7 +19,7 @@ dependency "vpc_system_services" {
 # 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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/dns/resolver_instance?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/dns/resolver_instance?ref=v3.1.1"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -36,6 +36,11 @@ inputs = {
     Purpose = "DNS Resolver"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "t3a.xlarge"
+    Reservation_Expiration = "2022-10-15"
+  }
   subnet_id = dependency.vpc_system_services.outputs.public_subnets[0]
   vpc_id = dependency.vpc_system_services.outputs.vpc_id
   reverse_enabled = true # Set to 'true' on second run

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/070-instance-bastion/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/bastion?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/bastion?ref=v3.1.1"
 }
 
 dependency "vpc-access" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "Bastion Access"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "t3a.medium"
+    Reservation_Expiration = "2022-10-15"
+  }
   instance_name = "bastion"
   instance_type = local.account_vars.locals.instance_types["bastion"]
   vpc_id = dependency.vpc-access.outputs.vpc_id

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/071-instance-salt-master/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master?ref=v3.1.1"
 }
 
 dependency "vpc-system-services" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "Salt Master"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "t3a.xlarge"
+    Reservation_Expiration = "2022-10-15"
+  }
   instance_name = "salt-master"
   instance_type = local.account_vars.locals.salt_master_instance_type
   vpc_id = dependency.vpc-system-services.outputs.vpc_id

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/080-instance-repo-server/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/repo_server?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/repo_server?ref=v3.1.1"
 }
 
 dependency "vpc-system-services" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "Repo Server - Package Repository for Servers"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "t3a.xlarge"
+    Reservation_Expiration = "2022-10-15"
+  }
   instance_name = "reposerver" # TODO: Fix this when actual swap is taking place.
   instance_type = local.account_vars.locals.repo_server_instance_type
   vpc_id = dependency.vpc-system-services.outputs.vpc_id

+ 12 - 1
prod/aws-us-gov/mdr-prod-c2/090-instance-github/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/github?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/github?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -35,6 +35,17 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
     Schedule  = "none"
   }
+  instance_tags = {
+    Reserved = false
+    Reserved_Type = "c5.4xlarge"
+    Reservation_Expiration = "2022-10-15"
+    Reservation_Notes = "Reserved incorrectly on 10/15. Needs 'UNIX/Linux' instead of 'RHEL' reservation."
+  }
+  backup_instance_tags = {
+    Reserved = true
+    Reserved_Type = "t3a.medium"
+    Reservation_Expiration = "2022-10-15"
+  }
   instance_type = local.account_vars.locals.instance_types["github"]
   backup_instance_type = local.account_vars.locals.instance_types["github-backup"]
   instance_count = local.account_vars.locals.github_instance_count

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/090-instance-mailrelay/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/mailrelay?ref=v3.0.5"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/mailrelay?ref=v3.1.1"
 }
 
 dependency "vpc-system-services" {
@@ -52,6 +52,11 @@ inputs = {
     Purpose = "Mail Relay - Proxy between our systems and SES"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "t3a.xlarge"
+    Reservation_Expiration = "2022-10-15"
+  }
   instance_name = "mailrelay2" 
   instance_type = local.account_vars.locals.mailrelay_instance_type
   vpc_id = dependency.vpc-system-services.outputs.vpc_id

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/090-instance-teleport/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/teleport-single-instance?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/teleport-single-instance?ref=v3.1.1"
 }
 
 dependency "vpc-system-services" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "Proxy Access via SSH"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "t3a.large"
+    Reservation_Expiration = "2022-10-15"
+  }
   instance_name = "teleport"
   instance_type = "t3a.large"
   vpc_id = dependency.vpc-system-services.outputs.vpc_id

+ 18 - 1
prod/aws-us-gov/mdr-prod-c2/090-instance-vault/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/vault?ref=v3.0.7"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/vault?ref=v3.1.1"
 }
 
 dependency "vpc-system-services" {
@@ -35,6 +35,23 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
     Schedule = "None"
   }
+  instance_tags = [
+    {
+      Reserved = true
+      Reserved_Type = "t3a.medium"
+      Reservation_Expiration = "2022-10-15"
+    },
+    {
+      Reserved = true
+      Reserved_Type = "t3a.medium"
+      Reservation_Expiration = "2022-10-15"
+    },
+    {
+      Reserved = true
+      Reserved_Type = "t3a.medium"
+      Reservation_Expiration = "2022-10-15"
+    }
+  ]
   instance_name = "vault"
   instance_type = local.account_vars.locals.vault_server_instance_type
   vpc_id = dependency.vpc-system-services.outputs.vpc_id

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/150-splunk-cluster-master/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/cluster_master?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/cluster_master?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "Splunk Cluster Master"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "m5a.xlarge"
+    Reservation_Expiration = "2022-10-15"
+  }
   prefix = local.account_vars.locals.splunk_prefix
   instance_type = local.account_vars.locals.instance_types["splunk-cm"]
   vpc_id = dependency.vpc.outputs.vpc_id

+ 18 - 1
prod/aws-us-gov/mdr-prod-c2/160-splunk-indexer-cluster/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/indexer_cluster?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/indexer_cluster?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -34,6 +34,23 @@ inputs = {
     Purpose = "Splunk Indexer Cluster"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = [
+    {
+      Reserved = true
+      Reserved_Type = "i3en.3xlarge"
+      Reservation_Expiration = "2022-10-18"
+    },
+    {
+      Reserved = true
+      Reserved_Type = "i3en.3xlarge"
+      Reservation_Expiration = "2022-10-18"
+    },
+    {
+      Reserved = false
+      Reserved_Type = ""
+      Reservation_Expiration = ""
+    }
+  ]
   prefix = local.account_vars.locals.splunk_prefix
   instance_type = local.account_vars.locals.instance_types["splunk-indexer"]
   vpc_id = dependency.vpc.outputs.vpc_id

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/170-splunk-searchhead/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/searchhead?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/searchhead?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "Splunk Searchhead"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "m5a.4xlarge"
+    Reservation_Expiration = "2022-10-15"
+  }
   prefix = local.account_vars.locals.splunk_prefix
   instance_type = local.account_vars.locals.instance_types["splunk-sh"]
   vpc_id = dependency.vpc.outputs.vpc_id

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/190-splunk-fm-shared-search/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/searchhead?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/searchhead?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "FM Shared Search"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "m5a.large"
+    Reservation_Expiration = "2022-10-18"
+  }
   prefix = "fm"
   instance_name = "fm-shared-search-0"
   alb_name      = "fm-shared-search"

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/190-splunk-mc/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/searchhead?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/searchhead?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "Splunk Monitoring Console"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "m5a.large"
+    Reservation_Expiration = "2022-10-18"
+  }
   prefix = "mc"
   instance_name = "splunk-mc-0"
   alb_name      = "splunk-mc"

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/200-customer-portal/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/customer_portal_legacywaf?ref=v3.0.2"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/customer_portal_legacywaf?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -43,6 +43,11 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
     Schedule  = "none"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "t3a.medium"
+    Reservation_Expiration = "2022-10-15"
+  }
   instance_name = "customer-portal"
   instance_type = local.account_vars.locals.instance_types["portal"]
   vpc_id = dependency.vpc.outputs.vpc_id

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/220-instance-jira/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/jira/instance_jira?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/jira/instance_jira?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -38,6 +38,11 @@ inputs = {
     Purpose = "Jira Ticketing"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "m5a.xlarge"
+    Reservation_Expiration = "2022-10-15"
+  }
   instance_count = local.account_vars.locals.github_instance_count
   instance_type = local.account_vars.locals.instance_types["jira-server"]
   vpc_id = dependency.vpc.outputs.vpc_id

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/250-phantom/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/phantom?ref=v3.0.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/phantom?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "Phantom System"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "m5a.4xlarge"
+    Reservation_Expiration = "2022-10-15"
+  }
   instance_type = local.account_vars.locals.instance_types["phantom"]
   vpc_id = dependency.vpc.outputs.vpc_id
   vpc_cidr = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/270-nessus-security-center/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_security_center?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_security_center?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "Tenable Nessus Security Center"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "m5a.xlarge"
+    Reservation_Expiration = "2022-10-15"
+  }
   instance_type = local.account_vars.locals.instance_types["nessus_security_center"]
   vpc_id = dependency.vpc.outputs.vpc_id
   azs = dependency.vpc.outputs.azs

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/275-nessus-security-managers/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_nessus_manager?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_nessus_manager?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "Tenable Nessus Managers - Inbound from LCPs"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "m5a.large"
+    Reservation_Expiration = "2022-10-18"
+  }
   instance_type = local.account_vars.locals.instance_types["nessus_managers"]
   vpc_id = dependency.vpc.outputs.vpc_id
   azs = dependency.vpc.outputs.azs

+ 6 - 1
prod/aws-us-gov/mdr-prod-c2/275-nessus-security-scanners/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_nessus_scanner?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_nessus_scanner?ref=v3.1.1"
 }
 
 dependency "vpc" {
@@ -34,6 +34,11 @@ inputs = {
     Purpose = "Tenable Nessus Scanners"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  instance_tags = {
+    Reserved = true
+    Reserved_Type = "m5a.large"
+    Reservation_Expiration = "2022-10-18"
+  }
   instance_type = local.account_vars.locals.instance_types["nessus_scanners"]
   vpc_id = dependency.vpc.outputs.vpc_id
   azs = dependency.vpc.outputs.azs