diff --git a/main.tf b/main.tf
index 375b3d5..4d31583 100644
--- a/main.tf
+++ b/main.tf
@@ -55,7 +55,7 @@ resource "sumologic_monitor" "tf_monitor" {
 
  trigger_conditions {
     dynamic "logs_static_condition" {
-            for_each = toset(var.monitor_monitor_type == "Logs" ? ["1"] : [])
+            for_each = toset(var.monitor_monitor_type == "Logs" && (local.hasLogsCriticalAlert||local.hasLogsWarningAlert) ? ["1"] : [])
             content {
               dynamic "critical" {
                 for_each = local.hasLogsCriticalAlert ? ["1"] : []
@@ -94,7 +94,7 @@ resource "sumologic_monitor" "tf_monitor" {
       }
     }
     dynamic "metrics_static_condition" {
-            for_each = toset(var.monitor_monitor_type == "Metrics" ? ["1"] : [])
+            for_each = toset(var.monitor_monitor_type == "Metrics"&&(local.hasMetricsCriticalAlert||local.hasMetricsWarningAlert) ? ["1"] : [])
             content {
               dynamic "critical" {
                 for_each = local.hasMetricsCriticalAlert ? ["1"] : []
diff --git a/monitor_packages/ActiveMQ/versions.tf b/monitor_packages/ActiveMQ/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/ActiveMQ/versions.tf
+++ b/monitor_packages/ActiveMQ/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/ApacheTomcat/versions.tf b/monitor_packages/ApacheTomcat/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/ApacheTomcat/versions.tf
+++ b/monitor_packages/ApacheTomcat/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/Cassandra/versions.tf b/monitor_packages/Cassandra/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/Cassandra/versions.tf
+++ b/monitor_packages/Cassandra/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/Couchbase/versions.tf b/monitor_packages/Couchbase/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/Couchbase/versions.tf
+++ b/monitor_packages/Couchbase/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/Elasticsearch/versions.tf b/monitor_packages/Elasticsearch/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/Elasticsearch/versions.tf
+++ b/monitor_packages/Elasticsearch/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/IIS/versions.tf b/monitor_packages/IIS/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/IIS/versions.tf
+++ b/monitor_packages/IIS/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/Kafka/versions.tf b/monitor_packages/Kafka/versions.tf
index de2227b..35d5918 100644
--- a/monitor_packages/Kafka/versions.tf
+++ b/monitor_packages/Kafka/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/MariaDB/versions.tf b/monitor_packages/MariaDB/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/MariaDB/versions.tf
+++ b/monitor_packages/MariaDB/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/Memcached/versions.tf b/monitor_packages/Memcached/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/Memcached/versions.tf
+++ b/monitor_packages/Memcached/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/MongoDB/MongoDB.tf b/monitor_packages/MongoDB/MongoDB.tf
index 9c98592..b6d9baf 100644
--- a/monitor_packages/MongoDB/MongoDB.tf
+++ b/monitor_packages/MongoDB/MongoDB.tf
@@ -122,7 +122,7 @@ module "MongoDB-MissingPrimary" {
 			]
 }
 module "MongoDB-InstanceDown" {
-  source                    = "SumoLogic/sumo-logic-monitor/sumologic"
+  source                    = "../../"
   #version                  = "{revision}"
   monitor_name                = "MongoDB - Instance Down"
   monitor_description         = "This alert fires when we detect that the MongoDB instance is down."
diff --git a/monitor_packages/MongoDB/versions.tf b/monitor_packages/MongoDB/versions.tf
index de2227b..35d5918 100644
--- a/monitor_packages/MongoDB/versions.tf
+++ b/monitor_packages/MongoDB/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/Oracle/versions.tf b/monitor_packages/Oracle/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/Oracle/versions.tf
+++ b/monitor_packages/Oracle/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/RabbitMQ/versions.tf b/monitor_packages/RabbitMQ/versions.tf
index 8ce5bd5..c8703b1 100644
--- a/monitor_packages/RabbitMQ/versions.tf
+++ b/monitor_packages/RabbitMQ/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source  = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/SQLServer/versions.tf b/monitor_packages/SQLServer/versions.tf
index 4773d56..9c6a206 100644
--- a/monitor_packages/SQLServer/versions.tf
+++ b/monitor_packages/SQLServer/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/SquidProxy/versions.tf b/monitor_packages/SquidProxy/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/SquidProxy/versions.tf
+++ b/monitor_packages/SquidProxy/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/Varnish/versions.tf b/monitor_packages/Varnish/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/Varnish/versions.tf
+++ b/monitor_packages/Varnish/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/apache/versions.tf b/monitor_packages/apache/versions.tf
index de2227b..35d5918 100644
--- a/monitor_packages/apache/versions.tf
+++ b/monitor_packages/apache/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/haproxy/versions.tf b/monitor_packages/haproxy/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/haproxy/versions.tf
+++ b/monitor_packages/haproxy/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/host_process_metrics/versions.tf b/monitor_packages/host_process_metrics/versions.tf
index 34e2c69..4c6b36a 100644
--- a/monitor_packages/host_process_metrics/versions.tf
+++ b/monitor_packages/host_process_metrics/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/http_response/versions.tf b/monitor_packages/http_response/versions.tf
index de2227b..35d5918 100644
--- a/monitor_packages/http_response/versions.tf
+++ b/monitor_packages/http_response/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/kubernetes/versions.tf b/monitor_packages/kubernetes/versions.tf
index de2227b..35d5918 100644
--- a/monitor_packages/kubernetes/versions.tf
+++ b/monitor_packages/kubernetes/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/mysql/versions.tf b/monitor_packages/mysql/versions.tf
index de2227b..35d5918 100644
--- a/monitor_packages/mysql/versions.tf
+++ b/monitor_packages/mysql/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/nginx-ingress/versions.tf b/monitor_packages/nginx-ingress/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/nginx-ingress/versions.tf
+++ b/monitor_packages/nginx-ingress/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/nginx-plus-ingress/versions.tf b/monitor_packages/nginx-plus-ingress/versions.tf
index de2227b..35d5918 100644
--- a/monitor_packages/nginx-plus-ingress/versions.tf
+++ b/monitor_packages/nginx-plus-ingress/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/nginx-plus/versions.tf b/monitor_packages/nginx-plus/versions.tf
index de2227b..35d5918 100644
--- a/monitor_packages/nginx-plus/versions.tf
+++ b/monitor_packages/nginx-plus/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/nginx/versions.tf b/monitor_packages/nginx/versions.tf
index 438d169..8dc4f77 100644
--- a/monitor_packages/nginx/versions.tf
+++ b/monitor_packages/nginx/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/postgresql/versions.tf b/monitor_packages/postgresql/versions.tf
index de2227b..35d5918 100644
--- a/monitor_packages/postgresql/versions.tf
+++ b/monitor_packages/postgresql/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }
diff --git a/monitor_packages/redis/versions.tf b/monitor_packages/redis/versions.tf
index de2227b..35d5918 100644
--- a/monitor_packages/redis/versions.tf
+++ b/monitor_packages/redis/versions.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     sumologic = {
-      version = "~> 2.6.2"
+      version = "~> 2.18.0"
       source = "SumoLogic/sumologic"
     }
   }