MON-185 - Global README updated, monitor query updated

README.md

@@ -19,6 +19,7 @@ Here is the repository organization:
         - [eventhub](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/azure/eventhub/)
         - [iothubs](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/azure/iothubs/)
         - [redis](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/azure/redis/)
+        - [servicebus](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/azure/servicebus/)
         - [sql-database](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/azure/sql-database/)
         - [storage](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/azure/storage/)
         - [stream-analytics](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/azure/stream-analytics/)

cloud/azure/README.md

@@ -21,6 +21,7 @@ Creates a set of Azure DataDog monitors for the following components :
 * Azure SQL monitors
 * Azure Redis monitors
 * Azure Event Hub monitors
+* Azure Service Bus monitors
 * Azure Stream Analytics monitors
 * Azure Storage monitors
 * Azure IOT Hub monitors
@@ -149,6 +150,8 @@ Inputs
 | redis_server_load_rate_threshold_warning | Server CPU load rate (warning threshold) | string | `70` | no |
 | redis_status_message | Custom message for Redis status monitor | string | `` | no |
 | redis_status_silenced | Groups to mute for Redis status monitor | map | `<map>` | no |
+| servicebus_status_message | Custom message for Service Bus status monitor | string | `` | no |
+| servicebus_status_silenced | Groups to mute for Service Bus status monitor | map | `<map>` | no |
 | sqldatabase_cpu_message | Custom message for SQL CPU monitor | string | `` | no |
 | sqldatabase_cpu_silenced | Groups to mute for SQL CPU monitor | map | `<map>` | no |
 | sqldatabase_cpu_threshold_critical | CPU usage in percent (critical threshold) | string | `90` | no |

cloud/azure/eventhub/README.md

@@ -10,7 +10,6 @@ module "datadog-monitors-azure-eventhub" {
 
   message = "${module.datadog-message-alerting.alerting-message}"
   environment = "${var.environment}"
-  subscription_id = "${var.subscription_id}"
 }
 ```
 

cloud/azure/inputs.tf

@@ -655,6 +655,19 @@ variable "redis_server_load_rate_threshold_warning" {
   default     = 70
 }
 
+# Azure Service Bus specific variables
+variable "servicebus_status_silenced" {
+  description = "Groups to mute for Service Bus status monitor"
+  type        = "map"
+  default     = {}
+}
+
+variable "servicebus_status_message" {
+  description = "Custom message for Service Bus status monitor"
+  type        = "string"
+  default     = ""
+}
+
 # Azure SQL Database specific variables
 variable "sqldatabase_cpu_silenced" {
   description = "Groups to mute for SQL CPU monitor"

cloud/azure/monitors.tf

@@ -168,6 +168,20 @@ module "redis" {
   server_load_rate_threshold_warning        = "${var.redis_server_load_rate_threshold_warning}"
 }
 
+module "servicebus" {
+  source = "./servicebus"
+
+  environment = "${var.environment}"
+  message     = "${var.message}"
+  delay       = "${var.delay}"
+
+  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_custom       = "${var.filter_tags_custom}"
+
+  status_silenced = "${var.servicebus_status_silenced}"
+  status_message  = "${var.servicebus_status_message}"
+}
+
 module "sqldatabase" {
   source = "./sql-database"
 

cloud/azure/servicebus/README.md

@@ -10,7 +10,6 @@ module "datadog-monitors-azure-servicebus" {
 
   message = "${module.datadog-message-alerting.alerting-message}"
   environment = "${var.environment}"
-  subscription_id = "${var.subscription_id}"
 }
 ```
 
@@ -36,4 +35,7 @@ Inputs
 Related documentation
 ---------------------
 
+DataDog documentation : [https://docs.datadoghq.com/integrations/azure/](https://docs.datadoghq.com/integrations/azure/)  
+You must search `servicebus`, there is no integration for now.
+
 Azure metrics documentation : [https://docs.microsoft.com/fr-fr/azure/monitoring-and-diagnostics/monitoring-supported-metrics#microsoftservicebusnamespaces](https://docs.microsoft.com/fr-fr/azure/monitoring-and-diagnostics/monitoring-supported-metrics#microsoftservicebusnamespaces)

cloud/azure/servicebus/monitors-service-bus.tf

@@ -11,8 +11,8 @@ resource "datadog_monitor" "servicebus_status" {
   message = "${coalesce(var.status_message, var.message)}"
 
   query = <<EOF
-      avg(last_5m): avg:azure.servicebus_namespaces.status{${data.template_file.filter.rendered}} by {resource_group,region,name} != 1
-      EOF
+      min(last_5m): avg:azure.servicebus_namespaces.status{${data.template_file.filter.rendered}} by {resource_group,region,name} != 1
+EOF
 
   type = "metric alert"
 

cloud/azure/stream-analytics/README.md

@@ -10,7 +10,6 @@ module "datadog-monitors-azure-redis" {
 
   message = "${module.datadog-message-alerting.alerting-message}"
   environment = "${var.environment}"
-  subscription_id = "${var.subscription_id}"
 }
 ```