diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml index e0c799a..e0bed0f 100644 --- a/.catalog-onboard-pipeline.yaml +++ b/.catalog-onboard-pipeline.yaml @@ -6,7 +6,7 @@ offerings: catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd offering_id: 0294f96e-7314-48d1-a710-c08a541b2119 variations: - - name: standard + - name: click-and-go mark_ready: false install_type: fullstack format_kind: stack diff --git a/ibm_catalog.json b/ibm_catalog.json index 12432a5..791bb4f 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -70,8 +70,10 @@ ], "flavors": [ { - "label": "Standard", - "name": "standard", + "label": "Click and go", + "name": "click-and-go", + "index": 1, + "working_directory": "./", "compliance": { "authority": "scc-v3", "profiles": [ @@ -223,7 +225,7 @@ "key": "existing_resource_group_name", "type": "string", "default_value": "Default", - "description": "The name of an existing resource group to provision all resources to.", + "description": "The name of an existing resource group to provision the resources.", "required": true, "custom_config": { "type": "resource_group", @@ -237,7 +239,7 @@ { "key": "enable_platform_metrics", "type": "boolean", - "default_value": true, + "default_value": false, "description": "Setting this to true will enable platform metrics for the Cloud Monitoring instance. NOTE: You can configure 1 instance only of the IBM Cloud Monitoring service per region to collect platform metrics in that location.", "required": false }, @@ -256,16 +258,48 @@ "required": false }, { - "display_name": "event_notifications_email_list", - "key": "en_email_list", + "key": "key_protect_plan", + "type": "string", + "default_value": "tiered-pricing", + "description": "The service plan of the Key Protect instance that will be provisioned by this solution. Only used if not supplying `existing_kms_instance_crn`. [Learn more](https://cloud.ibm.com/docs/key-protect?topic=key-protect-pricing-plan).", + "required": false, + "options": [ + { + "displayname": "Standard", + "value": "tiered-pricing" + }, + { + "displayname": "Cross-region Resiliency", + "value": "cross-region-resiliency" + } + ] + }, + { + "key": "cloud_monitoring_plan", + "type": "string", + "default_value": "graduated-tier", + "description": "The IBM Cloud Monitoring plan to provision. Available values are `lite` and `graduated-tier` and `graduated-tier-sysdig-secure-plus-monitor` (available in region eu-fr2 only). [Learn more](https://cloud.ibm.com/docs/monitoring?topic=monitoring-service_plans)", + "required": false, + "options": [ + { + "displayname": "Lite", + "value": "lite" + }, + { + "displayname": "Graduated Tier", + "value": "graduated-tier" + } + ] + }, + { + "key": "event_notifications_email_list", "type": "array", "default_value": [], "description": "List of emails to configure event notifications.", "required": false }, { - "display_name": "existing_event_notifications_instance_crn", - "key": "existing_en_instance_crn", + "key": "existing_event_notifications_instance_crn", "type": "string", "default_value": "__NULL__", "description": "The CRN of existing event notification instance. If not supplied, a new instance is created.", @@ -279,8 +313,7 @@ "required": false }, { - "display_name": "secrets_manager_service_plan", - "key": "sm_service_plan", + "key": "secrets_manager_service_plan", "type": "string", "default_value": "standard", "description": "The pricing plan to use for IBM Cloud Secrets Manager. Not used if `existing_secrets_manager_crn` is specified.", @@ -298,16 +331,16 @@ }, { "display_name": "disable_secrets_manager_iam_credentials_engine", - "key": "skip_iam_authorization_policy", + "key": "skip_secrets_manager_iam_auth_policy", "type": "boolean", "default_value": false, "description": "Whether to skip the creation of the IAM authorization policies required to enable the Secrets Manager IAM credentials engine. If set to false, policies will be created that grants the Secrets Manager instance 'Operator' access to the IAM identity service, and 'Groups Service Member Manage' access to the IAM groups service.", "required": false }, { - "key": "app_config_service_plan", + "key": "app_config_plan", "type": "string", - "default_value": "basic", + "default_value": "enterprise", "description": "The pricing plan to use for the IBM Cloud App Configuration instance.", "required": false, "options": [ diff --git a/reference-architectures/core-security-services-architecture.svg b/reference-architectures/core-security-services-architecture.svg index cf4a1de..f8dc601 100644 --- a/reference-architectures/core-security-services-architecture.svg +++ b/reference-architectures/core-security-services-architecture.svg @@ -1,4 +1,4 @@ -
IBM Cloud
%3CmxGraphModel%3E%3Croot%3E%3CmxCell%20id%3D%220%22%2F%3E%3CmxCell%20id%3D%221%22%20parent%3D%220%22%2F%3E%3CmxCell%20id%3D%222%22%20value%3D%22%22%20style%3D%22shape%3Dimage%3Baspect%3Dfixed%3Bimage%3Ddata%3Aimage%2Fsvg%2Bxml%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMjlweCIgaGVpZ2h0PSIyOHB4IiB2aWV3Qm94PSIwIDAgMjkgMjgiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI%2BCiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUzICg3MjUyMCkgLSBodHRwczovL3NrZXRjaGFwcC5jb20gLS0%2BCiAgICA8dGl0bGU%2BUmVzb3VyY2UgR3JvdXAgQmxhY2s8L3RpdGxlPgogICAgPGRlc2M%2BQ3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M%2BCiAgICA8ZGVmcz4KICAgICAgICA8cG9seWdvbiBpZD0icGF0aC0xIiBwb2ludHM9IjAgMCAyOCAwIDI4IDI4IDAgMjgiPjwvcG9seWdvbj4KICAgIDwvZGVmcz4KICAgIDxnIGlkPSJQYWdlLTEiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJSZXNvdXJjZS1Hcm91cC1CbGFjayIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMC4zNzUwMDAsIDAuMDAwMDAwKSI%2BCiAgICAgICAgICAgIDxtYXNrIGlkPSJtYXNrLTIiIGZpbGw9IndoaXRlIj4KICAgICAgICAgICAgICAgIDx1c2UgeGxpbms6aHJlZj0iI3BhdGgtMSI%2BPC91c2U%2BCiAgICAgICAgICAgIDwvbWFzaz4KICAgICAgICAgICAgPGcgaWQ9IkNsaXAtMiI%2BPC9nPgogICAgICAgICAgICA8cGF0aCBkPSJNOCwyMCBMMjAsMjAgTDIwLDggTDgsOCBMOCwyMCBaIE0yMCwyMiBMOCwyMiBDNi44OTYsMjEuOTk5IDYuMDAxLDIxLjEwNCA2LDIwIEw2LDggQzYuMDAxLDYuODk2IDYuODk2LDYuMDAxIDgsNiBMMjAsNiBDMjEuMTA0LDYuMDAxIDIxLjk5OSw2Ljg5NiAyMiw4IEwyMiwyMCBDMjEuOTk5LDIxLjEwNCAyMS4xMDQsMjEuOTk5IDIwLDIyIEwyMCwyMiBaIiBpZD0iRmlsbC0xIiBmaWxsPSIjMDAwMDAwIiBtYXNrPSJ1cmwoI21hc2stMikiPjwvcGF0aD4KICAgICAgICAgICAgPHBhdGggZD0iTTUuOTk5OCwyOCBMMS45OTk4LDI4IEMwLjg5NTgsMjcuOTk5IDAuMDAwOCwyNy4xMDQgLTAuMDAwMiwyNiBMLTAuMDAwMiwyIEMwLjAwMDgsMC44OTYgMC44OTU4LDAuMDAxIDEuOTk5OCwwIEw1Ljk5OTgsMCBMNS45OTk4LDIgTDEuOTk5OCwyIEwxLjk5OTgsMjYgTDUuOTk5OCwyNiBMNS45OTk4LDI4IFoiIGlkPSJGaWxsLTMiIGZpbGw9IiMwMDAwMDAiIG1hc2s9InVybCgjbWFzay0yKSI%2BPC9wYXRoPgogICAgICAgICAgICA8cGF0aCBkPSJNMjYuMDAwMywyOCBMMjIuMDAwMywyOCBMMjIuMDAwMywyNiBMMjYuMDAwMywyNiBMMjYuMDAwMywyIEwyMi4wMDAzLDIgTDIyLjAwMDMsMCBMMjYuMDAwMywwIEMyNy4xMDQzLDAuMDAxIDI3Ljk5OTMsMC44OTYgMjguMDAwMywyIEwyOC4wMDAzLDI2IEMyNy45OTkzLDI3LjEwNCAyNy4xMDQzLDI3Ljk5OSAyNi4wMDAzLDI4IiBpZD0iRmlsbC00IiBmaWxsPSIjMDAwMDAwIiBtYXNrPSJ1cmwoI21hc2stMikiPjwvcGF0aD4KICAgICAgICA8L2c%2BCiAgICA8L2c%2BCjwvc3ZnPg%3D%3D%3B%22%20vertex%3D%221%22%20parent%3D%221%22%3E%3CmxGeometry%20x%3D%22778%22%20y%3D%22136.84000000000006%22%20width%3D%2224%22%20height%3D%2223.17%22%20as%3D%22geometry%22%2F%3E%3C%2FmxCell%3E%3C%2Froot%3E%3C%2FmxGraphModel%3EĀ  Ā  Ā  Ā Resource Group
Ā  Ā  Ā  Ā  Ā  Ā  Ā  Object Storage

Event NotificationsĀ bucketCloud LogsĀ bucketCloud LogsMetrics bucketAT events bucket
Secrets Manager
Key Protect
Event Notifications
Activity Tracking Event Routing
Cloud Monitoring
App
configuration
SCC Workload Protection
IAM Engine
CloudLogs
Region
\ No newline at end of file +
IBM Cloud
IBM Cloud
Ā  Ā  Ā Resource Group
Ā  Ā  Ā Resource Group

AT events bucketCloud LogsĀ bucketCloud LogsMetrics bucketCloud Logs forAT data bucketCloud Logs forAT metrics bucketEvent NotificationsĀ bucket
Secrets Manager
Secrets Ma...
Key Protect
Key Protect
Event Notifications
Event Noti...
Activity Tracking Event Routing
Activity T...
Cloud Monitoring
Cloud Moni...
App Configuration
App Config...
SCC Workload Protection
SCC Worklo...
IAM Engine
IAM Engine
Cloud Logsfor loggingCloud Logsfor ActivityTracking
Region
Region
Object Storage Instance
Object Storage Instance
Text is not SVG - cannot display
\ No newline at end of file diff --git a/reference-architectures/reference-architecture-css.md b/reference-architectures/reference-architecture-css.md index 62c8721..96d5e87 100644 --- a/reference-architectures/reference-architecture-css.md +++ b/reference-architectures/reference-architecture-css.md @@ -1,8 +1,8 @@ --- copyright: - years: 2024 -lastupdated: "2024-12-05" + years: 2024, 2025 +lastupdated: "2025-09-05" subcollection: deployable-reference-architectures @@ -11,7 +11,7 @@ authors: email: bhakta@ibm.com # The release that the reference architecture describes -version: 3.0.0 +version: 4.0.0 # Use if the reference architecture has deployable code. # Value is the URL to land the user in the IBM Cloud catalog details page for the deployable architecture. @@ -52,7 +52,7 @@ https://test.cloud.ibm.com/docs/solution-as-code?topic=solution-as-code-naming-g # Cloud foundation for security and observability {: #core-security-services-pattern} {: toc-content-type="reference-architecture"} -{: toc-version="3.0.0"} +{: toc-version="4.0.0"}