From fb0c778e7558b4c5cfd6d7e8f1a2af0cb34e018b Mon Sep 17 00:00:00 2001 From: Marwin Baumann Date: Wed, 7 Aug 2024 14:32:30 +0200 Subject: [PATCH 1/2] feature: upgrade the datadog integration module, exposing the latest settings --- datadog.tf | 57 +++++++++++++++++++++++++++++++++------------------- variables.tf | 15 +++++++++----- 2 files changed, 46 insertions(+), 26 deletions(-) diff --git a/datadog.tf b/datadog.tf index cce9ca6..5c9cddb 100644 --- a/datadog.tf +++ b/datadog.tf @@ -3,26 +3,36 @@ module "datadog_audit" { count = try(var.datadog.enable_integration, false) == true ? 1 : 0 providers = { aws = aws.audit } - source = "github.com/schubergphilis/terraform-aws-mcaf-datadog?ref=v0.3.12" - api_key = try(var.datadog.api_key, null) - excluded_regions = var.datadog_excluded_regions - install_log_forwarder = var.datadog.install_log_forwarder - log_collection_services = var.datadog.log_collection_services - site_url = try(var.datadog.site_url, null) - tags = var.tags + source = "github.com/schubergphilis/terraform-aws-mcaf-datadog?ref=v0.7.0" + api_key = try(var.datadog.api_key, null) + cspm_resource_collection_enabled = var.datadog.cspm_resource_collection_enabled + excluded_regions = var.datadog_excluded_regions + extended_resource_collection_enabled = var.datadog.extended_resource_collection_enabled + install_log_forwarder = var.datadog.install_log_forwarder + log_collection_services = var.datadog.log_collection_services + log_forwarder_version = var.datadog.log_forwarder_version + metric_tag_filters = var.datadog.metric_tag_filters + namespace_rules = var.datadog.namespace_rules + site_url = try(var.datadog.site_url, null) + tags = var.tags } module "datadog_master" { #checkov:skip=CKV_AWS_124: since this is managed by terraform, we reason that this already provides feedback and a seperate SNS topic is therefore not required count = try(var.datadog.enable_integration, false) == true ? 1 : 0 - source = "github.com/schubergphilis/terraform-aws-mcaf-datadog?ref=v0.3.12" - api_key = try(var.datadog.api_key, null) - excluded_regions = var.datadog_excluded_regions - install_log_forwarder = var.datadog.install_log_forwarder - log_collection_services = var.datadog.log_collection_services - site_url = try(var.datadog.site_url, null) - tags = var.tags + source = "github.com/schubergphilis/terraform-aws-mcaf-datadog?ref=v0.7.0" + api_key = try(var.datadog.api_key, null) + cspm_resource_collection_enabled = var.datadog.cspm_resource_collection_enabled + excluded_regions = var.datadog_excluded_regions + extended_resource_collection_enabled = var.datadog.extended_resource_collection_enabled + install_log_forwarder = var.datadog.install_log_forwarder + log_collection_services = var.datadog.log_collection_services + log_forwarder_version = var.datadog.log_forwarder_version + metric_tag_filters = var.datadog.metric_tag_filters + namespace_rules = var.datadog.namespace_rules + site_url = try(var.datadog.site_url, null) + tags = var.tags } module "datadog_logging" { @@ -30,11 +40,16 @@ module "datadog_logging" { count = try(var.datadog.enable_integration, false) == true ? 1 : 0 providers = { aws = aws.logging } - source = "github.com/schubergphilis/terraform-aws-mcaf-datadog?ref=v0.3.12" - api_key = try(var.datadog.api_key, null) - excluded_regions = var.datadog_excluded_regions - install_log_forwarder = var.datadog.install_log_forwarder - log_collection_services = var.datadog.log_collection_services - site_url = try(var.datadog.site_url, null) - tags = var.tags + source = "github.com/schubergphilis/terraform-aws-mcaf-datadog?ref=v0.7.0" + api_key = try(var.datadog.api_key, null) + cspm_resource_collection_enabled = var.datadog.cspm_resource_collection_enabled + excluded_regions = var.datadog_excluded_regions + extended_resource_collection_enabled = var.datadog.extended_resource_collection_enabled + install_log_forwarder = var.datadog.install_log_forwarder + log_collection_services = var.datadog.log_collection_services + log_forwarder_version = var.datadog.log_forwarder_version + metric_tag_filters = var.datadog.metric_tag_filters + namespace_rules = var.datadog.namespace_rules + site_url = try(var.datadog.site_url, null) + tags = var.tags } diff --git a/variables.tf b/variables.tf index 1ec4352..b244d11 100644 --- a/variables.tf +++ b/variables.tf @@ -225,11 +225,16 @@ variable "control_tower_account_ids" { variable "datadog" { type = object({ - api_key = string - enable_integration = bool - install_log_forwarder = optional(bool, false) - log_collection_services = optional(list(string), []) - site_url = string + api_key = string + cspm_resource_collection_enabled = optional(bool, false) + enable_integration = bool + extended_resource_collection_enabled = optional(bool, false) + install_log_forwarder = optional(bool, false) + log_collection_services = optional(list(string), []) + log_forwarder_version = optional(string) + metric_tag_filters = optional(map(string), {}) + namespace_rules = optional(list(string), []) + site_url = string }) default = null description = "Datadog integration options for the core accounts" From aea5759191f1078f4b42ea1587ab8ad87f667f75 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 7 Aug 2024 12:33:35 +0000 Subject: [PATCH 2/2] docs(readme): update module usage --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5ca546e..fe58bfc 100644 --- a/README.md +++ b/README.md @@ -443,9 +443,9 @@ module "landing_zone" { | [audit\_manager\_reports](#module\_audit\_manager\_reports) | schubergphilis/mcaf-s3/aws | 0.12.1 | | [aws\_config\_s3](#module\_aws\_config\_s3) | github.com/schubergphilis/terraform-aws-mcaf-s3 | v0.8.0 | | [aws\_sso\_permission\_sets](#module\_aws\_sso\_permission\_sets) | ./modules/permission-set | n/a | -| [datadog\_audit](#module\_datadog\_audit) | github.com/schubergphilis/terraform-aws-mcaf-datadog | v0.3.12 | -| [datadog\_logging](#module\_datadog\_logging) | github.com/schubergphilis/terraform-aws-mcaf-datadog | v0.3.12 | -| [datadog\_master](#module\_datadog\_master) | github.com/schubergphilis/terraform-aws-mcaf-datadog | v0.3.12 | +| [datadog\_audit](#module\_datadog\_audit) | github.com/schubergphilis/terraform-aws-mcaf-datadog | v0.7.0 | +| [datadog\_logging](#module\_datadog\_logging) | github.com/schubergphilis/terraform-aws-mcaf-datadog | v0.7.0 | +| [datadog\_master](#module\_datadog\_master) | github.com/schubergphilis/terraform-aws-mcaf-datadog | v0.7.0 | | [kms\_key](#module\_kms\_key) | github.com/schubergphilis/terraform-aws-mcaf-kms | v0.3.0 | | [kms\_key\_audit](#module\_kms\_key\_audit) | github.com/schubergphilis/terraform-aws-mcaf-kms | v0.3.0 | | [kms\_key\_logging](#module\_kms\_key\_logging) | github.com/schubergphilis/terraform-aws-mcaf-kms | v0.3.0 | @@ -553,7 +553,7 @@ module "landing_zone" { | [aws\_security\_hub\_sns\_subscription](#input\_aws\_security\_hub\_sns\_subscription) | Subscription options for the LandingZone-SecurityHubFindings SNS topic | 
map(object({
    endpoint = string
    protocol = string
  }))
| `{}` | no | | [aws\_service\_control\_policies](#input\_aws\_service\_control\_policies) | AWS SCP's parameters to disable required/denied policies, set a list of allowed AWS regions, and set principals that are exempt from the restriction | 
object({
    allowed_regions                 = optional(list(string), [])
    aws_deny_disabling_security_hub = optional(bool, true)
    aws_deny_leaving_org            = optional(bool, true)
    aws_deny_root_user_ous          = optional(list(string), [])
    aws_require_imdsv2              = optional(bool, true)
    principal_exceptions            = optional(list(string), [])
  })
| `{}` | no | | [aws\_sso\_permission\_sets](#input\_aws\_sso\_permission\_sets) | Map of AWS IAM Identity Center permission sets with AWS accounts and group names that should be granted access to each account | 
map(object({
    assignments         = list(map(list(string)))
    inline_policy       = optional(string, null)
    managed_policy_arns = optional(list(string), [])
    session_duration    = optional(string, "PT4H")
  }))
| `{}` | no | -| [datadog](#input\_datadog) | Datadog integration options for the core accounts | 
object({
    api_key                 = string
    enable_integration      = bool
    install_log_forwarder   = optional(bool, false)
    log_collection_services = optional(list(string), [])
    site_url                = string
  })
| `null` | no | +| [datadog](#input\_datadog) | Datadog integration options for the core accounts | 
object({
    api_key                              = string
    cspm_resource_collection_enabled     = optional(bool, false)
    enable_integration                   = bool
    extended_resource_collection_enabled = optional(bool, false)
    install_log_forwarder                = optional(bool, false)
    log_collection_services              = optional(list(string), [])
    log_forwarder_version                = optional(string)
    metric_tag_filters                   = optional(map(string), {})
    namespace_rules                      = optional(list(string), [])
    site_url                             = string
  })
| `null` | no | | [datadog\_excluded\_regions](#input\_datadog\_excluded\_regions) | List of regions where metrics collection will be disabled. | `list(string)` | `[]` | no | | [kms\_key\_policy](#input\_kms\_key\_policy) | A list of valid KMS key policy JSON documents | `list(string)` | `[]` | no | | [kms\_key\_policy\_audit](#input\_kms\_key\_policy\_audit) | A list of valid KMS key policy JSON document for use with audit KMS key | `list(string)` | `[]` | no |