From 92833feff788d16b3831623690d676b88448e006 Mon Sep 17 00:00:00 2001
From: Ahmed Fourti <ahmed.fourti@fr.clara.net>
Date: Wed, 13 Dec 2017 12:11:15 +0100
Subject: [PATCH] MON-96 Update non-cloud resource tags

---
 middleware/apache/monitors-apache.tf  |  2 +-
 middleware/nginx/monitors-nginx.tf    |  2 +-
 middleware/php-fpm/monitors-fpm.tf    |  4 ++--
 system/linux/monitors-linux-basics.tf | 14 +++++++-------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf
index 49b31d4..b542aa4 100644
--- a/middleware/apache/monitors-apache.tf
+++ b/middleware/apache/monitors-apache.tf
@@ -23,5 +23,5 @@ resource "datadog_monitor" "Apache_process" {
   require_full_window = true
   no_data_timeframe   = 20
 
-  tags = ["*"]
+  tags = ["env:${var.env}", "type:apache"]
 }
diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf
index e09c010..03595bf 100644
--- a/middleware/nginx/monitors-nginx.tf
+++ b/middleware/nginx/monitors-nginx.tf
@@ -23,5 +23,5 @@ resource "datadog_monitor" "Nginx_process" {
   require_full_window = true
   no_data_timeframe   = 20
 
-  tags = ["*"]
+  tags = ["env:${var.env}", "type:nginx"]
 }
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index 97e7ff8..8bf654e 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -23,7 +23,7 @@ resource "datadog_monitor" "php-fpm_process_idle" {
   renotify_interval   = 0
   no_data_timeframe   = 20
 
-  tags = ["*"]
+  tags = ["env:${var.env}", "type:php-fpm"]
 }
 
 resource "datadog_monitor" "FPM_process" {
@@ -51,5 +51,5 @@ resource "datadog_monitor" "FPM_process" {
   require_full_window = true
   no_data_timeframe   = 20
 
-  tags = ["*"]
+  tags = ["env:${var.env}", "type:php-fpm"]
 }
diff --git a/system/linux/monitors-linux-basics.tf b/system/linux/monitors-linux-basics.tf
index 459122d..6260aed 100644
--- a/system/linux/monitors-linux-basics.tf
+++ b/system/linux/monitors-linux-basics.tf
@@ -10,7 +10,7 @@ resource "datadog_monitor" "cpu_80_15min" {
     critical = "${var.cpu_15_critical}"
   }
 
-  tags = ["*"]
+  tags = ["env:${var.env}", "type:system"]
 
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
@@ -36,7 +36,7 @@ resource "datadog_monitor" "cpu_95_5min" {
     critical = "${var.cpu_5_critical}"
   }
 
-  tags = ["*"]
+  tags = ["env:${var.env}", "type:system"]
 
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
@@ -62,7 +62,7 @@ resource "datadog_monitor" "datadog_free_disk_space_5" {
     critical = 5
   }
 
-  tags = ["*"]
+  tags = ["env:${var.env}", "type:system"]
 
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
@@ -89,7 +89,7 @@ resource "datadog_monitor" "datadog_free_disk_space_10" {
     critical = 10
   }
 
-  tags = ["*"]
+  tags = ["env:${var.env}", "type:system"]
 
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
@@ -115,7 +115,7 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_5" {
     critical = 5
   }
 
-  tags = ["*"]
+  tags = ["env:${var.env}", "type:system"]
 
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
@@ -142,7 +142,7 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_10" {
     critical = 10
   }
 
-  tags = ["*"]
+  tags = ["env:${var.env}", "type:system"]
 
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"
@@ -188,7 +188,7 @@ resource "datadog_monitor" "datadog_free_memory" {
     critical = 5
   }
 
-  tags = ["*"]
+  tags = ["env:${var.env}", "type:system"]
 
   notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
   evaluation_delay    = "${var.linux_basics_config["delay"]}"