Skip to content
This repository was archived by the owner on Dec 17, 2024. It is now read-only.

latest updates to dev tile #63

Merged
merged 7 commits into from
Sep 30, 2024
Merged

latest updates to dev tile #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd40b1c
docs: add permissions needed to catalog docs
toddgiguere Sep 27, 2024
4abae9a
updates
ocofaigh Sep 27, 2024
dfa472f
bump test wrapper
ocofaigh Sep 27, 2024
41e9d08
bump ES
ocofaigh Sep 27, 2024
b8a9b4e
updates
ocofaigh Sep 28, 2024
f83e30f
bump sample app
ocofaigh Sep 28, 2024
476e4fc
observ DA updates
ocofaigh Sep 30, 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
33 changes: 26 additions & 7 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
]
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Writer",
"crn:v1:bluemix:public:iam::::role:Editor"
],
"service_name": "codeengine"
}
],
"architecture": {
Expand Down Expand Up @@ -299,10 +306,10 @@
"required": false
},
{
"key": "enable_platform_metrics",
"key": "enable_platform_logs_metrics",
"type": "boolean",
"default_value": false,
"description": "Whether the monitoring instance is configured to receive all platform metrics in the target region. There can only be one instance per region provisioned for platform metrics.",
"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.",
"required": false
},
{
Expand Down Expand Up @@ -414,7 +421,7 @@
"profiles": [
{
"profile_name": "AI Security Guardrails 2.0",
"profile_version": "1.0.0"
"profile_version": "1.1.0"
}
]
},
Expand Down Expand Up @@ -501,6 +508,18 @@
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
]
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Administrator"
],
"service_name": "containers-kubernetes"
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Administrator"
],
"service_name": "is.vpc"
}
],
"architecture": {
Expand All @@ -518,11 +537,11 @@
"description": " "
},
{
"title": "- watsonx.ai use of Elasticsearch ELSER2 vector index for RAG",
"title": "i. watsonx.ai use of Elasticsearch ELSER2 vector index for RAG",
"description": " "
},
{
"title": "- watsonx Assistant Conversational Search with UI feature for uploading documents to create or use Elasticsearch ELSER2 vector index for RAG",
"title": "ii. watsonx Assistant Conversational Search with UI feature for uploading documents to create or use Elasticsearch ELSER2 vector index for RAG",
"description": " "
},
{
Expand Down Expand Up @@ -656,10 +675,10 @@
"required": false
},
{
"key": "enable_platform_metrics",
"key": "enable_platform_logs_metrics",
"type": "boolean",
"default_value": false,
"description": "Whether the monitoring instance is configured to receive all platform metrics in the target region. There can only be one instance per region provisioned for platform metrics.",
"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.",
"required": false
},
{
Expand Down
14 changes: 9 additions & 5 deletions solutions/basic/stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"default": null
},
{
"name": "enable_platform_metrics",
"name": "enable_platform_logs_metrics",
"required": false,
"type": "boolean",
"hidden": false,
Expand Down Expand Up @@ -236,7 +236,7 @@
},
{
"name": "Essential Security - Logging Monitoring Activity Tracker",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.eaf90e32-42b4-4cd6-a4c3-ea720f6ea9f7-global",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.157744e4-5ef1-4e0f-9b8b-8b49b2ee8bb2-global",
"inputs": [
{
"name": "ibmcloud_api_key",
Expand Down Expand Up @@ -268,7 +268,11 @@
},
{
"name": "enable_platform_metrics",
"value": "ref:../../inputs/enable_platform_metrics"
"value": "ref:../../inputs/enable_platform_logs_metrics"
},
{
"name": "enable_platform_logging",
"value": "ref:../../inputs/enable_platform_logs_metrics"
}
]
},
Expand Down Expand Up @@ -404,7 +408,7 @@
},
{
"name": "Gen AI - Databases for Elasticsearch",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.aa4a2c9b-8a6a-472d-a9d3-9fc6e97b062f-global",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bd9fa211-0586-4580-90a7-47f22f6b8b4b-global",
"inputs": [
{
"name": "use_existing_resource_group",
Expand Down Expand Up @@ -659,7 +663,7 @@
},
{
"name": "Workload - Sample RAG App Configuration",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.15a21bde-a11f-476b-a312-83a9c863e8eb-global",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0f19e9f8-07c5-4091-9c0a-5f55f846b152-global",
"inputs": [
{
"name": "toolchain_region",
Expand Down
28 changes: 16 additions & 12 deletions solutions/standard/stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"default": null
},
{
"name": "enable_platform_metrics",
"name": "enable_platform_logs_metrics",
"required": false,
"type": "boolean",
"hidden": false,
Expand Down Expand Up @@ -236,7 +236,7 @@
},
{
"name": "Essential Security - Logging Monitoring Activity Tracker",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.eaf90e32-42b4-4cd6-a4c3-ea720f6ea9f7-global",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.157744e4-5ef1-4e0f-9b8b-8b49b2ee8bb2-global",
"inputs": [
{
"name": "ibmcloud_api_key",
Expand Down Expand Up @@ -268,7 +268,11 @@
},
{
"name": "enable_platform_metrics",
"value": "ref:../../inputs/enable_platform_metrics"
"value": "ref:../../inputs/enable_platform_logs_metrics"
},
{
"name": "enable_platform_logging",
"value": "ref:../../inputs/enable_platform_logs_metrics"
}
]
},
Expand Down Expand Up @@ -404,7 +408,7 @@
},
{
"name": "Gen AI - Databases for Elasticsearch",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.aa4a2c9b-8a6a-472d-a9d3-9fc6e97b062f-global",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bd9fa211-0586-4580-90a7-47f22f6b8b4b-global",
"inputs": [
{
"name": "use_existing_resource_group",
Expand Down Expand Up @@ -543,7 +547,7 @@
]
},
{
"name": "Workload - Red Hat OpenShift Container Platform on VPC",
"name": "Workload - Compute Red Hat OpenShift Container Platform on VPC",
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.639be978-b7d7-4702-9723-0b638225491b-global",
"inputs": [
{
Expand Down Expand Up @@ -622,7 +626,7 @@
]
},
{
"name": "Workload - Application Lifecycle Management",
"name": "Workload - DevSecOps Application Lifecycle Management",
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.d0d2aff1-8f34-4fa8-bc00-92378edd2226-global",
"inputs": [
{
Expand Down Expand Up @@ -655,7 +659,7 @@
},
{
"name": "cluster_name",
"value": "ref:../Workload - Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
"value": "ref:../Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
},
{
"name": "registry_namespace",
Expand Down Expand Up @@ -701,7 +705,7 @@
},
{
"name": "Workload - Sample RAG App Configuration",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.15a21bde-a11f-476b-a312-83a9c863e8eb-global",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0f19e9f8-07c5-4091-9c0a-5f55f846b152-global",
"inputs": [
{
"name": "toolchain_region",
Expand All @@ -725,11 +729,11 @@
},
{
"name": "cd_pipeline_id",
"value": "ref:../Workload - Application Lifecycle Management/outputs/cd_pipeline_id"
"value": "ref:../Workload - DevSecOps Application Lifecycle Management/outputs/cd_pipeline_id"
},
{
"name": "ci_pipeline_id",
"value": "ref:../Workload - Application Lifecycle Management/outputs/ci_pipeline_id"
"value": "ref:../Workload - DevSecOps Application Lifecycle Management/outputs/ci_pipeline_id"
},
{
"name": "watson_machine_learning_instance_guid",
Expand Down Expand Up @@ -781,11 +785,11 @@
},
{
"name": "cluster_name",
"value": "ref:../Workload - Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
"value": "ref:../Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
},
{
"name": "cluster_zone_count",
"value": "ref:../Workload - Red Hat OpenShift Container Platform on VPC/inputs/cluster_zones"
"value": "ref:../Workload - Compute Red Hat OpenShift Container Platform on VPC/inputs/cluster_zones"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.23.1
require (
github.com/gruntwork-io/terratest v0.47.1
github.com/stretchr/testify v1.9.0
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.2
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.3
)

require (
Expand Down
4 changes: 2 additions & 2 deletions tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.2 h1:CS7GP1awUY/oR/NmQo4O1GUjnd0mkpsDVaxGM/Kg+iQ=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.2/go.mod h1:xOJLB0UttcTG0FPVLikDM6RxP4iC+apBD01hidt2gYo=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.3 h1:34LldlFzaFwNpeeUJI7yIwG7JO0twRC8nPIsgatzZRs=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.3/go.mod h1:xOJLB0UttcTG0FPVLikDM6RxP4iC+apBD01hidt2gYo=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tmccombs/hcl2json v0.5.0 h1:cT2sXStOzKL06c8ZTf9vh+0N8GKGzV7+9RUaY5/iUP8=
github.com/tmccombs/hcl2json v0.5.0/go.mod h1:B0ZpBthAKbQur6yZRKrtaqDmYLCvgnwHOBApE0faCpU=
Expand Down