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
 }
+