From 70ccf81cd2980d580ccf06fc77bdb7832d7ffad5 Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Wed, 6 Mar 2024 13:22:59 +0100 Subject: [PATCH 1/3] chore: update Sumo Logic Terraform Provider to 2.28.3 This is needed to fix vulnerabilities --- monitor_packages/ActiveMQ/versions.tf | 4 ++-- monitor_packages/ApacheTomcat/versions.tf | 4 ++-- monitor_packages/Cassandra/versions.tf | 4 ++-- monitor_packages/Couchbase/versions.tf | 4 ++-- monitor_packages/Elasticsearch/versions.tf | 4 ++-- monitor_packages/IIS/versions.tf | 4 ++-- monitor_packages/Kafka/versions.tf | 4 ++-- monitor_packages/MariaDB/versions.tf | 4 ++-- monitor_packages/Memcached/versions.tf | 4 ++-- monitor_packages/MongoDB/versions.tf | 4 ++-- monitor_packages/Oracle/versions.tf | 4 ++-- monitor_packages/RabbitMQ/versions.tf | 4 ++-- monitor_packages/SQLServer/versions.tf | 2 +- monitor_packages/SquidProxy/versions.tf | 4 ++-- monitor_packages/Varnish/versions.tf | 4 ++-- monitor_packages/apache/versions.tf | 4 ++-- monitor_packages/haproxy/versions.tf | 4 ++-- monitor_packages/host_process_metrics/versions.tf | 2 +- monitor_packages/http_response/versions.tf | 4 ++-- monitor_packages/kubernetes/versions.tf | 4 ++-- monitor_packages/mysql/versions.tf | 4 ++-- monitor_packages/nginx-ingress/versions.tf | 4 ++-- monitor_packages/nginx-plus-ingress/versions.tf | 4 ++-- monitor_packages/nginx-plus/versions.tf | 4 ++-- monitor_packages/nginx/versions.tf | 4 ++-- monitor_packages/postgresql/versions.tf | 4 ++-- monitor_packages/redis/versions.tf | 4 ++-- 27 files changed, 52 insertions(+), 52 deletions(-) diff --git a/monitor_packages/ActiveMQ/versions.tf b/monitor_packages/ActiveMQ/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/ActiveMQ/versions.tf +++ b/monitor_packages/ActiveMQ/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/ApacheTomcat/versions.tf b/monitor_packages/ApacheTomcat/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/ApacheTomcat/versions.tf +++ b/monitor_packages/ApacheTomcat/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/Cassandra/versions.tf b/monitor_packages/Cassandra/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/Cassandra/versions.tf +++ b/monitor_packages/Cassandra/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/Couchbase/versions.tf b/monitor_packages/Couchbase/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/Couchbase/versions.tf +++ b/monitor_packages/Couchbase/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/Elasticsearch/versions.tf b/monitor_packages/Elasticsearch/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/Elasticsearch/versions.tf +++ b/monitor_packages/Elasticsearch/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/IIS/versions.tf b/monitor_packages/IIS/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/IIS/versions.tf +++ b/monitor_packages/IIS/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/Kafka/versions.tf b/monitor_packages/Kafka/versions.tf index 35d5918..a25e035 100644 --- a/monitor_packages/Kafka/versions.tf +++ b/monitor_packages/Kafka/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/MariaDB/versions.tf b/monitor_packages/MariaDB/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/MariaDB/versions.tf +++ b/monitor_packages/MariaDB/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/Memcached/versions.tf b/monitor_packages/Memcached/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/Memcached/versions.tf +++ b/monitor_packages/Memcached/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/MongoDB/versions.tf b/monitor_packages/MongoDB/versions.tf index 35d5918..a25e035 100644 --- a/monitor_packages/MongoDB/versions.tf +++ b/monitor_packages/MongoDB/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/Oracle/versions.tf b/monitor_packages/Oracle/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/Oracle/versions.tf +++ b/monitor_packages/Oracle/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/RabbitMQ/versions.tf b/monitor_packages/RabbitMQ/versions.tf index c8703b1..b9ce94c 100644 --- a/monitor_packages/RabbitMQ/versions.tf +++ b/monitor_packages/RabbitMQ/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/SQLServer/versions.tf b/monitor_packages/SQLServer/versions.tf index 9c6a206..79ec292 100644 --- a/monitor_packages/SQLServer/versions.tf +++ b/monitor_packages/SQLServer/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } diff --git a/monitor_packages/SquidProxy/versions.tf b/monitor_packages/SquidProxy/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/SquidProxy/versions.tf +++ b/monitor_packages/SquidProxy/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/Varnish/versions.tf b/monitor_packages/Varnish/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/Varnish/versions.tf +++ b/monitor_packages/Varnish/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/apache/versions.tf b/monitor_packages/apache/versions.tf index 35d5918..a25e035 100644 --- a/monitor_packages/apache/versions.tf +++ b/monitor_packages/apache/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/haproxy/versions.tf b/monitor_packages/haproxy/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/haproxy/versions.tf +++ b/monitor_packages/haproxy/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/host_process_metrics/versions.tf b/monitor_packages/host_process_metrics/versions.tf index 4c6b36a..a25e035 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.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } diff --git a/monitor_packages/http_response/versions.tf b/monitor_packages/http_response/versions.tf index 35d5918..a25e035 100644 --- a/monitor_packages/http_response/versions.tf +++ b/monitor_packages/http_response/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/kubernetes/versions.tf b/monitor_packages/kubernetes/versions.tf index 35d5918..a25e035 100644 --- a/monitor_packages/kubernetes/versions.tf +++ b/monitor_packages/kubernetes/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/mysql/versions.tf b/monitor_packages/mysql/versions.tf index 35d5918..a25e035 100644 --- a/monitor_packages/mysql/versions.tf +++ b/monitor_packages/mysql/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/nginx-ingress/versions.tf b/monitor_packages/nginx-ingress/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/nginx-ingress/versions.tf +++ b/monitor_packages/nginx-ingress/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/nginx-plus-ingress/versions.tf b/monitor_packages/nginx-plus-ingress/versions.tf index 35d5918..a25e035 100644 --- a/monitor_packages/nginx-plus-ingress/versions.tf +++ b/monitor_packages/nginx-plus-ingress/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/nginx-plus/versions.tf b/monitor_packages/nginx-plus/versions.tf index 35d5918..a25e035 100644 --- a/monitor_packages/nginx-plus/versions.tf +++ b/monitor_packages/nginx-plus/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/nginx/versions.tf b/monitor_packages/nginx/versions.tf index 8dc4f77..79ec292 100644 --- a/monitor_packages/nginx/versions.tf +++ b/monitor_packages/nginx/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/postgresql/versions.tf b/monitor_packages/postgresql/versions.tf index 35d5918..a25e035 100644 --- a/monitor_packages/postgresql/versions.tf +++ b/monitor_packages/postgresql/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} diff --git a/monitor_packages/redis/versions.tf b/monitor_packages/redis/versions.tf index 35d5918..a25e035 100644 --- a/monitor_packages/redis/versions.tf +++ b/monitor_packages/redis/versions.tf @@ -3,8 +3,8 @@ terraform { required_providers { sumologic = { - version = "~> 2.18.0" + version = ">= 2.28.3, < 3.0.0" source = "SumoLogic/sumologic" } } -} \ No newline at end of file +} From 2feb11f5f03bcc727a02dc15493dc72987b68b54 Mon Sep 17 00:00:00 2001 From: Sachin Magar Date: Wed, 20 Mar 2024 17:01:06 +0530 Subject: [PATCH 2/3] resolved Invalid threshold configuration issues and duplicate variale --- monitor_packages/Elasticsearch/Elasticsearch.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/monitor_packages/Elasticsearch/Elasticsearch.tf b/monitor_packages/Elasticsearch/Elasticsearch.tf index f2517af..8064b8b 100644 --- a/monitor_packages/Elasticsearch/Elasticsearch.tf +++ b/monitor_packages/Elasticsearch/Elasticsearch.tf @@ -462,7 +462,7 @@ module "Elasticsearch-TooManySlowQuery" { time_range = "5m", occurrence_type = "ResultCount" trigger_source = "AllResults" - trigger_type = "Warning", + trigger_type = "Critical", detection_method = "StaticCondition" }, { @@ -471,25 +471,25 @@ module "Elasticsearch-TooManySlowQuery" { time_range = "5m", occurrence_type = "ResultCount" trigger_source = "AllResults" - trigger_type = "ResolvedWarning", + trigger_type = "ResolvedCritical", detection_method = "StaticCondition" }, { - threshold_type = "GreaterThanOrEqual", + threshold_type = "GreaterThan", threshold = 0, time_range = "5m", occurrence_type = "ResultCount" trigger_source = "AllResults" - trigger_type = "Critical", + trigger_type = "Warning", detection_method = "StaticCondition" }, { - threshold_type = "LessThan", + threshold_type = "LessThanOrEqual", threshold = 0, time_range = "5m", occurrence_type = "ResultCount" trigger_source = "AllResults" - trigger_type = "ResolvedCritical", + trigger_type = "ResolvedWarning", detection_method = "StaticCondition" } ] From 44859398f19ff8c2c6e7528c883e36e4af2e661c Mon Sep 17 00:00:00 2001 From: Sachin Magar Date: Wed, 20 Mar 2024 17:15:04 +0530 Subject: [PATCH 3/3] resolved Invalid threshold configuration issues and duplicate variale --- monitor_packages/Couchbase/variables.tf | 14 -------------- monitor_packages/Kafka/kafka.tf | 4 ++-- monitor_packages/Oracle/Oracle.tf | 4 ++-- monitor_packages/SquidProxy/squidproxy.tf | 12 ++++++------ 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/monitor_packages/Couchbase/variables.tf b/monitor_packages/Couchbase/variables.tf index e3a8bcb..4d176bb 100644 --- a/monitor_packages/Couchbase/variables.tf +++ b/monitor_packages/Couchbase/variables.tf @@ -86,20 +86,6 @@ variable "email_notifications_critical" { description = "Email Notifications to be sent by the critical alert." } -variable "email_notifications_critical" { - type = list(object( - { - connection_type = string, - recipients = list(string), - subject = string, - time_zone = string, - message_body = string, - run_for_trigger_types = list(string) - } - )) - description = "Email Notifications to be sent by the critical alert." -} - variable "email_notifications_warning" { type = list(object( { diff --git a/monitor_packages/Kafka/kafka.tf b/monitor_packages/Kafka/kafka.tf index 37fa57f..d589316 100644 --- a/monitor_packages/Kafka/kafka.tf +++ b/monitor_packages/Kafka/kafka.tf @@ -233,7 +233,7 @@ module "FatalEventonBroker" { time_range = "5m", trigger_type = "Critical", threshold = 0, - threshold_type = "GreaterThanOrEqual", + threshold_type = "GreaterThan", occurrence_type = "ResultCount", trigger_source = "AllResults" @@ -243,7 +243,7 @@ module "FatalEventonBroker" { time_range = "5m", trigger_type = "ResolvedCritical", threshold = 0, - threshold_type = "LessThan", + threshold_type = "LessThanOrEqual", occurrence_type = "ResultCount" trigger_source = "AllResults" diff --git a/monitor_packages/Oracle/Oracle.tf b/monitor_packages/Oracle/Oracle.tf index bbbec3f..18108e3 100644 --- a/monitor_packages/Oracle/Oracle.tf +++ b/monitor_packages/Oracle/Oracle.tf @@ -49,7 +49,7 @@ module "Oracle-DatabaseCrash" { } triggers = [ { - threshold_type = "GreaterThanOrEqual", + threshold_type = "GreaterThan", threshold = 0, time_range = "5m", occurrence_type = "ResultCount" @@ -58,7 +58,7 @@ module "Oracle-DatabaseCrash" { detection_method = "LogsStaticCondition" }, { - threshold_type = "LessThan", + threshold_type = "LessThanOrEqual", threshold = 0, time_range = "5m", occurrence_type = "ResultCount" diff --git a/monitor_packages/SquidProxy/squidproxy.tf b/monitor_packages/SquidProxy/squidproxy.tf index 8e9f7fd..6963826 100644 --- a/monitor_packages/SquidProxy/squidproxy.tf +++ b/monitor_packages/SquidProxy/squidproxy.tf @@ -51,7 +51,7 @@ module "SquidProxy-HighClientHTTP4xxErrorRate" { } triggers = [ { - threshold_type = "GreaterThanOrEqual", + threshold_type = "GreaterThan", threshold = 0, time_range = "5m", occurrence_type = "ResultCount" @@ -60,7 +60,7 @@ module "SquidProxy-HighClientHTTP4xxErrorRate" { detection_method = "LogsStaticCondition" }, { - threshold_type = "LessThan", + threshold_type = "LessThanOrEqual", threshold = 0, time_range = "5m", occurrence_type = "ResultCount" @@ -86,7 +86,7 @@ module "SquidProxy-HighServerHTTP5xxErrorRate" { } triggers = [ { - threshold_type = "GreaterThanOrEqual", + threshold_type = "GreaterThan", threshold = 0, time_range = "5m", occurrence_type = "ResultCount" @@ -95,7 +95,7 @@ module "SquidProxy-HighServerHTTP5xxErrorRate" { detection_method = "LogsStaticCondition" }, { - threshold_type = "LessThan", + threshold_type = "LessThanOrEqual", threshold = 0, time_range = "5m", occurrence_type = "ResultCount" @@ -121,7 +121,7 @@ module "SquidProxy-HighDeniedRequest" { } triggers = [ { - threshold_type = "GreaterThanOrEqual", + threshold_type = "GreaterThan", threshold = 0, time_range = "5m", occurrence_type = "ResultCount" @@ -130,7 +130,7 @@ module "SquidProxy-HighDeniedRequest" { detection_method = "LogsStaticCondition" }, { - threshold_type = "LessThan", + threshold_type = "LessThanOrEqual", threshold = 0, time_range = "5m", occurrence_type = "ResultCount"