Merge pull request #3 from kabisa/provider-v3

Provider v3

Author: obeleh

.terraform.lock.hcl

@@ -222,7 +222,6 @@ avg(last_10m):max:sqlserver.stats.procs_blocked{tag:xxx} by {host} >= 1
 | variable                   | default  | required | description  |
 |----------------------------|----------|----------|--------------|
 | env                        |          | Yes      |              |
-| alert_env                  |          | Yes      |              |
 | filter_str                 |          | Yes      |              |
 | service                    |          | Yes      |              |
 | notification_channel       |          | Yes      |              |

README.md

@@ -6,7 +6,8 @@ locals {
 }
 
 module "batches_compiled_percent" {
-  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.6.2"
+  source  = "kabisa/generic-monitor/datadog"
+  version = "0.7.5"
 
   name  = "SQL Server - Percentage of batches requiring compilation"
   query = "avg(${var.batches_compiled_percent_evaluation_period}):(max:sqlserver.stats.sql_compilations{${local.batches_compiled_percent_filter}} by {host} / max:sqlserver.stats.batch_requests{${local.batches_compiled_percent_filter}} by {host}) * 100 >= ${var.batches_compiled_percent_critical}"
@@ -24,7 +25,7 @@ module "batches_compiled_percent" {
   note               = var.batches_compiled_percent_note
 
   # module level vars
-  env                  = var.alert_env
+  env                  = var.env
   service              = var.service
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags

batches-compiled-percent.tf

@@ -6,7 +6,8 @@ locals {
 }
 
 module "buffer_cache_hit_ratio" {
-  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.6.2"
+  source  = "kabisa/generic-monitor/datadog"
+  version = "0.7.5"
 
   name  = "SQL Server - Buffer cache hit ratio"
   query = "avg(${var.buffer_cache_hit_ratio_evaluation_period}):min:sqlserver.buffer.cache_hit_ratio{${local.buffer_cache_hit_ratio_filter}} by {host} * 100 < ${var.buffer_cache_hit_ratio_critical}"
@@ -24,7 +25,7 @@ module "buffer_cache_hit_ratio" {
   note               = var.buffer_cache_hit_ratio_note
 
   # module level vars
-  env                  = var.alert_env
+  env                  = var.env
   service              = var.service
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags

buffer-cache-hit-ratio.tf

@@ -1,8 +1,9 @@
 module "can_connect" {
-  source = "git@github.com:kabisa/terraform-datadog-service-check-monitor.git?ref=1.2.0"
+  source  = "kabisa/service-check-monitor/datadog"
+  version = "1.4.1"
 
   name         = "SQL Server - Can connect"
-  check_name   = "sqlserver.can_connect"
+  metric_name  = "sqlserver.can_connect"
   by_tags      = ["host", "db"]
   include_tags = local.service_check_include_tags
   exclude_tags = local.service_check_exclude_tags
@@ -20,7 +21,7 @@ module "can_connect" {
   note               = var.can_connect_note
 
   # module level vars
-  env                  = var.alert_env
+  env                  = var.env
   service              = var.service
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags

can-connect.tf

@@ -6,7 +6,8 @@ locals {
 }
 
 module "connections" {
-  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.6.2"
+  source  = "kabisa/generic-monitor/datadog"
+  version = "0.7.5"
 
   name  = "SQL Server - Connections"
   query = "avg(${var.connections_evaluation_period}):max:sqlserver.stats.connections{${local.connections_filter}} by {host} >= ${var.connections_critical}"
@@ -24,7 +25,7 @@ module "connections" {
   note               = var.connections_note
 
   # module level vars
-  env                  = var.alert_env
+  env                  = var.env
   service              = var.service
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags

connections.tf

@@ -6,7 +6,8 @@ locals {
 }
 
 module "database_state" {
-  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.6.2"
+  source  = "kabisa/generic-monitor/datadog"
+  version = "0.7.5"
 
   name  = "SQL Server - Database state"
   query = "max(${var.database_state_evaluation_period}):max:sqlserver.database.state{${local.database_state_filter}} by {host,database,database_state_desc} >= ${var.database_state_critical}"
@@ -24,7 +25,7 @@ module "database_state" {
   note               = var.database_state_note
 
   # module level vars
-  env                  = var.alert_env
+  env                  = var.env
   service              = var.service
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags

database-state.tf

@@ -6,7 +6,8 @@ locals {
 }
 
 module "lock_waits" {
-  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.6.2"
+  source  = "kabisa/generic-monitor/datadog"
+  version = "0.7.5"
 
   name  = "SQL Server - Lock waits"
   query = "avg(${var.lock_waits_evaluation_period}):max:sqlserver.stats.lock_waits{${local.lock_waits_filter}} by {host} > ${var.lock_waits_critical}"
@@ -24,7 +25,7 @@ module "lock_waits" {
   note               = var.lock_waits_note
 
   # module level vars
-  env                  = var.alert_env
+  env                  = var.env
   service              = var.service
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags

lock-waits.tf

@@ -6,7 +6,8 @@ locals {
 }
 
 module "page_life_expectancy" {
-  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.6.2"
+  source  = "kabisa/generic-monitor/datadog"
+  version = "0.7.5"
 
   name  = "SQL Server - Page life expectancy"
   query = "avg(${var.page_life_expectancy_evaluation_period}):min:sqlserver.buffer.page_life_expectancy{${local.page_life_expectancy_filter}} by {host} < ${var.page_life_expectancy_critical}"
@@ -24,7 +25,7 @@ module "page_life_expectancy" {
   note               = var.page_life_expectancy_note
 
   # module level vars
-  env                  = var.alert_env
+  env                  = var.env
   service              = var.service
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags

page-life-expectancy.tf

@@ -6,7 +6,8 @@ locals {
 }
 
 module "procs_blocked" {
-  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.6.2"
+  source  = "kabisa/generic-monitor/datadog"
+  version = "0.7.5"
 
   name  = "SQL Server - Blocked processes"
   query = "avg(${var.procs_blocked_evaluation_period}):max:sqlserver.stats.procs_blocked{${local.procs_blocked_filter}} by {host} >= ${var.procs_blocked_critical}"
@@ -24,7 +25,7 @@ module "procs_blocked" {
   note               = var.procs_blocked_note
 
   # module level vars
-  env                  = var.alert_env
+  env                  = var.env
   service              = var.service
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags