From eb33fbd1edba2312114478012eb317ab4d94039f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Beaufils?= Date: Tue, 21 Jan 2020 10:26:32 +0100 Subject: [PATCH 1/3] MON-557: Create monitor sqlserver.can_connect --- database/sqlserver/README.md | 49 +++++++++++++++ database/sqlserver/inputs.tf | 79 ++++++++++++++++++++++++ database/sqlserver/modules.tf | 10 +++ database/sqlserver/monitors-sqlserver.tf | 31 ++++++++++ database/sqlserver/outputs.tf | 4 ++ 5 files changed, 173 insertions(+) create mode 100644 database/sqlserver/README.md create mode 100644 database/sqlserver/inputs.tf create mode 100644 database/sqlserver/modules.tf create mode 100644 database/sqlserver/monitors-sqlserver.tf create mode 100644 database/sqlserver/outputs.tf diff --git a/database/sqlserver/README.md b/database/sqlserver/README.md new file mode 100644 index 0000000..495fa4e --- /dev/null +++ b/database/sqlserver/README.md @@ -0,0 +1,49 @@ +# DATABASE SQL SERVER DataDog monitors + +## How to use this module + +``` +module "datadog-monitors-database-sqlserver" { + source = "claranet/monitors/datadog//database/sqlserver" + version = "{revision}" + + environment = var.environment + message = module.datadog-message-alerting.alerting-message +} + +``` + +## Purpose + +Creates DataDog monitors with the following checks: + +- SQL Server server does not respond + +## Inputs + +| Name | Description | Type | Default | Required | +|------|-------------|:----:|:-----:|:-----:| +| environment | Environment | string | n/a | yes | +| evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no | +| filter\_tags\_custom | Tags used for custom filtering when filter\_tags\_use\_defaults is false | string | `"*"` | no | +| filter\_tags\_custom\_excluded | Tags excluded for custom filtering when filter\_tags\_use\_defaults is false | string | `""` | no | +| filter\_tags\_use\_defaults | Use default filter tags convention | string | `"true"` | no | +| message | Message sent when an alert is triggered | string | n/a | yes | +| new\_host\_delay | Delay in seconds for the metric evaluation | string | `"300"` | no | +| notify\_no\_data | Will raise no data alert if set to true | string | `"true"` | no | +| prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no | +| sqlserver\_availability\_enabled | Flag to enable SQL Server availability monitor | string | `"true"` | no | +| sqlserver\_availability\_extra\_tags | Extra tags for SQL Server availability monitor | list(string) | `[]` | no | +| sqlserver\_availability\_message | Custom message for SQL Server availability monitor | string | `""` | no | +| sqlserver\_availability\_no\_data\_timeframe | SQL Server availability monitor no data timeframe | string | `"10"` | no | +| sqlserver\_availability\_threshold\_warning | SQL Server availability monitor (warning threshold) | string | `"3"` | no | + +## Outputs + +| Name | Description | +|------|-------------| +| sqlserver\_availability\_id | id for monitor sqlserver\_availability | + +## Related documentation + +DataDog documentation: [https://docs.datadoghq.com/integrations/sqlserver/](https://docs.datadoghq.com/integrations/sqlserver/) diff --git a/database/sqlserver/inputs.tf b/database/sqlserver/inputs.tf new file mode 100644 index 0000000..378a413 --- /dev/null +++ b/database/sqlserver/inputs.tf @@ -0,0 +1,79 @@ +variable "environment" { + description = "Environment" + type = string +} + +variable "evaluation_delay" { + description = "Delay in seconds for the metric evaluation" + default = 15 +} + +variable "new_host_delay" { + description = "Delay in seconds for the metric evaluation" + default = 300 +} + +variable "prefix_slug" { + description = "Prefix string to prepend between brackets on every monitors names" + default = "" +} + +variable "notify_no_data" { + description = "Will raise no data alert if set to true" + default = true +} + +variable "message" { + description = "Message sent when an alert is triggered" +} + +variable "filter_tags_use_defaults" { + description = "Use default filter tags convention" + default = "true" +} + +variable "filter_tags_custom" { + description = "Tags used for custom filtering when filter_tags_use_defaults is false" + default = "*" +} + +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + +# SQL Server specific + +################################# +### SQL Server availability ### +################################# + +variable "sqlserver_availability_enabled" { + description = "Flag to enable SQL Server availability monitor" + type = string + default = "true" +} + +variable "sqlserver_availability_extra_tags" { + description = "Extra tags for SQL Server availability monitor" + type = list(string) + default = [] +} + +variable "sqlserver_availability_message" { + description = "Custom message for SQL Server availability monitor" + type = string + default = "" +} + +variable "sqlserver_availability_threshold_warning" { + description = "SQL Server availability monitor (warning threshold)" + type = string + default = 3 +} + +variable "sqlserver_availability_no_data_timeframe" { + description = "SQL Server availability monitor no data timeframe" + type = string + default = 10 +} diff --git a/database/sqlserver/modules.tf b/database/sqlserver/modules.tf new file mode 100644 index 0000000..37d1850 --- /dev/null +++ b/database/sqlserver/modules.tf @@ -0,0 +1,10 @@ +module "filter-tags" { + source = "../../common/filter-tags" + + environment = var.environment + resource = "mysql" + filter_tags_use_defaults = var.filter_tags_use_defaults + filter_tags_custom = var.filter_tags_custom + filter_tags_custom_excluded = var.filter_tags_custom_excluded +} + diff --git a/database/sqlserver/monitors-sqlserver.tf b/database/sqlserver/monitors-sqlserver.tf new file mode 100644 index 0000000..2351f30 --- /dev/null +++ b/database/sqlserver/monitors-sqlserver.tf @@ -0,0 +1,31 @@ +resource "datadog_monitor" "sqlserver_availability" { + count = var.sqlserver_availability_enabled == "true" ? 1 : 0 + name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] SQL Server server does not respond" + message = coalesce(var.sqlserver_availability_message, var.message) + type = "service check" + + query = < Date: Tue, 21 Jan 2020 10:48:24 +0100 Subject: [PATCH 2/3] MON-557: Update README + update resource name --- README.md | 1 + database/sqlserver/README.md | 38 +++++++++++++++++------------------ database/sqlserver/modules.tf | 2 +- database/sqlserver/outputs.tf | 1 + 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index d440fd0..f19e34e 100644 --- a/README.md +++ b/README.md @@ -200,6 +200,7 @@ module "datadog-monitors-system-generic" { - [mysql](https://github.com/claranet/terraform-datadog-monitors/tree/master/database/mysql/) - [postgresql](https://github.com/claranet/terraform-datadog-monitors/tree/master/database/postgresql/) - [redis](https://github.com/claranet/terraform-datadog-monitors/tree/master/database/redis/) + - [sqlserver](https://github.com/claranet/terraform-datadog-monitors/tree/master/database/sqlserver/) - [middleware](https://github.com/claranet/terraform-datadog-monitors/tree/master/middleware/) - [apache](https://github.com/claranet/terraform-datadog-monitors/tree/master/middleware/apache/) - [kong](https://github.com/claranet/terraform-datadog-monitors/tree/master/middleware/kong/) diff --git a/database/sqlserver/README.md b/database/sqlserver/README.md index 495fa4e..fada893 100644 --- a/database/sqlserver/README.md +++ b/database/sqlserver/README.md @@ -1,11 +1,11 @@ -# DATABASE SQL SERVER DataDog monitors +# DATABASE SQLSERVER DataDog monitors ## How to use this module -``` +```hcl module "datadog-monitors-database-sqlserver" { - source = "claranet/monitors/datadog//database/sqlserver" - version = "{revision}" + source = "claranet/monitors/datadog//database/sqlserver" + version = "{revision}" environment = var.environment message = module.datadog-message-alerting.alerting-message @@ -22,21 +22,21 @@ Creates DataDog monitors with the following checks: ## Inputs | Name | Description | Type | Default | Required | -|------|-------------|:----:|:-----:|:-----:| -| environment | Environment | string | n/a | yes | -| evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no | -| filter\_tags\_custom | Tags used for custom filtering when filter\_tags\_use\_defaults is false | string | `"*"` | no | -| filter\_tags\_custom\_excluded | Tags excluded for custom filtering when filter\_tags\_use\_defaults is false | string | `""` | no | -| filter\_tags\_use\_defaults | Use default filter tags convention | string | `"true"` | no | -| message | Message sent when an alert is triggered | string | n/a | yes | -| new\_host\_delay | Delay in seconds for the metric evaluation | string | `"300"` | no | -| notify\_no\_data | Will raise no data alert if set to true | string | `"true"` | no | -| prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no | -| sqlserver\_availability\_enabled | Flag to enable SQL Server availability monitor | string | `"true"` | no | -| sqlserver\_availability\_extra\_tags | Extra tags for SQL Server availability monitor | list(string) | `[]` | no | -| sqlserver\_availability\_message | Custom message for SQL Server availability monitor | string | `""` | no | -| sqlserver\_availability\_no\_data\_timeframe | SQL Server availability monitor no data timeframe | string | `"10"` | no | -| sqlserver\_availability\_threshold\_warning | SQL Server availability monitor (warning threshold) | string | `"3"` | no | +|------|-------------|------|---------|:-----:| +| environment | Environment | `string` | n/a | yes | +| evaluation\_delay | Delay in seconds for the metric evaluation | `number` | `15` | no | +| filter\_tags\_custom | Tags used for custom filtering when filter\_tags\_use\_defaults is false | `string` | `"*"` | no | +| filter\_tags\_custom\_excluded | Tags excluded for custom filtering when filter\_tags\_use\_defaults is false | `string` | `""` | no | +| filter\_tags\_use\_defaults | Use default filter tags convention | `string` | `"true"` | no | +| message | Message sent when an alert is triggered | `any` | n/a | yes | +| new\_host\_delay | Delay in seconds for the metric evaluation | `number` | `300` | no | +| notify\_no\_data | Will raise no data alert if set to true | `bool` | `true` | no | +| prefix\_slug | Prefix string to prepend between brackets on every monitors names | `string` | `""` | no | +| sqlserver\_availability\_enabled | Flag to enable SQL Server availability monitor | `string` | `"true"` | no | +| sqlserver\_availability\_extra\_tags | Extra tags for SQL Server availability monitor | `list(string)` | `[]` | no | +| sqlserver\_availability\_message | Custom message for SQL Server availability monitor | `string` | `""` | no | +| sqlserver\_availability\_no\_data\_timeframe | SQL Server availability monitor no data timeframe | `string` | `10` | no | +| sqlserver\_availability\_threshold\_warning | SQL Server availability monitor (warning threshold) | `string` | `3` | no | ## Outputs diff --git a/database/sqlserver/modules.tf b/database/sqlserver/modules.tf index 37d1850..ad2d0d8 100644 --- a/database/sqlserver/modules.tf +++ b/database/sqlserver/modules.tf @@ -2,7 +2,7 @@ module "filter-tags" { source = "../../common/filter-tags" environment = var.environment - resource = "mysql" + resource = "sqlserver" filter_tags_use_defaults = var.filter_tags_use_defaults filter_tags_custom = var.filter_tags_custom filter_tags_custom_excluded = var.filter_tags_custom_excluded diff --git a/database/sqlserver/outputs.tf b/database/sqlserver/outputs.tf index 146f651..2fb45db 100644 --- a/database/sqlserver/outputs.tf +++ b/database/sqlserver/outputs.tf @@ -2,3 +2,4 @@ output "sqlserver_availability_id" { description = "id for monitor sqlserver_availability" value = datadog_monitor.sqlserver_availability.*.id } + From 43866c3f40daae6a61871f7539f2f2c7e24ddc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Beaufils?= Date: Thu, 23 Jan 2020 10:54:26 +0100 Subject: [PATCH 3/3] MON-557: Update trigger condition - remove port not existing and replacing by db --- database/sqlserver/monitors-sqlserver.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/sqlserver/monitors-sqlserver.tf b/database/sqlserver/monitors-sqlserver.tf index 2351f30..9739f45 100644 --- a/database/sqlserver/monitors-sqlserver.tf +++ b/database/sqlserver/monitors-sqlserver.tf @@ -5,7 +5,7 @@ resource "datadog_monitor" "sqlserver_availability" { type = "service check" query = <