From b8119aef2b34dc7022c5850b0d7b6d969179b558 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi <2693213+xp-1000@users.noreply.github.com> Date: Tue, 22 Jun 2021 14:47:02 +0200 Subject: [PATCH] support for datadog provider v3 (#3) Co-authored-by: Patrick Decat --- CHANGELOG.md | 6 + README.md | 18 +- caas/docker/README.md | 2 +- caas/docker/monitors-docker.tf | 12 +- caas/docker/versions.tf | 5 +- caas/kubernetes/ark/README.md | 2 +- caas/kubernetes/ark/monitors-ark.tf | 6 +- caas/kubernetes/ark/versions.tf | 5 +- caas/kubernetes/cluster/README.md | 2 +- .../cluster/monitors-k8s-cluster.tf | 6 +- caas/kubernetes/cluster/versions.tf | 5 +- caas/kubernetes/ingress/vts/README.md | 2 +- .../ingress/vts/monitors-ingress.tf | 12 +- caas/kubernetes/ingress/vts/versions.tf | 5 +- caas/kubernetes/node/README.md | 2 +- caas/kubernetes/node/monitors-k8s-node.tf | 58 +----- caas/kubernetes/node/versions.tf | 5 +- caas/kubernetes/pod/README.md | 2 +- caas/kubernetes/pod/monitors-k8s-pod.tf | 18 +- caas/kubernetes/pod/versions.tf | 5 +- caas/kubernetes/velero/README.md | 2 +- caas/kubernetes/velero/monitors-velero.tf | 30 +-- caas/kubernetes/velero/versions.tf | 5 +- caas/kubernetes/workload/README.md | 2 +- .../workload/monitors-k8s-workload.tf | 30 +-- caas/kubernetes/workload/versions.tf | 5 +- cloud/aws/alb/README.md | 2 +- cloud/aws/alb/monitors-alb.tf | 36 +--- cloud/aws/alb/versions.tf | 5 +- cloud/aws/apigateway/README.md | 2 +- cloud/aws/apigateway/monitors-api.tf | 18 +- cloud/aws/apigateway/versions.tf | 5 +- cloud/aws/beanstalk/README.md | 2 +- cloud/aws/beanstalk/monitors-beanstalk.tf | 24 +-- cloud/aws/beanstalk/versions.tf | 5 +- cloud/aws/ecs/common/README.md | 2 +- cloud/aws/ecs/common/monitors-ecs-common.tf | 18 +- cloud/aws/ecs/common/versions.tf | 5 +- cloud/aws/ecs/ec2-cluster/README.md | 2 +- .../ec2-cluster/monitors-ecs-ec2-cluster.tf | 18 +- cloud/aws/ecs/ec2-cluster/versions.tf | 5 +- cloud/aws/ecs/fargate/README.md | 2 +- cloud/aws/ecs/fargate/monitors-ecs-fargate.tf | 19 +- cloud/aws/ecs/fargate/versions.tf | 5 +- cloud/aws/elasticache/common/README.md | 2 +- .../common/monitors-elasticache.tf | 32 +-- cloud/aws/elasticache/common/versions.tf | 5 +- cloud/aws/elasticache/memcached/README.md | 2 +- .../memcached/monitors-memcached.tf | 12 +- cloud/aws/elasticache/memcached/versions.tf | 5 +- cloud/aws/elasticache/redis/README.md | 2 +- cloud/aws/elasticache/redis/monitors-redis.tf | 20 +- cloud/aws/elasticache/redis/versions.tf | 5 +- cloud/aws/elasticsearch/README.md | 2 +- .../elasticsearch/monitors-elasticsearch.tf | 18 +- cloud/aws/elasticsearch/versions.tf | 5 +- cloud/aws/elb/README.md | 2 +- cloud/aws/elb/monitors-elb.tf | 36 +--- cloud/aws/elb/versions.tf | 5 +- cloud/aws/kinesis-firehose/README.md | 2 +- .../monitors-kinesis-firehose.tf | 6 +- cloud/aws/kinesis-firehose/versions.tf | 5 +- cloud/aws/lambda/README.md | 2 +- cloud/aws/lambda/monitors-lambda.tf | 24 +-- cloud/aws/lambda/versions.tf | 5 +- cloud/aws/nlb/README.md | 2 +- cloud/aws/nlb/monitors-nlb.tf | 6 +- cloud/aws/nlb/versions.tf | 5 +- cloud/aws/rds/aurora/mysql/README.md | 2 +- .../aurora/mysql/monitors-rds-aurora-mysql.tf | 6 +- cloud/aws/rds/aurora/mysql/versions.tf | 5 +- cloud/aws/rds/aurora/postgresql/README.md | 2 +- .../monitors-rds-aurora-postgresql.tf | 6 +- cloud/aws/rds/aurora/postgresql/versions.tf | 5 +- cloud/aws/rds/common/README.md | 2 +- cloud/aws/rds/common/monitors-rds-common.tf | 18 +- cloud/aws/rds/common/versions.tf | 5 +- cloud/aws/sqs/README.md | 2 +- cloud/aws/sqs/monitors-sqs.tf | 12 +- cloud/aws/sqs/versions.tf | 5 +- cloud/aws/vpn/README.md | 2 +- cloud/aws/vpn/monitors-vpn.tf | 4 - cloud/aws/vpn/versions.tf | 5 +- cloud/azure/apimanagement/README.md | 2 +- .../monitors-azure-apimanagement.tf | 30 +-- cloud/azure/apimanagement/versions.tf | 5 +- cloud/azure/app-gateway/README.md | 2 +- .../azure/app-gateway/monitors-app-gateway.tf | 50 +---- cloud/azure/app-gateway/versions.tf | 5 +- cloud/azure/app-services/README.md | 2 +- .../app-services/monitors-app_services.tf | 35 +--- cloud/azure/app-services/versions.tf | 5 +- cloud/azure/azure-search/README.md | 2 +- .../azure-search/monitors-azure-search.tf | 12 +- cloud/azure/azure-search/versions.tf | 5 +- cloud/azure/cosmosdb/README.md | 2 +- cloud/azure/cosmosdb/monitors-cosmosdb.tf | 24 +-- cloud/azure/cosmosdb/versions.tf | 5 +- cloud/azure/datalakestore/README.md | 2 +- .../datalakestore/monitors-datalakestore.tf | 4 - cloud/azure/datalakestore/versions.tf | 5 +- cloud/azure/eventgrid/README.md | 2 +- cloud/azure/eventgrid/monitors-eventgrid.tf | 16 +- cloud/azure/eventgrid/versions.tf | 5 +- cloud/azure/eventhub/README.md | 2 +- cloud/azure/eventhub/monitors-eventhub.tf | 16 +- cloud/azure/eventhub/versions.tf | 5 +- cloud/azure/functions/README.md | 2 +- cloud/azure/functions/monitors-functions.tf | 18 +- cloud/azure/functions/versions.tf | 5 +- cloud/azure/iothubs/README.md | 2 +- cloud/azure/iothubs/monitors-iothubs.tf | 80 ++----- cloud/azure/iothubs/versions.tf | 5 +- cloud/azure/keyvault/README.md | 2 +- cloud/azure/keyvault/monitors-keyvault.tf | 16 +- cloud/azure/keyvault/versions.tf | 5 +- cloud/azure/load-balancer/README.md | 2 +- .../load-balancer/monitors-load-balancer.tf | 4 - cloud/azure/load-balancer/versions.tf | 5 +- cloud/azure/mysql/README.md | 2 +- cloud/azure/mysql/monitors-mysql.tf | 24 +-- cloud/azure/mysql/versions.tf | 5 +- cloud/azure/postgresql/README.md | 2 +- .../azure/postgresql/monitors-postegresql.tf | 28 +-- cloud/azure/postgresql/versions.tf | 5 +- cloud/azure/redis/README.md | 2 +- cloud/azure/redis/monitors-azure-redis.tf | 22 +- cloud/azure/redis/versions.tf | 5 +- cloud/azure/serverfarms/README.md | 2 +- .../serverfarms/monitors-azure-serverfarms.tf | 16 +- cloud/azure/serverfarms/versions.tf | 5 +- cloud/azure/servicebus/README.md | 2 +- .../azure/servicebus/monitors-service-bus.tf | 20 +- cloud/azure/servicebus/versions.tf | 5 +- cloud/azure/sql-database/README.md | 2 +- .../sql-database/monitors-sql-database.tf | 28 +-- cloud/azure/sql-database/versions.tf | 5 +- cloud/azure/sql-elasticpool/README.md | 2 +- .../monitors-sql-elasticpool.tf | 18 +- cloud/azure/sql-elasticpool/versions.tf | 5 +- cloud/azure/storage/README.md | 2 +- cloud/azure/storage/monitors-azure-storage.tf | 195 +++--------------- cloud/azure/storage/versions.tf | 5 +- cloud/azure/stream-analytics/README.md | 2 +- .../monitors-stream-analytics.tf | 28 +-- cloud/azure/stream-analytics/versions.tf | 5 +- cloud/azure/virtual-machine/README.md | 2 +- .../monitors-virtual-machine.tf | 34 +-- cloud/azure/virtual-machine/versions.tf | 5 +- cloud/gcp/big-query/README.md | 2 +- cloud/gcp/big-query/monitors-big-query.tf | 54 +---- cloud/gcp/big-query/versions.tf | 5 +- cloud/gcp/cloud-sql/common/README.md | 2 +- .../common/monitors-cloud-sql-common.tf | 37 +--- cloud/gcp/cloud-sql/common/versions.tf | 5 +- cloud/gcp/cloud-sql/mysql/README.md | 2 +- .../mysql/monitors-cloudsql-mysql.tf | 6 +- cloud/gcp/cloud-sql/mysql/versions.tf | 5 +- cloud/gcp/gce/instance/README.md | 2 +- .../gcp/gce/instance/monitors-gce-instance.tf | 18 +- cloud/gcp/gce/instance/versions.tf | 5 +- cloud/gcp/lb/README.md | 2 +- cloud/gcp/lb/monitors-lb.tf | 30 +-- cloud/gcp/lb/versions.tf | 5 +- cloud/gcp/memorystore/redis/README.md | 2 +- .../redis/monitors-memorystore-redis.tf | 6 +- cloud/gcp/memorystore/redis/versions.tf | 5 +- cloud/gcp/pubsub/subscription/README.md | 2 +- .../subscription/monitors-subscription.tf | 18 +- cloud/gcp/pubsub/subscription/versions.tf | 5 +- cloud/gcp/pubsub/topic/README.md | 2 +- cloud/gcp/pubsub/topic/monitors-topics.tf | 18 +- cloud/gcp/pubsub/topic/versions.tf | 5 +- common/alerting-message/main.tf | 2 +- common/alerting-message/versions.tf | 7 +- database/elasticsearch/README.md | 2 +- .../elasticsearch/monitors-elasticsearch.tf | 134 +++--------- database/elasticsearch/versions.tf | 5 +- database/mongodb/README.md | 2 +- database/mongodb/monitors-mongo.tf | 22 +- database/mongodb/versions.tf | 5 +- database/mysql/README.md | 2 +- database/mysql/monitors-mysql.tf | 64 ++---- database/mysql/versions.tf | 5 +- database/postgresql/README.md | 2 +- database/postgresql/monitors-postgresql.tf | 18 +- database/postgresql/versions.tf | 5 +- database/proxysql/README.md | 2 +- database/proxysql/monitors-proxysql.tf | 30 +-- database/proxysql/versions.tf | 5 +- database/redis/README.md | 2 +- database/redis/monitors-redis.tf | 60 +----- database/redis/versions.tf | 5 +- database/solr/README.md | 2 +- database/solr/monitors-solr.tf | 12 +- database/solr/versions.tf | 5 +- database/sqlserver/README.md | 2 +- database/sqlserver/monitors-sqlserver.tf | 6 +- database/sqlserver/versions.tf | 5 +- database/zookeeper/README.md | 2 +- database/zookeeper/monitors-zookeeper.tf | 12 +- database/zookeeper/versions.tf | 5 +- middleware/apache/README.md | 2 +- middleware/apache/monitors-apache.tf | 6 +- middleware/apache/versions.tf | 5 +- middleware/kong/README.md | 2 +- middleware/kong/monitors-kong.tf | 12 +- middleware/kong/versions.tf | 5 +- middleware/nginx/README.md | 2 +- middleware/nginx/monitors-nginx.tf | 12 +- middleware/nginx/versions.tf | 5 +- middleware/php-fpm/README.md | 2 +- middleware/php-fpm/monitors-fpm.tf | 12 +- middleware/php-fpm/versions.tf | 5 +- network/dns/README.md | 2 +- network/dns/monitors-dns.tf | 6 +- network/dns/versions.tf | 5 +- network/http/ssl/README.md | 2 +- network/http/ssl/monitors-ssl.tf | 12 +- network/http/ssl/versions.tf | 5 +- network/http/webcheck/README.md | 2 +- network/http/webcheck/monitors-webcheck.tf | 6 +- network/http/webcheck/versions.tf | 5 +- network/tls/README.md | 2 +- network/tls/monitors-tls.tf | 24 +-- network/tls/versions.tf | 5 +- saas/new-relic/README.md | 2 +- saas/new-relic/monitors-new-relic.tf | 12 +- saas/new-relic/versions.tf | 5 +- system/generic/README.md | 2 +- system/generic/monitors-system.tf | 36 +--- system/generic/versions.tf | 5 +- system/unreachable/README.md | 2 +- system/unreachable/monitors-unreachable.tf | 6 +- system/unreachable/versions.tf | 5 +- 235 files changed, 636 insertions(+), 1848 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccc0a6d..8ee7e97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v4.0.0 (Jun 22, 2021) + +## New Feature + +* Support for Datadog provider v3 (#3) + # v3.6.0 (January 27, 2021) ## Improvement diff --git a/README.md b/README.md index 0e5b377..b5bbbc6 100644 --- a/README.md +++ b/README.md @@ -14,18 +14,24 @@ This repository aims to provide a base of generic and pre configured monitors fo ## Getting started -### Terraform +### Versions -Here is the minimum version required to use these modules of integrations. +Here are the minimum versions required to use these modules of integrations. -``` +```hcl terraform { - required_version = ">= 0.12.26" + required_providers { + datadog = { + source = "DataDog/datadog" + version = ">= 3.1.0" + } + } + required_version = ">= 0.12.31" } ``` -Note: terraform 0.12.26+ is required as it the first version compatible with, but ignoring, the `source` argument for provider requirements introduced in terraform 0.13.0. +_Note_: if you want to use Datadog provider v2, you need to use version 3 of the modules in this repository. ### DataDog provider @@ -33,8 +39,6 @@ Here is the last tester terraform provider version for datadog but next versions ``` provider "datadog" { - version = "2.6.0" # last tested working version - api_key = var.datadog_api_key app_key = var.datadog_app_key } diff --git a/caas/docker/README.md b/caas/docker/README.md index 1ed0a0a..2107f05 100644 --- a/caas/docker/README.md +++ b/caas/docker/README.md @@ -24,7 +24,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/caas/docker/monitors-docker.tf b/caas/docker/monitors-docker.tf index 712a057..690b42b 100644 --- a/caas/docker/monitors-docker.tf +++ b/caas/docker/monitors-docker.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "not_responding" { "docker.service_up"${module.filter-tags.service_check}.by("host").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.not_responding_threshold_warning critical = 5 } @@ -27,10 +27,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:docker", "provider:docker", "resource:docker", "team:claranet", "created-by:terraform"], var.not_responding_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "memory_used" { @@ -45,7 +41,7 @@ resource "datadog_monitor" "memory_used" { > ${var.memory_used_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.memory_used_threshold_warning critical = var.memory_used_threshold_critical } @@ -61,9 +57,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:docker", "provider:docker", "resource:docker", "team:claranet", "created-by:terraform"], var.memory_used_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/caas/docker/versions.tf b/caas/docker/versions.tf index b46bd44..1c28e79 100644 --- a/caas/docker/versions.tf +++ b/caas/docker/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/caas/kubernetes/ark/README.md b/caas/kubernetes/ark/README.md index 61970d8..5a3c62e 100644 --- a/caas/kubernetes/ark/README.md +++ b/caas/kubernetes/ark/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/caas/kubernetes/ark/monitors-ark.tf b/caas/kubernetes/ark/monitors-ark.tf index 152f6d0..d41b417 100644 --- a/caas/kubernetes/ark/monitors-ark.tf +++ b/caas/kubernetes/ark/monitors-ark.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "ark_schedules_monitor" { sum(${var.ark_schedules_monitor_timeframe}):min:ark.ark_backup_failure_total${module.filter-tags.query_alert} by {schedule}.as_count() > 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 warning = 0 } @@ -26,9 +26,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:ark", "team:claranet", "created-by:terraform"], var.ark_schedules_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/caas/kubernetes/ark/versions.tf b/caas/kubernetes/ark/versions.tf index b46bd44..1c28e79 100644 --- a/caas/kubernetes/ark/versions.tf +++ b/caas/kubernetes/ark/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/caas/kubernetes/cluster/README.md b/caas/kubernetes/cluster/README.md index cfae488..425a449 100644 --- a/caas/kubernetes/cluster/README.md +++ b/caas/kubernetes/cluster/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/caas/kubernetes/cluster/monitors-k8s-cluster.tf b/caas/kubernetes/cluster/monitors-k8s-cluster.tf index 22e5d25..6219dc3 100644 --- a/caas/kubernetes/cluster/monitors-k8s-cluster.tf +++ b/caas/kubernetes/cluster/monitors-k8s-cluster.tf @@ -9,7 +9,7 @@ resource "datadog_monitor" "apiserver" { "kube_apiserver_controlplane.up"${module.filter-tags.service_check}.last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.apiserver_threshold_warning critical = 5 } @@ -25,9 +25,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform"], var.apiserver_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/caas/kubernetes/cluster/versions.tf b/caas/kubernetes/cluster/versions.tf index b46bd44..1c28e79 100644 --- a/caas/kubernetes/cluster/versions.tf +++ b/caas/kubernetes/cluster/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/caas/kubernetes/ingress/vts/README.md b/caas/kubernetes/ingress/vts/README.md index 2e5b43b..acc8094 100644 --- a/caas/kubernetes/ingress/vts/README.md +++ b/caas/kubernetes/ingress/vts/README.md @@ -24,7 +24,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/caas/kubernetes/ingress/vts/monitors-ingress.tf b/caas/kubernetes/ingress/vts/monitors-ingress.tf index 4f2e64e..4ced3e7 100644 --- a/caas/kubernetes/ingress/vts/monitors-ingress.tf +++ b/caas/kubernetes/ingress/vts/monitors-ingress.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "nginx_ingress_too_many_5xx" { * 100, 0) > ${var.ingress_5xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.ingress_5xx_threshold_warning critical = var.ingress_5xx_threshold_critical } @@ -27,10 +27,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:nginx-ingress-controller", "team:claranet", "created-by:terraform"], var.ingress_5xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "nginx_ingress_too_many_4xx" { @@ -46,7 +42,7 @@ resource "datadog_monitor" "nginx_ingress_too_many_4xx" { * 100, 0) > ${var.ingress_4xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.ingress_4xx_threshold_warning critical = var.ingress_4xx_threshold_critical } @@ -62,9 +58,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:nginx-ingress-controller", "team:claranet", "created-by:terraform"], var.ingress_4xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/caas/kubernetes/ingress/vts/versions.tf b/caas/kubernetes/ingress/vts/versions.tf index b46bd44..1c28e79 100644 --- a/caas/kubernetes/ingress/vts/versions.tf +++ b/caas/kubernetes/ingress/vts/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/caas/kubernetes/node/README.md b/caas/kubernetes/node/README.md index e29e4d6..cc05848 100644 --- a/caas/kubernetes/node/README.md +++ b/caas/kubernetes/node/README.md @@ -32,7 +32,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/caas/kubernetes/node/monitors-k8s-node.tf b/caas/kubernetes/node/monitors-k8s-node.tf index ccd754d..def810c 100644 --- a/caas/kubernetes/node/monitors-k8s-node.tf +++ b/caas/kubernetes/node/monitors-k8s-node.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "disk_pressure" { "kubernetes_state.node.disk_pressure"${module.filter-tags.service_check}.by("node").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.disk_pressure_threshold_warning critical = 5 } @@ -23,10 +23,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform"], var.disk_pressure_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "disk_out" { @@ -39,7 +35,7 @@ resource "datadog_monitor" "disk_out" { "kubernetes_state.node.out_of_disk"${module.filter-tags.service_check}.by("node").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.disk_out_threshold_warning critical = 5 } @@ -54,10 +50,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform"], var.disk_out_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "memory_pressure" { @@ -70,7 +62,7 @@ resource "datadog_monitor" "memory_pressure" { "kubernetes_state.node.memory_pressure"${module.filter-tags.service_check}.by("node").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.memory_pressure_threshold_warning critical = 5 } @@ -85,10 +77,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform"], var.memory_pressure_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "ready" { @@ -101,7 +89,7 @@ resource "datadog_monitor" "ready" { "kubernetes_state.node.ready"${module.filter-tags.service_check}.by("node").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.ready_threshold_warning critical = 5 } @@ -116,10 +104,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform"], var.ready_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "kubelet_ping" { @@ -132,7 +116,7 @@ resource "datadog_monitor" "kubelet_ping" { "kubernetes.kubelet.check.ping"${module.filter-tags.service_check}.by("name").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.kubelet_ping_threshold_warning critical = 5 } @@ -148,10 +132,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform"], var.kubelet_ping_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "kubelet_syncloop" { @@ -164,7 +144,7 @@ resource "datadog_monitor" "kubelet_syncloop" { "kubernetes.kubelet.check.syncloop"${module.filter-tags.service_check}.by("name").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.kubelet_syncloop_threshold_warning critical = 5 } @@ -179,10 +159,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform"], var.kubelet_syncloop_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "unregister_net_device" { @@ -204,10 +180,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform"], var.unregister_net_device_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "node_unschedulable" { @@ -222,7 +194,7 @@ resource "datadog_monitor" "node_unschedulable" { > 0 EOQ - thresholds = { + monitor_thresholds { critical = 0 } @@ -237,10 +209,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform"], var.node_unschedulable_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "volume_space" { @@ -256,7 +224,7 @@ resource "datadog_monitor" "volume_space" { * 100 > ${var.volume_space_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.volume_space_threshold_critical warning = var.volume_space_threshold_warning } @@ -272,10 +240,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform"], var.volume_space_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "volume_inodes" { @@ -291,7 +255,7 @@ resource "datadog_monitor" "volume_inodes" { * 100 > ${var.volume_inodes_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.volume_inodes_threshold_critical warning = var.volume_inodes_threshold_warning } @@ -307,9 +271,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform"], var.volume_inodes_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/caas/kubernetes/node/versions.tf b/caas/kubernetes/node/versions.tf index b46bd44..1c28e79 100644 --- a/caas/kubernetes/node/versions.tf +++ b/caas/kubernetes/node/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/caas/kubernetes/pod/README.md b/caas/kubernetes/pod/README.md index ef45d10..b9196e5 100644 --- a/caas/kubernetes/pod/README.md +++ b/caas/kubernetes/pod/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/caas/kubernetes/pod/monitors-k8s-pod.tf b/caas/kubernetes/pod/monitors-k8s-pod.tf index d286e6c..53da50f 100644 --- a/caas/kubernetes/pod/monitors-k8s-pod.tf +++ b/caas/kubernetes/pod/monitors-k8s-pod.tf @@ -9,7 +9,7 @@ resource "datadog_monitor" "pod_phase_status" { default(sum:kubernetes_state.pod.status_phase${module.filter-tags-phase.query_alert} by {namespace,kube_cluster_name}, 0) > 0 EOQ - thresholds = { + monitor_thresholds { critical = 0 } @@ -25,10 +25,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-pod", "team:claranet", "created-by:terraform"], var.pod_phase_status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "error" { @@ -43,7 +39,7 @@ resource "datadog_monitor" "error" { > ${var.error_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.error_threshold_critical warning = var.error_threshold_warning } @@ -59,10 +55,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-pod", "team:claranet", "created-by:terraform"], var.error_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "terminated" { @@ -77,7 +69,7 @@ resource "datadog_monitor" "terminated" { > ${var.terminated_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.terminated_threshold_critical warning = var.terminated_threshold_warning } @@ -93,9 +85,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-pod", "team:claranet", "created-by:terraform"], var.terminated_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/caas/kubernetes/pod/versions.tf b/caas/kubernetes/pod/versions.tf index b46bd44..1c28e79 100644 --- a/caas/kubernetes/pod/versions.tf +++ b/caas/kubernetes/pod/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/caas/kubernetes/velero/README.md b/caas/kubernetes/velero/README.md index d3bfb88..c1f5589 100644 --- a/caas/kubernetes/velero/README.md +++ b/caas/kubernetes/velero/README.md @@ -27,7 +27,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/caas/kubernetes/velero/monitors-velero.tf b/caas/kubernetes/velero/monitors-velero.tf index 9a4260c..12b0539 100644 --- a/caas/kubernetes/velero/monitors-velero.tf +++ b/caas/kubernetes/velero/monitors-velero.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "velero_scheduled_backup_missing" { sum(${var.velero_scheduled_backup_missing_monitor_timeframe}):sum:velero.velero_backup_success_total${module.filter-tags-scheduled-backup.query_alert} by {cluster-name,schedule}.as_count() < 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 } @@ -25,10 +25,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_scheduled_backup_missing_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "velero_backup_failure" { @@ -41,7 +37,7 @@ resource "datadog_monitor" "velero_backup_failure" { sum(${var.velero_backup_failure_monitor_timeframe}):min:velero.velero_backup_failure_total${module.filter-tags.query_alert} by {schedule}.as_count() > 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 warning = 0 } @@ -58,10 +54,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_failure_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "velero_backup_partial_failure" { @@ -74,7 +66,7 @@ resource "datadog_monitor" "velero_backup_partial_failure" { sum(${var.velero_backup_partial_failure_monitor_timeframe}):min:velero.velero_backup_partial_failure_total${module.filter-tags.query_alert} by {schedule}.as_count() > 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 warning = 0 } @@ -91,10 +83,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_partial_failure_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "velero_backup_deletion_failure" { @@ -107,7 +95,7 @@ resource "datadog_monitor" "velero_backup_deletion_failure" { sum(${var.velero_backup_deletion_failure_monitor_timeframe}):min:velero.velero_backup_deletion_failure_total${module.filter-tags.query_alert} by {schedule}.as_count() > 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 warning = 0 } @@ -124,10 +112,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_deletion_failure_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "velero_volume_snapshot_failure" { @@ -140,7 +124,7 @@ resource "datadog_monitor" "velero_volume_snapshot_failure" { sum(${var.velero_volume_snapshot_failure_monitor_timeframe}):min:velero.velero_volume_snapshot_failure_total${module.filter-tags.query_alert} by {schedule}.as_count() > 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 warning = 0 } @@ -157,9 +141,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_volume_snapshot_failure_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/caas/kubernetes/velero/versions.tf b/caas/kubernetes/velero/versions.tf index b46bd44..1c28e79 100644 --- a/caas/kubernetes/velero/versions.tf +++ b/caas/kubernetes/velero/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/caas/kubernetes/workload/README.md b/caas/kubernetes/workload/README.md index 92cc3d1..5a6f329 100644 --- a/caas/kubernetes/workload/README.md +++ b/caas/kubernetes/workload/README.md @@ -27,7 +27,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/caas/kubernetes/workload/monitors-k8s-workload.tf b/caas/kubernetes/workload/monitors-k8s-workload.tf index a722a55..41ebbb4 100644 --- a/caas/kubernetes/workload/monitors-k8s-workload.tf +++ b/caas/kubernetes/workload/monitors-k8s-workload.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "job" { "kubernetes_state.job.complete"${module.filter-tags.service_check}.by("job_name").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.job_threshold_warning critical = 5 } @@ -23,10 +23,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform"], var.job_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "cronjob" { @@ -39,7 +35,7 @@ resource "datadog_monitor" "cronjob" { "kubernetes_state.cronjob.on_schedule_check"${module.filter-tags.service_check}.by("cronjob").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.cronjob_threshold_warning critical = 5 } @@ -54,10 +50,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform"], var.cronjob_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "replica_available" { @@ -73,7 +65,7 @@ resource "datadog_monitor" "replica_available" { + 1 < ${var.replica_available_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.replica_available_threshold_critical } @@ -88,10 +80,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform"], var.replica_available_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "replica_ready" { @@ -107,7 +95,7 @@ resource "datadog_monitor" "replica_ready" { + 1 < ${var.replica_available_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.replica_ready_threshold_critical } @@ -122,10 +110,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform"], var.replica_ready_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "replica_current" { @@ -141,7 +125,7 @@ resource "datadog_monitor" "replica_current" { + 1 < ${var.replica_available_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.replica_current_threshold_critical } @@ -156,9 +140,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform"], var.replica_current_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/caas/kubernetes/workload/versions.tf b/caas/kubernetes/workload/versions.tf index b46bd44..1c28e79 100644 --- a/caas/kubernetes/workload/versions.tf +++ b/caas/kubernetes/workload/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/alb/README.md b/cloud/aws/alb/README.md index d05eaf2..7017038 100644 --- a/cloud/aws/alb/README.md +++ b/cloud/aws/alb/README.md @@ -28,7 +28,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/alb/monitors-alb.tf b/cloud/aws/alb/monitors-alb.tf index 6fe5636..36f4b8d 100644 --- a/cloud/aws/alb/monitors-alb.tf +++ b/cloud/aws/alb/monitors-alb.tf @@ -12,7 +12,7 @@ resource "datadog_monitor" "ALB_no_healthy_instances" { ) * 100 < 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 warning = var.alb_no_healthy_instances_threshold_warning } @@ -27,10 +27,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"], var.alb_no_healthy_instances_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "ALB_latency" { @@ -45,7 +41,7 @@ resource "datadog_monitor" "ALB_latency" { > ${var.latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.latency_threshold_critical warning = var.latency_threshold_warning } @@ -59,10 +55,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"], var.latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "ALB_httpcode_5xx" { @@ -78,7 +70,7 @@ resource "datadog_monitor" "ALB_httpcode_5xx" { * 100 > ${var.httpcode_alb_5xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.httpcode_alb_5xx_threshold_critical warning = var.httpcode_alb_5xx_threshold_warning } @@ -92,10 +84,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"], var.httpcode_alb_5xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "ALB_httpcode_4xx" { @@ -111,7 +99,7 @@ resource "datadog_monitor" "ALB_httpcode_4xx" { * 100 > ${var.httpcode_alb_4xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.httpcode_alb_4xx_threshold_critical warning = var.httpcode_alb_4xx_threshold_warning } @@ -125,10 +113,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"], var.httpcode_alb_4xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "ALB_httpcode_target_5xx" { @@ -144,7 +128,7 @@ resource "datadog_monitor" "ALB_httpcode_target_5xx" { * 100 > ${var.httpcode_target_5xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.httpcode_target_5xx_threshold_critical warning = var.httpcode_target_5xx_threshold_warning } @@ -158,10 +142,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"], var.httpcode_target_5xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "ALB_httpcode_target_4xx" { @@ -177,7 +157,7 @@ resource "datadog_monitor" "ALB_httpcode_target_4xx" { * 100 > ${var.httpcode_target_4xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.httpcode_target_4xx_threshold_critical warning = var.httpcode_target_4xx_threshold_warning } @@ -191,9 +171,5 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"], var.httpcode_target_4xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/alb/versions.tf b/cloud/aws/alb/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/alb/versions.tf +++ b/cloud/aws/alb/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/apigateway/README.md b/cloud/aws/apigateway/README.md index c6a1551..faf74ef 100644 --- a/cloud/aws/apigateway/README.md +++ b/cloud/aws/apigateway/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/apigateway/monitors-api.tf b/cloud/aws/apigateway/monitors-api.tf index 4221abe..18bfa8f 100644 --- a/cloud/aws/apigateway/monitors-api.tf +++ b/cloud/aws/apigateway/monitors-api.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "API_Gateway_latency" { > ${var.latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.latency_threshold_warning critical = var.latency_threshold_critical } @@ -25,10 +25,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:apigateway", "team:claranet", "created-by:terraform"], var.latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring API Gateway 5xx errors percent @@ -45,7 +41,7 @@ resource "datadog_monitor" "API_http_5xx_errors_count" { * 100 > ${var.http_5xx_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.http_5xx_requests_threshold_warning critical = var.http_5xx_requests_threshold_critical } @@ -59,10 +55,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:apigateway", "team:claranet", "created-by:terraform"], var.http_5xx_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring API Gateway 4xx errors percent @@ -79,7 +71,7 @@ resource "datadog_monitor" "API_http_4xx_errors_count" { * 100 > ${var.http_4xx_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.http_4xx_requests_threshold_warning critical = var.http_4xx_requests_threshold_critical } @@ -93,9 +85,5 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:apigateway", "team:claranet", "created-by:terraform"], var.http_4xx_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/apigateway/versions.tf b/cloud/aws/apigateway/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/apigateway/versions.tf +++ b/cloud/aws/apigateway/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/beanstalk/README.md b/cloud/aws/beanstalk/README.md index 051935c..61ec6ea 100644 --- a/cloud/aws/beanstalk/README.md +++ b/cloud/aws/beanstalk/README.md @@ -26,7 +26,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/beanstalk/monitors-beanstalk.tf b/cloud/aws/beanstalk/monitors-beanstalk.tf index 3870416..c620372 100644 --- a/cloud/aws/beanstalk/monitors-beanstalk.tf +++ b/cloud/aws/beanstalk/monitors-beanstalk.tf @@ -9,7 +9,7 @@ resource "datadog_monitor" "health" { ${var.health_time_aggregator}(${var.health_timeframe}):min:aws.elasticbeanstalk.environment_health${module.filter-tags.query_alert} by {region,environmentname} >= ${var.health_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.health_threshold_critical warning = var.health_threshold_warning } @@ -25,10 +25,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:beanstalk", "team:claranet", "created-by:terraform"], var.health_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "application_latency_p90" { @@ -41,7 +37,7 @@ resource "datadog_monitor" "application_latency_p90" { ${var.application_latency_p90_time_aggregator}(${var.application_latency_p90_timeframe}):min:aws.elasticbeanstalk.application_latency_p_9_0${module.filter-tags-no-host.query_alert} by {region,environmentname} >= ${var.application_latency_p90_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.application_latency_p90_threshold_critical warning = var.application_latency_p90_threshold_warning } @@ -56,10 +52,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:beanstalk", "team:claranet", "created-by:terraform"], var.application_latency_p90_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "application_5xx_error_rate" { @@ -72,7 +64,7 @@ resource "datadog_monitor" "application_5xx_error_rate" { ${var.application_5xx_error_rate_time_aggregator}(${var.application_5xx_error_rate_timeframe}):sum:aws.elasticbeanstalk.application_requests_5xx${module.filter-tags-no-host.query_alert} by {region,environmentname}.as_rate() / sum:aws.elasticbeanstalk.application_requests_total${module.filter-tags-no-host.query_alert} by {region,environmentname}.as_rate() * 100 > ${var.application_5xx_error_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.application_5xx_error_rate_threshold_critical warning = var.application_5xx_error_rate_threshold_warning } @@ -87,10 +79,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:beanstalk", "team:claranet", "created-by:terraform"], var.application_5xx_error_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "root_filesystem_usage" { @@ -103,7 +91,7 @@ resource "datadog_monitor" "root_filesystem_usage" { ${var.root_filesystem_usage_aggregator}(${var.root_filesystem_usage_timeframe}):min:aws.elasticbeanstalk.root_filesystem_util${module.filter-tags.query_alert} by {region,environmentname,host} > ${var.root_filesystem_usage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.root_filesystem_usage_threshold_critical warning = var.root_filesystem_usage_threshold_warning } @@ -118,9 +106,5 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:beanstalk", "team:claranet", "created-by:terraform"], var.root_filesystem_usage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/beanstalk/versions.tf b/cloud/aws/beanstalk/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/beanstalk/versions.tf +++ b/cloud/aws/beanstalk/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/ecs/common/README.md b/cloud/aws/ecs/common/README.md index 833b636..9264227 100644 --- a/cloud/aws/ecs/common/README.md +++ b/cloud/aws/ecs/common/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/ecs/common/monitors-ecs-common.tf b/cloud/aws/ecs/common/monitors-ecs-common.tf index 6d6cc31..2607570 100644 --- a/cloud/aws/ecs/common/monitors-ecs-common.tf +++ b/cloud/aws/ecs/common/monitors-ecs-common.tf @@ -12,7 +12,7 @@ resource "datadog_monitor" "service_cpu_utilization" { EOQ - thresholds = { + monitor_thresholds { critical = var.service_cpu_utilization_threshold_critical warning = var.service_cpu_utilization_threshold_warning } @@ -28,10 +28,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:ecs", "team:claranet", "created-by:terraform", "category:service"], var.service_cpu_utilization_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "service_memory_utilization" { @@ -46,7 +42,7 @@ resource "datadog_monitor" "service_memory_utilization" { > ${var.service_memory_utilization_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.service_memory_utilization_threshold_critical warning = var.service_memory_utilization_threshold_warning } @@ -62,10 +58,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:ecs", "team:claranet", "created-by:terraform", "category:service"], var.service_memory_utilization_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "service_missing_tasks" { @@ -81,7 +73,7 @@ resource "datadog_monitor" "service_missing_tasks" { EOQ - thresholds = { + monitor_thresholds { critical = var.service_missing_tasks_threshold_critical warning = var.service_missing_tasks_threshold_warning } @@ -97,8 +89,4 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:ecs", "team:claranet", "created-by:terraform", "category:service"], var.service_missing_tasks_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/ecs/common/versions.tf b/cloud/aws/ecs/common/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/ecs/common/versions.tf +++ b/cloud/aws/ecs/common/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/ecs/ec2-cluster/README.md b/cloud/aws/ecs/ec2-cluster/README.md index a315129..c7a7229 100644 --- a/cloud/aws/ecs/ec2-cluster/README.md +++ b/cloud/aws/ecs/ec2-cluster/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/ecs/ec2-cluster/monitors-ecs-ec2-cluster.tf b/cloud/aws/ecs/ec2-cluster/monitors-ecs-ec2-cluster.tf index 7b3a3ae..2766414 100644 --- a/cloud/aws/ecs/ec2-cluster/monitors-ecs-ec2-cluster.tf +++ b/cloud/aws/ecs/ec2-cluster/monitors-ecs-ec2-cluster.tf @@ -10,7 +10,7 @@ resource "datadog_monitor" "ecs_agent_status" { EOQ - thresholds = { + monitor_thresholds { warning = var.agent_status_threshold_warning critical = 5 } @@ -27,10 +27,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:ecs", "team:claranet", "created-by:terraform", "category:agent"], var.agent_status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "cluster_cpu_utilization" { @@ -46,7 +42,7 @@ resource "datadog_monitor" "cluster_cpu_utilization" { EOQ - thresholds = { + monitor_thresholds { critical = var.cluster_cpu_utilization_threshold_critical warning = var.cluster_cpu_utilization_threshold_warning } @@ -63,10 +59,6 @@ EOQ tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:ecs", "team:claranet", "created-by:terraform", "category:cluster"], var.cluster_cpu_utilization_extra_tags) - lifecycle { - ignore_changes = [silenced] - } - } resource "datadog_monitor" "cluster_memory_reservation" { @@ -82,7 +74,7 @@ resource "datadog_monitor" "cluster_memory_reservation" { EOQ - thresholds = { + monitor_thresholds { critical = var.cluster_memory_reservation_threshold_critical warning = var.cluster_memory_reservation_threshold_warning } @@ -98,8 +90,4 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:ecs", "team:claranet", "created-by:terraform", "category:cluster"], var.cluster_memory_reservation_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/ecs/ec2-cluster/versions.tf b/cloud/aws/ecs/ec2-cluster/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/ecs/ec2-cluster/versions.tf +++ b/cloud/aws/ecs/ec2-cluster/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/ecs/fargate/README.md b/cloud/aws/ecs/fargate/README.md index fbf389f..8488a71 100644 --- a/cloud/aws/ecs/fargate/README.md +++ b/cloud/aws/ecs/fargate/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/ecs/fargate/monitors-ecs-fargate.tf b/cloud/aws/ecs/fargate/monitors-ecs-fargate.tf index 1102cec..e183f8c 100644 --- a/cloud/aws/ecs/fargate/monitors-ecs-fargate.tf +++ b/cloud/aws/ecs/fargate/monitors-ecs-fargate.tf @@ -10,7 +10,7 @@ resource "datadog_monitor" "service_check" { "fargate_check"${module.filter-tags.service_check}.last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.service_check_threshold_warning critical = 5 } @@ -27,12 +27,7 @@ EOQ include_tags = true - tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:ecs_fargate", "team:claranet", "created-by:terraform", "category:service"], var.service_check_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "cpu_utilization" { @@ -48,7 +43,7 @@ ${var.cpu_utilization_time_aggregator}(${var.cpu_utilization_timeframe}): EOQ - thresholds = { + monitor_thresholds { critical = var.cpu_utilization_threshold_critical warning = var.cpu_utilization_threshold_warning } @@ -65,10 +60,6 @@ EOQ tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:ecs_fargate", "team:claranet", "created-by:terraform"], var.cpu_utilization_extra_tags) - lifecycle { - ignore_changes = [silenced] - } - } resource "datadog_monitor" "memory_utilization" { @@ -86,7 +77,7 @@ ${var.memory_utilization_time_aggregator}(${var.memory_utilization_timeframe}): EOQ - thresholds = { + monitor_thresholds { critical = var.memory_utilization_threshold_critical warning = var.memory_utilization_threshold_warning } @@ -103,8 +94,4 @@ EOQ tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:ecs_fargate", "team:claranet", "created-by:terraform"], var.memory_utilization_extra_tags) - lifecycle { - ignore_changes = [silenced] - } - } diff --git a/cloud/aws/ecs/fargate/versions.tf b/cloud/aws/ecs/fargate/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/ecs/fargate/versions.tf +++ b/cloud/aws/ecs/fargate/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/elasticache/common/README.md b/cloud/aws/elasticache/common/README.md index ab46749..dc20ae6 100644 --- a/cloud/aws/elasticache/common/README.md +++ b/cloud/aws/elasticache/common/README.md @@ -28,7 +28,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/elasticache/common/monitors-elasticache.tf b/cloud/aws/elasticache/common/monitors-elasticache.tf index 1925a36..22154d4 100644 --- a/cloud/aws/elasticache/common/monitors-elasticache.tf +++ b/cloud/aws/elasticache/common/monitors-elasticache.tf @@ -10,7 +10,7 @@ resource "datadog_monitor" "elasticache_eviction" { ) > ${var.eviction_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.eviction_threshold_warning critical = var.eviction_threshold_critical } @@ -26,10 +26,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform"], var.eviction_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "elasticache_max_connection" { @@ -56,10 +52,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform"], var.max_connection_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "elasticache_no_connection" { @@ -85,10 +77,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform"], var.no_connection_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "elasticache_swap" { @@ -103,7 +91,7 @@ resource "datadog_monitor" "elasticache_swap" { ) > ${var.swap_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.swap_threshold_warning critical = var.swap_threshold_critical } @@ -119,10 +107,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform"], var.swap_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "elasticache_free_memory" { @@ -137,7 +121,7 @@ resource "datadog_monitor" "elasticache_free_memory" { < ${var.free_memory_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.free_memory_threshold_warning critical = var.free_memory_threshold_critical } @@ -153,10 +137,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform"], var.free_memory_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "elasticache_eviction_growing" { @@ -171,7 +151,7 @@ resource "datadog_monitor" "elasticache_eviction_growing" { > ${var.eviction_growing_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.eviction_growing_threshold_warning critical = var.eviction_growing_threshold_critical } @@ -187,9 +167,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform"], var.eviction_growing_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/elasticache/common/versions.tf b/cloud/aws/elasticache/common/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/elasticache/common/versions.tf +++ b/cloud/aws/elasticache/common/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/elasticache/memcached/README.md b/cloud/aws/elasticache/memcached/README.md index 3de5d51..23c00b7 100644 --- a/cloud/aws/elasticache/memcached/README.md +++ b/cloud/aws/elasticache/memcached/README.md @@ -24,7 +24,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/elasticache/memcached/monitors-memcached.tf b/cloud/aws/elasticache/memcached/monitors-memcached.tf index dd2052e..9bb1a4c 100644 --- a/cloud/aws/elasticache/memcached/monitors-memcached.tf +++ b/cloud/aws/elasticache/memcached/monitors-memcached.tf @@ -12,7 +12,7 @@ resource "datadog_monitor" "memcached_get_hits" { ) * 100 < ${var.get_hits_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.get_hits_threshold_warning critical = var.get_hits_threshold_critical } @@ -28,10 +28,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-memcached", "team:claranet", "created-by:terraform", "engine:memcached"], var.get_hits_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "memcached_cpu_high" { @@ -46,7 +42,7 @@ resource "datadog_monitor" "memcached_cpu_high" { ) > ${var.cpu_high_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cpu_high_threshold_warning critical = var.cpu_high_threshold_critical } @@ -63,9 +59,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-memcached", "team:claranet", "created-by:terraform", "engine:memcached"], var.cpu_high_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/elasticache/memcached/versions.tf b/cloud/aws/elasticache/memcached/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/elasticache/memcached/versions.tf +++ b/cloud/aws/elasticache/memcached/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/elasticache/redis/README.md b/cloud/aws/elasticache/redis/README.md index 9fb4ee9..a13d960 100644 --- a/cloud/aws/elasticache/redis/README.md +++ b/cloud/aws/elasticache/redis/README.md @@ -26,7 +26,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/elasticache/redis/monitors-redis.tf b/cloud/aws/elasticache/redis/monitors-redis.tf index 18d862a..1a9466b 100644 --- a/cloud/aws/elasticache/redis/monitors-redis.tf +++ b/cloud/aws/elasticache/redis/monitors-redis.tf @@ -12,7 +12,7 @@ resource "datadog_monitor" "redis_cache_hits" { * 100, 100) < ${var.cache_hits_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cache_hits_threshold_warning critical = var.cache_hits_threshold_critical } @@ -28,10 +28,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-redis", "team:claranet", "created-by:terraform", "engine:redis"], var.cache_hits_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "redis_cpu_high" { @@ -58,10 +54,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-redis", "team:claranet", "created-by:terraform", "engine:redis"], var.cpu_high_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "redis_replication_lag" { @@ -76,7 +68,7 @@ resource "datadog_monitor" "redis_replication_lag" { ) > ${var.replication_lag_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.replication_lag_threshold_warning critical = var.replication_lag_threshold_critical } @@ -92,10 +84,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-redis", "team:claranet", "created-by:terraform", "engine:redis"], var.replication_lag_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "redis_commands" { @@ -122,9 +110,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-redis", "team:claranet", "created-by:terraform", "engine:redis"], var.commands_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/elasticache/redis/versions.tf b/cloud/aws/elasticache/redis/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/elasticache/redis/versions.tf +++ b/cloud/aws/elasticache/redis/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/elasticsearch/README.md b/cloud/aws/elasticsearch/README.md index ee945da..d22364d 100644 --- a/cloud/aws/elasticsearch/README.md +++ b/cloud/aws/elasticsearch/README.md @@ -27,7 +27,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/elasticsearch/monitors-elasticsearch.tf b/cloud/aws/elasticsearch/monitors-elasticsearch.tf index e083a47..bd73e31 100644 --- a/cloud/aws/elasticsearch/monitors-elasticsearch.tf +++ b/cloud/aws/elasticsearch/monitors-elasticsearch.tf @@ -16,7 +16,7 @@ resource "datadog_monitor" "es_cluster_status" { ) >= 2 EOQ - thresholds = { + monitor_thresholds { warning = 1 critical = 2 } @@ -33,10 +33,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.es_cluster_status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } ### Elasticsearch cluster free storage space monitor ### @@ -53,7 +49,7 @@ resource "datadog_monitor" "es_free_space_low" { ) < ${var.diskspace_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.diskspace_threshold_warning critical = var.diskspace_threshold_critical } @@ -69,10 +65,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.diskspace_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } ### Elasticsearch cluster CPU monitor ### @@ -88,7 +80,7 @@ resource "datadog_monitor" "es_cpu_90_15min" { ) > ${var.cpu_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cpu_threshold_warning critical = var.cpu_threshold_critical } @@ -104,9 +96,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.cpu_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/elasticsearch/versions.tf b/cloud/aws/elasticsearch/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/elasticsearch/versions.tf +++ b/cloud/aws/elasticsearch/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/elb/README.md b/cloud/aws/elb/README.md index 68aee70..eefea2f 100644 --- a/cloud/aws/elb/README.md +++ b/cloud/aws/elb/README.md @@ -28,7 +28,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/elb/monitors-elb.tf b/cloud/aws/elb/monitors-elb.tf index 38bd37a..c936852 100644 --- a/cloud/aws/elb/monitors-elb.tf +++ b/cloud/aws/elb/monitors-elb.tf @@ -12,7 +12,7 @@ resource "datadog_monitor" "ELB_no_healthy_instances" { ) * 100 < 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 warning = var.elb_no_healthy_instance_threshold_warning } @@ -29,10 +29,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"], var.elb_no_healthy_instance_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "ELB_too_much_4xx" { @@ -48,7 +44,7 @@ resource "datadog_monitor" "ELB_too_much_4xx" { * 100 > ${var.elb_4xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.elb_4xx_threshold_warning critical = var.elb_4xx_threshold_critical } @@ -64,10 +60,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"], var.elb_4xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "ELB_too_much_5xx" { @@ -83,7 +75,7 @@ resource "datadog_monitor" "ELB_too_much_5xx" { * 100 > ${var.elb_5xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.elb_5xx_threshold_warning critical = var.elb_5xx_threshold_critical } @@ -99,10 +91,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"], var.elb_5xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "ELB_too_much_4xx_backend" { @@ -118,7 +106,7 @@ resource "datadog_monitor" "ELB_too_much_4xx_backend" { * 100 > ${var.elb_backend_4xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.elb_backend_4xx_threshold_warning critical = var.elb_backend_4xx_threshold_critical } @@ -134,10 +122,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"], var.elb_backend_4xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "ELB_too_much_5xx_backend" { @@ -153,7 +137,7 @@ resource "datadog_monitor" "ELB_too_much_5xx_backend" { * 100 > ${var.elb_backend_5xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.elb_backend_5xx_threshold_warning critical = var.elb_backend_5xx_threshold_critical } @@ -169,10 +153,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"], var.elb_backend_5xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "ELB_backend_latency" { @@ -187,7 +167,7 @@ resource "datadog_monitor" "ELB_backend_latency" { > ${var.elb_backend_latency_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.elb_backend_latency_warning critical = var.elb_backend_latency_critical } @@ -203,9 +183,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"], var.elb_backend_latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/elb/versions.tf b/cloud/aws/elb/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/elb/versions.tf +++ b/cloud/aws/elb/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/kinesis-firehose/README.md b/cloud/aws/kinesis-firehose/README.md index 2bbbb30..7ed2416 100644 --- a/cloud/aws/kinesis-firehose/README.md +++ b/cloud/aws/kinesis-firehose/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf b/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf index c347066..e0fb7a0 100644 --- a/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf +++ b/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "firehose_incoming_records" { ) <= 0 EOQ - thresholds = { + monitor_thresholds { critical = 0 } @@ -27,9 +27,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:kinesis-firehose", "team:claranet", "created-by:terraform"], var.incoming_records_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/kinesis-firehose/versions.tf b/cloud/aws/kinesis-firehose/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/kinesis-firehose/versions.tf +++ b/cloud/aws/kinesis-firehose/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/lambda/README.md b/cloud/aws/lambda/README.md index 423d8eb..65363bc 100644 --- a/cloud/aws/lambda/README.md +++ b/cloud/aws/lambda/README.md @@ -26,7 +26,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/lambda/monitors-lambda.tf b/cloud/aws/lambda/monitors-lambda.tf index 0312122..53f0616 100644 --- a/cloud/aws/lambda/monitors-lambda.tf +++ b/cloud/aws/lambda/monitors-lambda.tf @@ -18,7 +18,7 @@ resource "datadog_monitor" "pct_errors" { evaluation_delay = var.evaluation_delay new_host_delay = var.new_host_delay - thresholds = { + monitor_thresholds { critical = var.pct_errors_threshold_critical warning = var.pct_errors_threshold_warning } @@ -32,10 +32,6 @@ resource "datadog_monitor" "pct_errors" { locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:lambda", "team:claranet", "created-by:terraform"], var.pct_errors_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Errors Absolute Value @@ -54,7 +50,7 @@ resource "datadog_monitor" "errors" { evaluation_delay = var.evaluation_delay new_host_delay = var.new_host_delay - thresholds = { + monitor_thresholds { critical = var.errors_threshold_critical warning = var.errors_threshold_warning } @@ -68,10 +64,6 @@ resource "datadog_monitor" "errors" { locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:lambda", "team:claranet", "created-by:terraform"], var.errors_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Throttles @@ -90,7 +82,7 @@ resource "datadog_monitor" "throttles" { evaluation_delay = var.evaluation_delay new_host_delay = var.new_host_delay - thresholds = { + monitor_thresholds { critical = var.throttles_threshold_critical warning = var.throttles_threshold_warning } @@ -104,10 +96,6 @@ resource "datadog_monitor" "throttles" { locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:lambda", "team:claranet", "created-by:terraform"], var.throttles_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # INVOCATIONS @@ -126,7 +114,7 @@ resource "datadog_monitor" "invocations" { evaluation_delay = var.evaluation_delay new_host_delay = var.new_host_delay - thresholds = { + monitor_thresholds { critical = var.invocations_threshold_critical warning = var.invocations_threshold_warning } @@ -143,8 +131,4 @@ resource "datadog_monitor" "invocations" { tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:lambda", "team:claranet", "created-by:terraform"], var.invocations_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/lambda/versions.tf b/cloud/aws/lambda/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/lambda/versions.tf +++ b/cloud/aws/lambda/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/nlb/README.md b/cloud/aws/nlb/README.md index c62517f..2f753a5 100644 --- a/cloud/aws/nlb/README.md +++ b/cloud/aws/nlb/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/nlb/monitors-nlb.tf b/cloud/aws/nlb/monitors-nlb.tf index 7492b51..2de3037 100644 --- a/cloud/aws/nlb/monitors-nlb.tf +++ b/cloud/aws/nlb/monitors-nlb.tf @@ -12,7 +12,7 @@ resource "datadog_monitor" "NLB_no_healthy_instances" { ) * 100 < 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 warning = var.nlb_no_healthy_instances_threshold_warning } @@ -27,9 +27,5 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:nlb", "team:claranet", "created-by:terraform"], var.nlb_no_healthy_instances_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/nlb/versions.tf b/cloud/aws/nlb/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/nlb/versions.tf +++ b/cloud/aws/nlb/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/rds/aurora/mysql/README.md b/cloud/aws/rds/aurora/mysql/README.md index 3676452..f9fbf83 100644 --- a/cloud/aws/rds/aurora/mysql/README.md +++ b/cloud/aws/rds/aurora/mysql/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf b/cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf index 92fbed8..9542979 100644 --- a/cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf +++ b/cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "rds_aurora_mysql_replica_lag" { ) > ${var.aurora_replicalag_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.aurora_replicalag_threshold_warning critical = var.aurora_replicalag_threshold_critical } @@ -27,8 +27,4 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds-aurora-mysql", "team:claranet", "created-by:terraform"], var.aurora_replicalag_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/rds/aurora/mysql/versions.tf b/cloud/aws/rds/aurora/mysql/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/rds/aurora/mysql/versions.tf +++ b/cloud/aws/rds/aurora/mysql/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/rds/aurora/postgresql/README.md b/cloud/aws/rds/aurora/postgresql/README.md index e60be60..61bd925 100644 --- a/cloud/aws/rds/aurora/postgresql/README.md +++ b/cloud/aws/rds/aurora/postgresql/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf b/cloud/aws/rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf index e47ee1a..7b43be3 100644 --- a/cloud/aws/rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf +++ b/cloud/aws/rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "rds_aurora_postgresql_replica_lag" { ) > ${var.aurora_replicalag_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.aurora_replicalag_threshold_warning critical = var.aurora_replicalag_threshold_critical } @@ -27,8 +27,4 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds-aurora-postgresql", "team:claranet", "created-by:terraform"], var.aurora_replicalag_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/rds/aurora/postgresql/versions.tf b/cloud/aws/rds/aurora/postgresql/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/rds/aurora/postgresql/versions.tf +++ b/cloud/aws/rds/aurora/postgresql/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/rds/common/README.md b/cloud/aws/rds/common/README.md index 86a64bb..3855c93 100644 --- a/cloud/aws/rds/common/README.md +++ b/cloud/aws/rds/common/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/rds/common/monitors-rds-common.tf b/cloud/aws/rds/common/monitors-rds-common.tf index 00e9639..cfbc30b 100644 --- a/cloud/aws/rds/common/monitors-rds-common.tf +++ b/cloud/aws/rds/common/monitors-rds-common.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "rds_cpu_90_15min" { ) > ${var.cpu_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cpu_threshold_warning critical = var.cpu_threshold_critical } @@ -26,10 +26,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"], var.cpu_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } ### RDS instance free space monitor ### @@ -46,7 +42,7 @@ resource "datadog_monitor" "rds_free_space_low" { ) < ${var.diskspace_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.diskspace_threshold_warning critical = var.diskspace_threshold_critical } @@ -62,10 +58,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"], var.diskspace_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } ### RDS Replica Lag monitor ### @@ -81,7 +73,7 @@ resource "datadog_monitor" "rds_replica_lag" { ) > ${var.replicalag_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.replicalag_threshold_warning critical = var.replicalag_threshold_critical } @@ -96,8 +88,4 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"], var.replicalag_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/rds/common/versions.tf b/cloud/aws/rds/common/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/rds/common/versions.tf +++ b/cloud/aws/rds/common/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/sqs/README.md b/cloud/aws/sqs/README.md index 5d06cea..0fdc0a3 100644 --- a/cloud/aws/sqs/README.md +++ b/cloud/aws/sqs/README.md @@ -24,7 +24,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/sqs/monitors-sqs.tf b/cloud/aws/sqs/monitors-sqs.tf index 29f84a5..794f69b 100644 --- a/cloud/aws/sqs/monitors-sqs.tf +++ b/cloud/aws/sqs/monitors-sqs.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "visible_messages" { > ${var.visible_messages_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.visible_messages_threshold_critical warning = var.visible_messages_threshold_warning } @@ -27,10 +27,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:sqs", "team:claranet", "created-by:terraform"], var.visible_messages_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Age of the Oldest Message @@ -46,7 +42,7 @@ resource "datadog_monitor" "age_of_oldest_message" { > ${var.age_of_oldest_message_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.age_of_oldest_message_threshold_critical warning = var.age_of_oldest_message_threshold_warning } @@ -62,8 +58,4 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:sqs", "team:claranet", "created-by:terraform"], var.age_of_oldest_message_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/sqs/versions.tf b/cloud/aws/sqs/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/sqs/versions.tf +++ b/cloud/aws/sqs/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/aws/vpn/README.md b/cloud/aws/vpn/README.md index 302dc18..ec79422 100644 --- a/cloud/aws/vpn/README.md +++ b/cloud/aws/vpn/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/aws/vpn/monitors-vpn.tf b/cloud/aws/vpn/monitors-vpn.tf index 2d6e77c..728e846 100644 --- a/cloud/aws/vpn/monitors-vpn.tf +++ b/cloud/aws/vpn/monitors-vpn.tf @@ -21,9 +21,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:vpn", "team:claranet", "created-by:terraform"], var.vpn_status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/aws/vpn/versions.tf b/cloud/aws/vpn/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/aws/vpn/versions.tf +++ b/cloud/aws/vpn/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/apimanagement/README.md b/cloud/azure/apimanagement/README.md index 9cde1c9..5144325 100644 --- a/cloud/azure/apimanagement/README.md +++ b/cloud/azure/apimanagement/README.md @@ -27,7 +27,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf index 908e40c..fe4e060 100644 --- a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf +++ b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "apimgt_status" { ${var.status_time_aggregator}(${var.status_timeframe}):avg:azure.apimanagement_service.status${module.filter-tags.query_alert} by {resource_group,region,name} < 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 } @@ -24,10 +24,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:apimanagement", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "apimgt_failed_requests" { @@ -43,7 +39,7 @@ resource "datadog_monitor" "apimgt_failed_requests" { ) * 100 > ${var.failed_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.failed_requests_threshold_critical warning = var.failed_requests_threshold_warning } @@ -59,10 +55,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:apimanagement", "team:claranet", "created-by:terraform"], var.failed_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "apimgt_other_requests" { @@ -78,7 +70,7 @@ resource "datadog_monitor" "apimgt_other_requests" { ) * 100 > ${var.other_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.other_requests_threshold_critical warning = var.other_requests_threshold_warning } @@ -94,10 +86,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:apimanagement", "team:claranet", "created-by:terraform"], var.other_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "apimgt_unauthorized_requests" { @@ -113,7 +101,7 @@ resource "datadog_monitor" "apimgt_unauthorized_requests" { ) * 100 > ${var.unauthorized_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.unauthorized_requests_threshold_critical warning = var.unauthorized_requests_threshold_warning } @@ -129,10 +117,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:apimanagement", "team:claranet", "created-by:terraform"], var.unauthorized_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "apimgt_successful_requests" { @@ -150,7 +134,7 @@ resource "datadog_monitor" "apimgt_successful_requests" { , 100) < ${var.successful_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.successful_requests_threshold_critical warning = var.successful_requests_threshold_warning } @@ -166,9 +150,5 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:apimanagement", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/apimanagement/versions.tf b/cloud/azure/apimanagement/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/apimanagement/versions.tf +++ b/cloud/azure/apimanagement/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/app-gateway/README.md b/cloud/azure/app-gateway/README.md index 881ff04..a9f4f1b 100644 --- a/cloud/azure/app-gateway/README.md +++ b/cloud/azure/app-gateway/README.md @@ -31,7 +31,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/app-gateway/monitors-app-gateway.tf b/cloud/azure/app-gateway/monitors-app-gateway.tf index e4d9236..7680ac2 100644 --- a/cloud/azure/app-gateway/monitors-app-gateway.tf +++ b/cloud/azure/app-gateway/monitors-app-gateway.tf @@ -23,10 +23,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-gateway", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Gateway total_requests @@ -52,10 +48,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-gateway", "team:claranet", "created-by:terraform"], var.total_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Gateway backend_connect_time @@ -70,7 +62,7 @@ resource "datadog_monitor" "appgateway_backend_connect_time" { sum:azure.network_applicationgateways.backend_connect_time${module.filter-tags.query_alert} by {resource_group,region,name,backendhttpsetting,backendpool,backendserver} > ${var.appgateway_backend_connect_time_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.appgateway_backend_connect_time_threshold_critical warning = var.appgateway_backend_connect_time_threshold_warning } @@ -86,10 +78,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-gateway", "team:claranet", "created-by:terraform"], var.appgateway_backend_connect_time_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Gateway failed_requests @@ -106,7 +94,7 @@ resource "datadog_monitor" "appgateway_failed_requests" { * 100),0) > ${var.appgateway_failed_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.appgateway_failed_requests_threshold_critical warning = var.appgateway_failed_requests_threshold_warning } @@ -122,10 +110,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-gateway", "team:claranet", "created-by:terraform"], var.appgateway_failed_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Gateway unhealthy_host_ratio @@ -143,7 +127,7 @@ resource "datadog_monitor" "appgateway_healthy_host_ratio" { * 100 > ${var.appgateway_unhealthy_host_ratio_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.appgateway_unhealthy_host_ratio_threshold_critical warning = var.appgateway_unhealthy_host_ratio_threshold_warning } @@ -158,10 +142,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-gateway", "team:claranet", "created-by:terraform"], var.appgateway_unhealthy_host_ratio_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Gateway response_status 4xx @@ -179,7 +159,7 @@ resource "datadog_monitor" "appgateway_http_4xx_errors" { EOQ - thresholds = { + monitor_thresholds { warning = var.appgateway_http_4xx_errors_threshold_warning critical = var.appgateway_http_4xx_errors_threshold_critical } @@ -193,10 +173,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-gateway", "team:claranet", "created-by:terraform"], var.appgateway_http_4xx_errors_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Gateway response_status 5xx @@ -213,7 +189,7 @@ resource "datadog_monitor" "appgateway_http_5xx_errors" { * 100),0) > ${var.appgateway_http_5xx_errors_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.appgateway_http_5xx_errors_threshold_warning critical = var.appgateway_http_5xx_errors_threshold_critical } @@ -227,10 +203,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-gateway", "team:claranet", "created-by:terraform"], var.appgateway_http_5xx_errors_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Gateway Backend response_status 4xx @@ -248,7 +220,7 @@ resource "datadog_monitor" "appgateway_backend_http_4xx_errors" { EOQ - thresholds = { + monitor_thresholds { warning = var.appgateway_backend_http_4xx_errors_threshold_warning critical = var.appgateway_backend_http_4xx_errors_threshold_critical } @@ -262,10 +234,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-gateway", "team:claranet", "created-by:terraform"], var.appgateway_backend_http_4xx_errors_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Gateway Backend response_status 5xx @@ -282,7 +250,7 @@ resource "datadog_monitor" "appgateway_backend_http_5xx_errors" { * 100),0) > ${var.appgateway_backend_http_5xx_errors_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.appgateway_backend_http_5xx_errors_threshold_warning critical = var.appgateway_backend_http_5xx_errors_threshold_critical } @@ -296,8 +264,4 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-gateway", "team:claranet", "created-by:terraform"], var.appgateway_backend_http_5xx_errors_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/app-gateway/versions.tf b/cloud/azure/app-gateway/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/app-gateway/versions.tf +++ b/cloud/azure/app-gateway/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/app-services/README.md b/cloud/azure/app-services/README.md index 10f6a5f..f1aab0e 100644 --- a/cloud/azure/app-services/README.md +++ b/cloud/azure/app-services/README.md @@ -28,7 +28,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/app-services/monitors-app_services.tf b/cloud/azure/app-services/monitors-app_services.tf index e6a0872..319d203 100644 --- a/cloud/azure/app-services/monitors-app_services.tf +++ b/cloud/azure/app-services/monitors-app_services.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "appservices_response_time" { ) > ${var.response_time_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.response_time_threshold_warning critical = var.response_time_threshold_critical } @@ -25,10 +25,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-services", "team:claranet", "created-by:terraform"], var.response_time_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Services memory usage @@ -44,7 +40,7 @@ resource "datadog_monitor" "appservices_memory_usage_count" { ) > ${var.memory_usage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.memory_usage_threshold_warning critical = var.memory_usage_threshold_critical } @@ -58,10 +54,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-services", "team:claranet", "created-by:terraform"], var.memory_usage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Services 5xx errors percent @@ -78,7 +70,7 @@ resource "datadog_monitor" "appservices_http_5xx_errors_count" { ) * 100 > ${var.http_5xx_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.http_5xx_requests_threshold_warning critical = var.http_5xx_requests_threshold_critical } @@ -92,10 +84,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-services", "team:claranet", "created-by:terraform"], var.http_5xx_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Services 4xx errors percent @@ -112,7 +100,7 @@ resource "datadog_monitor" "appservices_http_4xx_errors_count" { ) * 100 > ${var.http_4xx_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.http_4xx_requests_threshold_warning critical = var.http_4xx_requests_threshold_critical } @@ -126,10 +114,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-services", "team:claranet", "created-by:terraform"], var.http_4xx_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Services HTTP 2xx & 3xx status pages percent @@ -148,7 +132,7 @@ resource "datadog_monitor" "appservices_http_success_status_rate" { ) * 100, 100) < ${var.http_successful_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.http_successful_requests_threshold_warning critical = var.http_successful_requests_threshold_critical } @@ -162,10 +146,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-services", "team:claranet", "created-by:terraform"], var.http_successful_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring App Services status @@ -179,7 +159,7 @@ resource "datadog_monitor" "appservices_status" { ${var.status_time_aggregator}(${var.status_timeframe}):avg:azure.app_services.status${module.filter-tags.query_alert} by {resource_group,region,name} < 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 } @@ -193,8 +173,5 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-services", "team:claranet", "created-by:terraform"], var.status_extra_tags) - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/app-services/versions.tf b/cloud/azure/app-services/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/app-services/versions.tf +++ b/cloud/azure/app-services/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/azure-search/README.md b/cloud/azure/azure-search/README.md index a3bd2c5..6d0cf32 100644 --- a/cloud/azure/azure-search/README.md +++ b/cloud/azure/azure-search/README.md @@ -24,7 +24,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/azure-search/monitors-azure-search.tf b/cloud/azure/azure-search/monitors-azure-search.tf index 07e5657..5788f48 100644 --- a/cloud/azure/azure-search/monitors-azure-search.tf +++ b/cloud/azure/azure-search/monitors-azure-search.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "azure_search_latency" { ) > ${var.latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.latency_threshold_warning critical = var.latency_threshold_critical } @@ -26,10 +26,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:azure-search", "team:claranet", "created-by:terraform"], var.latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # Monitoring Azure Search throttled queries @@ -45,7 +41,7 @@ resource "datadog_monitor" "azure_search_throttled_queries_rate" { ) > ${var.throttled_queries_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.throttled_queries_rate_threshold_warning critical = var.throttled_queries_rate_threshold_critical } @@ -59,9 +55,5 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:azure-search", "team:claranet", "created-by:terraform"], var.throttled_queries_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/azure-search/versions.tf b/cloud/azure/azure-search/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/azure-search/versions.tf +++ b/cloud/azure/azure-search/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/cosmosdb/README.md b/cloud/azure/cosmosdb/README.md index c337605..c545185 100644 --- a/cloud/azure/cosmosdb/README.md +++ b/cloud/azure/cosmosdb/README.md @@ -26,7 +26,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/cosmosdb/monitors-cosmosdb.tf b/cloud/azure/cosmosdb/monitors-cosmosdb.tf index f76f648..fee4748 100644 --- a/cloud/azure/cosmosdb/monitors-cosmosdb.tf +++ b/cloud/azure/cosmosdb/monitors-cosmosdb.tf @@ -10,7 +10,7 @@ resource "datadog_monitor" "cosmos_db_status" { < 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 } @@ -26,10 +26,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:cosmos_db", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "cosmos_db_4xx_requests" { @@ -55,7 +51,7 @@ resource "datadog_monitor" "cosmos_db_4xx_requests" { , 0) * 100 > ${var.cosmos_db_4xx_request_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.cosmos_db_4xx_request_rate_threshold_critical warning = var.cosmos_db_4xx_request_rate_threshold_warning } @@ -71,10 +67,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:cosmos_db", "team:claranet", "created-by:terraform"], var.cosmos_db_4xx_request_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "cosmos_db_5xx_requests" { @@ -91,7 +83,7 @@ resource "datadog_monitor" "cosmos_db_5xx_requests" { , 0) * 100 > ${var.cosmos_db_5xx_request_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.cosmos_db_5xx_request_rate_threshold_critical warning = var.cosmos_db_5xx_request_rate_threshold_warning } @@ -107,10 +99,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:cosmos_db", "team:claranet", "created-by:terraform"], var.cosmos_db_5xx_request_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "cosmos_db_scaling" { @@ -127,7 +115,7 @@ resource "datadog_monitor" "cosmos_db_scaling" { , 0) * 100 > ${var.cosmos_db_scaling_error_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.cosmos_db_scaling_error_rate_threshold_critical warning = var.cosmos_db_scaling_error_rate_threshold_warning } @@ -143,9 +131,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:cosmos_db", "team:claranet", "created-by:terraform"], var.cosmos_db_scaling_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/cosmosdb/versions.tf b/cloud/azure/cosmosdb/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/cosmosdb/versions.tf +++ b/cloud/azure/cosmosdb/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/datalakestore/README.md b/cloud/azure/datalakestore/README.md index 9d7fa6d..e321f1f 100644 --- a/cloud/azure/datalakestore/README.md +++ b/cloud/azure/datalakestore/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/datalakestore/monitors-datalakestore.tf b/cloud/azure/datalakestore/monitors-datalakestore.tf index 4aa0496..0d8fa42 100644 --- a/cloud/azure/datalakestore/monitors-datalakestore.tf +++ b/cloud/azure/datalakestore/monitors-datalakestore.tf @@ -22,9 +22,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:datalakestore", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/datalakestore/versions.tf b/cloud/azure/datalakestore/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/datalakestore/versions.tf +++ b/cloud/azure/datalakestore/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/eventgrid/README.md b/cloud/azure/eventgrid/README.md index 5ae8b0b..5b0ee4d 100644 --- a/cloud/azure/eventgrid/README.md +++ b/cloud/azure/eventgrid/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/eventgrid/monitors-eventgrid.tf b/cloud/azure/eventgrid/monitors-eventgrid.tf index f4379c7..efe5402 100644 --- a/cloud/azure/eventgrid/monitors-eventgrid.tf +++ b/cloud/azure/eventgrid/monitors-eventgrid.tf @@ -22,10 +22,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:eventgrid", "team:claranet", "created-by:terraform"], var.no_successful_message_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "eventgrid_failed_messages" { @@ -44,7 +40,7 @@ resource "datadog_monitor" "eventgrid_failed_messages" { ) > ${var.failed_messages_rate_thresold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.failed_messages_rate_thresold_critical warning = var.failed_messages_rate_thresold_warning } @@ -60,10 +56,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:eventgrid", "team:claranet", "created-by:terraform"], var.failed_messages_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "eventgrid_unmatched_events" { @@ -82,7 +74,7 @@ resource "datadog_monitor" "eventgrid_unmatched_events" { ) > ${var.unmatched_events_rate_thresold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.unmatched_events_rate_thresold_critical warning = var.unmatched_events_rate_thresold_warning } @@ -98,9 +90,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:eventgrid", "team:claranet", "created-by:terraform"], var.unmatched_events_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/eventgrid/versions.tf b/cloud/azure/eventgrid/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/eventgrid/versions.tf +++ b/cloud/azure/eventgrid/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/eventhub/README.md b/cloud/azure/eventhub/README.md index d2063aa..682fa3b 100644 --- a/cloud/azure/eventhub/README.md +++ b/cloud/azure/eventhub/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/eventhub/monitors-eventhub.tf b/cloud/azure/eventhub/monitors-eventhub.tf index 293fa2c..caa6321 100644 --- a/cloud/azure/eventhub/monitors-eventhub.tf +++ b/cloud/azure/eventhub/monitors-eventhub.tf @@ -22,10 +22,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:eventhub", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "eventhub_failed_requests" { @@ -41,7 +37,7 @@ resource "datadog_monitor" "eventhub_failed_requests" { ) * 100 > ${var.failed_requests_rate_thresold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.failed_requests_rate_thresold_critical warning = var.failed_requests_rate_thresold_warning } @@ -57,10 +53,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:eventhub", "team:claranet", "created-by:terraform"], var.failed_requests_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "eventhub_errors" { @@ -78,7 +70,7 @@ resource "datadog_monitor" "eventhub_errors" { ) * 100 > ${var.errors_rate_thresold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.errors_rate_thresold_critical warning = var.errors_rate_thresold_warning } @@ -94,9 +86,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:eventhub", "team:claranet", "created-by:terraform"], var.errors_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/eventhub/versions.tf b/cloud/azure/eventhub/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/eventhub/versions.tf +++ b/cloud/azure/eventhub/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/functions/README.md b/cloud/azure/functions/README.md index c7afd83..62c6aca 100644 --- a/cloud/azure/functions/README.md +++ b/cloud/azure/functions/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/functions/monitors-functions.tf b/cloud/azure/functions/monitors-functions.tf index 651cec8..f54aa18 100644 --- a/cloud/azure/functions/monitors-functions.tf +++ b/cloud/azure/functions/monitors-functions.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "function_http_5xx_errors_rate" { , 0) * 100 > ${var.http_5xx_errors_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.http_5xx_errors_rate_threshold_warning critical = var.http_5xx_errors_rate_threshold_critical } @@ -25,10 +25,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:azure_functions", "team:claranet", "created-by:terraform"], var.http_5xx_errors_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "function_high_connections_count" { @@ -43,7 +39,7 @@ resource "datadog_monitor" "function_high_connections_count" { > ${var.high_connections_count_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.high_connections_count_threshold_warning critical = var.high_connections_count_threshold_critical } @@ -57,10 +53,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:azure_functions", "team:claranet", "created-by:terraform"], var.high_connections_count_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "function_high_threads_count" { @@ -75,7 +67,7 @@ resource "datadog_monitor" "function_high_threads_count" { > ${var.high_threads_count_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.high_threads_count_threshold_warning critical = var.high_threads_count_threshold_critical } @@ -89,9 +81,5 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:azure_functions", "team:claranet", "created-by:terraform"], var.high_threads_count_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/functions/versions.tf b/cloud/azure/functions/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/functions/versions.tf +++ b/cloud/azure/functions/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/iothubs/README.md b/cloud/azure/iothubs/README.md index a5ca014..9557a9f 100644 --- a/cloud/azure/iothubs/README.md +++ b/cloud/azure/iothubs/README.md @@ -36,7 +36,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/iothubs/monitors-iothubs.tf b/cloud/azure/iothubs/monitors-iothubs.tf index 9c6a255..a104616 100644 --- a/cloud/azure/iothubs/monitors-iothubs.tf +++ b/cloud/azure/iothubs/monitors-iothubs.tf @@ -13,7 +13,7 @@ resource "datadog_monitor" "too_many_jobs_failed" { * 100 , 0) > ${var.failed_jobs_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.failed_jobs_rate_threshold_warning critical = var.failed_jobs_rate_threshold_critical } @@ -29,10 +29,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.failed_jobs_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "too_many_list_jobs_failed" { @@ -50,7 +46,7 @@ resource "datadog_monitor" "too_many_list_jobs_failed" { * 100, 0) > ${var.failed_listjobs_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.failed_listjobs_rate_threshold_warning critical = var.failed_listjobs_rate_threshold_critical } @@ -66,10 +62,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.failed_listjobs_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "too_many_query_jobs_failed" { @@ -87,7 +79,7 @@ resource "datadog_monitor" "too_many_query_jobs_failed" { * 100, 0) > ${var.failed_queryjobs_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.failed_queryjobs_rate_threshold_warning critical = var.failed_queryjobs_rate_threshold_critical } @@ -103,10 +95,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.failed_queryjobs_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "status" { @@ -133,10 +121,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "total_devices" { @@ -162,10 +146,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.total_devices_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "too_many_c2d_methods_failed" { @@ -183,7 +163,7 @@ resource "datadog_monitor" "too_many_c2d_methods_failed" { * 100, 0) > ${var.failed_c2d_methods_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.failed_c2d_methods_rate_threshold_warning critical = var.failed_c2d_methods_rate_threshold_critical } @@ -199,10 +179,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.failed_c2d_methods_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "too_many_c2d_twin_read_failed" { @@ -220,7 +196,7 @@ resource "datadog_monitor" "too_many_c2d_twin_read_failed" { * 100, 0) > ${var.failed_c2d_twin_read_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.failed_c2d_twin_read_rate_threshold_warning critical = var.failed_c2d_twin_read_rate_threshold_critical } @@ -236,10 +212,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.failed_c2d_twin_read_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "too_many_c2d_twin_update_failed" { @@ -257,7 +229,7 @@ resource "datadog_monitor" "too_many_c2d_twin_update_failed" { * 100, 0) > ${var.failed_c2d_twin_update_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.failed_c2d_twin_update_rate_threshold_warning critical = var.failed_c2d_twin_update_rate_threshold_critical } @@ -273,10 +245,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.failed_c2d_twin_update_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "too_many_d2c_twin_read_failed" { @@ -294,7 +262,7 @@ resource "datadog_monitor" "too_many_d2c_twin_read_failed" { * 100, 0) > ${var.failed_d2c_twin_read_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.failed_d2c_twin_read_rate_threshold_warning critical = var.failed_d2c_twin_read_rate_threshold_critical } @@ -310,10 +278,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.failed_d2c_twin_read_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "too_many_d2c_twin_update_failed" { @@ -331,7 +295,7 @@ resource "datadog_monitor" "too_many_d2c_twin_update_failed" { * 100, 0) > ${var.failed_d2c_twin_update_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.failed_d2c_twin_update_rate_threshold_warning critical = var.failed_d2c_twin_update_rate_threshold_critical } @@ -347,10 +311,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.failed_d2c_twin_update_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "too_many_d2c_telemetry_egress_dropped" { @@ -370,7 +330,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_dropped" { * 100, 0) > ${var.dropped_d2c_telemetry_egress_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.dropped_d2c_telemetry_egress_rate_threshold_warning critical = var.dropped_d2c_telemetry_egress_rate_threshold_critical } @@ -386,10 +346,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.dropped_d2c_telemetry_egress_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "too_many_d2c_telemetry_egress_orphaned" { @@ -409,7 +365,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_orphaned" { * 100, 0) > ${var.orphaned_d2c_telemetry_egress_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.orphaned_d2c_telemetry_egress_rate_threshold_warning critical = var.orphaned_d2c_telemetry_egress_rate_threshold_critical } @@ -425,10 +381,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.orphaned_d2c_telemetry_egress_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "too_many_d2c_telemetry_egress_invalid" { @@ -448,7 +400,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_invalid" { * 100, 0) > ${var.invalid_d2c_telemetry_egress_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.invalid_d2c_telemetry_egress_rate_threshold_warning critical = var.invalid_d2c_telemetry_egress_rate_threshold_critical } @@ -464,10 +416,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.invalid_d2c_telemetry_egress_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "too_many_d2c_telemetry_ingress_nosent" { @@ -484,7 +432,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_ingress_nosent" { * 100) > ${var.too_many_d2c_telemetry_ingress_nosent_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.too_many_d2c_telemetry_ingress_nosent_rate_threshold_warning critical = var.too_many_d2c_telemetry_ingress_nosent_rate_threshold_critical } @@ -500,8 +448,4 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"], var.too_many_d2c_telemetry_ingress_nosent_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/iothubs/versions.tf b/cloud/azure/iothubs/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/iothubs/versions.tf +++ b/cloud/azure/iothubs/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/keyvault/README.md b/cloud/azure/keyvault/README.md index dfe8636..186b8b9 100644 --- a/cloud/azure/keyvault/README.md +++ b/cloud/azure/keyvault/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/keyvault/monitors-keyvault.tf b/cloud/azure/keyvault/monitors-keyvault.tf index 90692f1..85fb14b 100644 --- a/cloud/azure/keyvault/monitors-keyvault.tf +++ b/cloud/azure/keyvault/monitors-keyvault.tf @@ -22,10 +22,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:keyvault", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "keyvault_api_result" { @@ -43,7 +39,7 @@ resource "datadog_monitor" "keyvault_api_result" { , 100) < ${var.api_result_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.api_result_threshold_critical warning = var.api_result_threshold_warning } @@ -59,10 +55,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:keyvault", "team:claranet", "created-by:terraform"], var.api_result_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "keyvault_api_latency" { @@ -77,7 +69,7 @@ resource "datadog_monitor" "keyvault_api_latency" { > ${var.api_latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.api_latency_threshold_critical warning = var.api_latency_threshold_warning } @@ -93,9 +85,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:keyvault", "team:claranet", "created-by:terraform"], var.api_latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/keyvault/versions.tf b/cloud/azure/keyvault/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/keyvault/versions.tf +++ b/cloud/azure/keyvault/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/load-balancer/README.md b/cloud/azure/load-balancer/README.md index b66ab28..db57b99 100644 --- a/cloud/azure/load-balancer/README.md +++ b/cloud/azure/load-balancer/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/load-balancer/monitors-load-balancer.tf b/cloud/azure/load-balancer/monitors-load-balancer.tf index 4f9a844..3ffdf53 100644 --- a/cloud/azure/load-balancer/monitors-load-balancer.tf +++ b/cloud/azure/load-balancer/monitors-load-balancer.tf @@ -22,9 +22,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:load-balancer", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/load-balancer/versions.tf b/cloud/azure/load-balancer/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/load-balancer/versions.tf +++ b/cloud/azure/load-balancer/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/mysql/README.md b/cloud/azure/mysql/README.md index 04f2226..419f29d 100644 --- a/cloud/azure/mysql/README.md +++ b/cloud/azure/mysql/README.md @@ -26,7 +26,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/mysql/monitors-mysql.tf b/cloud/azure/mysql/monitors-mysql.tf index 3bcdc13..6e24841 100644 --- a/cloud/azure/mysql/monitors-mysql.tf +++ b/cloud/azure/mysql/monitors-mysql.tf @@ -10,7 +10,7 @@ resource "datadog_monitor" "mysql_cpu_usage" { ) > ${var.cpu_usage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.cpu_usage_threshold_critical warning = var.cpu_usage_threshold_warning } @@ -26,10 +26,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:mysql", "team:claranet", "created-by:terraform"], var.cpu_usage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_free_storage" { @@ -44,7 +40,7 @@ resource "datadog_monitor" "mysql_free_storage" { ) < ${var.free_storage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.free_storage_threshold_critical warning = var.free_storage_threshold_warning } @@ -60,10 +56,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:mysql", "team:claranet", "created-by:terraform"], var.free_storage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_io_consumption" { @@ -78,7 +70,7 @@ resource "datadog_monitor" "mysql_io_consumption" { ) > ${var.io_consumption_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.io_consumption_threshold_critical warning = var.io_consumption_threshold_warning } @@ -94,10 +86,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:mysql", "team:claranet", "created-by:terraform"], var.io_consumption_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_memory_usage" { @@ -112,7 +100,7 @@ resource "datadog_monitor" "mysql_memory_usage" { ) > ${var.memory_usage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.memory_usage_threshold_critical warning = var.memory_usage_threshold_warning } @@ -128,9 +116,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:mysql", "team:claranet", "created-by:terraform"], var.memory_usage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/mysql/versions.tf b/cloud/azure/mysql/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/mysql/versions.tf +++ b/cloud/azure/mysql/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/postgresql/README.md b/cloud/azure/postgresql/README.md index f8e413a..0620e6b 100644 --- a/cloud/azure/postgresql/README.md +++ b/cloud/azure/postgresql/README.md @@ -27,7 +27,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/postgresql/monitors-postegresql.tf b/cloud/azure/postgresql/monitors-postegresql.tf index a24827d..3e96e23 100644 --- a/cloud/azure/postgresql/monitors-postegresql.tf +++ b/cloud/azure/postgresql/monitors-postegresql.tf @@ -10,7 +10,7 @@ resource "datadog_monitor" "postgresql_cpu_usage" { ) > ${var.cpu_usage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.cpu_usage_threshold_critical warning = var.cpu_usage_threshold_warning } @@ -26,10 +26,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:postgresql", "team:claranet", "created-by:terraform"], var.cpu_usage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "postgresql_no_connection" { @@ -56,10 +52,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:postgresql", "team:claranet", "created-by:terraform"], var.no_connection_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "postgresql_free_storage" { @@ -74,7 +66,7 @@ resource "datadog_monitor" "postgresql_free_storage" { ) < ${var.free_storage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.free_storage_threshold_critical warning = var.free_storage_threshold_warning } @@ -90,10 +82,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:postgresql", "team:claranet", "created-by:terraform"], var.free_storage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "postgresql_io_consumption" { @@ -108,7 +96,7 @@ resource "datadog_monitor" "postgresql_io_consumption" { ) > ${var.io_consumption_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.io_consumption_threshold_critical warning = var.io_consumption_threshold_warning } @@ -124,10 +112,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:postgresql", "team:claranet", "created-by:terraform"], var.io_consumption_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "postgresql_memory_usage" { @@ -142,7 +126,7 @@ resource "datadog_monitor" "postgresql_memory_usage" { ) > ${var.memory_usage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.memory_usage_threshold_critical warning = var.memory_usage_threshold_warning } @@ -158,9 +142,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:postgresql", "team:claranet", "created-by:terraform"], var.memory_usage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/postgresql/versions.tf b/cloud/azure/postgresql/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/postgresql/versions.tf +++ b/cloud/azure/postgresql/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/redis/README.md b/cloud/azure/redis/README.md index 73dd38d..c4cf476 100644 --- a/cloud/azure/redis/README.md +++ b/cloud/azure/redis/README.md @@ -26,7 +26,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/redis/monitors-azure-redis.tf b/cloud/azure/redis/monitors-azure-redis.tf index 1349a67..bf6c5ea 100644 --- a/cloud/azure/redis/monitors-azure-redis.tf +++ b/cloud/azure/redis/monitors-azure-redis.tf @@ -22,10 +22,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:redis", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "evictedkeys" { @@ -40,7 +36,7 @@ resource "datadog_monitor" "evictedkeys" { ) > ${var.evictedkeys_limit_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.evictedkeys_limit_threshold_warning critical = var.evictedkeys_limit_threshold_critical } @@ -56,10 +52,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:redis", "team:claranet", "created-by:terraform"], var.evictedkeys_limit_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "percent_processor_time" { @@ -74,7 +66,7 @@ resource "datadog_monitor" "percent_processor_time" { ) > ${var.percent_processor_time_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.percent_processor_time_threshold_warning critical = var.percent_processor_time_threshold_critical } @@ -90,10 +82,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:redis", "team:claranet", "created-by:terraform"], var.percent_processor_time_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "server_load" { @@ -108,7 +96,7 @@ resource "datadog_monitor" "server_load" { ) > ${var.server_load_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.server_load_rate_threshold_warning critical = var.server_load_rate_threshold_critical } @@ -124,9 +112,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:redis", "team:claranet", "created-by:terraform"], var.server_load_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/redis/versions.tf b/cloud/azure/redis/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/redis/versions.tf +++ b/cloud/azure/redis/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/serverfarms/README.md b/cloud/azure/serverfarms/README.md index 0ce78aa..0f1c703 100644 --- a/cloud/azure/serverfarms/README.md +++ b/cloud/azure/serverfarms/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/serverfarms/monitors-azure-serverfarms.tf b/cloud/azure/serverfarms/monitors-azure-serverfarms.tf index ba474df..3e56420 100644 --- a/cloud/azure/serverfarms/monitors-azure-serverfarms.tf +++ b/cloud/azure/serverfarms/monitors-azure-serverfarms.tf @@ -22,10 +22,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:serverfarms", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "cpu_percentage" { @@ -40,7 +36,7 @@ resource "datadog_monitor" "cpu_percentage" { ) > ${var.cpu_percentage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cpu_percentage_threshold_warning critical = var.cpu_percentage_threshold_critical } @@ -56,10 +52,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:serverfarms", "team:claranet", "created-by:terraform"], var.cpu_percentage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "memory_percentage" { @@ -74,7 +66,7 @@ resource "datadog_monitor" "memory_percentage" { ) > ${var.memory_percentage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.memory_percentage_threshold_warning critical = var.memory_percentage_threshold_critical } @@ -90,9 +82,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:serverfarms", "team:claranet", "created-by:terraform"], var.memory_percentage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/serverfarms/versions.tf b/cloud/azure/serverfarms/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/serverfarms/versions.tf +++ b/cloud/azure/serverfarms/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/servicebus/README.md b/cloud/azure/servicebus/README.md index f76eed5..88ecc3b 100644 --- a/cloud/azure/servicebus/README.md +++ b/cloud/azure/servicebus/README.md @@ -26,7 +26,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/servicebus/monitors-service-bus.tf b/cloud/azure/servicebus/monitors-service-bus.tf index 0161a01..4443ee7 100644 --- a/cloud/azure/servicebus/monitors-service-bus.tf +++ b/cloud/azure/servicebus/monitors-service-bus.tf @@ -22,10 +22,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:servicebus", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "service_bus_no_active_connections" { @@ -51,10 +47,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:servicebus", "team:claranet", "created-by:terraform"], var.no_active_connections_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "service_bus_user_errors" { @@ -70,7 +62,7 @@ resource "datadog_monitor" "service_bus_user_errors" { ) * 100 > ${var.user_errors_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.user_errors_threshold_critical warning = var.user_errors_threshold_warning } @@ -86,10 +78,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:servicebus", "team:claranet", "created-by:terraform"], var.user_errors_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "service_bus_server_errors" { @@ -105,7 +93,7 @@ resource "datadog_monitor" "service_bus_server_errors" { ) * 100 > ${var.server_errors_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.server_errors_threshold_critical warning = var.server_errors_threshold_warning } @@ -121,9 +109,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:servicebus", "team:claranet", "created-by:terraform"], var.server_errors_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/servicebus/versions.tf b/cloud/azure/servicebus/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/servicebus/versions.tf +++ b/cloud/azure/servicebus/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/sql-database/README.md b/cloud/azure/sql-database/README.md index c597b17..6785f78 100644 --- a/cloud/azure/sql-database/README.md +++ b/cloud/azure/sql-database/README.md @@ -27,7 +27,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/sql-database/monitors-sql-database.tf b/cloud/azure/sql-database/monitors-sql-database.tf index 4895690..f608ef0 100644 --- a/cloud/azure/sql-database/monitors-sql-database.tf +++ b/cloud/azure/sql-database/monitors-sql-database.tf @@ -22,10 +22,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-database", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "sql-database_cpu" { @@ -40,7 +36,7 @@ resource "datadog_monitor" "sql-database_cpu" { ) > ${var.cpu_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.cpu_threshold_critical warning = var.cpu_threshold_warning } @@ -56,10 +52,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-database", "team:claranet", "created-by:terraform"], var.cpu_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "sql-database_free_space_low" { @@ -74,7 +66,7 @@ resource "datadog_monitor" "sql-database_free_space_low" { ) > ${var.diskspace_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.diskspace_threshold_warning critical = var.diskspace_threshold_critical } @@ -90,10 +82,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-database", "team:claranet", "created-by:terraform"], var.diskspace_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "sql-database_dtu_consumption_high" { @@ -108,7 +96,7 @@ resource "datadog_monitor" "sql-database_dtu_consumption_high" { ) > ${var.dtu_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.dtu_threshold_warning critical = var.dtu_threshold_critical } @@ -124,10 +112,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-database", "team:claranet", "created-by:terraform"], var.dtu_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "sql-database_deadlocks_count" { @@ -142,7 +126,7 @@ resource "datadog_monitor" "sql-database_deadlocks_count" { ) > ${var.deadlock_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.deadlock_threshold_critical } @@ -157,9 +141,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-database", "team:claranet", "created-by:terraform"], var.deadlock_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/sql-database/versions.tf b/cloud/azure/sql-database/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/sql-database/versions.tf +++ b/cloud/azure/sql-database/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/sql-elasticpool/README.md b/cloud/azure/sql-elasticpool/README.md index 211ddc1..2f5ca46 100644 --- a/cloud/azure/sql-elasticpool/README.md +++ b/cloud/azure/sql-elasticpool/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf b/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf index 78cec3e..c65a1a1 100644 --- a/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf +++ b/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf @@ -10,7 +10,7 @@ resource "datadog_monitor" "sql_elasticpool_cpu" { ) > ${var.cpu_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.cpu_threshold_critical warning = var.cpu_threshold_warning } @@ -27,10 +27,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-elasticpool", "team:claranet", "created-by:terraform"], var.cpu_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "sql_elasticpool_free_space_low" { @@ -45,7 +41,7 @@ resource "datadog_monitor" "sql_elasticpool_free_space_low" { ) > ${var.diskspace_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.diskspace_threshold_warning critical = var.diskspace_threshold_critical } @@ -61,10 +57,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-elasticpool", "team:claranet", "created-by:terraform"], var.diskspace_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "sql_elasticpool_dtu_consumption_high" { @@ -79,7 +71,7 @@ resource "datadog_monitor" "sql_elasticpool_dtu_consumption_high" { ) > ${var.dtu_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.dtu_threshold_warning critical = var.dtu_threshold_critical } @@ -95,9 +87,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-elasticpool", "team:claranet", "created-by:terraform"], var.dtu_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/sql-elasticpool/versions.tf b/cloud/azure/sql-elasticpool/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/sql-elasticpool/versions.tf +++ b/cloud/azure/sql-elasticpool/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/storage/README.md b/cloud/azure/storage/README.md index c3d6ad9..efed117 100644 --- a/cloud/azure/storage/README.md +++ b/cloud/azure/storage/README.md @@ -55,7 +55,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf index 173d7b5..ee6d57e 100644 --- a/cloud/azure/storage/monitors-azure-storage.tf +++ b/cloud/azure/storage/monitors-azure-storage.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "storage_status" { EOQ - thresholds = { + monitor_thresholds { critical = 1 } @@ -26,10 +26,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } @@ -46,7 +42,7 @@ resource "datadog_monitor" "blobservices_requests_error" { EOQ - thresholds = { + monitor_thresholds { critical = var.successful_storage_requests_threshold_critical warning = var.successful_storage_requests_threshold_warning } @@ -65,10 +61,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "fileservices_requests_error" { @@ -83,7 +75,7 @@ resource "datadog_monitor" "fileservices_requests_error" { EOQ - thresholds = { + monitor_thresholds { critical = var.successful_storage_requests_threshold_critical warning = var.successful_storage_requests_threshold_warning } @@ -102,10 +94,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "queueservices_requests_error" { @@ -121,7 +109,7 @@ resource "datadog_monitor" "queueservices_requests_error" { EOQ - thresholds = { + monitor_thresholds { critical = var.successful_storage_requests_threshold_critical warning = var.successful_storage_requests_threshold_warning } @@ -140,10 +128,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "tableservices_requests_error" { @@ -159,7 +143,7 @@ resource "datadog_monitor" "tableservices_requests_error" { EOQ - thresholds = { + monitor_thresholds { critical = var.successful_storage_requests_threshold_critical warning = var.successful_storage_requests_threshold_warning } @@ -178,10 +162,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "blobservices_latency" { @@ -196,7 +176,7 @@ resource "datadog_monitor" "blobservices_latency" { EOQ - thresholds = { + monitor_thresholds { critical = var.latency_threshold_critical warning = var.latency_threshold_warning } @@ -215,10 +195,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "fileservices_latency" { @@ -233,7 +209,7 @@ resource "datadog_monitor" "fileservices_latency" { EOQ - thresholds = { + monitor_thresholds { critical = var.latency_threshold_critical warning = var.latency_threshold_warning } @@ -251,12 +227,8 @@ EOQ evaluation_delay = var.evaluation_delay renotify_interval = 0 - lifecycle { - ignore_changes = [silenced] - } tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.latency_extra_tags) -} resource "datadog_monitor" "queueservices_latency" { count = var.latency_enabled == "true" ? 1 : 0 @@ -270,7 +242,7 @@ resource "datadog_monitor" "queueservices_latency" { EOQ - thresholds = { + monitor_thresholds { critical = var.latency_threshold_critical warning = var.latency_threshold_warning } @@ -288,12 +260,8 @@ EOQ evaluation_delay = var.evaluation_delay renotify_interval = 0 - lifecycle { - ignore_changes = [silenced] - } tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.latency_extra_tags) -} resource "datadog_monitor" "tableservices_latency" { count = var.latency_enabled == "true" ? 1 : 0 @@ -307,7 +275,7 @@ resource "datadog_monitor" "tableservices_latency" { EOQ - thresholds = { + monitor_thresholds { critical = var.latency_threshold_critical warning = var.latency_threshold_warning } @@ -325,12 +293,8 @@ EOQ evaluation_delay = var.evaluation_delay renotify_interval = 0 - lifecycle { - ignore_changes = [silenced] - } tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.latency_extra_tags) -} resource "datadog_monitor" "blob_timeout_error_requests" { count = var.timeout_error_requests_enabled == "true" ? 1 : 0 @@ -344,7 +308,7 @@ resource "datadog_monitor" "blob_timeout_error_requests" { * 100),0) > ${var.timeout_error_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.timeout_error_requests_threshold_critical warning = var.timeout_error_requests_threshold_warning } @@ -363,10 +327,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "file_timeout_error_requests" { @@ -381,7 +341,7 @@ resource "datadog_monitor" "file_timeout_error_requests" { * 100),0) > ${var.timeout_error_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.timeout_error_requests_threshold_critical warning = var.timeout_error_requests_threshold_warning } @@ -400,10 +360,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "queue_timeout_error_requests" { @@ -419,7 +375,7 @@ resource "datadog_monitor" "queue_timeout_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.timeout_error_requests_threshold_critical warning = var.timeout_error_requests_threshold_warning } @@ -438,10 +394,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "table_timeout_error_requests" { @@ -457,7 +409,7 @@ resource "datadog_monitor" "table_timeout_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.timeout_error_requests_threshold_critical warning = var.timeout_error_requests_threshold_warning } @@ -476,10 +428,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "blob_network_error_requests" { @@ -495,7 +443,7 @@ resource "datadog_monitor" "blob_network_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.network_error_requests_threshold_critical warning = var.network_error_requests_threshold_warning } @@ -514,10 +462,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.network_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "file_network_error_requests" { @@ -533,7 +477,7 @@ resource "datadog_monitor" "file_network_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.network_error_requests_threshold_critical warning = var.network_error_requests_threshold_warning } @@ -552,10 +496,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.network_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "queue_network_error_requests" { @@ -571,7 +511,7 @@ resource "datadog_monitor" "queue_network_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.network_error_requests_threshold_critical warning = var.network_error_requests_threshold_warning } @@ -589,12 +529,8 @@ EOQ evaluation_delay = var.evaluation_delay renotify_interval = 0 - lifecycle { - ignore_changes = [silenced] - } tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.network_error_requests_extra_tags) -} resource "datadog_monitor" "table_network_error_requests" { count = var.network_error_requests_enabled == "true" ? 1 : 0 @@ -609,7 +545,7 @@ resource "datadog_monitor" "table_network_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.network_error_requests_threshold_critical warning = var.network_error_requests_threshold_warning } @@ -628,10 +564,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.network_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "blob_throttling_error_requests" { @@ -647,7 +579,7 @@ resource "datadog_monitor" "blob_throttling_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.throttling_error_requests_threshold_critical warning = var.throttling_error_requests_threshold_warning } @@ -665,12 +597,8 @@ EOQ evaluation_delay = var.evaluation_delay renotify_interval = 0 - lifecycle { - ignore_changes = [silenced] - } tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.throttling_error_requests_extra_tags) -} resource "datadog_monitor" "file_throttling_error_requests" { count = var.throttling_error_requests_enabled == "true" ? 1 : 0 @@ -685,7 +613,7 @@ resource "datadog_monitor" "file_throttling_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.throttling_error_requests_threshold_critical warning = var.throttling_error_requests_threshold_warning } @@ -704,7 +632,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.throttling_error_requests_extra_tags) -} resource "datadog_monitor" "queue_throttling_error_requests" { count = var.throttling_error_requests_enabled == "true" ? 1 : 0 @@ -719,7 +646,7 @@ resource "datadog_monitor" "queue_throttling_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.throttling_error_requests_threshold_critical warning = var.throttling_error_requests_threshold_warning } @@ -738,10 +665,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.throttling_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "table_throttling_error_requests" { @@ -757,7 +680,7 @@ resource "datadog_monitor" "table_throttling_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.throttling_error_requests_threshold_critical warning = var.throttling_error_requests_threshold_warning } @@ -776,10 +699,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.throttling_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } @@ -797,7 +716,7 @@ resource "datadog_monitor" "blob_server_other_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.server_other_error_requests_threshold_critical warning = var.server_other_error_requests_threshold_warning } @@ -816,10 +735,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.server_other_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "file_server_other_error_requests" { @@ -835,7 +750,7 @@ resource "datadog_monitor" "file_server_other_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.server_other_error_requests_threshold_critical warning = var.server_other_error_requests_threshold_warning } @@ -854,10 +769,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.server_other_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "queue_server_other_error_requests" { @@ -873,7 +784,7 @@ resource "datadog_monitor" "queue_server_other_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.server_other_error_requests_threshold_critical warning = var.server_other_error_requests_threshold_warning } @@ -891,12 +802,8 @@ EOQ evaluation_delay = var.evaluation_delay renotify_interval = 0 - lifecycle { - ignore_changes = [silenced] - } tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.server_other_error_requests_extra_tags) -} resource "datadog_monitor" "table_server_other_error_requests" { count = var.server_other_error_requests_enabled == "true" ? 1 : 0 @@ -911,7 +818,7 @@ resource "datadog_monitor" "table_server_other_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.server_other_error_requests_threshold_critical warning = var.server_other_error_requests_threshold_warning } @@ -930,10 +837,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.server_other_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "blob_client_other_error_requests" { @@ -948,7 +851,7 @@ resource "datadog_monitor" "blob_client_other_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.client_other_error_requests_threshold_critical warning = var.client_other_error_requests_threshold_warning } @@ -967,10 +870,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.client_other_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "file_client_other_error_requests" { @@ -986,7 +885,7 @@ resource "datadog_monitor" "file_client_other_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.client_other_error_requests_threshold_critical warning = var.client_other_error_requests_threshold_warning } @@ -1005,10 +904,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.client_other_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "queue_client_other_error_requests" { @@ -1024,7 +919,7 @@ resource "datadog_monitor" "queue_client_other_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.client_other_error_requests_threshold_critical warning = var.client_other_error_requests_threshold_warning } @@ -1042,12 +937,8 @@ EOQ evaluation_delay = var.evaluation_delay renotify_interval = 0 - lifecycle { - ignore_changes = [silenced] - } tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.client_other_error_requests_extra_tags) -} resource "datadog_monitor" "table_client_other_error_requests" { count = var.client_other_error_requests_enabled == "true" ? 1 : 0 @@ -1062,7 +953,7 @@ resource "datadog_monitor" "table_client_other_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.client_other_error_requests_threshold_critical warning = var.client_other_error_requests_threshold_warning } @@ -1081,10 +972,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.client_other_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "blob_authorization_error_requests" { @@ -1100,7 +987,7 @@ resource "datadog_monitor" "blob_authorization_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.authorization_error_requests_threshold_critical warning = var.authorization_error_requests_threshold_warning } @@ -1119,10 +1006,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.authorization_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "file_authorization_error_requests" { @@ -1138,7 +1021,7 @@ resource "datadog_monitor" "file_authorization_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.authorization_error_requests_threshold_critical warning = var.authorization_error_requests_threshold_warning } @@ -1156,12 +1039,8 @@ EOQ evaluation_delay = var.evaluation_delay renotify_interval = 0 - lifecycle { - ignore_changes = [silenced] - } tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.authorization_error_requests_extra_tags) -} resource "datadog_monitor" "queue_authorization_error_requests" { count = var.authorization_error_requests_enabled == "true" ? 1 : 0 @@ -1176,7 +1055,7 @@ resource "datadog_monitor" "queue_authorization_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.authorization_error_requests_threshold_critical warning = var.authorization_error_requests_threshold_warning } @@ -1195,10 +1074,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.authorization_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "table_authorization_error_requests" { @@ -1214,7 +1089,7 @@ resource "datadog_monitor" "table_authorization_error_requests" { EOQ - thresholds = { + monitor_thresholds { critical = var.authorization_error_requests_threshold_critical warning = var.authorization_error_requests_threshold_warning } @@ -1233,8 +1108,4 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.authorization_error_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/storage/versions.tf b/cloud/azure/storage/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/storage/versions.tf +++ b/cloud/azure/storage/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/stream-analytics/README.md b/cloud/azure/stream-analytics/README.md index 634ffe6..bce9282 100644 --- a/cloud/azure/stream-analytics/README.md +++ b/cloud/azure/stream-analytics/README.md @@ -27,7 +27,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/stream-analytics/monitors-stream-analytics.tf b/cloud/azure/stream-analytics/monitors-stream-analytics.tf index ae51b98..d7f30ca 100644 --- a/cloud/azure/stream-analytics/monitors-stream-analytics.tf +++ b/cloud/azure/stream-analytics/monitors-stream-analytics.tf @@ -22,10 +22,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "su_utilization" { @@ -50,16 +46,12 @@ EOQ locked = false require_full_window = false - thresholds = { + monitor_thresholds { warning = var.su_utilization_threshold_warning critical = var.su_utilization_threshold_critical } tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform"], var.su_utilization_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "failed_function_requests" { @@ -75,7 +67,7 @@ resource "datadog_monitor" "failed_function_requests" { ) * 100 > ${var.failed_function_requests_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.failed_function_requests_threshold_warning critical = var.failed_function_requests_threshold_critical } @@ -91,10 +83,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform"], var.failed_function_requests_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "conversion_errors" { @@ -109,7 +97,7 @@ resource "datadog_monitor" "conversion_errors" { ) > ${var.conversion_errors_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.conversion_errors_threshold_warning critical = var.conversion_errors_threshold_critical } @@ -125,10 +113,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform"], var.conversion_errors_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "runtime_errors" { @@ -143,7 +127,7 @@ resource "datadog_monitor" "runtime_errors" { ) > ${var.runtime_errors_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.runtime_errors_threshold_warning critical = var.runtime_errors_threshold_critical } @@ -159,9 +143,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform"], var.runtime_errors_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/stream-analytics/versions.tf b/cloud/azure/stream-analytics/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/stream-analytics/versions.tf +++ b/cloud/azure/stream-analytics/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/azure/virtual-machine/README.md b/cloud/azure/virtual-machine/README.md index e3b4f38..ea62266 100644 --- a/cloud/azure/virtual-machine/README.md +++ b/cloud/azure/virtual-machine/README.md @@ -28,7 +28,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/azure/virtual-machine/monitors-virtual-machine.tf b/cloud/azure/virtual-machine/monitors-virtual-machine.tf index edfbfe9..d952b4c 100644 --- a/cloud/azure/virtual-machine/monitors-virtual-machine.tf +++ b/cloud/azure/virtual-machine/monitors-virtual-machine.tf @@ -22,10 +22,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:virtualmachine", "team:claranet", "created-by:terraform"], var.status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "virtualmachine_cpu_usage" { @@ -40,7 +36,7 @@ resource "datadog_monitor" "virtualmachine_cpu_usage" { ) > ${var.cpu_usage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.cpu_usage_threshold_critical warning = var.cpu_usage_threshold_warning } @@ -56,10 +52,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:virtualmachine", "team:claranet", "created-by:terraform"], var.cpu_usage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "virtualmachine_credit_cpu_remaining_too_low" { @@ -77,7 +69,7 @@ resource "datadog_monitor" "virtualmachine_credit_cpu_remaining_too_low" { * 100 , 100) < ${var.cpu_remaining_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cpu_remaining_rate_threshold_warning critical = var.cpu_remaining_rate_threshold_critical } @@ -93,10 +85,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:virtualmachine", "team:claranet", "created-by:terraform"], var.cpu_remaining_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "virtualmachine_ram_reserved" { @@ -113,7 +101,7 @@ resource "datadog_monitor" "virtualmachine_ram_reserved" { > ${var.ram_reserved_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.ram_reserved_threshold_critical warning = var.ram_reserved_threshold_warning } @@ -129,10 +117,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:virtualmachine", "team:claranet", "created-by:terraform"], var.ram_reserved_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "virtualmachine_disk_space" { @@ -147,7 +131,7 @@ resource "datadog_monitor" "virtualmachine_disk_space" { > ${var.disk_space_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.disk_space_threshold_warning critical = var.disk_space_threshold_critical } @@ -163,10 +147,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:virtualmachine", "team:claranet", "created-by:terraform"], var.disk_space_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "virtualmachine_requests_failed" { @@ -184,7 +164,7 @@ resource "datadog_monitor" "virtualmachine_requests_failed" { > ${var.requests_failed_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.requests_failed_threshold_critical warning = var.requests_failed_threshold_warning } @@ -200,8 +180,4 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:virtualmachine", "team:claranet", "created-by:terraform"], var.requests_failed_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/azure/virtual-machine/versions.tf b/cloud/azure/virtual-machine/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/azure/virtual-machine/versions.tf +++ b/cloud/azure/virtual-machine/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/gcp/big-query/README.md b/cloud/gcp/big-query/README.md index ae4421f..83e52f5 100644 --- a/cloud/gcp/big-query/README.md +++ b/cloud/gcp/big-query/README.md @@ -31,7 +31,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/gcp/big-query/monitors-big-query.tf b/cloud/gcp/big-query/monitors-big-query.tf index 30f3128..82ee6c4 100644 --- a/cloud/gcp/big-query/monitors-big-query.tf +++ b/cloud/gcp/big-query/monitors-big-query.tf @@ -13,7 +13,7 @@ resource "datadog_monitor" "concurrent_queries" { > ${var.concurrent_queries_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.concurrent_queries_threshold_warning critical = var.concurrent_queries_threshold_critical } @@ -29,10 +29,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform"], var.concurrent_queries_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -50,7 +46,7 @@ resource "datadog_monitor" "execution_time" { > ${var.execution_time_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.execution_time_threshold_warning critical = var.execution_time_threshold_critical } @@ -66,10 +62,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform"], var.execution_time_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -87,7 +79,7 @@ resource "datadog_monitor" "scanned_bytes" { > ${var.scanned_bytes_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.scanned_bytes_threshold_warning critical = var.scanned_bytes_threshold_critical } @@ -103,10 +95,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform"], var.scanned_bytes_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -124,7 +112,7 @@ resource "datadog_monitor" "scanned_bytes_billed" { > ${var.scanned_bytes_billed_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.scanned_bytes_billed_threshold_warning critical = var.scanned_bytes_billed_threshold_critical } @@ -140,10 +128,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform"], var.scanned_bytes_billed_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -161,7 +145,7 @@ resource "datadog_monitor" "available_slots" { < ${var.available_slots_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.available_slots_threshold_warning critical = var.available_slots_threshold_critical } @@ -177,10 +161,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform"], var.available_slots_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -198,7 +178,7 @@ resource "datadog_monitor" "stored_bytes" { > ${var.stored_bytes_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.stored_bytes_threshold_warning critical = var.stored_bytes_threshold_critical } @@ -214,10 +194,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform"], var.stored_bytes_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -235,7 +211,7 @@ resource "datadog_monitor" "table_count" { > ${var.table_count_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.table_count_threshold_warning critical = var.table_count_threshold_critical } @@ -251,10 +227,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform"], var.table_count_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -272,7 +244,7 @@ resource "datadog_monitor" "uploaded_bytes" { > ${var.uploaded_bytes_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.uploaded_bytes_threshold_warning critical = var.uploaded_bytes_threshold_critical } @@ -288,10 +260,6 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform"], var.uploaded_bytes_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -309,7 +277,7 @@ resource "datadog_monitor" "uploaded_bytes_billed" { > ${var.uploaded_bytes_billed_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.uploaded_bytes_billed_threshold_warning critical = var.uploaded_bytes_billed_threshold_critical } @@ -325,9 +293,5 @@ EOQ locked = false tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform"], var.uploaded_bytes_billed_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/gcp/big-query/versions.tf b/cloud/gcp/big-query/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/gcp/big-query/versions.tf +++ b/cloud/gcp/big-query/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/gcp/cloud-sql/common/README.md b/cloud/gcp/cloud-sql/common/README.md index e79dc3c..60dd57f 100644 --- a/cloud/gcp/cloud-sql/common/README.md +++ b/cloud/gcp/cloud-sql/common/README.md @@ -28,7 +28,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/gcp/cloud-sql/common/monitors-cloud-sql-common.tf b/cloud/gcp/cloud-sql/common/monitors-cloud-sql-common.tf index 0237f22..66c2cac 100644 --- a/cloud/gcp/cloud-sql/common/monitors-cloud-sql-common.tf +++ b/cloud/gcp/cloud-sql/common/monitors-cloud-sql-common.tf @@ -13,7 +13,7 @@ resource "datadog_monitor" "cpu_utilization" { > ${var.cpu_utilization_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cpu_utilization_threshold_warning critical = var.cpu_utilization_threshold_critical } @@ -29,10 +29,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform"], var.cpu_utilization_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -50,7 +46,7 @@ resource "datadog_monitor" "disk_utilization" { > ${var.disk_utilization_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.disk_utilization_threshold_warning critical = var.disk_utilization_threshold_critical } @@ -67,10 +63,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform"], var.disk_utilization_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -95,7 +87,7 @@ resource "datadog_monitor" "disk_utilization_forecast" { >= ${var.disk_utilization_forecast_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.disk_utilization_forecast_threshold_critical critical_recovery = var.disk_utilization_forecast_threshold_critical_recovery } @@ -111,10 +103,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform"], var.disk_utilization_forecast_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -132,7 +120,7 @@ resource "datadog_monitor" "memory_utilization" { > ${var.memory_utilization_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.memory_utilization_threshold_warning critical = var.memory_utilization_threshold_critical } @@ -148,10 +136,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform"], var.memory_utilization_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -176,7 +160,7 @@ resource "datadog_monitor" "memory_utilization_forecast" { >= ${var.memory_utilization_forecast_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.memory_utilization_forecast_threshold_critical critical_recovery = var.memory_utilization_forecast_threshold_critical_recovery } @@ -192,10 +176,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform"], var.memory_utilization_forecast_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -210,11 +190,10 @@ resource "datadog_monitor" "failover_unavailable" { query = <= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf b/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf index 85393fb..dfa1fcc 100644 --- a/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf +++ b/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf @@ -13,7 +13,7 @@ resource "datadog_monitor" "replication_lag" { > ${var.replication_lag_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.replication_lag_threshold_critical warning = var.replication_lag_threshold_warning } @@ -30,9 +30,5 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "engine:mysql"], var.replication_lag_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/gcp/cloud-sql/mysql/versions.tf b/cloud/gcp/cloud-sql/mysql/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/gcp/cloud-sql/mysql/versions.tf +++ b/cloud/gcp/cloud-sql/mysql/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/gcp/gce/instance/README.md b/cloud/gcp/gce/instance/README.md index 362d006..925f9a6 100644 --- a/cloud/gcp/gce/instance/README.md +++ b/cloud/gcp/gce/instance/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/gcp/gce/instance/monitors-gce-instance.tf b/cloud/gcp/gce/instance/monitors-gce-instance.tf index 62ff8de..cf9c721 100644 --- a/cloud/gcp/gce/instance/monitors-gce-instance.tf +++ b/cloud/gcp/gce/instance/monitors-gce-instance.tf @@ -13,7 +13,7 @@ resource "datadog_monitor" "cpu_utilization" { > ${var.cpu_utilization_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cpu_utilization_threshold_warning critical = var.cpu_utilization_threshold_critical } @@ -30,10 +30,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:gce-instance", "team:claranet", "created-by:terraform"], var.cpu_utilization_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -57,7 +53,7 @@ resource "datadog_monitor" "disk_throttled_bps" { > ${var.disk_throttled_bps_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.disk_throttled_bps_threshold_warning critical = var.disk_throttled_bps_threshold_critical } @@ -73,10 +69,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:gce-instance", "team:claranet", "created-by:terraform"], var.disk_throttled_bps_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -100,7 +92,7 @@ resource "datadog_monitor" "disk_throttled_ops" { > ${var.disk_throttled_ops_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.disk_throttled_ops_threshold_warning critical = var.disk_throttled_ops_threshold_critical } @@ -116,9 +108,5 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:gce-instance", "team:claranet", "created-by:terraform"], var.disk_throttled_ops_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/gcp/gce/instance/versions.tf b/cloud/gcp/gce/instance/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/gcp/gce/instance/versions.tf +++ b/cloud/gcp/gce/instance/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/gcp/lb/README.md b/cloud/gcp/lb/README.md index c8311bd..bc9f21c 100644 --- a/cloud/gcp/lb/README.md +++ b/cloud/gcp/lb/README.md @@ -27,7 +27,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/gcp/lb/monitors-lb.tf b/cloud/gcp/lb/monitors-lb.tf index fc3fb67..6dae71d 100644 --- a/cloud/gcp/lb/monitors-lb.tf +++ b/cloud/gcp/lb/monitors-lb.tf @@ -14,7 +14,7 @@ resource "datadog_monitor" "error_rate_4xx" { * 100 > ${var.error_rate_4xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.error_rate_4xx_threshold_warning critical = var.error_rate_4xx_threshold_critical } @@ -30,10 +30,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:lb", "team:claranet", "created-by:terraform"], var.error_rate_4xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -52,7 +48,7 @@ resource "datadog_monitor" "error_rate_5xx" { * 100 > ${var.error_rate_5xx_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.error_rate_5xx_threshold_warning critical = var.error_rate_5xx_threshold_critical } @@ -68,10 +64,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:lb", "team:claranet", "created-by:terraform"], var.error_rate_5xx_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -89,7 +81,7 @@ resource "datadog_monitor" "backend_latency_service" { > ${var.backend_latency_service_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.backend_latency_service_threshold_warning critical = var.backend_latency_service_threshold_critical } @@ -105,10 +97,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:lb", "team:claranet", "created-by:terraform"], var.backend_latency_service_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -126,7 +114,7 @@ resource "datadog_monitor" "backend_latency_bucket" { > ${var.backend_latency_bucket_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.backend_latency_bucket_threshold_warning critical = var.backend_latency_bucket_threshold_critical } @@ -142,10 +130,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:lb", "team:claranet", "created-by:terraform"], var.backend_latency_bucket_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -163,7 +147,7 @@ resource "datadog_monitor" "request_count" { > ${var.request_count_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.request_count_threshold_warning critical = var.request_count_threshold_critical } @@ -179,9 +163,5 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:lb", "team:claranet", "created-by:terraform"], var.request_count_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/gcp/lb/versions.tf b/cloud/gcp/lb/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/gcp/lb/versions.tf +++ b/cloud/gcp/lb/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/gcp/memorystore/redis/README.md b/cloud/gcp/memorystore/redis/README.md index c5268a7..8444230 100644 --- a/cloud/gcp/memorystore/redis/README.md +++ b/cloud/gcp/memorystore/redis/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/gcp/memorystore/redis/monitors-memorystore-redis.tf b/cloud/gcp/memorystore/redis/monitors-memorystore-redis.tf index 0bc9616..78708a7 100644 --- a/cloud/gcp/memorystore/redis/monitors-memorystore-redis.tf +++ b/cloud/gcp/memorystore/redis/monitors-memorystore-redis.tf @@ -13,7 +13,7 @@ resource "datadog_monitor" "system_memory_usage_ratio" { * 100 > ${var.system_memory_usage_ratio_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.system_memory_usage_ratio_threshold_critical warning = var.system_memory_usage_ratio_threshold_warning } @@ -30,8 +30,4 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:memorystore", "team:claranet", "created-by:terraform", "engine:redis"], var.system_memory_usage_ratio_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/gcp/memorystore/redis/versions.tf b/cloud/gcp/memorystore/redis/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/gcp/memorystore/redis/versions.tf +++ b/cloud/gcp/memorystore/redis/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/gcp/pubsub/subscription/README.md b/cloud/gcp/pubsub/subscription/README.md index 26eb2c0..70abb29 100644 --- a/cloud/gcp/pubsub/subscription/README.md +++ b/cloud/gcp/pubsub/subscription/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/gcp/pubsub/subscription/monitors-subscription.tf b/cloud/gcp/pubsub/subscription/monitors-subscription.tf index daff29c..701852c 100644 --- a/cloud/gcp/pubsub/subscription/monitors-subscription.tf +++ b/cloud/gcp/pubsub/subscription/monitors-subscription.tf @@ -17,7 +17,7 @@ resource "datadog_monitor" "oldest_unacked_message_age" { >= ${var.oldest_unacked_message_age_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.oldest_unacked_message_age_threshold_warning critical = var.oldest_unacked_message_age_threshold_critical } @@ -33,10 +33,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:subscription", "team:claranet", "created-by:terraform"], var.oldest_unacked_message_age_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } ###################### @@ -58,7 +54,7 @@ resource "datadog_monitor" "subscription_push_latency" { >= ${var.subscription_push_latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.subscription_push_latency_threshold_warning critical = var.subscription_push_latency_threshold_critical } @@ -74,10 +70,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:subscription", "team:claranet", "created-by:terraform"], var.subscription_push_latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -105,7 +97,7 @@ resource "datadog_monitor" "subscription_push_latency_anomaly" { >= ${var.subscription_push_latency_anomaly_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.subscription_push_latency_anomaly_threshold_warning critical = var.subscription_push_latency_anomaly_threshold_critical } @@ -121,8 +113,4 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:subscription", "team:claranet", "created-by:terraform"], var.subscription_push_latency_anomaly_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } \ No newline at end of file diff --git a/cloud/gcp/pubsub/subscription/versions.tf b/cloud/gcp/pubsub/subscription/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/gcp/pubsub/subscription/versions.tf +++ b/cloud/gcp/pubsub/subscription/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/cloud/gcp/pubsub/topic/README.md b/cloud/gcp/pubsub/topic/README.md index f004b86..2645449 100644 --- a/cloud/gcp/pubsub/topic/README.md +++ b/cloud/gcp/pubsub/topic/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/cloud/gcp/pubsub/topic/monitors-topics.tf b/cloud/gcp/pubsub/topic/monitors-topics.tf index 1cda690..ad3ad54 100644 --- a/cloud/gcp/pubsub/topic/monitors-topics.tf +++ b/cloud/gcp/pubsub/topic/monitors-topics.tf @@ -13,7 +13,7 @@ resource "datadog_monitor" "sending_operations_count" { <= ${var.sending_operations_count_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.sending_operations_count_threshold_critical } @@ -28,10 +28,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:topic", "team:claranet", "created-by:terraform"], var.sending_operations_count_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -49,7 +45,7 @@ resource "datadog_monitor" "unavailable_sending_operations_count" { >= ${var.unavailable_sending_operations_count_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.unavailable_sending_operations_count_threshold_warning critical = var.unavailable_sending_operations_count_threshold_critical } @@ -65,10 +61,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:topic", "team:claranet", "created-by:terraform"], var.unavailable_sending_operations_count_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -88,7 +80,7 @@ resource "datadog_monitor" "unavailable_sending_operations_ratio" { >= ${var.unavailable_sending_operations_ratio_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.unavailable_sending_operations_ratio_threshold_warning critical = var.unavailable_sending_operations_ratio_threshold_critical } @@ -104,8 +96,4 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:topic", "team:claranet", "created-by:terraform"], var.unavailable_sending_operations_ratio_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/cloud/gcp/pubsub/topic/versions.tf b/cloud/gcp/pubsub/topic/versions.tf index b46bd44..1c28e79 100644 --- a/cloud/gcp/pubsub/topic/versions.tf +++ b/cloud/gcp/pubsub/topic/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/common/alerting-message/main.tf b/common/alerting-message/main.tf index a05c986..9efb7b7 100644 --- a/common/alerting-message/main.tf +++ b/common/alerting-message/main.tf @@ -12,7 +12,7 @@ EOF message_alert = var.message_alert message_warning = var.message_warning == null ? var.message_alert : var.message_warning message_nodata = var.message_nodata == null ? var.message_alert : var.message_nodata - message_recovery = join(" ", compact(distinct(list(var.message_alert, var.message_warning, var.message_nodata)))) + message_recovery = join(" ", compact(distinct([var.message_alert, var.message_warning, var.message_nodata]))) prepend_text = var.prepend_text append_text = var.append_text } diff --git a/common/alerting-message/versions.tf b/common/alerting-message/versions.tf index 6c0ba97..1c28e79 100644 --- a/common/alerting-message/versions.tf +++ b/common/alerting-message/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { - template = { - source = "hashicorp/template" + datadog = { + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/database/elasticsearch/README.md b/database/elasticsearch/README.md index cedbece..1138b9a 100644 --- a/database/elasticsearch/README.md +++ b/database/elasticsearch/README.md @@ -44,7 +44,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/database/elasticsearch/monitors-elasticsearch.tf b/database/elasticsearch/monitors-elasticsearch.tf index c3be583..c33ab9a 100644 --- a/database/elasticsearch/monitors-elasticsearch.tf +++ b/database/elasticsearch/monitors-elasticsearch.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "not_responding" { "elasticsearch.can_connect"${module.filter-tags.service_check}.by("server","port").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.not_responding_threshold_warning critical = 5 } @@ -27,10 +27,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.not_responding_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -48,7 +44,7 @@ resource "datadog_monitor" "cluster_status_not_green" { <= ${var.cluster_status_not_green_threshold_critical} EOQ - thresholds = { + monitor_thresholds { # ok = 2 warning = var.cluster_status_not_green_threshold_warning # Yellow critical = var.cluster_status_not_green_threshold_critical # Red @@ -63,10 +59,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.cluster_status_not_green_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -84,7 +76,7 @@ resource "datadog_monitor" "cluster_initializing_shards" { > ${var.cluster_initializing_shards_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cluster_initializing_shards_threshold_warning critical = var.cluster_initializing_shards_threshold_critical } @@ -98,10 +90,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.cluster_initializing_shards_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -119,7 +107,7 @@ resource "datadog_monitor" "cluster_relocating_shards" { > ${var.cluster_relocating_shards_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cluster_relocating_shards_threshold_warning critical = var.cluster_relocating_shards_threshold_critical } @@ -133,10 +121,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.cluster_relocating_shards_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -154,7 +138,7 @@ resource "datadog_monitor" "cluster_unassigned_shards" { > ${var.cluster_unassigned_shards_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cluster_unassigned_shards_threshold_warning critical = var.cluster_unassigned_shards_threshold_critical } @@ -168,10 +152,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.cluster_unassigned_shards_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -193,7 +173,7 @@ resource "datadog_monitor" "node_free_space" { < ${var.node_free_space_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.node_free_space_threshold_warning critical = var.node_free_space_threshold_critical } @@ -207,10 +187,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.node_free_space_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -228,7 +204,7 @@ resource "datadog_monitor" "jvm_heap_memory_usage" { > ${var.jvm_heap_memory_usage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.jvm_heap_memory_usage_threshold_warning critical = var.jvm_heap_memory_usage_threshold_critical } @@ -242,10 +218,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.jvm_heap_memory_usage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -263,7 +235,7 @@ resource "datadog_monitor" "jvm_memory_young_usage" { > ${var.jvm_memory_young_usage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.jvm_memory_young_usage_threshold_warning critical = var.jvm_memory_young_usage_threshold_critical } @@ -277,10 +249,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.jvm_memory_young_usage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -298,7 +266,7 @@ resource "datadog_monitor" "jvm_memory_old_usage" { > ${var.jvm_memory_old_usage_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.jvm_memory_old_usage_threshold_warning critical = var.jvm_memory_old_usage_threshold_critical } @@ -312,10 +280,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.jvm_memory_old_usage_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -336,7 +300,7 @@ resource "datadog_monitor" "jvm_gc_old_collection_latency" { > ${var.jvm_gc_old_collection_latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.jvm_gc_old_collection_latency_threshold_warning critical = var.jvm_gc_old_collection_latency_threshold_critical } @@ -350,10 +314,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.jvm_gc_old_collection_latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -374,7 +334,7 @@ resource "datadog_monitor" "jvm_gc_young_collection_latency" { > ${var.jvm_gc_young_collection_latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.jvm_gc_young_collection_latency_threshold_warning critical = var.jvm_gc_young_collection_latency_threshold_critical } @@ -388,10 +348,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.jvm_gc_young_collection_latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -413,7 +369,7 @@ resource "datadog_monitor" "indexing_latency" { > ${var.indexing_latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.indexing_latency_threshold_warning critical = var.indexing_latency_threshold_critical } @@ -427,10 +383,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.indexing_latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -452,7 +404,7 @@ resource "datadog_monitor" "flush_latency" { > ${var.flush_latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.flush_latency_threshold_warning critical = var.flush_latency_threshold_critical } @@ -466,10 +418,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.flush_latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -495,12 +443,12 @@ resource "datadog_monitor" "http_connections_anomaly" { >= ${var.http_connections_anomaly_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.http_connections_anomaly_threshold_warning critical = var.http_connections_anomaly_threshold_critical } - threshold_windows = { + monitor_threshold_windows { trigger_window = var.http_connections_anomaly_alert_window recovery_window = var.http_connections_anomaly_alert_window } @@ -514,10 +462,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.http_connections_anomaly_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -539,7 +483,7 @@ resource "datadog_monitor" "search_query_latency" { > ${var.search_query_latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.search_query_latency_threshold_warning critical = var.search_query_latency_threshold_critical } @@ -553,10 +497,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.search_query_latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -578,7 +518,7 @@ resource "datadog_monitor" "fetch_latency" { > ${var.fetch_latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.fetch_latency_threshold_warning critical = var.fetch_latency_threshold_critical } @@ -592,10 +532,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.fetch_latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -613,7 +549,7 @@ resource "datadog_monitor" "search_query_change" { >= ${var.search_query_change_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.search_query_change_threshold_warning critical = var.search_query_change_threshold_critical } @@ -627,10 +563,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.search_query_change_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -648,7 +580,7 @@ resource "datadog_monitor" "fetch_change" { >= ${var.fetch_change_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.fetch_change_threshold_warning critical = var.fetch_change_threshold_critical } @@ -662,10 +594,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.fetch_change_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -684,7 +612,7 @@ resource "datadog_monitor" "field_data_evictions_change" { > ${var.field_data_evictions_change_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.field_data_evictions_change_threshold_warning critical = var.field_data_evictions_change_threshold_critical } @@ -698,10 +626,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.field_data_evictions_change_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -720,7 +644,7 @@ resource "datadog_monitor" "query_cache_evictions_change" { > ${var.query_cache_evictions_change_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.query_cache_evictions_change_threshold_warning critical = var.query_cache_evictions_change_threshold_critical } @@ -734,10 +658,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.query_cache_evictions_change_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -756,7 +676,7 @@ resource "datadog_monitor" "request_cache_evictions_change" { > ${var.request_cache_evictions_change_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.request_cache_evictions_change_threshold_warning critical = var.request_cache_evictions_change_threshold_critical } @@ -770,10 +690,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.request_cache_evictions_change_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -791,7 +707,7 @@ resource "datadog_monitor" "task_time_in_queue_change" { > ${var.task_time_in_queue_change_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.task_time_in_queue_change_threshold_warning critical = var.task_time_in_queue_change_threshold_critical } @@ -805,9 +721,5 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:elasticsearch", "resource:elasticsearch", "team:claranet", "created-by:terraform"], var.task_time_in_queue_change_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/database/elasticsearch/versions.tf b/database/elasticsearch/versions.tf index b46bd44..1c28e79 100644 --- a/database/elasticsearch/versions.tf +++ b/database/elasticsearch/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/database/mongodb/README.md b/database/mongodb/README.md index 776282a..6c4c39b 100644 --- a/database/mongodb/README.md +++ b/database/mongodb/README.md @@ -26,7 +26,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/database/mongodb/monitors-mongo.tf b/database/mongodb/monitors-mongo.tf index 14e297a..6f01088 100644 --- a/database/mongodb/monitors-mongo.tf +++ b/database/mongodb/monitors-mongo.tf @@ -20,10 +20,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform"], var.mongodb_primary_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mongodb_secondary" { @@ -39,7 +35,7 @@ resource "datadog_monitor" "mongodb_secondary" { > 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 warning = 0 } @@ -54,10 +50,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform"], var.mongodb_secondary_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mongodb_server_count" { @@ -72,7 +64,7 @@ resource "datadog_monitor" "mongodb_server_count" { > 99 EOQ - thresholds = { + monitor_thresholds { critical = 99 warning = var.mongodb_desired_servers_count } @@ -87,10 +79,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform"], var.mongodb_secondary_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mongodb_replication" { @@ -104,7 +92,7 @@ resource "datadog_monitor" "mongodb_replication" { avg:mongodb.replset.replicationlag${module.filter-tags-secondary.query_alert} by {server} > ${var.mongodb_lag_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.mongodb_lag_critical warning = var.mongodb_lag_warning } @@ -119,9 +107,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform"], var.mongodb_replication_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/database/mongodb/versions.tf b/database/mongodb/versions.tf index b46bd44..1c28e79 100644 --- a/database/mongodb/versions.tf +++ b/database/mongodb/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/database/mysql/README.md b/database/mysql/README.md index b017fab..1500eb4 100644 --- a/database/mysql/README.md +++ b/database/mysql/README.md @@ -32,7 +32,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/database/mysql/monitors-mysql.tf b/database/mysql/monitors-mysql.tf index 096209c..5534907 100644 --- a/database/mysql/monitors-mysql.tf +++ b/database/mysql/monitors-mysql.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "mysql_availability" { "mysql.can_connect"${module.filter-tags.service_check}.by("port","server").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.mysql_availability_threshold_warning critical = 5 } @@ -24,10 +24,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform"], var.mysql_availability_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_connection" { @@ -43,7 +39,7 @@ resource "datadog_monitor" "mysql_connection" { ) * 100 > ${var.mysql_connection_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.mysql_connection_threshold_warning critical = var.mysql_connection_threshold_critical } @@ -57,10 +53,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform"], var.mysql_connection_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_aborted" { @@ -76,7 +68,7 @@ resource "datadog_monitor" "mysql_aborted" { ) * 100 > ${var.mysql_aborted_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.mysql_aborted_threshold_warning critical = var.mysql_aborted_threshold_critical } @@ -90,10 +82,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform"], var.mysql_aborted_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_slow" { @@ -109,7 +97,7 @@ resource "datadog_monitor" "mysql_slow" { ) * 100 > ${var.mysql_slow_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.mysql_slow_threshold_warning critical = var.mysql_slow_threshold_critical } @@ -123,10 +111,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform"], var.mysql_slow_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_pool_efficiency" { @@ -142,7 +126,7 @@ resource "datadog_monitor" "mysql_pool_efficiency" { ) * 100 > ${var.mysql_pool_efficiency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.mysql_pool_efficiency_threshold_warning critical = var.mysql_pool_efficiency_threshold_critical } @@ -156,10 +140,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform"], var.mysql_pool_efficiency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_pool_utilization" { @@ -176,7 +156,7 @@ resource "datadog_monitor" "mysql_pool_utilization" { * 100 > ${var.mysql_pool_utilization_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.mysql_pool_utilization_threshold_warning critical = var.mysql_pool_utilization_threshold_critical } @@ -190,10 +170,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform"], var.mysql_pool_utilization_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_threads_anomaly" { @@ -217,12 +193,12 @@ resource "datadog_monitor" "mysql_threads_anomaly" { >= ${var.mysql_threads_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.mysql_threads_threshold_critical critical_recovery = 0 } - threshold_windows = { + monitor_threshold_windows { trigger_window = var.mysql_threads_alert_window recovery_window = var.mysql_threads_alert_window } @@ -236,10 +212,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform"], var.mysql_threads_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_questions_anomaly" { @@ -263,12 +235,12 @@ resource "datadog_monitor" "mysql_questions_anomaly" { >= ${var.mysql_questions_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.mysql_questions_threshold_critical critical_recovery = 0 } - threshold_windows = { + monitor_threshold_windows { trigger_window = var.mysql_questions_alert_window recovery_window = var.mysql_questions_alert_window } @@ -282,10 +254,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform"], var.mysql_questions_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_replication_lag" { @@ -298,7 +266,7 @@ resource "datadog_monitor" "mysql_replication_lag" { ${var.mysql_replication_lag_time_aggregator}(${var.mysql_replication_lag_timeframe}):avg:mysql.replication.seconds_behind_master${module.filter-tags.query_alert} by {server} > ${var.mysql_replication_lag_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.mysql_replication_lag_threshold_warning critical = var.mysql_replication_lag_threshold_critical } @@ -312,10 +280,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform"], var.mysql_replication_lag_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "mysql_replication_status" { @@ -328,7 +292,7 @@ resource "datadog_monitor" "mysql_replication_status" { ${var.mysql_replication_status_time_aggregator}(${var.mysql_replication_status_timeframe}):avg:mysql.replication.slave_running${module.filter-tags.query_alert} by {server} < 1 EOQ - thresholds = { + monitor_thresholds { critical = 1 } @@ -342,8 +306,4 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform"], var.mysql_replication_status_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/database/mysql/versions.tf b/database/mysql/versions.tf index b46bd44..1c28e79 100644 --- a/database/mysql/versions.tf +++ b/database/mysql/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/database/postgresql/README.md b/database/postgresql/README.md index 9f34671..d7a2948 100644 --- a/database/postgresql/README.md +++ b/database/postgresql/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/database/postgresql/monitors-postgresql.tf b/database/postgresql/monitors-postgresql.tf index dcc35ae..ce03d16 100644 --- a/database/postgresql/monitors-postgresql.tf +++ b/database/postgresql/monitors-postgresql.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "postgresql_availability" { "postgres.can_connect"${module.filter-tags.service_check}.by("port","server").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.postgresql_availability_threshold_warning critical = 5 } @@ -24,10 +24,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:database", "provider:postgres", "resource:postgresql", "team:claranet", "created-by:terraform"], var.postgresql_availability_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "postgresql_connection_too_high" { @@ -42,7 +38,7 @@ resource "datadog_monitor" "postgresql_connection_too_high" { * 100 > ${var.postgresql_connection_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.postgresql_connection_threshold_warning critical = var.postgresql_connection_threshold_critical } @@ -56,10 +52,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:postgres", "resource:postgresql", "team:claranet", "created-by:terraform"], var.postgresql_connection_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "postgresql_too_many_locks" { @@ -74,7 +66,7 @@ resource "datadog_monitor" "postgresql_too_many_locks" { > ${var.postgresql_lock_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.postgresql_lock_threshold_warning critical = var.postgresql_lock_threshold_critical } @@ -88,9 +80,5 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:postgres", "resource:postgresql", "team:claranet", "created-by:terraform"], var.postgresql_lock_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/database/postgresql/versions.tf b/database/postgresql/versions.tf index b46bd44..1c28e79 100644 --- a/database/postgresql/versions.tf +++ b/database/postgresql/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/database/proxysql/README.md b/database/proxysql/README.md index bb8c13f..abf2857 100644 --- a/database/proxysql/README.md +++ b/database/proxysql/README.md @@ -27,7 +27,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/database/proxysql/monitors-proxysql.tf b/database/proxysql/monitors-proxysql.tf index 9ea8914..471721d 100644 --- a/database/proxysql/monitors-proxysql.tf +++ b/database/proxysql/monitors-proxysql.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "proxysql_thread_worker" { ${var.proxysql_thread_worker_time_aggregator}(${var.proxysql_thread_worker_timeframe}):avg:proxysql.mysql.thread_workers${module.filter-tags.query_alert} by {proxysql_server,proxysql_port} < ${var.proxysql_thread_worker_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.proxysql_thread_worker_threshold_warning critical = var.proxysql_thread_worker_threshold_critical } @@ -22,10 +22,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:proxysql", "resource:proxysql", "team:claranet", "created-by:terraform"], var.proxysql_thread_worker_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "proxysql_slow" { @@ -41,7 +37,7 @@ resource "datadog_monitor" "proxysql_slow" { ) * 100 > ${var.proxysql_slow_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.proxysql_slow_threshold_warning critical = var.proxysql_slow_threshold_critical } @@ -55,10 +51,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:proxysql", "resource:proxysql", "team:claranet", "created-by:terraform"], var.proxysql_slow_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "proxysql_client_conn_aborted" { @@ -71,7 +63,7 @@ resource "datadog_monitor" "proxysql_client_conn_aborted" { ${var.proxysql_client_conn_aborted_time_aggregator}(${var.proxysql_client_conn_aborted_timeframe}):avg:proxysql.client.connections_aborted${module.filter-tags.query_alert} by {proxysql_server,proxysql_port} > ${var.proxysql_client_conn_aborted_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.proxysql_client_conn_aborted_threshold_warning critical = var.proxysql_client_conn_aborted_threshold_critical } @@ -85,10 +77,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:proxysql", "resource:proxysql", "team:claranet", "created-by:terraform"], var.proxysql_client_conn_aborted_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "proxysql_server_conn_aborted" { @@ -101,7 +89,7 @@ resource "datadog_monitor" "proxysql_server_conn_aborted" { ${var.proxysql_server_conn_aborted_time_aggregator}(${var.proxysql_server_conn_aborted_timeframe}):avg:proxysql.server.connections_aborted${module.filter-tags.query_alert} by {proxysql_server,proxysql_port} > ${var.proxysql_server_conn_aborted_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.proxysql_server_conn_aborted_threshold_warning critical = var.proxysql_server_conn_aborted_threshold_critical } @@ -115,10 +103,6 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:proxysql", "resource:proxysql", "team:claranet", "created-by:terraform"], var.proxysql_server_conn_aborted_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "proxysql_pool_conn_failure" { @@ -133,7 +117,7 @@ resource "datadog_monitor" "proxysql_pool_conn_failure" { > ${var.proxysql_pool_conn_failure_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.proxysql_pool_conn_failure_threshold_warning critical = var.proxysql_pool_conn_failure_threshold_critical } @@ -147,8 +131,4 @@ EOQ include_tags = true tags = concat(["env:${var.environment}", "type:database", "provider:proxysql", "resource:proxysql", "team:claranet", "created-by:terraform"], var.proxysql_pool_conn_failure_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/database/proxysql/versions.tf b/database/proxysql/versions.tf index b46bd44..1c28e79 100644 --- a/database/proxysql/versions.tf +++ b/database/proxysql/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/database/redis/README.md b/database/redis/README.md index a5b8056..0413378 100644 --- a/database/redis/README.md +++ b/database/redis/README.md @@ -32,7 +32,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/database/redis/monitors-redis.tf b/database/redis/monitors-redis.tf index 98dd8c2..a05455b 100644 --- a/database/redis/monitors-redis.tf +++ b/database/redis/monitors-redis.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "not_responding" { "redis.can_connect"${module.filter-tags.service_check}.by("redis_host","redis_port").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.not_responding_threshold_warning critical = 5 } @@ -27,10 +27,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform"], var.not_responding_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "evicted_keys" { @@ -45,7 +41,7 @@ resource "datadog_monitor" "evicted_keys" { ) > ${var.evictedkeys_change_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.evictedkeys_change_threshold_warning critical = var.evictedkeys_change_threshold_critical } @@ -61,10 +57,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform"], var.evictedkeys_change_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "expirations" { @@ -79,7 +71,7 @@ resource "datadog_monitor" "expirations" { ) > ${var.expirations_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.expirations_rate_threshold_warning critical = var.expirations_rate_threshold_critical } @@ -95,10 +87,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform"], var.expirations_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "blocked_clients" { @@ -114,7 +102,7 @@ resource "datadog_monitor" "blocked_clients" { ) * 100 > ${var.blocked_clients_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.blocked_clients_threshold_warning critical = var.blocked_clients_threshold_critical } @@ -130,10 +118,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform"], var.blocked_clients_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "keyspace_full" { @@ -148,7 +132,7 @@ resource "datadog_monitor" "keyspace_full" { ) == ${var.keyspace_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.keyspace_threshold_warning critical = var.keyspace_threshold_critical } @@ -164,10 +148,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform"], var.keyspace_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "memory_used" { @@ -183,7 +163,7 @@ resource "datadog_monitor" "memory_used" { ) * 100 > ${var.mem_used_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.mem_used_threshold_warning critical = var.mem_used_threshold_critical } @@ -199,10 +179,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform"], var.mem_used_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "memory_frag" { @@ -217,7 +193,7 @@ resource "datadog_monitor" "memory_frag" { * 100 > ${var.mem_frag_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.mem_frag_threshold_warning critical = var.mem_frag_threshold_critical } @@ -233,10 +209,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform"], var.mem_frag_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "rejected_connections" { @@ -251,7 +223,7 @@ resource "datadog_monitor" "rejected_connections" { ) > ${var.rejected_con_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.rejected_con_threshold_warning critical = var.rejected_con_threshold_critical } @@ -267,10 +239,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform"], var.rejected_con_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "latency" { @@ -285,7 +253,7 @@ resource "datadog_monitor" "latency" { ) > ${var.latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.latency_threshold_warning critical = var.latency_threshold_critical } @@ -301,10 +269,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform"], var.latency_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "hitrate" { @@ -321,7 +285,7 @@ resource "datadog_monitor" "hitrate" { ) * 100 < ${var.hitrate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.hitrate_threshold_warning critical = var.hitrate_threshold_critical } @@ -337,9 +301,5 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform"], var.hitrate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/database/redis/versions.tf b/database/redis/versions.tf index b46bd44..1c28e79 100644 --- a/database/redis/versions.tf +++ b/database/redis/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/database/solr/README.md b/database/solr/README.md index 6a9d9ad..1aa27e6 100644 --- a/database/solr/README.md +++ b/database/solr/README.md @@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/database/solr/monitors-solr.tf b/database/solr/monitors-solr.tf index 26107cc..5fef8a2 100644 --- a/database/solr/monitors-solr.tf +++ b/database/solr/monitors-solr.tf @@ -13,7 +13,7 @@ resource "datadog_monitor" "not_responding" { EOQ - thresholds = { + monitor_thresholds { warning = var.not_responding_threshold_warning critical = 5 } @@ -29,11 +29,7 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:database", "provider:solr", "resource:solr", "team:claranet", - "created-by:terraform"], var.not_responding_extra_tags) - lifecycle { - ignore_changes = [silenced] - } } # @@ -52,7 +48,7 @@ resource "datadog_monitor" "search_handler_errors" { > ${var.search_handler_errors_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.search_handler_errors_rate_threshold_warning critical = var.search_handler_errors_rate_threshold_critical } @@ -66,7 +62,6 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:solr", "resource:solr", "team:claranet", - "created-by:terraform"], var.search_handler_errors_extra_tags) } @@ -85,7 +80,7 @@ resource "datadog_monitor" "searcher_warmup_time" { >= ${var.searcher_warmup_time_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.searcher_warmup_time_threshold_warning critical = var.searcher_warmup_time_threshold_critical } @@ -99,5 +94,4 @@ EOQ notify_no_data = false tags = concat(["env:${var.environment}", "type:database", "provider:solr", "resource:solr", "team:claranet", - "created-by:terraform"], var.searcher_warmup_time_extra_tags) } diff --git a/database/solr/versions.tf b/database/solr/versions.tf index b46bd44..1c28e79 100644 --- a/database/solr/versions.tf +++ b/database/solr/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/database/sqlserver/README.md b/database/sqlserver/README.md index 972bef0..26d6574 100644 --- a/database/sqlserver/README.md +++ b/database/sqlserver/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/database/sqlserver/monitors-sqlserver.tf b/database/sqlserver/monitors-sqlserver.tf index 9739f45..1e12d6c 100644 --- a/database/sqlserver/monitors-sqlserver.tf +++ b/database/sqlserver/monitors-sqlserver.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "sqlserver_availability" { "sqlserver.can_connect"${module.filter-tags.service_check}.by("db","server").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.sqlserver_availability_threshold_warning critical = 5 } @@ -24,8 +24,4 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:database", "provider:sqlserver", "resource:sqlserver", "team:claranet", "created-by:terraform"], var.sqlserver_availability_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/database/sqlserver/versions.tf b/database/sqlserver/versions.tf index b46bd44..1c28e79 100644 --- a/database/sqlserver/versions.tf +++ b/database/sqlserver/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/database/zookeeper/README.md b/database/zookeeper/README.md index 69f29d7..4df7c55 100644 --- a/database/zookeeper/README.md +++ b/database/zookeeper/README.md @@ -24,7 +24,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/database/zookeeper/monitors-zookeeper.tf b/database/zookeeper/monitors-zookeeper.tf index 884bb6a..58abc05 100644 --- a/database/zookeeper/monitors-zookeeper.tf +++ b/database/zookeeper/monitors-zookeeper.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "not_responding" { "zookeeper.ruok"${module.filter-tags.service_check}.by(${join(",", formatlist("\"%s\"", var.not_responding_group_by))}).last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.not_responding_threshold_warning critical = 5 } @@ -24,11 +24,7 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:database", "provider:zookeeper", "resource:zookeeper", "team:claranet", - "created-by:terraform"], var.zookeeper_not_responding_extra_tags) - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "datadog_monitor_zookeeper_latency" { @@ -42,7 +38,7 @@ resource "datadog_monitor" "datadog_monitor_zookeeper_latency" { zookeeper.avg_latency${module.filter-tags.query_alert} by {${join(",", var.zookeeper_latency_group_by)}}) > ${var.zookeeper_latency_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.zookeeper_latency_threshold_warning critical = var.zookeeper_latency_threshold_critical } @@ -57,9 +53,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:database", "provider:zookeeper", "resource:zookeeper", "team:claranet", - "created-by:terraform"], var.zookeeper_latency_availability_extra_tags) - lifecycle { - ignore_changes = [silenced] - } } diff --git a/database/zookeeper/versions.tf b/database/zookeeper/versions.tf index b46bd44..1c28e79 100644 --- a/database/zookeeper/versions.tf +++ b/database/zookeeper/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/middleware/apache/README.md b/middleware/apache/README.md index 049c94c..0aeebf2 100644 --- a/middleware/apache/README.md +++ b/middleware/apache/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf index 634c934..abe8811 100644 --- a/middleware/apache/monitors-apache.tf +++ b/middleware/apache/monitors-apache.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "datadog_apache_process" { "apache.can_connect"${module.filter-tags.service_check}.by("port","server").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.apache_connect_threshold_warning critical = 5 } @@ -24,9 +24,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:middleware", "provider:apache", "resource:apache", "team:claranet", "created-by:terraform"], var.apache_connect_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/middleware/apache/versions.tf b/middleware/apache/versions.tf index b46bd44..1c28e79 100644 --- a/middleware/apache/versions.tf +++ b/middleware/apache/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/middleware/kong/README.md b/middleware/kong/README.md index d612b56..7916d71 100644 --- a/middleware/kong/README.md +++ b/middleware/kong/README.md @@ -24,7 +24,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/middleware/kong/monitors-kong.tf b/middleware/kong/monitors-kong.tf index dde240d..c2f9bc7 100644 --- a/middleware/kong/monitors-kong.tf +++ b/middleware/kong/monitors-kong.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "not_responding" { "kong.can_connect"${module.filter-tags.service_check}.by("kong_host","kong_port").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.not_responding_threshold_warning critical = 5 } @@ -27,10 +27,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:middleware", "provider:kong", "resource:kong", "team:claranet", "created-by:terraform"], var.not_responding_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "treatment_limit" { @@ -46,7 +42,7 @@ resource "datadog_monitor" "treatment_limit" { > ${var.treatment_limit_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.treatment_limit_threshold_warning critical = var.treatment_limit_threshold_critical } @@ -62,9 +58,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:middleware", "provider:kong", "resource:kong", "team:claranet", "created-by:terraform"], var.treatment_limit_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/middleware/kong/versions.tf b/middleware/kong/versions.tf index b46bd44..1c28e79 100644 --- a/middleware/kong/versions.tf +++ b/middleware/kong/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/middleware/nginx/README.md b/middleware/nginx/README.md index 6fe2891..3e81a3d 100644 --- a/middleware/nginx/README.md +++ b/middleware/nginx/README.md @@ -24,7 +24,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf index 3438f2b..e94ef15 100644 --- a/middleware/nginx/monitors-nginx.tf +++ b/middleware/nginx/monitors-nginx.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "datadog_nginx_process" { "nginx.can_connect"${module.filter-tags.service_check}.by("server","port").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.nginx_connect_threshold_warning critical = 5 } @@ -24,10 +24,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:middleware", "provider:nginx", "resource:nginx", "team:claranet", "created-by:terraform"], var.nginx_connect_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "datadog_nginx_dropped_connections" { @@ -42,7 +38,7 @@ resource "datadog_monitor" "datadog_nginx_dropped_connections" { > ${var.nginx_dropped_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical = var.nginx_dropped_threshold_critical } @@ -56,9 +52,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:middleware", "provider:nginx", "resource:nginx", "team:claranet", "created-by:terraform"], var.nginx_dropped_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/middleware/nginx/versions.tf b/middleware/nginx/versions.tf index b46bd44..1c28e79 100644 --- a/middleware/nginx/versions.tf +++ b/middleware/nginx/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/middleware/php-fpm/README.md b/middleware/php-fpm/README.md index 1bc2fb3..d305012 100644 --- a/middleware/php-fpm/README.md +++ b/middleware/php-fpm/README.md @@ -24,7 +24,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf index 6398542..3ef7883 100644 --- a/middleware/php-fpm/monitors-fpm.tf +++ b/middleware/php-fpm/monitors-fpm.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "php_fpm_connect" { "php_fpm.can_ping"${module.filter-tags.service_check}.by("ping_url").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.php_fpm_connect_threshold_warning critical = 5 } @@ -24,10 +24,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:middleware", "provider:php-fpm", "resource:php-fpm", "team:claranet", "created-by:terraform"], var.php_fpm_connect_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "php_fpm_connect_idle" { @@ -44,7 +40,7 @@ resource "datadog_monitor" "php_fpm_connect_idle" { ) * 100 > ${var.php_fpm_busy_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.php_fpm_busy_threshold_warning critical = var.php_fpm_busy_threshold_critical } @@ -59,9 +55,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:middleware", "provider:php-fpm", "resource:php-fpm", "team:claranet", "created-by:terraform"], var.php_fpm_busy_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/middleware/php-fpm/versions.tf b/middleware/php-fpm/versions.tf index b46bd44..1c28e79 100644 --- a/middleware/php-fpm/versions.tf +++ b/middleware/php-fpm/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/network/dns/README.md b/network/dns/README.md index de683df..2f21bb3 100644 --- a/network/dns/README.md +++ b/network/dns/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/network/dns/monitors-dns.tf b/network/dns/monitors-dns.tf index 357dd0d..187ce96 100644 --- a/network/dns/monitors-dns.tf +++ b/network/dns/monitors-dns.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "cannot_resolve" { "dns.can_resolve"${module.filter-tags.service_check}.by("nameserver","resolved_hostname").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.cannot_resolve_threshold_warning critical = 5 } @@ -27,8 +27,4 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:network", "provider:dns_check", "resource:dns", "team:claranet", "created-by:terraform"], var.cannot_resolve_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } \ No newline at end of file diff --git a/network/dns/versions.tf b/network/dns/versions.tf index b46bd44..1c28e79 100644 --- a/network/dns/versions.tf +++ b/network/dns/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/network/http/ssl/README.md b/network/http/ssl/README.md index af9e0e6..94f3d54 100644 --- a/network/http/ssl/README.md +++ b/network/http/ssl/README.md @@ -24,7 +24,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/network/http/ssl/monitors-ssl.tf b/network/http/ssl/monitors-ssl.tf index c0bb4c5..78d65c0 100644 --- a/network/http/ssl/monitors-ssl.tf +++ b/network/http/ssl/monitors-ssl.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "invalid_ssl_certificate" { "http.ssl_cert"${module.filter-tags.service_check}.by("instance","url").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.invalid_ssl_certificate_threshold_warning critical = 5 } @@ -27,10 +27,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:network", "provider:http_check", "resource:ssl-certificate", "team:claranet", "created-by:terraform"], var.invalid_ssl_certificate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -48,7 +44,7 @@ resource "datadog_monitor" "certificate_expiration_date" { < ${var.certificate_expiration_date_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.certificate_expiration_date_threshold_warning critical = var.certificate_expiration_date_threshold_critical } @@ -64,8 +60,4 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:network", "provider:http_check", "resource:ssl-certificate", "team:claranet", "created-by:terraform"], var.certificate_expiration_date_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } \ No newline at end of file diff --git a/network/http/ssl/versions.tf b/network/http/ssl/versions.tf index b46bd44..1c28e79 100644 --- a/network/http/ssl/versions.tf +++ b/network/http/ssl/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/network/http/webcheck/README.md b/network/http/webcheck/README.md index 75c0658..75cd2bb 100644 --- a/network/http/webcheck/README.md +++ b/network/http/webcheck/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/network/http/webcheck/monitors-webcheck.tf b/network/http/webcheck/monitors-webcheck.tf index 53f1a6c..fc785c9 100644 --- a/network/http/webcheck/monitors-webcheck.tf +++ b/network/http/webcheck/monitors-webcheck.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "cannot_connect" { "http.can_connect"${module.filter-tags.service_check}.by("instance","url").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.cannot_connect_threshold_warning critical = 5 } @@ -27,8 +27,4 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:network", "provider:http_check", "resource:webcheck", "team:claranet", "created-by:terraform"], var.cannot_connect_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/network/http/webcheck/versions.tf b/network/http/webcheck/versions.tf index b46bd44..1c28e79 100644 --- a/network/http/webcheck/versions.tf +++ b/network/http/webcheck/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/network/tls/README.md b/network/tls/README.md index ea2a907..8d003a5 100644 --- a/network/tls/README.md +++ b/network/tls/README.md @@ -26,7 +26,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/network/tls/monitors-tls.tf b/network/tls/monitors-tls.tf index 674f379..35df142 100644 --- a/network/tls/monitors-tls.tf +++ b/network/tls/monitors-tls.tf @@ -11,7 +11,7 @@ resource "datadog_monitor" "cannot_connect" { "tls.can_connect"${module.filter-tags.service_check}.by("name","server","port","server_hostname").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.cannot_connect_threshold_warning critical = 5 } @@ -27,10 +27,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:network", "provider:tls", "resource:webcheck", "team:claranet", "created-by:terraform"], var.cannot_connect_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -46,7 +42,7 @@ resource "datadog_monitor" "invalid_tls_certificate" { "tls.cert_validation"${module.filter-tags.service_check}.by("name","server","port","server_hostname").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.invalid_tls_certificate_threshold_warning critical = 5 } @@ -61,10 +57,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:network", "provider:tls", "resource:tls-certificate", "team:claranet", "created-by:terraform"], var.invalid_tls_certificate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -80,7 +72,7 @@ resource "datadog_monitor" "tls_certificate_expiration" { "tls.cert_expiration"${module.filter-tags.service_check}.by("name","server","port","server_hostname").last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { warning = var.tls_certificate_expiration_threshold_warning critical = 5 } @@ -95,10 +87,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:network", "provider:tls", "resource:tls-certificate", "team:claranet", "created-by:terraform"], var.tls_certificate_expiration_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } # @@ -117,7 +105,7 @@ resource "datadog_monitor" "certificate_expiration_date" { EOQ - thresholds = { + monitor_thresholds { warning = var.certificate_expiration_date_threshold_warning critical = var.certificate_expiration_date_threshold_critical } @@ -133,8 +121,4 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:network", "provider:tls", "resource:tls-certificate", "team:claranet", "created-by:terraform"], var.certificate_expiration_date_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } \ No newline at end of file diff --git a/network/tls/versions.tf b/network/tls/versions.tf index b46bd44..1c28e79 100644 --- a/network/tls/versions.tf +++ b/network/tls/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/saas/new-relic/README.md b/saas/new-relic/README.md index f909108..cdb56d9 100644 --- a/saas/new-relic/README.md +++ b/saas/new-relic/README.md @@ -24,7 +24,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/saas/new-relic/monitors-new-relic.tf b/saas/new-relic/monitors-new-relic.tf index e1831d5..05080aa 100644 --- a/saas/new-relic/monitors-new-relic.tf +++ b/saas/new-relic/monitors-new-relic.tf @@ -10,7 +10,7 @@ resource "datadog_monitor" "app_error_rate" { > ${var.app_error_rate_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.app_error_rate_threshold_warning critical = var.app_error_rate_threshold_critical } @@ -26,10 +26,6 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:saas", "provider:new-relic", "resource:new-relic", "team:claranet", "created-by:terraform"], var.app_error_rate_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "app_apdex_score" { @@ -44,7 +40,7 @@ resource "datadog_monitor" "app_apdex_score" { < ${var.app_apdex_score_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.app_apdex_score_threshold_warning critical = var.app_apdex_score_threshold_critical } @@ -60,8 +56,4 @@ EOQ require_full_window = false tags = concat(["env:${var.environment}", "type:saas", "provider:new-relic", "resource:new-relic", "team:claranet", "created-by:terraform"], var.app_apdex_score_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/saas/new-relic/versions.tf b/saas/new-relic/versions.tf index b46bd44..1c28e79 100644 --- a/saas/new-relic/versions.tf +++ b/saas/new-relic/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/system/generic/README.md b/system/generic/README.md index e4c3e2b..4733d56 100644 --- a/system/generic/README.md +++ b/system/generic/README.md @@ -30,7 +30,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/system/generic/monitors-system.tf b/system/generic/monitors-system.tf index 0fa1288..0440aaa 100644 --- a/system/generic/monitors-system.tf +++ b/system/generic/monitors-system.tf @@ -10,7 +10,7 @@ resource "datadog_monitor" "cpu" { ) > ${var.cpu_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.cpu_threshold_warning critical = var.cpu_threshold_critical } @@ -25,10 +25,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:system", "provider:system-check", "resource:generic", "team:claranet", "created-by:terraform"], var.cpu_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "load" { @@ -43,7 +39,7 @@ resource "datadog_monitor" "load" { ) > ${var.load_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.load_threshold_warning critical = var.load_threshold_critical } @@ -58,10 +54,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:system", "provider:system-core", "resource:generic", "team:claranet", "created-by:terraform"], var.load_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "disk_space" { @@ -76,7 +68,7 @@ resource "datadog_monitor" "disk_space" { * 100 > ${var.disk_space_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.disk_space_threshold_warning critical = var.disk_space_threshold_critical } @@ -91,10 +83,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:system", "provider:disk", "resource:generic", "team:claranet", "created-by:terraform"], var.disk_space_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "disk_space_forecast" { @@ -115,7 +103,7 @@ resource "datadog_monitor" "disk_space_forecast" { >= ${var.disk_space_forecast_threshold_critical} EOQ - thresholds = { + monitor_thresholds { critical_recovery = var.disk_space_forecast_threshold_critical_recovery critical = var.disk_space_forecast_threshold_critical } @@ -131,10 +119,6 @@ EOQ renotify_interval = 0 tags = concat(["env:${var.environment}", "type:system", "provider:disk", "resource:generic", "team:claranet", "created-by:terraform"], var.disk_space_forecast_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "disk_inodes" { @@ -149,7 +133,7 @@ resource "datadog_monitor" "disk_inodes" { * 100 > ${var.disk_inodes_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.disk_inodes_threshold_warning critical = var.disk_inodes_threshold_critical } @@ -164,10 +148,6 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:system", "provider:disk", "resource:generic", "team:claranet", "created-by:terraform"], var.disk_inodes_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } resource "datadog_monitor" "memory" { @@ -183,7 +163,7 @@ resource "datadog_monitor" "memory" { < ${var.memory_threshold_critical} EOQ - thresholds = { + monitor_thresholds { warning = var.memory_threshold_warning critical = var.memory_threshold_critical } @@ -199,9 +179,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:system", "provider:system-check", "resource:generic", "team:claranet", "created-by:terraform"], var.memory_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/system/generic/versions.tf b/system/generic/versions.tf index b46bd44..1c28e79 100644 --- a/system/generic/versions.tf +++ b/system/generic/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" } diff --git a/system/unreachable/README.md b/system/unreachable/README.md index 874a310..654ded8 100644 --- a/system/unreachable/README.md +++ b/system/unreachable/README.md @@ -23,7 +23,7 @@ Creates DataDog monitors with the following checks: | Name | Version | |------|---------| -| terraform | >= 0.12.26 | +| terraform | >= 0.12.31 | ## Inputs diff --git a/system/unreachable/monitors-unreachable.tf b/system/unreachable/monitors-unreachable.tf index b9bb232..1af06c9 100644 --- a/system/unreachable/monitors-unreachable.tf +++ b/system/unreachable/monitors-unreachable.tf @@ -8,7 +8,7 @@ resource "datadog_monitor" "host_unreachable" { "datadog.agent.up"${module.filter-tags.service_check}.last(6).count_by_status() EOQ - thresholds = { + monitor_thresholds { ok = 1 warning = 1 critical = 5 @@ -24,9 +24,5 @@ EOQ require_full_window = true tags = concat(["env:${var.environment}", "type:system", "provider:host", "resource:unreachable", "team:claranet", "created-by:terraform"], var.unreachable_extra_tags) - - lifecycle { - ignore_changes = [silenced] - } } diff --git a/system/unreachable/versions.tf b/system/unreachable/versions.tf index b46bd44..1c28e79 100644 --- a/system/unreachable/versions.tf +++ b/system/unreachable/versions.tf @@ -1,8 +1,9 @@ terraform { required_providers { datadog = { - source = "terraform-providers/datadog" + source = "DataDog/datadog" + version = ">= 3.1.0" } } - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" }