Skip to content

Commit 404b83e

Browse files
akocbekakocbek
authored
fix: added fix which was preventing some stack output from showing<br>* 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)
1 parent fe48e3b commit 404b83e

File tree

3 files changed

+281
-17
lines changed

3 files changed

+281
-17
lines changed

‎reference-architecture/rag-pattern.svg

Lines changed: 1 addition & 1 deletion
Loading

‎solutions/basic/stack_definition.json

Lines changed: 132 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,10 @@
685685
"name": "watson_assistant_region",
686686
"value": "ref:../../inputs/region"
687687
},
688+
{
689+
"name": "watsonx_admin_api_key",
690+
"value": "ref:../../inputs/watsonx_admin_api_key"
691+
},
688692
{
689693
"name": "watson_assistant_instance_id",
690694
"value": "ref:../Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_guid"
@@ -751,35 +755,155 @@
751755
"outputs": [
752756
{
753757
"name": "elasticsearch_hostname",
754-
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/hostname"
758+
"value": "ref:./members/Gen AI - Databases for Elasticsearch/outputs/hostname"
755759
},
756760
{
757761
"name": "elasticsearch_port",
758-
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/port"
762+
"value": "ref:./members/Gen AI - Databases for Elasticsearch/outputs/port"
759763
},
760764
{
761765
"name": "elasticsearch_service_credentials_json",
762-
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/service_credentials_json"
766+
"value": "ref:./members/Gen AI - Databases for Elasticsearch/outputs/service_credentials_json"
763767
},
764768
{
765769
"name": "elasticsearch_crn",
766-
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/crn"
770+
"value": "ref:./members/Gen AI - Databases for Elasticsearch/outputs/crn"
767771
},
768772
{
769773
"name": "watsonx_project_url",
770-
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watsonx_project_url"
774+
"value": "ref:./members/Workload - Sample RAG App Configuration/outputs/watsonx_project_url"
771775
},
772776
{
773777
"name": "watsonx_project_id",
774-
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watsonx_project_id"
778+
"value": "ref:./members/Workload - Sample RAG App Configuration/outputs/watsonx_project_id"
775779
},
776780
{
777781
"name": "watson_discovery_api_url",
778-
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watson_discovery_api_url"
782+
"value": "ref:./members/Workload - Sample RAG App Configuration/outputs/watson_discovery_api_url"
779783
},
780784
{
781785
"name": "watson_discovery_project_id",
782-
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watson_discovery_project_id"
786+
"value": "ref:./members/Workload - Sample RAG App Configuration/outputs/watson_discovery_project_id"
787+
},
788+
{
789+
"name": "kms_instance_crn",
790+
"value": "ref:./members/Essential Security - Encryption Key Management/outputs/kms_instance_crn"
791+
},
792+
{
793+
"name": "kms_private_endpoint",
794+
"value": "ref:./members/Essential Security - Encryption Key Management/outputs/kms_private_endpoint"
795+
},
796+
{
797+
"name": "kms_public_endpoint",
798+
"value": "ref:./members/Essential Security - Encryption Key Management/outputs/kms_public_endpoint"
799+
},
800+
{
801+
"name": "event_notification_instance_crn",
802+
"value": "ref:./members/Essential Security - Event Notifications/outputs/crn"
803+
},
804+
{
805+
"name": "event_notification_instance_name",
806+
"value": "ref:./members/Essential Security - Event Notifications/outputs/event_notification_instance_name"
807+
},
808+
{
809+
"name": "event_notification_instance_guid",
810+
"value": "ref:./members/Essential Security - Event Notifications/outputs/guid"
811+
},
812+
{
813+
"name": "cloud_logs_crn",
814+
"value": "ref:./members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_logs_crn"
815+
},
816+
{
817+
"name": "cloud_logs_guid",
818+
"value": "ref:./members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_logs_guid"
819+
},
820+
{
821+
"name": "cloud_monitoring_crn",
822+
"value": "ref:./members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_crn"
823+
},
824+
{
825+
"name": "cloud_monitoring_guid",
826+
"value": "ref:./members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_guid"
827+
},
828+
{
829+
"name": "secrets_manager_crn",
830+
"value": "ref:./members/Essential Security - Secrets Manager/outputs/secrets_manager_crn"
831+
},
832+
{
833+
"name": "secrets_manager_guid",
834+
"value": "ref:./members/Essential Security - Secrets Manager/outputs/secrets_manager_guid"
835+
},
836+
{
837+
"name": "secrets_manager_name",
838+
"value": "ref:./members/Essential Security - Secrets Manager/outputs/secrets_manager_name"
839+
},
840+
{
841+
"name": "scc_crn",
842+
"value": "ref:./members/Essential Security - Security Compliance Center/outputs/scc_crn"
843+
},
844+
{
845+
"name": "scc_guid",
846+
"value": "ref:./members/Essential Security - Security Compliance Center/outputs/scc_guid"
847+
},
848+
{
849+
"name": "scc_workload_protection_crn",
850+
"value": "ref:./members/Essential Security - Security Compliance Center/outputs/scc_workload_protection_crn"
851+
},
852+
{
853+
"name": "watson_discovery_crn",
854+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_crn"
855+
},
856+
{
857+
"name": "watson_discovery_dashboard_url",
858+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_dashboard_url"
859+
},
860+
{
861+
"name": "watson_machine_learning_crn",
862+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_crn"
863+
},
864+
{
865+
"name": "watson_machine_learning_dashboard_url",
866+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_dashboard_url"
867+
},
868+
{
869+
"name": "watson_machine_learning_guid",
870+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_guid"
871+
},
872+
{
873+
"name": "watson_studio_crn",
874+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_studio_crn"
875+
},
876+
{
877+
"name": "watson_studio_dashboard_url",
878+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_studio_dashboard_url"
879+
},
880+
{
881+
"name": "watson_studio_guid",
882+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_studio_guid"
883+
},
884+
{
885+
"name": "watsonx_assistant_crn",
886+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_crn"
887+
},
888+
{
889+
"name": "watsonx_assistant_dashboard_url",
890+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_dashboard_url"
891+
},
892+
{
893+
"name": "watsonx_data_crn",
894+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_crn"
895+
},
896+
{
897+
"name": "watsonx_data_dashboard_url",
898+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_dashboard_url"
899+
},
900+
{
901+
"name": "watsonx_data_guid",
902+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_guid"
903+
},
904+
{
905+
"name": "watson_discovery_guid",
906+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_guid"
783907
}
784908
]
785909
}

‎solutions/standard/stack_definition.json

Lines changed: 148 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,10 @@
735735
"name": "watson_assistant_region",
736736
"value": "ref:../../inputs/region"
737737
},
738+
{
739+
"name": "watsonx_admin_api_key",
740+
"value": "ref:../../inputs/watsonx_admin_api_key"
741+
},
738742
{
739743
"name": "watson_assistant_instance_id",
740744
"value": "ref:../Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_guid"
@@ -809,35 +813,171 @@
809813
"outputs": [
810814
{
811815
"name": "elasticsearch_hostname",
812-
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/hostname"
816+
"value": "ref:./members/Gen AI - Databases for Elasticsearch/outputs/hostname"
813817
},
814818
{
815819
"name": "elasticsearch_port",
816-
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/port"
820+
"value": "ref:./members/Gen AI - Databases for Elasticsearch/outputs/port"
817821
},
818822
{
819823
"name": "elasticsearch_service_credentials_json",
820-
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/service_credentials_json"
824+
"value": "ref:./members/Gen AI - Databases for Elasticsearch/outputs/service_credentials_json"
821825
},
822826
{
823827
"name": "elasticsearch_crn",
824-
"value": "ref:../Gen AI - Databases for Elasticsearch/outputs/crn"
828+
"value": "ref:./members/Gen AI - Databases for Elasticsearch/outputs/crn"
825829
},
826830
{
827831
"name": "watsonx_project_url",
828-
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watsonx_project_url"
832+
"value": "ref:./members/Workload - Sample RAG App Configuration/outputs/watsonx_project_url"
829833
},
830834
{
831835
"name": "watsonx_project_id",
832-
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watsonx_project_id"
836+
"value": "ref:./members/Workload - Sample RAG App Configuration/outputs/watsonx_project_id"
833837
},
834838
{
835839
"name": "watson_discovery_api_url",
836-
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watson_discovery_api_url"
840+
"value": "ref:./members/Workload - Sample RAG App Configuration/outputs/watson_discovery_api_url"
837841
},
838842
{
839843
"name": "watson_discovery_project_id",
840-
"value": "ref:../Workload - Sample RAG App Configuration/outputs/watson_discovery_project_id"
844+
"value": "ref:./members/Workload - Sample RAG App Configuration/outputs/watson_discovery_project_id"
845+
},
846+
{
847+
"name": "kms_instance_crn",
848+
"value": "ref:./members/Essential Security - Encryption Key Management/outputs/kms_instance_crn"
849+
},
850+
{
851+
"name": "kms_private_endpoint",
852+
"value": "ref:./members/Essential Security - Encryption Key Management/outputs/kms_private_endpoint"
853+
},
854+
{
855+
"name": "kms_public_endpoint",
856+
"value": "ref:./members/Essential Security - Encryption Key Management/outputs/kms_public_endpoint"
857+
},
858+
{
859+
"name": "event_notification_instance_crn",
860+
"value": "ref:./members/Essential Security - Event Notifications/outputs/crn"
861+
},
862+
{
863+
"name": "event_notification_instance_name",
864+
"value": "ref:./members/Essential Security - Event Notifications/outputs/event_notification_instance_name"
865+
},
866+
{
867+
"name": "event_notification_instance_guid",
868+
"value": "ref:./members/Essential Security - Event Notifications/outputs/guid"
869+
},
870+
{
871+
"name": "cloud_logs_crn",
872+
"value": "ref:./members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_logs_crn"
873+
},
874+
{
875+
"name": "cloud_logs_guid",
876+
"value": "ref:./members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_logs_guid"
877+
},
878+
{
879+
"name": "cloud_monitoring_crn",
880+
"value": "ref:./members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_crn"
881+
},
882+
{
883+
"name": "cloud_monitoring_guid",
884+
"value": "ref:./members/Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_guid"
885+
},
886+
{
887+
"name": "secrets_manager_crn",
888+
"value": "ref:./members/Essential Security - Secrets Manager/outputs/secrets_manager_crn"
889+
},
890+
{
891+
"name": "secrets_manager_guid",
892+
"value": "ref:./members/Essential Security - Secrets Manager/outputs/secrets_manager_guid"
893+
},
894+
{
895+
"name": "secrets_manager_name",
896+
"value": "ref:./members/Essential Security - Secrets Manager/outputs/secrets_manager_name"
897+
},
898+
{
899+
"name": "scc_crn",
900+
"value": "ref:./members/Essential Security - Security Compliance Center/outputs/scc_crn"
901+
},
902+
{
903+
"name": "scc_guid",
904+
"value": "ref:./members/Essential Security - Security Compliance Center/outputs/scc_guid"
905+
},
906+
{
907+
"name": "scc_workload_protection_crn",
908+
"value": "ref:./members/Essential Security - Security Compliance Center/outputs/scc_workload_protection_crn"
909+
},
910+
{
911+
"name": "watson_discovery_crn",
912+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_crn"
913+
},
914+
{
915+
"name": "watson_discovery_dashboard_url",
916+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_dashboard_url"
917+
},
918+
{
919+
"name": "watson_machine_learning_crn",
920+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_crn"
921+
},
922+
{
923+
"name": "watson_machine_learning_dashboard_url",
924+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_dashboard_url"
925+
},
926+
{
927+
"name": "watson_machine_learning_guid",
928+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_guid"
929+
},
930+
{
931+
"name": "watson_studio_crn",
932+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_studio_crn"
933+
},
934+
{
935+
"name": "watson_studio_dashboard_url",
936+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_studio_dashboard_url"
937+
},
938+
{
939+
"name": "watson_studio_guid",
940+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_studio_guid"
941+
},
942+
{
943+
"name": "watsonx_assistant_crn",
944+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_crn"
945+
},
946+
{
947+
"name": "watsonx_assistant_dashboard_url",
948+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_dashboard_url"
949+
},
950+
{
951+
"name": "watsonx_data_crn",
952+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_crn"
953+
},
954+
{
955+
"name": "watsonx_data_dashboard_url",
956+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_dashboard_url"
957+
},
958+
{
959+
"name": "watsonx_data_guid",
960+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watsonx_data_guid"
961+
},
962+
{
963+
"name": "watson_discovery_guid",
964+
"value": "ref:./members/Gen AI - WatsonX SaaS services/outputs/watson_discovery_guid"
965+
},
966+
{
967+
"name": "workload_cluster_name",
968+
"value": "ref:./members/Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
969+
},
970+
{
971+
"name": "workload_cluster_id",
972+
"value": "ref:./members/Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_id"
973+
},
974+
{
975+
"name": "workload_cluster_private_service_endpoint_url",
976+
"value": "ref:./members/Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_private_service_endpoint_url"
977+
},
978+
{
979+
"name": "workload_cluster_public_service_endpoint_url",
980+
"value": "ref:./members/Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_public_service_endpoint_url"
841981
}
842982
]
843983
}

0 commit comments

Comments
 (0)