From c6efa390370cd594b4570f3f5db4e583e6b4059f Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Mon, 29 Apr 2019 22:53:02 +0200 Subject: [PATCH 1/3] MON-182 add manifest for better naming with multi level module --- caas/kubernetes/ingress/vts/MANIFEST.txt | 1 + cloud/aws/elasticache/common/MANIFEST.txt | 1 + cloud/aws/elasticache/memcached/MANIFEST.txt | 1 + cloud/aws/elasticache/redis/MANIFEST.txt | 1 + cloud/aws/rds/aurora/mysql/MANIFEST.txt | 1 + cloud/aws/rds/aurora/postgresql/MANIFEST.txt | 1 + cloud/aws/rds/common/MANIFEST.txt | 1 + cloud/gcp/cloud-sql/common/MANIFEST.txt | 1 + cloud/gcp/cloud-sql/mysql/MANIFEST.txt | 1 + cloud/gcp/gce/instance/MANIFEST.txt | 1 + 10 files changed, 10 insertions(+) create mode 100644 caas/kubernetes/ingress/vts/MANIFEST.txt create mode 100644 cloud/aws/elasticache/common/MANIFEST.txt create mode 100644 cloud/aws/elasticache/memcached/MANIFEST.txt create mode 100644 cloud/aws/elasticache/redis/MANIFEST.txt create mode 100644 cloud/aws/rds/aurora/mysql/MANIFEST.txt create mode 100644 cloud/aws/rds/aurora/postgresql/MANIFEST.txt create mode 100644 cloud/aws/rds/common/MANIFEST.txt create mode 100644 cloud/gcp/cloud-sql/common/MANIFEST.txt create mode 100644 cloud/gcp/cloud-sql/mysql/MANIFEST.txt create mode 100644 cloud/gcp/gce/instance/MANIFEST.txt diff --git a/caas/kubernetes/ingress/vts/MANIFEST.txt b/caas/kubernetes/ingress/vts/MANIFEST.txt new file mode 100644 index 0000000..672cd3d --- /dev/null +++ b/caas/kubernetes/ingress/vts/MANIFEST.txt @@ -0,0 +1 @@ +caas-kubernetes diff --git a/cloud/aws/elasticache/common/MANIFEST.txt b/cloud/aws/elasticache/common/MANIFEST.txt new file mode 100644 index 0000000..3d83252 --- /dev/null +++ b/cloud/aws/elasticache/common/MANIFEST.txt @@ -0,0 +1 @@ +cloud-aws diff --git a/cloud/aws/elasticache/memcached/MANIFEST.txt b/cloud/aws/elasticache/memcached/MANIFEST.txt new file mode 100644 index 0000000..3d83252 --- /dev/null +++ b/cloud/aws/elasticache/memcached/MANIFEST.txt @@ -0,0 +1 @@ +cloud-aws diff --git a/cloud/aws/elasticache/redis/MANIFEST.txt b/cloud/aws/elasticache/redis/MANIFEST.txt new file mode 100644 index 0000000..3d83252 --- /dev/null +++ b/cloud/aws/elasticache/redis/MANIFEST.txt @@ -0,0 +1 @@ +cloud-aws diff --git a/cloud/aws/rds/aurora/mysql/MANIFEST.txt b/cloud/aws/rds/aurora/mysql/MANIFEST.txt new file mode 100644 index 0000000..3d83252 --- /dev/null +++ b/cloud/aws/rds/aurora/mysql/MANIFEST.txt @@ -0,0 +1 @@ +cloud-aws diff --git a/cloud/aws/rds/aurora/postgresql/MANIFEST.txt b/cloud/aws/rds/aurora/postgresql/MANIFEST.txt new file mode 100644 index 0000000..3d83252 --- /dev/null +++ b/cloud/aws/rds/aurora/postgresql/MANIFEST.txt @@ -0,0 +1 @@ +cloud-aws diff --git a/cloud/aws/rds/common/MANIFEST.txt b/cloud/aws/rds/common/MANIFEST.txt new file mode 100644 index 0000000..3d83252 --- /dev/null +++ b/cloud/aws/rds/common/MANIFEST.txt @@ -0,0 +1 @@ +cloud-aws diff --git a/cloud/gcp/cloud-sql/common/MANIFEST.txt b/cloud/gcp/cloud-sql/common/MANIFEST.txt new file mode 100644 index 0000000..6de6b50 --- /dev/null +++ b/cloud/gcp/cloud-sql/common/MANIFEST.txt @@ -0,0 +1 @@ +cloud-gcp diff --git a/cloud/gcp/cloud-sql/mysql/MANIFEST.txt b/cloud/gcp/cloud-sql/mysql/MANIFEST.txt new file mode 100644 index 0000000..6de6b50 --- /dev/null +++ b/cloud/gcp/cloud-sql/mysql/MANIFEST.txt @@ -0,0 +1 @@ +cloud-gcp diff --git a/cloud/gcp/gce/instance/MANIFEST.txt b/cloud/gcp/gce/instance/MANIFEST.txt new file mode 100644 index 0000000..6de6b50 --- /dev/null +++ b/cloud/gcp/gce/instance/MANIFEST.txt @@ -0,0 +1 @@ +cloud-gcp From f4ca1c4651886de31cc5748c3beac0972e2770d9 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Mon, 29 Apr 2019 23:45:41 +0200 Subject: [PATCH 2/3] MON-182 remove useless variables --- cloud/azure/functions/README.md | 2 -- cloud/azure/mysql/README.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/cloud/azure/functions/README.md b/cloud/azure/functions/README.md index 3a129f6..42bbeec 100644 --- a/cloud/azure/functions/README.md +++ b/cloud/azure/functions/README.md @@ -8,8 +8,6 @@ module "datadog-monitors-cloud-azure-functions" { environment = "${var.environment}" message = "${module.datadog-message-alerting.alerting-message}" - - functions_max_scale_count = 2 } ``` diff --git a/cloud/azure/mysql/README.md b/cloud/azure/mysql/README.md index 3ee50d8..83caccd 100644 --- a/cloud/azure/mysql/README.md +++ b/cloud/azure/mysql/README.md @@ -8,8 +8,6 @@ module "datadog-monitors-cloud-azure-mysql" { environment = "${var.environment}" message = "${module.datadog-message-alerting.alerting-message}" - - total_connection_limit = "${var.total_connection_limit}" } ``` From 91814f8ed0e162fce691f4513c4003749d17f64c Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Mon, 29 Apr 2019 23:48:10 +0200 Subject: [PATCH 3/3] MON-182 fix bh only alerting message for memory --- system/generic/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/generic/README.md b/system/generic/README.md index 8ce3010..a0234cf 100644 --- a/system/generic/README.md +++ b/system/generic/README.md @@ -9,7 +9,7 @@ module "datadog-monitors-system-generic" { environment = "${var.environment}" message = "${module.datadog-message-alerting.alerting-message}" - memory_message = "${module.datadog-message-alerting.alerting-message-bh-only}" + memory_message = "${module.datadog-message-alerting-bh-only.alerting-message}" } ```