Merged in MON-66_monitors_subdirs (pull request #5)

MON-66: Rework tree directories and update how to declare TF modules

Approved-by: Jérôme Respaut <shr3ps@gmail.com>
Approved-by: Alexandre Gaillet <alexandre.gaillet@fr.clara.net>
Approved-by: vincent.elkhatib@morea.fr <vincent.elkhatib@morea.fr>
Approved-by: Quentin Manfroi <quentin.manfroi@yahoo.fr>
Approved-by: Patrick Decat <patrick.decat@fr.clara.net>

README.md

@@ -1,8 +1,8 @@
-# README #
+# README - DataDog Monitors #
 
 This repository is used to store all our monitors templates. 
 
-These templates have to be used with dedicated agent configurations and ressource tagging to works as expected.
+These templates have to be used with dedicated agent configurations and resource tagging to works as expected.
 
 ### How to contribute ? ###
 
@@ -10,13 +10,11 @@ The easiest way to contribute on this repository is to add monitors file inside
 
 ### Important notes ###
 
-*This repository will be included as a Terraform module source.
+* This repository will be included as a Terraform module source.
- 
+* Each monitors have to be disabled by default, so you have to manage this condition when you create your monitors.
-*Each monitors have to be disabled by default, so you have to manage this condition when you create your monitors.
+* If you override a basic monitor with a custom one, you have to use tag filters on you query. (Example dd_cpu_high, if you want to override default cpu monitors)
 
-*If you override a basic monitor with a custom one, you have to use tag filters on you query. (Example dd_cpu_high, if you want to override default cpu monitors)
+### Main.tf : add the DataDog provider ###
-
-### Main.tf : add the datadog provider ###
 
 ```
 provider "datadog" {
@@ -29,7 +27,7 @@ provider "datadog" {
 
 ```
 module "datadog-monitors" {
-  source = "git::ssh://git@bitbucket.org/morea/terraform.datadog.monitors.git"
+  source = "git::ssh://git@bitbucket.org/morea/terraform.feature.datadog.git//{module-path}?ref={version}"
 
   critical_escalation_group = "${var.critical_escalation_group}"
   warning_escalation_group  = "${var.warning_escalation_group}"

cloud/aws/elb/inputs.tf

@@ -0,0 +1 @@
+../../../inputs.tf

cloud/aws/rds-mysql/inputs.tf

@@ -0,0 +1 @@
+../../../inputs.tf

middleware/apache/inputs.tf

@@ -0,0 +1 @@
+../../inputs.tf

middleware/nginx/inputs.tf

@@ -0,0 +1 @@
+../../inputs.tf

middleware/php-fpm/inputs.tf

@@ -0,0 +1 @@
+../../inputs.tf

system/generic/inputs.tf

@@ -0,0 +1 @@
+../../inputs.tf

system/linux/inputs.tf

@@ -0,0 +1 @@
+../../inputs.tf

testing/dummy/dummy.tf

@@ -0,0 +1,3 @@
+
+
+resource "null_resource" "test-migration" {}

testing/modules.tf

@@ -1,5 +1,5 @@
 module "datadog-monitors" {
-  source = "git::ssh://git@bitbucket.org/morea/terraform.datadog.monitors.git"
+  source = "git::ssh://git@bitbucket.org/morea/terraform.feature.datadog.git"
 
   env     = "${var.environment}"
   region  = "${var.region}"
@@ -12,4 +12,3 @@ module "datadog-monitors" {
   dd_linux_basics  = "${var.dd_linux_basics}"
 
 }
-