From e0afd6deb141edef4be222a9f6b90b53db1679f3 Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Tue, 19 Nov 2024 19:07:49 +0530 Subject: [PATCH 01/22] feat:An ability to override Kibana image URL in DA --- solutions/standard/main.tf | 2 +- solutions/standard/variables.tf | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/solutions/standard/main.tf b/solutions/standard/main.tf index c26e5fa6..27fe7a50 100644 --- a/solutions/standard/main.tf +++ b/solutions/standard/main.tf @@ -307,7 +307,7 @@ module "code_engine_kibana" { apps = { (local.code_engine_app_name) = { - image_reference = "docker.elastic.co/kibana/kibana:${local.es_full_version}" + image_reference = var.kibana_image_reference != "" ? var.kibana_image_reference : "docker.elastic.co/kibana/kibana:${local.es_full_version}" image_port = 5601 run_env_variables = [{ type = "literal" diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index b378fcbb..6cad34bc 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -354,3 +354,9 @@ variable "elasticsearch_full_version" { type = string default = null } + +variable "kibana_image_reference" { + description = "The docker image reference for Kibana.Please give your image input or leave blank for default." + type = string + default = "" +} From f7020fda4b5a610db6ac89b140220f1b6050b39d Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Wed, 20 Nov 2024 14:45:27 +0530 Subject: [PATCH 02/22] changed the description for kibana_image_reference ,enable_kibana_dashboard and elasticsearch_full_version,changed empty string to null added variable in ibm_catalog.json --- ibm_catalog.json | 3 +++ solutions/standard/main.tf | 2 +- solutions/standard/variables.tf | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 2f116cb4..047eeea3 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -200,6 +200,9 @@ } ] }, + { + "key":"kibana_image_reference" + }, { "key": "access_tags" }, diff --git a/solutions/standard/main.tf b/solutions/standard/main.tf index 27fe7a50..3161d8c7 100644 --- a/solutions/standard/main.tf +++ b/solutions/standard/main.tf @@ -307,7 +307,7 @@ module "code_engine_kibana" { apps = { (local.code_engine_app_name) = { - image_reference = var.kibana_image_reference != "" ? var.kibana_image_reference : "docker.elastic.co/kibana/kibana:${local.es_full_version}" + image_reference = var.kibana_image_reference != null ? var.kibana_image_reference : "docker.elastic.co/kibana/kibana:${local.es_full_version}" image_port = 5601 run_env_variables = [{ type = "literal" diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index 6cad34bc..bdec2539 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -345,18 +345,18 @@ variable "existing_code_engine_project_id" { variable "enable_kibana_dashboard" { type = bool - description = "Set it true to deploy Kibana in code engine. NOTE: Kibana image is coming direcly from the official registry (https://www.docker.elastic.co/) and not certified by the IBM." + description = "Set it true to deploy Kibana in code engine. When enabled, the Kibana image reference can be specified using the 'kibana_image_reference' input.NOTE: Kibana image is coming direcly from the official registry (https://www.docker.elastic.co/) and not certified by the IBM." default = false } variable "elasticsearch_full_version" { - description = "(Optional) Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard. If no value is passed, data lookup will fetch the full version using the Elasticsearch API, see https://github.com/elastic/kibana?tab=readme-ov-file#version-compatibility-with-elasticsearch" + description = "(Optional) Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard.Value is only used if enable_kibana_dashboard is true and if no value is passed for kibana_image_reference. If no value is passed, data lookup will fetch the full version using the Elasticsearch API, see https://github.com/elastic/kibana?tab=readme-ov-file#version-compatibility-with-elasticsearch" type = string default = null } variable "kibana_image_reference" { - description = "The docker image reference for Kibana.Please give your image input or leave blank for default." + description = "The docker image reference to use for Kibana if enable_kibana_dashboard is set to true. If no value is set, it will pull the image from the official Elastic registry (https://www.docker.elastic.co). Ensure to use a version that is compatible with the Elasticsearch version being used." type = string - default = "" + default = null } From c1b72fa2ba856f29820dbe55138d05c0507abf6e Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Wed, 20 Nov 2024 21:28:40 +0530 Subject: [PATCH 03/22] FORMATTED THE VARIABLE DESCRIPTION --- ibm_catalog.json | 15 ++++++++++++--- solutions/standard/variables.tf | 6 +++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index c7f9c53a..dc612da0 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -204,9 +204,6 @@ } ] }, - { - "key":"kibana_image_reference" - }, { "key": "access_tags" }, @@ -300,6 +297,18 @@ "value": ".elser_model_2_linux-x86_64" } ] + }, + { + "key": "kibana_image_reference" + }, + { + "key": "existing_code_engine_project_id" + }, + { + "key": "enable_kibana_dashboard" + }, + { + "key": "elasticsearch_full_version" } ] } diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index bdec2539..031b5137 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -345,18 +345,18 @@ variable "existing_code_engine_project_id" { variable "enable_kibana_dashboard" { type = bool - description = "Set it true to deploy Kibana in code engine. When enabled, the Kibana image reference can be specified using the 'kibana_image_reference' input.NOTE: Kibana image is coming direcly from the official registry (https://www.docker.elastic.co/) and not certified by the IBM." + description = "Set to true to deploy Kibana in Code Engine. NOTE: By default, the Kibana image will be pulled from the official Elastic registry (docker.elastic.co) and is not certified by IBM, however this can be overridden using the `kibana_image_reference` input." default = false } variable "elasticsearch_full_version" { - description = "(Optional) Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard.Value is only used if enable_kibana_dashboard is true and if no value is passed for kibana_image_reference. If no value is passed, data lookup will fetch the full version using the Elasticsearch API, see https://github.com/elastic/kibana?tab=readme-ov-file#version-compatibility-with-elasticsearch" + description = "(Optional) Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard. Value is only used if `enable_kibana_dashboard` is true and if no value is passed for `kibana_image_reference`. If no value is passed, data lookup will fetch the full version using the Elasticsearch API, see https://github.com/elastic/kibana?tab=readme-ov-file#version-compatibility-with-elasticsearch" type = string default = null } variable "kibana_image_reference" { - description = "The docker image reference to use for Kibana if enable_kibana_dashboard is set to true. If no value is set, it will pull the image from the official Elastic registry (https://www.docker.elastic.co). Ensure to use a version that is compatible with the Elasticsearch version being used." + description = "The docker image reference to use for Kibana if `enable_kibana_dashboard` is set to true. If no value is set, it will pull the image from the official Elastic registry (https://www.docker.elastic.co). Ensure to use a version that is compatible with the Elasticsearch version being used." type = string default = null } From f2d1a39d34ba991791abb8c8736897bd4f0ac4f6 Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Fri, 6 Dec 2024 18:19:23 +0530 Subject: [PATCH 04/22] Updated the description for elasticsearch_full_version --- common-dev-assets | 2 +- solutions/standard/variables.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common-dev-assets b/common-dev-assets index 95f6c1ed..0f1f11eb 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 95f6c1ed6360a3350a750313fb94d7781f129aba +Subproject commit 0f1f11eb807b936a39b2a41106b5c26afd4b2b03 diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index 031b5137..1073346b 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -350,7 +350,7 @@ variable "enable_kibana_dashboard" { } variable "elasticsearch_full_version" { - description = "(Optional) Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard. Value is only used if `enable_kibana_dashboard` is true and if no value is passed for `kibana_image_reference`. If no value is passed, data lookup will fetch the full version using the Elasticsearch API, see https://github.com/elastic/kibana?tab=readme-ov-file#version-compatibility-with-elasticsearch" + description = "Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard. Value is only used if `enable_kibana_dashboard` is true and if no value is passed for `kibana_image_reference`. If no value is passed, data lookup will fetch the full version using the Elasticsearch API, see https://github.com/elastic/kibana?tab=readme-ov-file#version-compatibility-with-elasticsearch" type = string default = null } From 3d19ed91572ec2f00d675b30b359387a8d0c600b Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Fri, 6 Dec 2024 18:41:12 +0530 Subject: [PATCH 05/22] updated variable description --- solutions/standard/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index 1094f5e9..575c9868 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -356,7 +356,7 @@ variable "enable_kibana_dashboard" { } variable "elasticsearch_full_version" { - description = "(Optional) Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard. Value is only used if `enable_kibana_dashboard` is true and if no value is passed for `kibana_image_reference`. If no value is passed, data lookup will fetch the full version using the Elasticsearch API, see https://github.com/elastic/kibana?tab=readme-ov-file#version-compatibility-with-elasticsearch" + description = "Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard. Value is only used if `enable_kibana_dashboard` is true and if no value is passed for `kibana_image_reference`. If no value is passed, data lookup will fetch the full version using the Elasticsearch API, see https://github.com/elastic/kibana?tab=readme-ov-file#version-compatibility-with-elasticsearch" type = string default = null } From c9e140c80bd61117b4cb07d8ee229b7f83ba3d65 Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Thu, 19 Dec 2024 12:23:25 +0530 Subject: [PATCH 06/22] changed the logic and updated the variable descriptions --- solutions/standard/main.tf | 2 +- solutions/standard/variables.tf | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/solutions/standard/main.tf b/solutions/standard/main.tf index be73cfde..88b2c2bb 100644 --- a/solutions/standard/main.tf +++ b/solutions/standard/main.tf @@ -463,7 +463,7 @@ module "code_engine_kibana" { apps = { (local.code_engine_app_name) = { - image_reference = var.kibana_image_digest != null ? "${var.kibana_registry_namespace_image}@${var.kibana_image_digest}" : (var.kibana_image_reference != null ? var.kibana_image_reference : "docker.elastic.co/kibana/kibana:${local.es_full_version}") + image_reference = var.kibana_image_digest != null ? "${var.kibana_registry_namespace_image}@${var.kibana_image_digest}" : "docker.elastic.co/kibana/kibana:${local.es_full_version}" image_port = 5601 run_env_variables = [{ type = "literal" diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index 20f57be7..f9c1f74e 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -359,24 +359,18 @@ variable "existing_code_engine_project_id" { variable "enable_kibana_dashboard" { type = bool - description = "Set to true to deploy Kibana in Code Engine. NOTE: By default, the Kibana image will be pulled from the official Elastic registry (docker.elastic.co) and is not certified by IBM, however this can be overridden using the `kibana_image_reference` input." + description = "Set to true to deploy Kibana in Code Engine. NOTE: By default, the Kibana image will be pulled from the official Elastic registry (docker.elastic.co) and is not certified by IBM, however this can be overridden using the `kibana_registry_namespace_image` and `kibana_image_digest` input." default = false } variable "kibana_registry_namespace_image" { - description = "Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard. Value is only used if `enable_kibana_dashboard` is true and if no value is passed for `kibana_image_reference`. If no value is passed, data lookup will fetch the full version using the Elasticsearch API, see https://github.com/elastic/kibana?tab=readme-ov-file#version-compatibility-with-elasticsearch" + description = "Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard. Value is only used if `enable_kibana_dashboard` is true . By default, the image will be fetched from `docker.elastic.co/kibana/kibana`. If overriding this value, ensure it is compatible with your Elasticsearch instance." type = string default = "docker.elastic.co/kibana/kibana" } variable "kibana_image_digest" { - description = "By default, when enable_kibana_dashboard is set to true, the DA will deploy a kibana using an image tag version that is applicable with the version of Elasticsearch deployed. Alternatively you can override this by supplying an image digest in the format of sha256:xxxxx..., however if doing so ensure the digest entered is an applicable version for your Elasticsearch instance." - type = string - default = null -} - -variable "kibana_image_reference" { - description = "The docker image reference to use for Kibana if `enable_kibana_dashboard` is set to true. If no value is set, it will pull the image from the official Elastic registry (https://www.docker.elastic.co). Ensure to use a version that is compatible with the Elasticsearch version being used." + description = "By default, when `enable_kibana_dashboard` is set to true, the DA will deploy a kibana using an image tag version that is applicable with the version of Elasticsearch deployed. Alternatively you can override this by supplying an image digest in the format of `sha256:xxxxx...`, however if doing so ensure the digest entered is an applicable version for your Elasticsearch instance." type = string default = null } From 9c7248eb8a1720521589881f8a5ca83cd0a9ab8a Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Fri, 20 Dec 2024 16:59:25 +0530 Subject: [PATCH 07/22] fixed failures --- solutions/standard/main.tf | 17 ++++++++--------- solutions/standard/variables.tf | 6 +++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/solutions/standard/main.tf b/solutions/standard/main.tf index 88b2c2bb..3ff46240 100644 --- a/solutions/standard/main.tf +++ b/solutions/standard/main.tf @@ -431,20 +431,19 @@ module "secrets_manager_service_credentials" { # Code Engine Kibana Dashboard instance ######################################################################################################################## -locals { - code_engine_project_id = var.existing_code_engine_project_id != null ? var.existing_code_engine_project_id : null - code_engine_project_name = local.code_engine_project_id != null ? null : var.prefix != null ? "${var.prefix}-code-engine-kibana-project" : "ce-kibana-project" - code_engine_app_name = var.prefix != null ? "${var.prefix}-kibana-app" : "ce-kibana-app" - es_data = var.enable_kibana_dashboard ? jsondecode(data.http.es_metadata[0].response_body) : null - es_full_version = var.enable_kibana_dashboard ? (var.kibana_registry_namespace_image != null ? var.kibana_registry_namespace_image : local.es_data.version.number) : null -} - data "http" "es_metadata" { count = var.enable_kibana_dashboard ? 1 : 0 url = "https://${local.elasticsearch_username}:${local.admin_pass}@${local.elasticsearch_hostname}:${local.elasticsearch_port}" ca_cert_pem = base64decode(local.elasticsearch_cert) } +locals { + code_engine_project_id = var.existing_code_engine_project_id != null ? var.existing_code_engine_project_id : null + code_engine_project_name = local.code_engine_project_id != null ? null : var.prefix != null ? "${var.prefix}-code-engine-kibana-project" : "ce-kibana-project" + code_engine_app_name = var.prefix != null ? "${var.prefix}-kibana-app" : "ce-kibana-app" + kibana_version = var.enable_kibana_dashboard ? jsondecode(data.http.es_metadata[0].response_body).version.number : null +} + module "code_engine_kibana" { count = var.enable_kibana_dashboard ? 1 : 0 source = "terraform-ibm-modules/code-engine/ibm" @@ -463,7 +462,7 @@ module "code_engine_kibana" { apps = { (local.code_engine_app_name) = { - image_reference = var.kibana_image_digest != null ? "${var.kibana_registry_namespace_image}@${var.kibana_image_digest}" : "docker.elastic.co/kibana/kibana:${local.es_full_version}" + image_reference = var.kibana_image_digest != null ? "${var.kibana_registry_namespace_image}@${var.kibana_image_digest}" : "${var.kibana_registry_namespace_image}:${local.kibana_version}" image_port = 5601 run_env_variables = [{ type = "literal" diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index f9c1f74e..b06dd8fb 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -352,8 +352,8 @@ variable "admin_pass_sm_secret_name" { ############################################################## variable "existing_code_engine_project_id" { - description = "Existing code engine project ID to deploy Kibana. If no value is passed, a new code engine project will be created." type = string + description = "Existing code engine project ID to deploy Kibana. If no value is passed, a new code engine project will be created." default = null } @@ -364,13 +364,13 @@ variable "enable_kibana_dashboard" { } variable "kibana_registry_namespace_image" { - description = "Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard. Value is only used if `enable_kibana_dashboard` is true . By default, the image will be fetched from `docker.elastic.co/kibana/kibana`. If overriding this value, ensure it is compatible with your Elasticsearch instance." type = string + description = "Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard. Value is only used if `enable_kibana_dashboard` is true . By default, the image will be fetched from `docker.elastic.co/kibana/kibana`. If overriding this value, ensure it is compatible with your Elasticsearch instance." default = "docker.elastic.co/kibana/kibana" } variable "kibana_image_digest" { - description = "By default, when `enable_kibana_dashboard` is set to true, the DA will deploy a kibana using an image tag version that is applicable with the version of Elasticsearch deployed. Alternatively you can override this by supplying an image digest in the format of `sha256:xxxxx...`, however if doing so ensure the digest entered is an applicable version for your Elasticsearch instance." type = string + description = "By default, when `enable_kibana_dashboard` is set to true, the DA will deploy a kibana using an image tag version that is applicable with the version of Elasticsearch deployed. Alternatively you can override this by supplying an image digest in the format of `sha256:xxxxx...`, however if doing so ensure the digest entered is an applicable version for your Elasticsearch instance." default = null } From 5d1e8c8f169161506bdbfa5b2655916e214b2e62 Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Thu, 26 Dec 2024 13:49:23 +0530 Subject: [PATCH 08/22] changed variable description --- ibm_catalog.json | 2 +- solutions/standard/variables.tf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 517f0f11..9205989b 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -71,7 +71,7 @@ } ], "architecture": { - "descriptions": "This architecture creates an instance of IBM CLoud Databases for Elasticsearch instance with KMS encryption. Supports autoscaling.", + "descriptions": "This architecture creates an instance of IBM Cloud Databases for Elasticsearch instance with KMS encryption. Supports autoscaling.", "features": [ { "title": " Creates an instance of Databases for Elasticsearch", diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index b06dd8fb..d8c3925d 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -365,12 +365,12 @@ variable "enable_kibana_dashboard" { variable "kibana_registry_namespace_image" { type = string - description = "Full version of the Elasticsearch instance in the format `x.x.x` to deploy Kibana dashboard. Value is only used if `enable_kibana_dashboard` is true . By default, the image will be fetched from `docker.elastic.co/kibana/kibana`. If overriding this value, ensure it is compatible with your Elasticsearch instance." + description = "The full Elasticsearch version (format `x.x.x`) required to deploy the Kibana dashboard. This value is used only when `enable_kibana_dashboard` is set to true. By default, the image is pulled from `docker.elastic.co/kibana/kibana`. If overridden, ensure the version is compatible with the Elasticsearch instance." default = "docker.elastic.co/kibana/kibana" } variable "kibana_image_digest" { type = string - description = "By default, when `enable_kibana_dashboard` is set to true, the DA will deploy a kibana using an image tag version that is applicable with the version of Elasticsearch deployed. Alternatively you can override this by supplying an image digest in the format of `sha256:xxxxx...`, however if doing so ensure the digest entered is an applicable version for your Elasticsearch instance." + description = "When `enable_kibana_dashboard` is set to true, Kibana is deployed using an image tag compatible with the Elasticsearch version. Alternatively, an image digest in the format `sha256:xxxxx...` can also be specified but it must correspond to a version compatible with the Elasticsearch instance." default = null } From faa6320e5d3640e6e447352cbde1891a453bfaa0 Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Wed, 1 Jan 2025 16:10:19 +0530 Subject: [PATCH 09/22] updated variable description --- solutions/standard/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index d8c3925d..8848338f 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -353,7 +353,7 @@ variable "admin_pass_sm_secret_name" { variable "existing_code_engine_project_id" { type = string - description = "Existing code engine project ID to deploy Kibana. If no value is passed, a new code engine project will be created." + description = "Existing code engine project ID to deploy Kibana. If no value is passed, a new code engine project ID will be created." default = null } From 6aa40bb55c795312b3eea5a5eb57af18acbb84ff Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Tue, 7 Jan 2025 11:02:29 +0530 Subject: [PATCH 10/22] revert override --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index 0f1f11eb..ffeb38ae 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 0f1f11eb807b936a39b2a41106b5c26afd4b2b03 +Subproject commit ffeb38ae284999d23c25416b2f19268ca0ff49b8 From 850b30293d74278723093eedd7b878071c9c8f75 Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Tue, 7 Jan 2025 11:05:32 +0530 Subject: [PATCH 11/22] changes --- solutions/standard/main.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/solutions/standard/main.tf b/solutions/standard/main.tf index 5c160bba..17c714f3 100644 --- a/solutions/standard/main.tf +++ b/solutions/standard/main.tf @@ -431,12 +431,6 @@ module "secrets_manager_service_credentials" { # Code Engine Kibana Dashboard instance ######################################################################################################################## -data "http" "es_metadata" { - count = var.enable_kibana_dashboard ? 1 : 0 - url = "https://${local.elasticsearch_username}:${local.admin_pass}@${local.elasticsearch_hostname}:${local.elasticsearch_port}" - ca_cert_pem = base64decode(local.elasticsearch_cert) -} - locals { code_engine_project_id = var.existing_code_engine_project_id != null ? var.existing_code_engine_project_id : null code_engine_project_name = local.code_engine_project_id != null ? null : var.prefix != null ? "${var.prefix}-code-engine-kibana-project" : "ce-kibana-project" @@ -444,6 +438,12 @@ locals { kibana_version = var.enable_kibana_dashboard ? jsondecode(data.http.es_metadata[0].response_body).version.number : null } +data "http" "es_metadata" { + count = var.enable_kibana_dashboard ? 1 : 0 + url = "https://${local.elasticsearch_username}:${local.admin_pass}@${local.elasticsearch_hostname}:${local.elasticsearch_port}" + ca_cert_pem = base64decode(local.elasticsearch_cert) +} + module "code_engine_kibana" { count = var.enable_kibana_dashboard ? 1 : 0 source = "terraform-ibm-modules/code-engine/ibm" From e15d93ebadc054d2bbfad1d75d0345b698eaf47d Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Tue, 7 Jan 2025 11:12:21 +0530 Subject: [PATCH 12/22] format json --- ibm_catalog.json | 601 ++++++++++++++++++++++++----------------------- 1 file changed, 301 insertions(+), 300 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 9205989b..fe76bbb9 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1,355 +1,356 @@ { - "products": [ - { - "name": "deploy-arch-ibm-icd-elasticsearch", - "label": "Cloud automation for Databases for Elasticsearch", - "product_kind": "solution", - "tags": [ - "ibm_created", - "target_terraform", - "terraform", - "data_management", - "solution" - ], - "keywords": [ - "elasticsearch", - "IaC", - "infrastructure as code", - "terraform", - "solution", - "elasticsearch standard", - "database", - "nosql" - ], - "short_description": "Creates and configures an instance of IBM Cloud Databases for Elasticsearch.", - "long_description": "This architecture supports creating and configuring an instance of Databases for Elasticsearch with KMS encryption.", - "offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-icd-elasticsearch/blob/main/README.md", - "offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-icd-elasticsearch/main/images/elasticsearch_icon.svg", - "provider_name": "IBM", - "features": [ - { - "title": "Creates an instance of Databases for Elasticsearch", - "description": "Creates and configures an IBM Cloud Databases for Elasticsearch instance." - }, - { - "title": "Supports KMS encryption", - "description": "Provides KMS encryption for the data that you store in the database." - }, - { - "title": "Supports autoscaling", - "description": "Provides the autoscaling to allow the database to increase resources in response to usage." - }, - { - "title": "Attaches access tags", - "description": "Attaches access tags to the Elasticsearch instance." + "products": [ + { + "name": "deploy-arch-ibm-icd-elasticsearch", + "label": "Cloud automation for Databases for Elasticsearch", + "product_kind": "solution", + "tags": [ + "ibm_created", + "target_terraform", + "terraform", + "data_management", + "solution" + ], + "keywords": [ + "elasticsearch", + "IaC", + "infrastructure as code", + "terraform", + "solution", + "elasticsearch standard", + "database", + "nosql" + ], + "short_description": "Creates and configures an instance of IBM Cloud Databases for Elasticsearch.", + "long_description": "This architecture supports creating and configuring an instance of Databases for Elasticsearch with KMS encryption.", + "offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-icd-elasticsearch/blob/main/README.md", + "offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-icd-elasticsearch/main/images/elasticsearch_icon.svg", + "provider_name": "IBM", + "features": [ + { + "title": "Creates an instance of Databases for Elasticsearch", + "description": "Creates and configures an IBM Cloud Databases for Elasticsearch instance." + }, + { + "title": "Supports KMS encryption", + "description": "Provides KMS encryption for the data that you store in the database." + }, + { + "title": "Supports autoscaling", + "description": "Provides the autoscaling to allow the database to increase resources in response to usage." + }, + { + "title": "Attaches access tags", + "description": "Attaches access tags to the Elasticsearch instance." + }, + { + "title": "Supports backup restoration", + "description": "Provides database restoration using a backup created by a deployment with the same service ID." + } + ], + "flavors": [ + { + "label": "Standard", + "name": "standard", + "install_type": "fullstack", + "working_directory": "solutions/standard", + "compliance": { + "authority": "scc-v3", + "profiles": [ + { + "profile_name": "IBM Cloud Framework for Financial Services", + "profile_version": "1.6.0" + } + ] }, - { - "title": "Supports backup restoration", - "description": "Provides database restoration using a backup created by a deployment with the same service ID." - } - ], - "flavors": [ - { - "label": "Standard", - "name": "standard", - "install_type": "fullstack", - "working_directory": "solutions/standard", - "compliance": { - "authority": "scc-v3", - "profiles": [ - { - "profile_name": "IBM Cloud Framework for Financial Services", - "profile_version": "1.6.0" - } - ]}, - "iam_permissions": [ + "iam_permissions": [ + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::role:Editor" + ], + "service_name": "databases-for-elasticsearch" + } + ], + "architecture": { + "descriptions": "This architecture creates an instance of IBM Cloud Databases for Elasticsearch instance with KMS encryption. Supports autoscaling.", + "features": [ { - "role_crns": [ - "crn:v1:bluemix:public:iam::::role:Editor" - ], - "service_name": "databases-for-elasticsearch" + "title": " Creates an instance of Databases for Elasticsearch", + "description": "This architecture creates an instance of IBM Cloud Databases for Elasticsearch with KMS encryption. It accepts or creates a resource group, and provides autoscaling rules." } ], - "architecture": { - "descriptions": "This architecture creates an instance of IBM Cloud Databases for Elasticsearch instance with KMS encryption. Supports autoscaling.", - "features": [ - { - "title": " Creates an instance of Databases for Elasticsearch", - "description": "This architecture creates an instance of IBM Cloud Databases for Elasticsearch with KMS encryption. It accepts or creates a resource group, and provides autoscaling rules." - } - ], - "diagrams": [ - { - "diagram": { - "caption": "Databases for Elasticsearch instance on IBM Cloud", - "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-icd-elasticsearch/main/reference-architecture/deployable-architecture-elasticsearch.svg", - "type": "image/svg+xml" - }, - "description": "This architecture supports creating and configuring an instance of Databases for Elasticsearch instance with KMS encryption." - } - ] - }, - "configuration": [ - { - "key": "ibmcloud_api_key" - }, - { - "key": "provider_visibility", - "options": [ - { - "displayname": "private", - "value": "private" - }, - { - "displayname": "public", - "value": "public" - }, - { - "displayname": "public-and-private", - "value": "public-and-private" - } - ] - }, - { - "key": "use_existing_resource_group" - }, - { - "key": "resource_group_name" - }, - { - "key": "prefix" - }, - { - "key": "region", - "required": true, - "options": [ - { - "displayname": "Chennai (che01)", - "value": "che01" - }, - { - "displayname": "Dallas (us-south)", - "value": "us-south" - }, - { - "displayname": "Frankfurt (eu-de)", - "value": "eu-de" - }, - { - "displayname": "London (eu-gb)", - "value": "eu-gb" - }, - { - "displayname": "Madrid (eu-es)", - "value": "eu-es" - }, - { - "displayname": "Osaka (jp-osa)", - "value": "jp-osa" - }, - { - "displayname": "Paris (par01)", - "value": "par01" - }, - { - "displayname": "Sao Paulo (br-sao)", - "value": "br-sao" - }, - { - "displayname": "Sydney (au-syd)", - "value": "au-syd" - }, - { - "displayname": "Toronto (ca-tor)", - "value": "ca-tor" - }, - { - "displayname": "Tokyo (jp-tok)", - "value": "jp-tok" - }, - { - "displayname": "Washington (us-east)", - "value": "us-east" - } - ] - }, - { - "key": "name" - }, - { - "key": "existing_db_instance_crn" - }, - { - "key": "plan", - "options": [ - { - "displayname": "enterprise", - "value": "enterprise" - }, - { - "displayname": "platinum", - "value": "platinum" - } - ] - }, - { - "key": "elasticsearch_version", - "required": true, - "options": [ - { - "displayname": "8.15", - "value": "8.15" - }, - { - "displayname": "8.12", - "value": "8.12" - }, - { - "displayname": "8.10", - "value": "8.10" - } - ] - }, - { - "key": "tags" - }, - { - "key": "access_tags" - }, - { - "key": "auto_scaling" - }, - { - "key": "members" - }, - { - "key": "member_memory_mb" - }, - { - "key": "member_cpu_count" - }, - { - "key": "member_disk_mb" + "diagrams": [ + { + "diagram": { + "caption": "Databases for Elasticsearch instance on IBM Cloud", + "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-icd-elasticsearch/main/reference-architecture/deployable-architecture-elasticsearch.svg", + "type": "image/svg+xml" }, + "description": "This architecture supports creating and configuring an instance of Databases for Elasticsearch instance with KMS encryption." + } + ] + }, + "configuration": [ + { + "key": "ibmcloud_api_key" + }, + { + "key": "provider_visibility", + "options": [ { - "key": "member_host_flavor" + "displayname": "private", + "value": "private" }, { - "key": "admin_pass" + "displayname": "public", + "value": "public" }, { - "key": "users" - }, + "displayname": "public-and-private", + "value": "public-and-private" + } + ] + }, + { + "key": "use_existing_resource_group" + }, + { + "key": "resource_group_name" + }, + { + "key": "prefix" + }, + { + "key": "region", + "required": true, + "options": [ { - "key": "service_credential_names" + "displayname": "Chennai (che01)", + "value": "che01" }, { - "key": "existing_secrets_manager_instance_crn" + "displayname": "Dallas (us-south)", + "value": "us-south" }, { - "key": "existing_secrets_manager_endpoint_type", - "options": [ - { - "displayname": "public", - "value": "public" - }, - { - "displayname": "private", - "value": "private" - } - ] + "displayname": "Frankfurt (eu-de)", + "value": "eu-de" }, { - "key": "service_credential_secrets" + "displayname": "London (eu-gb)", + "value": "eu-gb" }, { - "key": "admin_pass_sm_secret_group" + "displayname": "Madrid (eu-es)", + "value": "eu-es" }, { - "key": "use_existing_admin_pass_sm_secret_group" + "displayname": "Osaka (jp-osa)", + "value": "jp-osa" }, { - "key": "admin_pass_sm_secret_name" + "displayname": "Paris (par01)", + "value": "par01" }, { - "key": "skip_es_sm_auth_policy" + "displayname": "Sao Paulo (br-sao)", + "value": "br-sao" }, { - "key": "ibmcloud_kms_api_key" + "displayname": "Sydney (au-syd)", + "value": "au-syd" }, { - "key": "kms_endpoint_type", - "options": [ - { - "displayname": "public", - "value": "public" - }, - { - "displayname": "private", - "value": "private" - } - ] + "displayname": "Toronto (ca-tor)", + "value": "ca-tor" }, { - "key": "use_ibm_owned_encryption_key" + "displayname": "Tokyo (jp-tok)", + "value": "jp-tok" }, { - "key": "existing_kms_instance_crn", - "required": true - }, + "displayname": "Washington (us-east)", + "value": "us-east" + } + ] + }, + { + "key": "name" + }, + { + "key": "existing_db_instance_crn" + }, + { + "key": "plan", + "options": [ { - "key": "existing_kms_key_crn" + "displayname": "enterprise", + "value": "enterprise" }, { - "key": "existing_backup_kms_key_crn" - }, + "displayname": "platinum", + "value": "platinum" + } + ] + }, + { + "key": "elasticsearch_version", + "required": true, + "options": [ { - "key": "use_default_backup_encryption_key" + "displayname": "8.15", + "value": "8.15" }, { - "key": "elasticsearch_key_ring_name" + "displayname": "8.12", + "value": "8.12" }, { - "key": "elasticsearch_key_name" - }, + "displayname": "8.10", + "value": "8.10" + } + ] + }, + { + "key": "tags" + }, + { + "key": "access_tags" + }, + { + "key": "auto_scaling" + }, + { + "key": "members" + }, + { + "key": "member_memory_mb" + }, + { + "key": "member_cpu_count" + }, + { + "key": "member_disk_mb" + }, + { + "key": "member_host_flavor" + }, + { + "key": "admin_pass" + }, + { + "key": "users" + }, + { + "key": "service_credential_names" + }, + { + "key": "existing_secrets_manager_instance_crn" + }, + { + "key": "existing_secrets_manager_endpoint_type", + "options": [ { - "key": "skip_es_kms_auth_policy" + "displayname": "public", + "value": "public" }, { - "key": "backup_crn" - }, + "displayname": "private", + "value": "private" + } + ] + }, + { + "key": "service_credential_secrets" + }, + { + "key": "admin_pass_sm_secret_group" + }, + { + "key": "use_existing_admin_pass_sm_secret_group" + }, + { + "key": "admin_pass_sm_secret_name" + }, + { + "key": "skip_es_sm_auth_policy" + }, + { + "key": "ibmcloud_kms_api_key" + }, + { + "key": "kms_endpoint_type", + "options": [ { - "key": "enable_elser_model" + "displayname": "public", + "value": "public" }, { - "key": "elser_model_type", - "options": [ - { - "displayname": ".elser_model_1", - "value": ".elser_model_1" - }, - { - "displayname": ".elser_model_2", - "value": ".elser_model_2" - }, - { - "displayname": ".elser_model_2_linux-x86_64", - "value": ".elser_model_2_linux-x86_64" - } - ] - }, + "displayname": "private", + "value": "private" + } + ] + }, + { + "key": "use_ibm_owned_encryption_key" + }, + { + "key": "existing_kms_instance_crn", + "required": true + }, + { + "key": "existing_kms_key_crn" + }, + { + "key": "existing_backup_kms_key_crn" + }, + { + "key": "use_default_backup_encryption_key" + }, + { + "key": "elasticsearch_key_ring_name" + }, + { + "key": "elasticsearch_key_name" + }, + { + "key": "skip_es_kms_auth_policy" + }, + { + "key": "backup_crn" + }, + { + "key": "enable_elser_model" + }, + { + "key": "elser_model_type", + "options": [ { - "key": "enable_kibana_dashboard" + "displayname": ".elser_model_1", + "value": ".elser_model_1" }, { - "key": "existing_code_engine_project_id" + "displayname": ".elser_model_2", + "value": ".elser_model_2" }, { - "key": "elasticsearch_full_version" + "displayname": ".elser_model_2_linux-x86_64", + "value": ".elser_model_2_linux-x86_64" } ] - } - ] - } - ] - } + }, + { + "key": "enable_kibana_dashboard" + }, + { + "key": "existing_code_engine_project_id" + }, + { + "key": "elasticsearch_full_version" + } + ] + } + ] + } + ] +} From 8da70bb160587988ca4a589f549f43654824b5e0 Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Tue, 7 Jan 2025 11:33:08 +0530 Subject: [PATCH 13/22] Added variables in catalog.json --- ibm_catalog.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 9205989b..cabbf342 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -345,7 +345,10 @@ "key": "existing_code_engine_project_id" }, { - "key": "elasticsearch_full_version" + "key": "kibana_registry_namespace_image" + }, + { + "key": "kibana_image_digest" } ] } From 29518ecaa46109ea55975641f0658a04f9d04021 Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Tue, 7 Jan 2025 14:34:11 +0530 Subject: [PATCH 14/22] Revert "Added variables in catalog.json" This reverts commit 8da70bb160587988ca4a589f549f43654824b5e0. --- ibm_catalog.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index cabbf342..9205989b 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -345,10 +345,7 @@ "key": "existing_code_engine_project_id" }, { - "key": "kibana_registry_namespace_image" - }, - { - "key": "kibana_image_digest" + "key": "elasticsearch_full_version" } ] } From d1885f6c3697f861358007946b2332cabccacc7c Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Tue, 7 Jan 2025 14:41:28 +0530 Subject: [PATCH 15/22] Added variables in catalog.json --- ibm_catalog.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 9205989b..cabbf342 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -345,7 +345,10 @@ "key": "existing_code_engine_project_id" }, { - "key": "elasticsearch_full_version" + "key": "kibana_registry_namespace_image" + }, + { + "key": "kibana_image_digest" } ] } From 9ceb0c8f90b65904a7cb1c1dd373ab856d62f1b3 Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Wed, 8 Jan 2025 12:20:55 +0530 Subject: [PATCH 16/22] c-d-v --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index 0f1f11eb..ffeb38ae 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 0f1f11eb807b936a39b2a41106b5c26afd4b2b03 +Subproject commit ffeb38ae284999d23c25416b2f19268ca0ff49b8 From 034709faa861eb5b03576b956ba4f3846b851b6c Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Wed, 8 Jan 2025 13:02:44 +0530 Subject: [PATCH 17/22] updated test --- tests/pr_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pr_test.go b/tests/pr_test.go index c30f39f3..0e678276 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -121,7 +121,7 @@ func TestRunStandardSolutionSchematics(t *testing.T) { {Name: "access_tags", Value: permanentResources["accessTags"], DataType: "list(string)"}, {Name: "existing_kms_instance_crn", Value: permanentResources["hpcs_south_crn"], DataType: "string"}, {Name: "existing_backup_kms_key_crn", Value: permanentResources["hpcs_south_root_key_crn"], DataType: "string"}, - {Name: "kms_endpoint_type", Value: "public", DataType: "string"}, + {Name: "kms_endpoint_type", Value: "private", DataType: "string"}, {Name: "resource_group_name", Value: options.Prefix, DataType: "string"}, {Name: "plan", Value: "platinum", DataType: "string"}, {Name: "enable_elser_model", Value: true, DataType: "bool"}, From 8f27c8597132a6bb55ac5931b8d35ac391da3db9 Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Thu, 9 Jan 2025 11:50:42 +0530 Subject: [PATCH 18/22] Resolved comments --- solutions/standard/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/standard/main.tf b/solutions/standard/main.tf index 17c714f3..cbe434bc 100644 --- a/solutions/standard/main.tf +++ b/solutions/standard/main.tf @@ -466,7 +466,7 @@ module "code_engine_kibana" { image_port = 5601 run_env_variables = [{ type = "literal" - name = "ELASTICSEARCH_HOSTS", + name = "ELASTICSEARCH_HOSTS" value = "[\"https://${local.elasticsearch_hostname}:${local.elasticsearch_port}\"]" }, { From 4f5e4b578910e89f43d1467a4a220f426faa6ccc Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Mon, 20 Jan 2025 14:42:10 +0530 Subject: [PATCH 19/22] Resolved comments --- solutions/standard/variables.tf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index 8848338f..b48cc1da 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -365,7 +365,7 @@ variable "enable_kibana_dashboard" { variable "kibana_registry_namespace_image" { type = string - description = "The full Elasticsearch version (format `x.x.x`) required to deploy the Kibana dashboard. This value is used only when `enable_kibana_dashboard` is set to true. By default, the image is pulled from `docker.elastic.co/kibana/kibana`. If overridden, ensure the version is compatible with the Elasticsearch instance." + description = "The full Elasticsearch version (format `[registry-url]/[namespace]/[image]`) required to deploy the Kibana dashboard. This value is used only when `enable_kibana_dashboard` is set to true. By default, the image is pulled from `docker.elastic.co/kibana/kibana`. If overridden, ensure the version is compatible with the Elasticsearch instance." default = "docker.elastic.co/kibana/kibana" } @@ -373,4 +373,8 @@ variable "kibana_image_digest" { type = string description = "When `enable_kibana_dashboard` is set to true, Kibana is deployed using an image tag compatible with the Elasticsearch version. Alternatively, an image digest in the format `sha256:xxxxx...` can also be specified but it must correspond to a version compatible with the Elasticsearch instance." default = null + validation { + condition = var.kibana_image_digest == null || regex("^sha256:", var.kibana_image_digest) + error_message = "If provided, the value of kibana_image_digest must start with 'sha256:'." + } } From 5c14a8f7bddb3acf88569dded8f605670d8fbbf8 Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Mon, 20 Jan 2025 23:21:25 +0530 Subject: [PATCH 20/22] added validation --- solutions/standard/variables.tf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index b48cc1da..355832d2 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -374,7 +374,9 @@ variable "kibana_image_digest" { description = "When `enable_kibana_dashboard` is set to true, Kibana is deployed using an image tag compatible with the Elasticsearch version. Alternatively, an image digest in the format `sha256:xxxxx...` can also be specified but it must correspond to a version compatible with the Elasticsearch instance." default = null validation { - condition = var.kibana_image_digest == null || regex("^sha256:", var.kibana_image_digest) + condition = var.kibana_image_digest == null || can(regex("^sha256:", var.kibana_image_digest)) error_message = "If provided, the value of kibana_image_digest must start with 'sha256:'." } + + } From 128e919b9defd4de99358b108fccea4f31f3894f Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Tue, 21 Jan 2025 00:12:44 +0530 Subject: [PATCH 21/22] resolved comments --- solutions/standard/variables.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index 355832d2..541091de 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -353,19 +353,19 @@ variable "admin_pass_sm_secret_name" { variable "existing_code_engine_project_id" { type = string - description = "Existing code engine project ID to deploy Kibana. If no value is passed, a new code engine project ID will be created." + description = "Existing code engine project ID to deploy Kibana. If no value is passed, a new code engine project will be created." default = null } variable "enable_kibana_dashboard" { type = bool - description = "Set to true to deploy Kibana in Code Engine. NOTE: By default, the Kibana image will be pulled from the official Elastic registry (docker.elastic.co) and is not certified by IBM, however this can be overridden using the `kibana_registry_namespace_image` and `kibana_image_digest` input." + description = "Set to true to deploy Kibana in Code Engine. NOTE: By default, the Kibana image will be pulled from the official Elastic registry (docker.elastic.co) and is not certified by IBM, however this can be overridden using the `kibana_registry_namespace_image` and `kibana_image_digest` inputs." default = false } variable "kibana_registry_namespace_image" { type = string - description = "The full Elasticsearch version (format `[registry-url]/[namespace]/[image]`) required to deploy the Kibana dashboard. This value is used only when `enable_kibana_dashboard` is set to true. By default, the image is pulled from `docker.elastic.co/kibana/kibana`. If overridden, ensure the version is compatible with the Elasticsearch instance." + description = "The full Elasticsearch version (format `[registry-url]/[namespace]/[image]`) required to deploy the Kibana dashboard. This value is used only when `enable_kibana_dashboard` is set to true. By default, the image is pulled from `docker.elastic.co/kibana/kibana`." default = "docker.elastic.co/kibana/kibana" } From b7c7cfe1c622dee21af6b69aedbdcb989241c4b8 Mon Sep 17 00:00:00 2001 From: Aatreyee Mukherjee Date: Wed, 22 Jan 2025 11:33:42 +0530 Subject: [PATCH 22/22] resolved comments --- solutions/standard/version.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/standard/version.tf b/solutions/standard/version.tf index 99a88e8b..3e341a8b 100644 --- a/solutions/standard/version.tf +++ b/solutions/standard/version.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.0" + required_version = ">= 1.9.0" # Lock DA into an exact provider version - renovate automation will keep it updated required_providers {