feat: enabled COS bucket monitoring and activity tracking by default …

…in the DA solution (#255)
terraform-ibm-modules · Jul 24, 2024 · ee903fd · ee903fd
1 parent d03e2a5
commit ee903fd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-12-10T05:17:42Z",
+  "generated_at": "2023-12-11T05:17:42Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

diff --git a/common-dev-assets b/common-dev-assets
diff --git a/solutions/standard/main.tf b/solutions/standard/main.tf
@@ -88,7 +88,7 @@ locals {
 module "cos" {
   count                               = var.existing_cos_bucket_name != null ? 0 : 1
   source                              = "terraform-ibm-modules/cos/ibm"
-  version                             = "8.5.3"
+  version                             = "8.8.0"
   create_cos_instance                 = var.existing_cos_instance_crn == null ? true : false
   create_cos_bucket                   = var.existing_cos_bucket_name == null ? true : false
   existing_cos_instance_id            = var.existing_cos_instance_crn
@@ -105,7 +105,7 @@ module "cos" {
   management_endpoint_type_for_bucket = var.management_endpoint_type_for_bucket
   existing_kms_instance_guid          = local.kms_instance_guid
   kms_key_crn                         = local.cos_kms_key_crn
-  sysdig_crn                          = var.existing_monitoring_crn
+  monitoring_crn                      = var.existing_monitoring_crn
   retention_enabled                   = var.retention_enabled
   activity_tracker_crn                = var.existing_activity_tracker_crn
   archive_days                        = var.archive_days

diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf
@@ -29,7 +29,7 @@ variable "existing_monitoring_crn" {
   type        = string
   nullable    = true
   default     = null
-  description = "(Optional) The CRN of an existing IBM Cloud Monitoring instance. It is used to monitor the IBM Cloud Object Storage bucket that is used for storing failed events."
+  description = "The CRN of an IBM Cloud Monitoring instance used to monitor the IBM Cloud Object Storage bucket that is used for storing failed events. If no value passed, metrics are sent to the instance associated to the container's location unless otherwise specified in the Metrics Router service configuration. Ignored if using existing Object Storage bucket."
 }
 
 variable "prefix" {
@@ -259,7 +259,7 @@ variable "existing_activity_tracker_crn" {
   type        = string
   nullable    = true
   default     = null
-  description = "(Optional) The CRN of an existing Activity Tracker instance. Used to send Object Storage bucket log data and all object write events to the Activity Tracker. Used only if not supplying an existing Object Storage bucket."
+  description = "The CRN of an Activity Tracker instance to configure on the IBM Cloud Object Storage bucket that is used for storing failed events. If no value passed, events are sent to the instance associated to the container's location unless otherwise specified in the Activity Tracker Event Routing service configuration. Ignored if using existing Object Storage bucket."
 }
 
 variable "existing_cos_endpoint" {
+4 −0		common-go-assets/common-permanent-resources.yaml
+2 −0		module-assets/.pre-commit-config.yaml
+1 −1		module-assets/ci/install-deps.sh
+3 −3		module-assets/ci/run-tests.sh