add ES DA and disable Watsonx Saas (#1)

Author: akocbek

ibm_catalog.json

@@ -138,6 +138,12 @@
 								"crn:v1:bluemix:public:iam::::role:Editor"
 							],
 							"service_name": "discovery"
+						},
+						{
+							"service_name": "databases-for-elasticsearch",
+							"role_crns": [
+							  "crn:v1:bluemix:public:iam::::role:Editor"
+							]
 						}
 					],
 					"architecture": {
@@ -288,6 +294,22 @@
 						}
 					],
 					"outputs": [
+						{
+							"key": "elasticsearch_hostname",
+							"description": "Elasticsearch instance hostname."
+						},
+						{
+							"key": "elasticsearch_port",
+							"description": "Elasticsearch instance port."
+						},
+						{
+							"key": "elasticsearch_service_credentials_json",
+							"description": "Elasticsearch instance service credentials json map."
+						},
+						{
+							"key": "elasticsearch_crn",
+							"description": "Elasticsearch instance crn."
+						},
 						{
 							"key": "watsonx_project_url",
 							"description": "The URL to the WatsonX project for the sample RAG application."

sample_deploy_config.json

@@ -9,8 +9,9 @@
     "2c - Security Service - Security Compliance Center",
     "3 - Observability - Logging Monitoring Activity Tracker",
     "4 - WatsonX SaaS services",
-    "5 - Sample RAG app - Application Lifecycle Management",
-    "6 - Sample RAG app configuration"
+    "5 - Databases for Elasticsearch",
+    "6 - Sample RAG app - Application Lifecycle Management",
+    "7 - Sample RAG app configuration"
   ],
   "stack_inputs": {
     "prefix": "<YOUR PREFIX HERE>",

stack_definition.json

@@ -72,7 +72,7 @@
   "members": [
     {
       "name": "1 - Account Infrastructure Base",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.be107739-fdfc-4089-95e0-def4abac847d-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.62aeb17c-2272-416c-b982-5f17fa508d04-global",
       "inputs": [
         {
           "name": "prefix",
@@ -262,7 +262,7 @@
     },
     {
       "name": "4 - WatsonX SaaS services",
-      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.c237751c-d3dd-4c23-b0b1-ba726d30c8e9-global",
+      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.a68377c5-2a73-4832-8fd9-ad5b73b5256b-global",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -315,7 +315,57 @@
       ]
     },
     {
-      "name": "5 - Sample RAG app - Application Lifecycle Management",
+      "name": "5 - Databases for Elasticsearch",
+			"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c5ea982b-011a-46c8-a49d-0de273f40b46-global",
+			"inputs": [
+				{
+					"name": "use_existing_resource_group",
+					"value": true
+				},
+				{
+					"name": "resource_group_name",
+					"value": "ref:../../members/1 - Account Infrastructure Base/outputs/workload_resource_group_name"
+				},
+				{
+					"name": "region",
+					"value": "ref:../../inputs/region"
+				},
+				{
+					"name": "prefix",
+					"value": "ref:../../inputs/prefix"
+				},
+				{
+					"name": "plan",
+					"value": "enterprise"
+				},
+				{
+					"name": "elasticsearch_version",
+					"value": "8.12"
+				},
+				{
+					"name": "existing_kms_instance_crn",
+					"value": "ref:../../members/2a - Security Service - Key Management/outputs/kms_instance_crn"
+				},
+				{
+					"name": "kms_endpoint_type",
+					"value": "private"
+				},
+				{
+					"name": "member_host_flavor",
+					"value": "b3c.4x16.encrypted"
+				},
+        {
+					"name": "service_credential_names",
+					"value": {
+						"elastic_db_admin" : "Administrator",
+						"wxasst_db_user" : "Editor",
+						"toolchain_db_user" : "Editor"
+					}
+				}
+			]
+		},
+    {
+      "name": "6 - Sample RAG app - Application Lifecycle Management",
       "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.cce4d1b1-c09a-4c23-8aba-92f6e9f38cda-global",
       "inputs": [
         {
@@ -417,8 +467,8 @@
       ]
     },
     {
-      "name": "6 - Sample RAG app configuration",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.af19228a-3182-46da-b52a-b1d9f662609d-global",
+      "name": "7 - Sample RAG app configuration",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.92fcdabc-7c4e-450e-9f1b-e6b059119aa7-global",
       "inputs": [
         {
           "name": "toolchain_region",
@@ -446,11 +496,11 @@
         },
         {
           "name": "cd_pipeline_id",
-          "value": "ref:../5 - Sample RAG app - Application Lifecycle Management/outputs/cd_pipeline_id"
+          "value": "ref:../6 - Sample RAG app - Application Lifecycle Management/outputs/cd_pipeline_id"
         },
         {
           "name": "ci_pipeline_id",
-          "value": "ref:../5 - Sample RAG app - Application Lifecycle Management/outputs/ci_pipeline_id"
+          "value": "ref:../6 - Sample RAG app - Application Lifecycle Management/outputs/ci_pipeline_id"
         },
         {
           "name": "watson_machine_learning_instance_guid",
@@ -500,6 +550,22 @@
     }
   ],
   "outputs": [
+		{
+		  "name": "elasticsearch_hostname",
+		  "value": "ref:./members/5 - Databases for Elasticsearch/outputs/hostname"
+		},
+		{
+		  "name": "elasticsearch_port",
+		  "value": "ref:./members/5 - Databases for Elasticsearch/outputs/port"
+		},
+		{
+		  "name": "elasticsearch_service_credentials_json",
+		  "value": "ref:./members/5 - Databases for Elasticsearch/outputs/service_credentials_json"
+		},
+    {
+		  "name": "elasticsearch_crn",
+		  "value": "ref:./members/5 - Databases for Elasticsearch/outputs/crn"
+		},
     {
       "name": "watsonx_project_url",
       "value": "ref:./members/6 - Sample RAG app configuration/outputs/watsonx_project_url"