From ec9a4e02104415863eb4540d4d4e0817e0e89ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Thu, 12 Jun 2025 11:52:19 +0100 Subject: [PATCH 1/3] feat: expose virtual inputs for Observability add-on --- ibm_catalog.json | 59 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index d7a5b0e..7ad2a1b 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -154,6 +154,16 @@ "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, @@ -166,19 +176,6 @@ "key": "ibmcloud_api_key", "required": true }, - { - "key": "existing_resource_group_name", - "display_name": "resource_group", - "type": "string", - "custom_config": { - "type": "resource_group", - "grouping": "deployment", - "original_grouping": "deployment", - "config_constraints": { - "identifier": "rg_name" - } - } - }, { "key": "prefix", "required": true @@ -273,6 +270,42 @@ "default_value": "basic", "description": "The plan to use for the App Configuration service instance." }, + { + "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", + "type": "string", + "custom_config": { + "type": "resource_group", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "identifier": "rg_name" + } + } + }, { "key": "enterprise_id", "required": false, From 42a7cd24efc2aa5b0e7cd35229fd2e641c0d0ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Thu, 12 Jun 2025 13:58:05 +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 7ad2a1b..e9bb55e 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -280,7 +280,7 @@ }, { "key": "logs_routing_tenant_regions", - "type": "array", + "type": "list(strings)", "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, From 5ab71c6e9a8bdc33fde3bf62a2a64c1f147f70e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Thu, 12 Jun 2025 13:58:53 +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 e9bb55e..72b2da9 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -280,7 +280,7 @@ }, { "key": "logs_routing_tenant_regions", - "type": "list(strings)", + "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,