feat: add cloud logs support

catalogValidationValues.json.template

@@ -2,5 +2,5 @@
   "ibmcloud_api_key": $VALIDATION_APIKEY,
   "prefix": $PREFIX,
   "existing_resource_group_name": $RG_NAME,
-  "enable_platform_logs_metrics": false
+  "enable_platform_metrics": false
 }

ibm_catalog.json

@@ -202,10 +202,17 @@
 							}
 						},
 						{
-							"key": "enable_platform_logs_metrics",
+							"key": "enable_platform_metrics",
 							"type": "boolean",
 							"default_value": true,
-							"description": "Whether to provision logging and monitoring instances are configured to receive all platform logs and metrics in the target region. There can only be one instance per region provisioned for platform logs/metrics.",
+							"description": "Setting this to true will enable the IBM Cloud Monitoring instance to collect the platform metrics.",
+							"required": false
+						},
+						{
+							"key": "enable_platform_logs",
+							"type": "boolean",
+							"default_value": true,
+							"description": "Setting this to true will create a tenant in the same region that the Cloud Logs instance is provisioned to enable platform logs for that region. To send platform logs from other regions, you can explicitially specify a list of regions using the `logs_routing_tenant_regions` input. NOTE: You can only have 1 tenant per region in an account. If `log_analysis_provision` is set to true, this variable will also enable platform logs for the Log analysis instance.",
 							"required": false
 						},
 						{
@@ -307,6 +314,10 @@
 							"key": "log_analysis_crn",
 							"description": "The id of the provisioned Log Analysis instance."
 						},
+						{
+							"key": "cloud_logs_crn",
+							"description": "The id of the provisioned Cloud Logs instance."
+						},
 						{
 							"key": "scc_workload_protection_crn",
 							"description": "SCC Workload Protection instance CRN."

stack_definition.json

@@ -25,7 +25,15 @@
       "custom_config": {}
     },
     {
-      "name": "enable_platform_logs_metrics",
+      "name": "enable_platform_metrics",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "enable_platform_logs",
       "required": false,
       "type": "boolean",
       "hidden": false,
@@ -168,15 +176,19 @@
         },
         {
           "name": "enable_platform_logs",
-          "value": "ref:../../inputs/enable_platform_logs_metrics"
+          "value": "ref:../../inputs/enable_platform_logs"
         },
         {
           "name": "enable_platform_metrics",
-          "value": "ref:../../inputs/enable_platform_logs_metrics"
+          "value": "ref:../../inputs/enable_platform_metrics"
+        },
+        {
+          "name": "existing_en_instance_crn",
+          "value": "ref:../../members/3 - Event Notifications/outputs/crn"
         }
       ],
       "name": "2 - Observability",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.9a4b4855-07a5-43a0-af1d-ef44e091821c-global"
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.157744e4-5ef1-4e0f-9b8b-8b49b2ee8bb2-global"
     },
     {
       "inputs": [
@@ -219,10 +231,6 @@
         {
           "name": "prefix",
           "value": "ref:../../inputs/prefix"
-        },
-        {
-          "name": "existing_monitoring_crn",
-          "value": "ref:../../members/2 - Observability/outputs/cloud_monitoring_crn"
         }
       ],
       "name": "3 - Event Notifications",