From 64be248b9eff70649c9cb2d6b1d0f5381adc5110 Mon Sep 17 00:00:00 2001
From: vincent EL KHATIB <vincent.elkhatib@morea.fr>
Date: Thu, 2 Nov 2017 15:47:47 +0100
Subject: [PATCH] MON-81 added tag *

---
 monitors-linux-basics.tf     | 14 ++++++++++++++
 monitors-rds_mysql-basics.tf |  4 ++++
 monitors_apache.tf           |  2 ++
 monitors_elb.tf              | 10 ++++++++++
 monitors_fpm.tf              |  4 ++++
 monitors_nginx.tf            |  2 ++
 6 files changed, 36 insertions(+)

diff --git a/monitors-linux-basics.tf b/monitors-linux-basics.tf
index 1ed76a8..d23a02e 100644
--- a/monitors-linux-basics.tf
+++ b/monitors-linux-basics.tf
@@ -10,6 +10,8 @@ resource "datadog_monitor" "cpu_80_15min" {
     critical = "${var.cpu_15_critical}"
   }
 
+  tags = ["*"]
+
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
   new_host_delay      = "${var.linux_basics_config["delay"]}"
@@ -34,6 +36,8 @@ resource "datadog_monitor" "cpu_95_5min" {
     critical = "${var.cpu_5_critical}"
   }
 
+  tags = ["*"]
+
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
   new_host_delay      = "${var.linux_basics_config["delay"]}"
@@ -58,6 +62,8 @@ resource "datadog_monitor" "datadog_free_disk_space_5" {
     critical = 5
   }
 
+  tags = ["*"]
+
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
   new_host_delay      = "${var.linux_basics_config["delay"]}"
@@ -83,6 +89,8 @@ resource "datadog_monitor" "datadog_free_disk_space_10" {
     critical = 10
   }
 
+  tags = ["*"]
+
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
   new_host_delay      = "${var.linux_basics_config["delay"]}"
@@ -107,6 +115,8 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_5" {
     critical = 5
   }
 
+  tags = ["*"]
+
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
   new_host_delay      = "${var.linux_basics_config["delay"]}"
@@ -132,6 +142,8 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_10" {
     critical = 10
   }
 
+  tags = ["*"]
+
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
   new_host_delay      = "${var.linux_basics_config["delay"]}"
@@ -178,6 +190,8 @@ resource "datadog_monitor" "datadog_free_memory" {
     critical = 5
   }
 
+  tags = ["*"]
+
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
   new_host_delay      = "${var.linux_basics_config["delay"]}"
diff --git a/monitors-rds_mysql-basics.tf b/monitors-rds_mysql-basics.tf
index e45cc1b..c0c44d1 100644
--- a/monitors-rds_mysql-basics.tf
+++ b/monitors-rds_mysql-basics.tf
@@ -16,6 +16,8 @@ resource "datadog_monitor" "rds-mysql_cpu_80_15min" {
     critical = "${var.rds_cpu_threshold["critical"]}"
   }
 
+  tags = ["*"]
+
   notify_no_data      = "${var.rds_config["notify_no_data"]}"
   evaluation_delay    = "${var.rds_config["delay"]}"
   renotify_interval   = 60
@@ -42,6 +44,8 @@ resource "datadog_monitor" "mysql_rds_free_space_low" {
     critical = "${var.rds_mem_threshold["critical"]}"
   }
 
+  tags = ["*"]
+
   notify_no_data      = "${var.rds_config["notify_no_data"]}"
   evaluation_delay    = "${var.rds_config["delay"]}"
   renotify_interval   = 60
diff --git a/monitors_apache.tf b/monitors_apache.tf
index b318de2..d807312 100644
--- a/monitors_apache.tf
+++ b/monitors_apache.tf
@@ -23,4 +23,6 @@ resource "datadog_monitor" "Apache_process" {
   locked              = false
   require_full_window = true
   no_data_timeframe   = 20
+
+  tags = ["*"]
 }
diff --git a/monitors_elb.tf b/monitors_elb.tf
index ccb72fb..788037a 100644
--- a/monitors_elb.tf
+++ b/monitors_elb.tf
@@ -16,6 +16,8 @@ resource "datadog_monitor" "ELB_no_healthy_instances" {
   require_full_window = true
   new_host_delay      = "${var.elb_config["delay"]}"
   no_data_timeframe   = 20
+
+  tags = ["*"]
 }
 
 resource "datadog_monitor" "ELB_unhealthy_instances" {
@@ -36,6 +38,8 @@ resource "datadog_monitor" "ELB_unhealthy_instances" {
   require_full_window = true
   new_host_delay      = "${var.elb_config["delay"]}"
   no_data_timeframe   = 20
+
+  tags = ["*"]
 }
 
 resource "datadog_monitor" "ELB_too_much_5xx_backend" {
@@ -61,6 +65,8 @@ resource "datadog_monitor" "ELB_too_much_5xx_backend" {
   require_full_window = true
   new_host_delay      = "${var.elb_config["delay"]}"
   no_data_timeframe   = 20
+
+  tags = ["*"]
 }
 
 resource "datadog_monitor" "ELB_too_much_4xx_backend" {
@@ -86,6 +92,8 @@ resource "datadog_monitor" "ELB_too_much_4xx_backend" {
   require_full_window = true
   new_host_delay      = "${var.elb_config["delay"]}"
   no_data_timeframe   = 20
+
+  tags = ["*"]
 }
 
 resource "datadog_monitor" "ELB_backend_latency" {
@@ -111,6 +119,8 @@ resource "datadog_monitor" "ELB_backend_latency" {
   require_full_window = true
   new_host_delay      = "${var.elb_config["delay"]}"
   no_data_timeframe   = 20
+
+  tags = ["*"]
 }
 
 
diff --git a/monitors_fpm.tf b/monitors_fpm.tf
index 9929229..957e1b9 100644
--- a/monitors_fpm.tf
+++ b/monitors_fpm.tf
@@ -23,6 +23,8 @@ resource "datadog_monitor" "php-fpm_process_idle" {
   require_full_window = true
   renotify_interval   = 0
   no_data_timeframe   = 20
+
+  tags = ["*"]
 }
 
 
@@ -51,4 +53,6 @@ resource "datadog_monitor" "FPM_process" {
   locked              = false
   require_full_window = true
   no_data_timeframe   = 20
+
+  tags = ["*"]
 }
diff --git a/monitors_nginx.tf b/monitors_nginx.tf
index 01a95fe..8baf1cc 100644
--- a/monitors_nginx.tf
+++ b/monitors_nginx.tf
@@ -23,4 +23,6 @@ resource "datadog_monitor" "Nginx_process" {
   locked              = false
   require_full_window = true
   no_data_timeframe   = 20
+
+  tags = ["*"]
 }