Skip to content

Commit 28cd263

Browse files
committed
feat: 7413: upgrade Module DataDog v2.5.0
1 parent 1a2379f commit 28cd263

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

main.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ resource "aws_iam_policy" "datadog-core" {
5959
"apigateway:GET",
6060
"autoscaling:Describe*",
6161
"budgets:ViewBudget",
62+
"cloudformation:DetectStack*",
6263
"cloudfront:GetDistributionConfig",
6364
"cloudfront:ListDistributions",
6465
"cloudtrail:DescribeTrails",
@@ -76,6 +77,7 @@ resource "aws_iam_policy" "datadog-core" {
7677
"ec2:Describe*",
7778
"ec2:DescribeInstanceStatus",
7879
"ec2:DescribeInstances",
80+
"ecs:Describe*",
7981
"ecs:List*",
8082
"elasticache:Describe*",
8183
"elasticache:List*",
@@ -88,6 +90,7 @@ resource "aws_iam_policy" "datadog-core" {
8890
"es:ListTags",
8991
"es:ListDomainNames",
9092
"es:DescribeElasticsearchDomains",
93+
"fsx:DescribeFileSystems",
9194
"health:DescribeEvents",
9295
"health:DescribeEventDetails",
9396
"health:DescribeAffectedEntities",
@@ -104,6 +107,7 @@ resource "aws_iam_policy" "datadog-core" {
104107
"logs:PutSubscriptionFilter",
105108
"logs:DeleteSubscriptionFilter",
106109
"logs:DescribeSubscriptionFilters",
110+
"organizations:DescribeOrganization",
107111
"rds:Describe*",
108112
"rds:List*",
109113
"redshift:DescribeClusters",
@@ -141,3 +145,9 @@ resource "aws_iam_role_policy_attachment" "datadog-core-attach" {
141145
role = aws_iam_role.datadog-integration[0].name
142146
policy_arn = aws_iam_policy.datadog-core[0].arn
143147
}
148+
149+
resource "aws_iam_role_policy_attachment" "datadog-core-attach-extras" {
150+
for_each = toset(var.extra_policy_arns)
151+
role = aws_iam_role.datadog-integration[0].name
152+
policy_arn = each.value
153+
}

vars.tf

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ variable "env" {
4949
}
5050
variable "account_specific_namespace_rules" {
5151
description = "account_specific_namespace_rules argument for datadog_integration_aws resource"
52-
type = map
52+
type = map(any)
5353
default = {}
5454
}
5555
variable "elb_logs_bucket_prefix" {
@@ -66,7 +66,7 @@ variable "log_exclude_at_match" {
6666
variable "dd_forwarder_template_version" {
6767
description = "Sets Datadog Forwarder version to use"
6868
type = string
69-
default = "3.17.0"
69+
default = "3.27.0"
7070
}
7171

7272
variable "dd_forwarder_dd_site" {
@@ -86,3 +86,9 @@ variable "filter_tags" {
8686
type = list(string)
8787
default = []
8888
}
89+
90+
variable "extra_policy_arns" {
91+
description = "Extra policy arns to attach to the datadog-integration-role"
92+
type = list(string)
93+
default = []
94+
}

0 commit comments

Comments
 (0)