Skip to content

Commit

Permalink
fix: added fix which was preventing some stack output from showing<br…
Browse files Browse the repository at this point in the history 
…>* added a fix where the value of the `watsonx_admin_api_key` was not being passed to the `Workload - Sample RAG App Configuration` member<br>* added a white background to the diagram to enable it to show in dark mode (#202)
  • Loading branch information
@akocbek
akocbek authored Dec 4, 2024
1 parent fe48e3b commit 404b83e
Show file tree
Hide file tree
Showing 3 changed files with 281 additions and 17 deletions.
2 changes: 1 addition & 1 deletion reference-architecture/rag-pattern.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 132 additions & 8 deletions solutions/basic/stack_definition.json
View file
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,155 @@
"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": "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": "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_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"
}
]
}
156 changes: 148 additions & 8 deletions solutions/standard/stack_definition.json
View file
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,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": "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": "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_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"
}
]
}

0 comments on commit 404b83e

Please sign in to comment.