Skip to content

fix: add extra stack outputs and inputs #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ocofaigh merged 6 commits into from
Dec 4, 2024
Merged

fix: add extra stack outputs and inputs #202

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
654d4cb
fix: add extra stack outputs and inputs
akocbekIBM Oct 2, 2024
3501681
fix
akocbekIBM Oct 3, 2024
0731afe
address PR comments
akocbekIBM Dec 3, 2024
f4aa34d
address PR comments
akocbekIBM Dec 3, 2024
fb8d6bf
remove dot from members
akocbekIBM Dec 4, 2024
0d54354
Merge branch 'main' into inputs_outputs
akocbek Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion reference-architecture/rag-pattern.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
156 changes: 148 additions & 8 deletions solutions/basic/stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,10 @@
"name": "watson_assistant_region",
"value": "ref:../../inputs/region"
},
{
"name": "watsonx_admin_api_key",
"value": "ref:../../inputs/watsonx_admin_api_key"
},
{
"name": "watson_assistant_instance_id",
"value": "ref:../Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_guid"
Expand Down Expand Up @@ -751,35 +755,171 @@
"outputs": [
{
"name": "elasticsearch_hostname",
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/hostname"
"value": "ref:../members/Gen AI - Databases for Elasticsearch/outputs/hostname"
},
{
"name": "elasticsearch_port",
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/port"
"value": "ref:../members/Gen AI - Databases for Elasticsearch/outputs/port"
},
{
"name": "elasticsearch_service_credentials_json",
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/service_credentials_json"
"value": "ref:../members/Gen AI - Databases for Elasticsearch/outputs/service_credentials_json"
},
{
"name": "elasticsearch_crn",
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/crn"
"value": "ref:../members/Gen AI - Databases for Elasticsearch/outputs/crn"
},
{
"name": "watsonx_project_url",
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watsonx_project_url"
"value": "ref:../members/Workload - Sample RAG App Configuration/outputs/watsonx_project_url"
},
{
"name": "watsonx_project_id",
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watsonx_project_id"
"value": "ref:../members/Workload - Sample RAG App Configuration/outputs/watsonx_project_id"
},
{
"name": "watson_discovery_api_url",
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watson_discovery_api_url"
"value": "ref:../members/Workload - Sample RAG App Configuration/outputs/watson_discovery_api_url"
},
{
"name": "watson_discovery_project_id",
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watson_discovery_project_id"
"value": "ref:../members/Workload - Sample RAG App Configuration/outputs/watson_discovery_project_id"
},
{
"name": "kms_instance_crn",
"value": "ref:../members/Essential Security - Encryption Key Management/outputs/kms_instance_crn"
},
{
"name": "kms_private_endpoint",
"value": "ref:../members/Essential Security - Encryption Key Management/outputs/kms_private_endpoint"
},
{
"name": "kms_public_endpoint",
"value": "ref:../members/Essential Security - Encryption Key Management/outputs/kms_public_endpoint"
},
{
"name": "event_notification_instance_crn",
"value": "ref:../members/Essential Security - Event Notifications/outputs/crn"
},
{
"name": "event_notification_instance_name",
"value": "ref:../members/Essential Security - Event Notifications/outputs/event_notification_instance_name"
},
{
"name": "event_notification_instance_guid",
"value": "ref:../members/Essential Security - Event Notifications/outputs/guid"
},
{
"name": "cloud_logs_crn",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_logs_crn"
},
{
"name": "cloud_logs_guid",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_logs_guid"
},
{
"name": "cloud_monitoring_crn",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_crn"
},
{
"name": "cloud_monitoring_guid",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_guid"
},
{
"name": "log_analysis_crn",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/log_analysis_crn"
},
{
"name": "log_analysis_guid",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/log_analysis_guid"
},
{
"name": "secrets_manager_crn",
"value": "ref:../members/Essential Security - Secrets Manager/outputs/secrets_manager_crn"
},
{
"name": "secrets_manager_guid",
"value": "ref:../members/Essential Security - Secrets Manager/outputs/secrets_manager_guid"
},
{
"name": "secrets_manager_name",
"value": "ref:../members/Essential Security - Secrets Manager/outputs/secrets_manager_name"
},
{
"name": "secrets_manager_name",
"value": "ref:../members/Essential Security - Secrets Manager/outputs/secrets_manager_name"
},
{
"name": "scc_crn",
"value": "ref:../members/Essential Security - Security Compliance Center/outputs/scc_crn"
},
{
"name": "scc_guid",
"value": "ref:../members/Essential Security - Security Compliance Center/outputs/scc_guid"
},
{
"name": "scc_workload_protection_crn",
"value": "ref:../members/Essential Security - Security Compliance Center/outputs/scc_workload_protection_crn"
},
{
"name": "watson_discovery_crn",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_crn"
},
{
"name": "watson_discovery_dashboard_url",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_dashboard_url"
},
{
"name": "watson_discovery_guid",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_guid"
},
{
"name": "watson_machine_learning_crn",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_crn"
},
{
"name": "watson_machine_learning_dashboard_url",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_dashboard_url"
},
{
"name": "watson_machine_learning_guid",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_guid"
},
{
"name": "watson_studio_crn",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_studio_crn"
},
{
"name": "watson_studio_dashboard_url",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_studio_dashboard_url"
},
{
"name": "watson_studio_guid",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_studio_guid"
},
{
"name": "watsonx_assistant_crn",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_crn"
},
{
"name": "watsonx_assistant_dashboard_url",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_dashboard_url"
},
{
"name": "watsonx_data_crn",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_crn"
},
{
"name": "watsonx_data_dashboard_url",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_dashboard_url"
},
{
"name": "watsonx_data_guid",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_guid"
},
{
"name": "watson_discovery_guid",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_guid"
}
]
}
172 changes: 164 additions & 8 deletions solutions/standard/stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,10 @@
"name": "watson_assistant_region",
"value": "ref:../../inputs/region"
},
{
"name": "watsonx_admin_api_key",
"value": "ref:../../inputs/watsonx_admin_api_key"
},
{
"name": "watson_assistant_instance_id",
"value": "ref:../Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_guid"
Expand Down Expand Up @@ -809,35 +813,187 @@
"outputs": [
{
"name": "elasticsearch_hostname",
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/hostname"
"value": "ref:../members/Gen AI - Databases for Elasticsearch/outputs/hostname"
},
{
"name": "elasticsearch_port",
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/port"
"value": "ref:../members/Gen AI - Databases for Elasticsearch/outputs/port"
},
{
"name": "elasticsearch_service_credentials_json",
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/service_credentials_json"
"value": "ref:../members/Gen AI - Databases for Elasticsearch/outputs/service_credentials_json"
},
{
"name": "elasticsearch_crn",
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/crn"
"value": "ref:../members/Gen AI - Databases for Elasticsearch/outputs/crn"
},
{
"name": "watsonx_project_url",
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watsonx_project_url"
"value": "ref:../members/Workload - Sample RAG App Configuration/outputs/watsonx_project_url"
},
{
"name": "watsonx_project_id",
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watsonx_project_id"
"value": "ref:../members/Workload - Sample RAG App Configuration/outputs/watsonx_project_id"
},
{
"name": "watson_discovery_api_url",
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watson_discovery_api_url"
"value": "ref:../members/Workload - Sample RAG App Configuration/outputs/watson_discovery_api_url"
},
{
"name": "watson_discovery_project_id",
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watson_discovery_project_id"
"value": "ref:../members/Workload - Sample RAG App Configuration/outputs/watson_discovery_project_id"
},
{
"name": "kms_instance_crn",
"value": "ref:../members/Essential Security - Encryption Key Management/outputs/kms_instance_crn"
},
{
"name": "kms_private_endpoint",
"value": "ref:../members/Essential Security - Encryption Key Management/outputs/kms_private_endpoint"
},
{
"name": "kms_public_endpoint",
"value": "ref:../members/Essential Security - Encryption Key Management/outputs/kms_public_endpoint"
},
{
"name": "event_notification_instance_crn",
"value": "ref:../members/Essential Security - Event Notifications/outputs/crn"
},
{
"name": "event_notification_instance_name",
"value": "ref:../members/Essential Security - Event Notifications/outputs/event_notification_instance_name"
},
{
"name": "event_notification_instance_guid",
"value": "ref:../members/Essential Security - Event Notifications/outputs/guid"
},
{
"name": "cloud_logs_crn",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_logs_crn"
},
{
"name": "cloud_logs_guid",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_logs_guid"
},
{
"name": "cloud_monitoring_crn",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_crn"
},
{
"name": "cloud_monitoring_guid",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_guid"
},
{
"name": "log_analysis_crn",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/log_analysis_crn"
},
{
"name": "log_analysis_guid",
"value": "ref:../members/Essential Security - Logging Monitoring Activity Tracker/outputs/log_analysis_guid"
Copy link
Contributor

@ocofaigh ocofaigh Nov 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove log_analysis_crn and log_analysis_guid - the stack no longer deploys log analysis

},
{
"name": "secrets_manager_crn",
"value": "ref:../members/Essential Security - Secrets Manager/outputs/secrets_manager_crn"
},
{
"name": "secrets_manager_guid",
"value": "ref:../members/Essential Security - Secrets Manager/outputs/secrets_manager_guid"
},
{
"name": "secrets_manager_name",
"value": "ref:../members/Essential Security - Secrets Manager/outputs/secrets_manager_name"
},
{
"name": "secrets_manager_name",
"value": "ref:../members/Essential Security - Secrets Manager/outputs/secrets_manager_name"
},
{
"name": "scc_crn",
"value": "ref:../members/Essential Security - Security Compliance Center/outputs/scc_crn"
},
{
"name": "scc_guid",
"value": "ref:../members/Essential Security - Security Compliance Center/outputs/scc_guid"
},
{
"name": "scc_workload_protection_crn",
"value": "ref:../members/Essential Security - Security Compliance Center/outputs/scc_workload_protection_crn"
},
{
"name": "watson_discovery_crn",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_crn"
},
{
"name": "watson_discovery_dashboard_url",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_dashboard_url"
},
{
"name": "watson_discovery_guid",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_guid"
},
{
"name": "watson_machine_learning_crn",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_crn"
},
{
"name": "watson_machine_learning_dashboard_url",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_dashboard_url"
},
{
"name": "watson_machine_learning_guid",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_guid"
},
{
"name": "watson_studio_crn",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_studio_crn"
},
{
"name": "watson_studio_dashboard_url",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_studio_dashboard_url"
},
{
"name": "watson_studio_guid",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_studio_guid"
},
{
"name": "watsonx_assistant_crn",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_crn"
},
{
"name": "watsonx_assistant_dashboard_url",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_dashboard_url"
},
{
"name": "watsonx_data_crn",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_crn"
},
{
"name": "watsonx_data_dashboard_url",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_dashboard_url"
},
{
"name": "watsonx_data_guid",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_guid"
},
{
"name": "watson_discovery_guid",
"value": "ref:../members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_guid"
},
{
"name": "workload_cluster_name",
"value": "ref:../members/Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
},
{
"name": "workload_cluster_id",
"value": "ref:../members/Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_id"
},
{
"name": "workload_cluster_private_service_endpoint_url",
"value": "ref:../members/Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_private_service_endpoint_url"
},
{
"name": "workload_cluster_public_service_endpoint_url",
"value": "ref:../members/Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_public_service_endpoint_url"
}
]
}