Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit e86e751

Browse files
author
Rajat Agrawal
committed
feat: addon poc content taken from vburckhardt/addon-poc Repo - genai Branch
1 parent 18f41ad commit e86e751

File tree

3 files changed

+188
-446
lines changed

3 files changed

+188
-446
lines changed

‎.gitignore‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Local .terraform directories
2+
**/.terraform/*
3+
4+
# .tfstate files
5+
*.tfstate
6+
*.tfstate.*
7+
8+
# Crash log files
9+
crash.log
10+
crash.*.log
11+
12+
# Exclude all .tfvars files, which are likely to contain sensitive data, such as
13+
# password, private keys, and other secrets. These should not be part of version
14+
# control as they are data points which are potentially sensitive and subject
15+
# to change depending on the environment.
16+
*.tfvars
17+
*.tfvars.json
18+
19+
# Ignore override files as they are usually used to override resources locally and so
20+
# are not checked in
21+
override.tf
22+
override.tf.json
23+
*_override.tf
24+
*_override.tf.json
25+
26+
# Ignore transient lock info files created by terraform apply
27+
.terraform.tfstate.lock.info
28+
29+
# Include override files you do wish to add to version control using negated pattern
30+
# !example_override.tf
31+
32+
# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
33+
# example: *tfplan*
34+
35+
# Ignore CLI configuration files
36+
.terraformrc
37+
terraform.rc

‎ibm_catalog.json‎

Lines changed: 82 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,18 @@
11
{
22
"products": [
33
{
4-
"label": "WatsonX Generative AI",
5-
"name": "watsonx_generative_ai",
4+
"label": "Gen AI",
5+
"name": "Gen_AI",
6+
"version": "1.0.2",
67
"product_kind": "solution",
78
"tags": [
8-
"watson",
9-
"watsonx.ai",
10-
"ibm_created"
11-
],
12-
"keywords": [
13-
"watson",
14-
"watsonx",
15-
"ai"
16-
],
17-
"short_description": "Deploy Watsonx.ai SaaS with Assistant and Governance to automate the deployment and setup of the IBM watsonx platform.",
18-
"long_description": "The Watsonx.ai SaaS with Assistant and Governance deployable architecture easily deploys and embeds AI across your business, manages all data sources, and accelerates responsible AI workflows on one platform.",
19-
"provider_name": "IBM",
20-
"offering_docs_url": "https://cloud.ibm.com/docs/watsonx-ai-saas-automation?topic=watsonx-ai-saas-automation-overview",
21-
"support_details": "This is a proof of concept and no official support is given.",
22-
"features": [
23-
{
24-
"title": "Build with watsonx applications",
25-
"description": "watsonx combines the power of watsonx.ai studio for AI with the scale of watsonx.data store, enabling the creation of next-generation AI."
26-
},
27-
{
28-
"title": "Develop with Watson Studio",
29-
"description": "Develop sophisticated machine learning models using Notebooks and code-free tools to infuse AI throughout your business."
30-
},
31-
{
32-
"title": "Deliver and build conversational interfaces with watsonx Assistant",
33-
"description": "IBM watsonx Assistant lets you build conversational interfaces into any application, device, or channel."
34-
},
35-
{
36-
"title": "Integrate predictive capabilities with Watson Machine Learning",
37-
"description": "Deploy, manage, and integrate machine learning models into your applications and services in as little as one click."
38-
},
39-
{
40-
"title": "Accelerate buisness decisions Watson Discovery",
41-
"description": "Watson Discovery adds a cognitive search and content analytics engine to applications."
42-
},
43-
{
44-
"title": "Manage and monitor with watsonx.governance",
45-
"description": "IBM watsonx.governance™ helps you direct, manage, and monitor your organization's AI activities."
46-
}
9+
"watson"
4710
],
11+
"offering_icon_url": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBpZD0iaWNvbiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIHZpZXdCb3g9IjAgMCAzMiAzMiI+CiAgPGRlZnM+CiAgICA8c3R5bGU+CiAgICAgIC5jbHMtMSB7CiAgICAgICAgZmlsbDogbm9uZTsKICAgICAgfQoKICAgICAgLmNscy0xLCAuY2xzLTIgewogICAgICAgIHN0cm9rZS13aWR0aDogMHB4OwogICAgICB9CiAgICA8L3N0eWxlPgogIDwvZGVmcz4KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Im0xOSwyMnYtMmgxdi03aC0xdi0yaDR2MmgtMXY3aDF2MmgtNFoiLz4KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Im0xNS41MDA1LDIyaDJsLTMuNTAwNS0xMWgtM2wtMy40OTY2LDExaDEuOTk4OGwuNjAxOC0yaDQuNzc4MWwuNjE4NCwyWm0tNC43OTQ3LTRsMS42Mjg0LTUuNDExMS4yNTU5LS4wMDI0LDEuNjczNiw1LjQxMzZoLTMuNTU3OVoiLz4KICA8cG9seWdvbiBjbGFzcz0iY2xzLTIiIHBvaW50cz0iMzIgNCAyOCA0IDI4IDAgMjYgMCAyNiA0IDIyIDQgMjIgNiAyNiA2IDI2IDEwIDI4IDEwIDI4IDYgMzIgNiAzMiA0Ii8+CiAgPHJlY3QgY2xhc3M9ImNscy0yIiB4PSIzMCIgeT0iMTIiIHdpZHRoPSIyIiBoZWlnaHQ9IjIiLz4KICA8cmVjdCBjbGFzcz0iY2xzLTIiIHg9IjE4IiB5PSIwIiB3aWR0aD0iMiIgaGVpZ2h0PSIyIi8+CiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjMyIDMyIDAgMzIgMCAwIDE0IDAgMTQgMiAyIDIgMiAzMCAzMCAzMCAzMCAxOCAzMiAxOCAzMiAzMiIvPgogIDxyZWN0IGlkPSJfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXyIgZGF0YS1uYW1lPSImYW1wO2x0O1RyYW5zcGFyZW50IFJlY3RhbmdsZSZhbXA7Z3Q7IiBjbGFzcz0iY2xzLTEiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIvPgo8L3N2Zz4=",
4812
"flavors": [
4913
{
50-
"label": "Standard",
51-
"name": "genai-stack-standard",
14+
"label": "Basic",
15+
"name": "Basic-dda0",
5216
"licenses": [
5317
{
5418
"id": "LICENSE",
@@ -136,10 +100,27 @@
136100
"role_crns": [
137101
"crn:v1:bluemix:public:iam::::role:Editor"
138102
]
103+
},
104+
{
105+
"service_name": "databases-for-elasticsearch",
106+
"role_crns": [
107+
"crn:v1:bluemix:public:iam::::role:Editor"
108+
]
109+
},
110+
{
111+
"service_name": "event-notifications",
112+
"role_crns": [
113+
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
114+
"crn:v1:bluemix:public:iam::::role:Editor"
115+
]
139116
}
140117
],
141118
"architecture": {
142119
"features": [
120+
{
121+
"title": "Retrieval Augmented Generation sample pattern",
122+
"description": "Deploy a banking retrieval augmented generation (RAG) sample application to IBM Cloud Code Engine using Continous Delivery."
123+
},
143124
{
144125
"title": "Ensure Observability",
145126
"description": "The architecture provides observability by deploying services such as IBM Log Analysis, IBM Monitoring, IBM Activity Tracker, and log retention through Cloud Object Storage buckets."
@@ -150,7 +131,7 @@
150131
},
151132
{
152133
"title": "Achieve Regulatory Compliance",
153-
"description": "The architecture ensures regulatory compliance with IBM Security Compliance Center (SCC)."
134+
"description": "The architecture ensures regulatory compliance by implementing CI/CD/CC pipelines, along with IBM Security Compliance Center (SCC) for secure application lifecycle management."
154135
},
155136
{
156137
"title": "Establish Trust",
@@ -160,128 +141,103 @@
160141
"diagrams": [
161142
{
162143
"diagram": {
163-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-ibm-genai/main/reference-architecture/Genai Pattern v2-part-2.svg",
144+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/RAG Pattern v2-part-2.svg",
164145
"caption": "Reference architecture",
165146
"type": "image/svg+xml",
166-
"thumbnail_url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-ibm-genai/main/reference-architecture/Genai Pattern v2-part-2.svg"
147+
"thumbnail_url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/RAG Pattern v2-part-2.svg"
167148
},
168149
"description": "Reference architecture"
169150
},
170151
{
171152
"diagram": {
172-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-ibm-genai/main/reference-architecture/genai-stack.png",
153+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/rag-stack.svg",
173154
"caption": "Solution components",
174155
"type": "image/svg+xml",
175-
"thumbnail_url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-ibm-genai/main/reference-architecture/genai-stack.png"
156+
"thumbnail_url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/rag-stack.svg"
176157
},
177158
"description": "Solution components"
178159
}
179160
]
180161
},
181-
"configuration": [
182-
{
183-
"key": "prefix",
184-
"type": "string",
185-
"default_value": "gen-ai",
186-
"description": "A prefix added to the name of all resources created by this solution. Used to avoid name clashes in the target account when existing this solution multiple times.",
187-
"required": true
188-
},
189-
{
190-
"key": "region",
191-
"type": "string",
192-
"default_value": "us-south",
193-
"description": "The region in which all resources are deployed.",
194-
"required": false,
195-
"options": [
162+
"dependencies": [
163+
{
164+
"name": "deploy-arch-ibm-observability",
165+
"id": "231fad60-b8ac-4540-bc34-ae1e4379d46f-global",
166+
"version": "^1.12.2",
167+
"flavors": [
168+
"instances"
169+
],
170+
"catalog_id": "0fbd7aba-de09-43bf-b848-ade81f4ad0ff",
171+
"optional": true
172+
},
173+
{
174+
"name": "Core_Security_Services",
175+
"id": "f3dabaf3-5150-43c4-81ff-f28126db83e2",
176+
"version": "^1.0.0",
177+
"flavors": [
178+
""
179+
],
180+
"catalog_id": "9212a6da-ac9b-4f3c-94d8-83a866e1a250",
181+
"optional": true,
182+
"input_mapping": [
196183
{
197-
"displayname": "us-south",
198-
"value": "us-south"
199-
},
200-
{
201-
"displayname": "eu-de",
202-
"value": "eu-de"
184+
"dependency_output": "kms_instance_crn",
185+
"version_input": "existing_kms_instance_crn"
203186
}
204187
]
205188
},
206189
{
207-
"key": "resource_group_name",
208-
"type": "string",
209-
"default_value": "genai-services",
210-
"description": "The name of the resource group that is created by this solution. The actual name is prefixed with the value of the input 'prefix'. All resources created by this solution are deployed in this resource group.",
211-
"required": false
212-
},
213-
{
214-
"key": "watsonx_admin_api_key",
215-
"type": "password",
216-
"description": "The API key used to provision the watson project resources. If not set, the API key used to deploy the solution is used.",
217-
"required": false
218-
},
219-
{
220-
"key": "secret_manager_service_plan",
221-
"type": "string",
222-
"default_value": "trial",
223-
"description": "The service/pricing plan to use when provisioning a new Secrets Manager instance. Only one trial instance is allowed per account.",
224-
"required": false,
225-
"options": [
226-
{
227-
"displayname": "Trial",
228-
"value": "trial"
229-
},
190+
"name": "deploy-arch-ibm-account-infra-base",
191+
"id": "9fcd1945-8ebc-4072-85dc-6400653e7077-global",
192+
"version": "^1.11.6",
193+
"flavors": [
194+
"standard"
195+
],
196+
"catalog_id": "0fbd7aba-de09-43bf-b848-ade81f4ad0ff",
197+
"optional": true,
198+
"input_mapping": [
230199
{
231-
"displayname": "Standard",
232-
"value": "standard"
200+
"dependency_output": "workload_resource_group_name",
201+
"version_input": "existing_resource_group_name"
233202
}
234203
]
235-
},
204+
}
205+
],
206+
"configuration": [
236207
{
237-
"key": "existing_secrets_manager_crn",
208+
"key": "region",
238209
"type": "string",
239-
"default_value": "__NULL__",
240-
"description": "The CRN of an existing secret manager instance to use in this solution. If not set, a new secret manager instance is provisioned.",
210+
"default_value": "us-south",
241211
"required": false
242212
},
243213
{
244-
"key": "enable_platform_logs_metrics",
245-
"type": "boolean",
246-
"default_value": false,
247-
"description": "Whether to provision logging and monitoring instances are configured to receive all platform logs and metrics in the target region. There can only be one instance per region provisioned for platform logs/metrics.",
214+
"key": "elasticsearch_plan",
215+
"type": "string",
216+
"default_value": "enterprise",
248217
"required": false
249218
},
250219
{
251-
"key": "existing_kms_instance_crn",
220+
"key": "prefix",
252221
"type": "string",
253-
"default_value": "__NULL__",
254-
"description": "The CRN of an existing KMS instance to use in this solution. If not set, a new KP instance is provisioned.",
255-
"required": false
222+
"default_value": "rag",
223+
"required": true
256224
},
257225
{
258-
"key": "en_email_list",
259-
"type": "array",
260-
"default_value": [],
261-
"description": "List of emails to configure event notifications.",
226+
"key": "existing_kms_instance_crn",
227+
"type": "string",
228+
"default_value": "",
262229
"required": false
263230
},
264231
{
265-
"key": "scc_service_plan",
232+
"key": "existing_resource_group_name",
266233
"type": "string",
267-
"default_value": "security-compliance-center-standard-plan",
268-
"description": "The pricing plan to use for the IBM Cloud Security and Compliance Center.",
269-
"required": false,
270-
"options": [
271-
{
272-
"displayname": "standard",
273-
"value": "security-compliance-center-standard-plan"
274-
},
275-
{
276-
"displayname": "trial",
277-
"value": "security-compliance-center-trial-plan"
278-
}
279-
]
234+
"default_value": "default",
235+
"required": true
280236
}
281237
],
282-
"install_type": "fullstack"
238+
"install_type": "extension"
283239
}
284240
]
285241
}
286242
]
287-
}
243+
}

0 commit comments

Comments
 (0)