From 8611688834acbe71e1695faa7ce7d0ef7c5300ee Mon Sep 17 00:00:00 2001
From: Himanshu Sharma <hsharma@sumologic.com>
Date: Mon, 20 Mar 2023 14:36:55 +0530
Subject: [PATCH 1/2] Updating app components monitors with FGP block

---
 application-components/cassandra_monitors.tf  |  5 ++++
 application-components/couchbase_monitors.tf  |  5 ++++
 application-components/db_component.tf        | 26 +++++++++----------
 .../elasticsearch_monitors.tf                 |  5 ++++
 application-components/main.tf                |  5 ++++
 application-components/mariadb_monitors.tf    |  5 ++++
 application-components/memcached_monitors.tf  |  5 ++++
 application-components/mongodb_monitors.tf    |  5 ++++
 application-components/mysql_monitors.tf      |  5 ++++
 application-components/oracle_monitors.tf     |  5 ++++
 application-components/postgresql_monitors.tf |  5 ++++
 application-components/redis_monitors.tf      |  5 ++++
 application-components/sqlserver_monitors.tf  |  5 ++++
 application-components/variables.tf           |  4 +--
 14 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/application-components/cassandra_monitors.tf b/application-components/cassandra_monitors.tf
index 6c976adf..c8b265d1 100644
--- a/application-components/cassandra_monitors.tf
+++ b/application-components/cassandra_monitors.tf
@@ -4,6 +4,11 @@ resource "sumologic_monitor_folder" "cassandra_monitor_folder" {
   name        = var.cassandra_monitor_folder
   description = "Folder for Cassandra Monitors"
   parent_id   = sumologic_monitor_folder.root_monitor_folder.id
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
 
 module "Cassandra-CompactionTaskPending" {
diff --git a/application-components/couchbase_monitors.tf b/application-components/couchbase_monitors.tf
index 65cbfed7..e312c41b 100644
--- a/application-components/couchbase_monitors.tf
+++ b/application-components/couchbase_monitors.tf
@@ -4,6 +4,11 @@ resource "sumologic_monitor_folder" "couchbase_monitor_folder" {
   name        = var.couchbase_monitor_folder
   description = "Folder for Couchbase Monitors"
   parent_id   = sumologic_monitor_folder.root_monitor_folder.id
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
 
 module "Couchbase-HighMemoryUsage" {
diff --git a/application-components/db_component.tf b/application-components/db_component.tf
index 99ee6f3c..b313f4e6 100644
--- a/application-components/db_component.tf
+++ b/application-components/db_component.tf
@@ -61,16 +61,16 @@ resource "sumologic_field" "pod_labels_db_cluster_port" {
 
 # ********************** Database component FERs ********************** #
 
-resource "sumologic_field_extraction_rule" "SumoLogicFieldExtractionRulesForDatabase" {
-  depends_on       = [sumologic_field.db_cluster, sumologic_field.db_system, sumologic_field.db_cluster_address, sumologic_field.db_cluster_port, sumologic_field.pod_labels_db_cluster, sumologic_field.pod_labels_db_system, sumologic_field.pod_labels_db_cluster_address, sumologic_field.pod_labels_db_cluster_port]
-  count            = length(local.all_components_values) > 0 && local.has_any_kubernetes_deployments ? 1 : 0
-  enabled          = true
-  name             = local.database_fer_name
-  parse_expression = <<EOT
-        if (!isEmpty(pod_labels_environment), pod_labels_environment, "") as environment
-        | pod_labels_component as component
-        | pod_labels_db_system as db_system
-        | pod_labels_db_cluster as db_cluster
-    EOT
-  scope            = "pod_labels_environment=* pod_labels_component=database pod_labels_db_system=* pod_labels_db_cluster=*"
-}
+# resource "sumologic_field_extraction_rule" "SumoLogicFieldExtractionRulesForDatabase" {
+#   depends_on       = [sumologic_field.db_cluster, sumologic_field.db_system, sumologic_field.db_cluster_address, sumologic_field.db_cluster_port, sumologic_field.pod_labels_db_cluster, sumologic_field.pod_labels_db_system, sumologic_field.pod_labels_db_cluster_address, sumologic_field.pod_labels_db_cluster_port]
+#   count            = length(local.all_components_values) > 0 && local.has_any_kubernetes_deployments ? 1 : 0
+#   enabled          = true
+#   name             = local.database_fer_name
+#   parse_expression = <<EOT
+#         if (!isEmpty(pod_labels_environment), pod_labels_environment, "") as environment
+#         | pod_labels_component as component
+#         | pod_labels_db_system as db_system
+#         | pod_labels_db_cluster as db_cluster
+#     EOT
+#   scope            = "account=prod"
+# }
diff --git a/application-components/elasticsearch_monitors.tf b/application-components/elasticsearch_monitors.tf
index bdc7896a..5728899a 100644
--- a/application-components/elasticsearch_monitors.tf
+++ b/application-components/elasticsearch_monitors.tf
@@ -4,6 +4,11 @@ resource "sumologic_monitor_folder" "elasticsearch_monitor_folder" {
   name        = var.elasticsearch_monitor_folder
   description = "Folder for Elasticsearch Monitors"
   parent_id   = sumologic_monitor_folder.root_monitor_folder.id
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
 
 module "Elasticsearch-QueryTimeTooSlow" {
diff --git a/application-components/main.tf b/application-components/main.tf
index 86e35b52..648bf0aa 100644
--- a/application-components/main.tf
+++ b/application-components/main.tf
@@ -51,4 +51,9 @@ resource "sumologic_content_permission" "share_personal_root_apps_folder_with_or
 resource "sumologic_monitor_folder" "root_monitor_folder" {
   name        = "${var.monitors_folder_name} - ${local.solution_version}"
   description = "This folder contains all the monitors for Application Component Solution."
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
diff --git a/application-components/mariadb_monitors.tf b/application-components/mariadb_monitors.tf
index 885b5334..018af7b0 100644
--- a/application-components/mariadb_monitors.tf
+++ b/application-components/mariadb_monitors.tf
@@ -4,6 +4,11 @@ resource "sumologic_monitor_folder" "mariadb_monitor_folder" {
   name        = var.mariadb_monitor_folder
   description = "Folder for MariaDB Monitors"
   parent_id   = sumologic_monitor_folder.root_monitor_folder.id
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
 
 module "MariaDB-NoindexusedintheSQLstatements" {
diff --git a/application-components/memcached_monitors.tf b/application-components/memcached_monitors.tf
index f6345712..7b3ab33f 100644
--- a/application-components/memcached_monitors.tf
+++ b/application-components/memcached_monitors.tf
@@ -4,6 +4,11 @@ resource "sumologic_monitor_folder" "memcached_monitor_folder" {
   name        = var.memcached_monitor_folder
   description = "Folder for Memcached Monitors"
   parent_id   = sumologic_monitor_folder.root_monitor_folder.id
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
 
 module "Memcached-AuthenticationError" {
diff --git a/application-components/mongodb_monitors.tf b/application-components/mongodb_monitors.tf
index bdd19801..7d6b0930 100644
--- a/application-components/mongodb_monitors.tf
+++ b/application-components/mongodb_monitors.tf
@@ -4,6 +4,11 @@ resource "sumologic_monitor_folder" "mongodb_monitor_folder" {
   name        = var.mongodb_monitor_folder
   description = "Folder for MongoDB Monitors"
   parent_id   = sumologic_monitor_folder.root_monitor_folder.id
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
 
 module "MongoDB-TooManyCursorsTimeouts" {
diff --git a/application-components/mysql_monitors.tf b/application-components/mysql_monitors.tf
index f0313841..bc5da1a6 100644
--- a/application-components/mysql_monitors.tf
+++ b/application-components/mysql_monitors.tf
@@ -4,6 +4,11 @@ resource "sumologic_monitor_folder" "mysql_monitor_folder" {
   name        = var.mysql_monitor_folder
   description = "Folder for MySQL Monitors"
   parent_id   = sumologic_monitor_folder.root_monitor_folder.id
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
 
 # Sumo Logic MySQL Metric Monitors
diff --git a/application-components/oracle_monitors.tf b/application-components/oracle_monitors.tf
index e7e070cd..1fb50dc2 100644
--- a/application-components/oracle_monitors.tf
+++ b/application-components/oracle_monitors.tf
@@ -4,6 +4,11 @@ resource "sumologic_monitor_folder" "oracle_monitor_folder" {
   name        = var.oracle_monitor_folder
   description = "Folder for Oracle Monitors"
   parent_id   = sumologic_monitor_folder.root_monitor_folder.id
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
 
 module "Oracle-HighCPUUsage" {
diff --git a/application-components/postgresql_monitors.tf b/application-components/postgresql_monitors.tf
index 5898022f..50002f0b 100644
--- a/application-components/postgresql_monitors.tf
+++ b/application-components/postgresql_monitors.tf
@@ -4,6 +4,11 @@ resource "sumologic_monitor_folder" "postgresql_monitor_folder" {
   name        = var.postgresql_monitor_folder
   description = "Folder for PostgreSQL Monitors"
   parent_id   = sumologic_monitor_folder.root_monitor_folder.id
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
 
 # Sumo Logic PostgreSQL Metric Monitors
diff --git a/application-components/redis_monitors.tf b/application-components/redis_monitors.tf
index 5e6d99b2..b8569241 100644
--- a/application-components/redis_monitors.tf
+++ b/application-components/redis_monitors.tf
@@ -4,6 +4,11 @@ resource "sumologic_monitor_folder" "redis_monitor_folder" {
   name        = var.redis_monitor_folder
   description = "Folder for Redis Monitors"
   parent_id   = sumologic_monitor_folder.root_monitor_folder.id
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
 
 # Sumo Logic Redis Metric Monitors
diff --git a/application-components/sqlserver_monitors.tf b/application-components/sqlserver_monitors.tf
index 6c25911e..8d92c7c9 100644
--- a/application-components/sqlserver_monitors.tf
+++ b/application-components/sqlserver_monitors.tf
@@ -4,6 +4,11 @@ resource "sumologic_monitor_folder" "sqlserver_monitor_folder" {
   name        = var.sqlserver_monitor_folder
   description = "Folder for SQL Server Monitors"
   parent_id   = sumologic_monitor_folder.root_monitor_folder.id
+  obj_permission {
+    subject_type = "org"
+    subject_id = var.sumologic_organization_id
+    permissions = ["Create", "Read", "Update", "Delete", "Manage"]
+  }
 }
 
 module "SQLServer-DiskUsage" {
diff --git a/application-components/variables.tf b/application-components/variables.tf
index acf0fadd..11b1a9a6 100644
--- a/application-components/variables.tf
+++ b/application-components/variables.tf
@@ -62,7 +62,7 @@ variable "components_on_kubernetes_deployment" {
         EOT
   validation {
     condition     = anytrue([for engine in split(",", var.components_on_kubernetes_deployment) : contains(["", "memcached", "cassandra", "elasticsearch", "sqlserver", "mongodb", "mysql", "postgresql", "redis", "mariadb", "couchbase", "oracle"], engine)])
-    error_message = "The value must be one of \"memcached,cassandra,elasticsearch,sqlserver,mongodb,mysql,postgresql,redis,mariadb,couchbase,oracle\""
+    error_message = "The value must be one of \"memcached,cassandra,elasticsearch,sqlserver,mongodb,mysql,postgresql,redis,mariadb,couchbase,oracle\"."
   }
   default = ""
 }
@@ -74,7 +74,7 @@ variable "components_on_non_kubernetes_deployment" {
         EOT
   validation {
     condition     = anytrue([for engine in split(",", var.components_on_non_kubernetes_deployment) : contains(["", "memcached", "cassandra", "elasticsearch", "sqlserver", "mongodb", "mysql", "postgresql", "redis", "mariadb", "couchbase", "oracle"], engine)])
-    error_message = "The value must be one of \"memcached,cassandra,elasticsearch,sqlserver,mongodb,mysql,postgresql,redis,mariadb,couchbase,oracle\""
+    error_message = "The value must be one of \"memcached,cassandra,elasticsearch,sqlserver,mongodb,mysql,postgresql,redis,mariadb,couchbase,oracle\"."
   }
   default = ""
 }

From aa0fd9c8032e0e825be5d63987ce79169bc68305 Mon Sep 17 00:00:00 2001
From: Himanshu Sharma <hsharma@sumologic.com>
Date: Mon, 20 Mar 2023 14:39:04 +0530
Subject: [PATCH 2/2] Restoring db_component.tf

---
 application-components/db_component.tf | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/application-components/db_component.tf b/application-components/db_component.tf
index b313f4e6..3073e9f7 100644
--- a/application-components/db_component.tf
+++ b/application-components/db_component.tf
@@ -61,16 +61,16 @@ resource "sumologic_field" "pod_labels_db_cluster_port" {
 
 # ********************** Database component FERs ********************** #
 
-# resource "sumologic_field_extraction_rule" "SumoLogicFieldExtractionRulesForDatabase" {
-#   depends_on       = [sumologic_field.db_cluster, sumologic_field.db_system, sumologic_field.db_cluster_address, sumologic_field.db_cluster_port, sumologic_field.pod_labels_db_cluster, sumologic_field.pod_labels_db_system, sumologic_field.pod_labels_db_cluster_address, sumologic_field.pod_labels_db_cluster_port]
-#   count            = length(local.all_components_values) > 0 && local.has_any_kubernetes_deployments ? 1 : 0
-#   enabled          = true
-#   name             = local.database_fer_name
-#   parse_expression = <<EOT
-#         if (!isEmpty(pod_labels_environment), pod_labels_environment, "") as environment
-#         | pod_labels_component as component
-#         | pod_labels_db_system as db_system
-#         | pod_labels_db_cluster as db_cluster
-#     EOT
-#   scope            = "account=prod"
-# }
+resource "sumologic_field_extraction_rule" "SumoLogicFieldExtractionRulesForDatabase" {
+  depends_on       = [sumologic_field.db_cluster, sumologic_field.db_system, sumologic_field.db_cluster_address, sumologic_field.db_cluster_port, sumologic_field.pod_labels_db_cluster, sumologic_field.pod_labels_db_system, sumologic_field.pod_labels_db_cluster_address, sumologic_field.pod_labels_db_cluster_port]
+  count            = length(local.all_components_values) > 0 && local.has_any_kubernetes_deployments ? 1 : 0
+  enabled          = true
+  name             = local.database_fer_name
+  parse_expression = <<EOT
+        if (!isEmpty(pod_labels_environment), pod_labels_environment, "") as environment
+        | pod_labels_component as component
+        | pod_labels_db_system as db_system
+        | pod_labels_db_cluster as db_cluster
+    EOT
+  scope            = "pod_labels_environment=* pod_labels_component=database pod_labels_db_system=* pod_labels_db_cluster=*"
+}
\ No newline at end of file