From 67fc12a4b59d25e0f93016aa63abd71e8dc61aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Thu, 12 Jun 2025 11:49:28 +0100 Subject: [PATCH 1/3] feat: add Observability DA as a surround (add-on) --- ibm_catalog.json | 93 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 77 insertions(+), 16 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 8a5ea38..4c08436 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -62,18 +62,6 @@ "key": "prefix", "required": true }, - { - "key": "existing_resource_group_name", - "display_name": "resource_group", - "custom_config": { - "type": "resource_group", - "grouping": "deployment", - "original_grouping": "deployment", - "config_constraints": { - "identifier": "rg_name" - } - } - }, { "key": "region", "required": true, @@ -120,9 +108,6 @@ } ] }, - { - "key": "app_config_name" - }, { "key": "app_config_plan", "required": true, @@ -145,6 +130,44 @@ } ] }, + { + "key": "enable_platform_metrics", + "type": "boolean", + "default_value": true, + "description": "When set to `true`, the IBM Cloud Monitoring instance will be configured to collect platform metrics from the provided region. You can configure 1 instance only of the IBM Cloud Monitoring service per region to collect platform metrics in that location. Check with the account or service administrator if another monitoring instance has already been configured. You may not have permissions to see all monitoring instances in the region. [Learn more](https://cloud.ibm.com/docs/monitoring?topic=monitoring-platform_metrics_enabling).", + "required": true, + "virtual": true + }, + { + "key": "logs_routing_tenant_regions", + "type": "array", + "default_value": [], + "description": "To manage platform logs that are generated by IBM Cloud services in a region of IBM Cloud, you must create a tenant in each region that you operate. Pass a list of regions to create a tenant in. [Learn more](https://cloud.ibm.com/docs/logs-router?topic=logs-router-about-platform-logs).", + "required": true, + "virtual": true, + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "string" + } + } + }, + { + "key": "existing_resource_group_name", + "display_name": "resource_group", + "custom_config": { + "type": "resource_group", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "identifier": "rg_name" + } + } + }, + { + "key": "app_config_name" + }, { "key": "app_config_service_endpoints", "options": [ @@ -294,7 +317,45 @@ "optional": true, "on_by_default": false, "version": "v3.0.7" - } + }, + { + "name": "deploy-arch-ibm-observability", + "description": "Enable to provision and configure IBM Cloud Logs, Cloud Monitoring, Metrics routing and Activity Tracker event routing for analysing logs and metrics generated by the App Configuration instance.", + "flavors": [ + "instances" + ], + "id": "a3137d28-79e0-479d-8a24-758ebd5a0eab-global", + "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3", + "input_mapping": [ + { + "dependency_output": "cloud_monitoring_crn", + "version_input": "existing_monitoring_crn" + }, + { + "dependency_input": "prefix", + "version_input": "prefix", + "reference_version": true + }, + { + "dependency_input": "region", + "version_input": "region", + "reference_version": true + }, + { + "dependency_input": "enable_platform_metrics", + "version_input": "enable_platform_metrics", + "reference_version": true + }, + { + "dependency_input": "logs_routing_tenant_regions", + "version_input": "logs_routing_tenant_regions", + "reference_version": true + } + ], + "optional": true, + "on_by_default": true, + "version": "v3.0.3" + }, ], "dependency_version_2": true, "terraform_version": "1.10.5" From 5234f44ed1b2940526267807b6346535c5a8e7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Thu, 12 Jun 2025 11:55:21 +0100 Subject: [PATCH 2/3] Update ibm_catalog.json --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 4c08436..29c4743 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -355,7 +355,7 @@ "optional": true, "on_by_default": true, "version": "v3.0.3" - }, + } ], "dependency_version_2": true, "terraform_version": "1.10.5" From b7b489386a75a3eb6f55dbfe6f5d128d0bc5385f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Thu, 12 Jun 2025 13:40:25 +0100 Subject: [PATCH 3/3] Update ibm_catalog.json --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 29c4743..f141707 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -140,7 +140,7 @@ }, { "key": "logs_routing_tenant_regions", - "type": "array", + "type": "list(string)", "default_value": [], "description": "To manage platform logs that are generated by IBM Cloud services in a region of IBM Cloud, you must create a tenant in each region that you operate. Pass a list of regions to create a tenant in. [Learn more](https://cloud.ibm.com/docs/logs-router?topic=logs-router-about-platform-logs).", "required": true,