Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:An ability to override Kibana image URL in DA #345

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
e0afd6d
feat:An ability to override Kibana image URL in DA
Nov 19, 2024
f7020fd
changed the description for kibana_image_reference ,enable_kibana_das…
Nov 20, 2024
52680ff
Merge branch 'main' into override_kibana_image_11649
Nov 20, 2024
c1b72fa
FORMATTED THE VARIABLE DESCRIPTION
Nov 20, 2024
2cafdb4
Merge branch 'main' into override_kibana_image_11649
aatreyee2506 Nov 28, 2024
22e9715
Merge branch 'main' into override_kibana_image_11649
Ak-sky Dec 2, 2024
8a33912
Merge branch 'main' into override_kibana_image_11649
Ak-sky Dec 4, 2024
f2d1a39
Updated the description for elasticsearch_full_version
Dec 6, 2024
3d19ed9
updated variable description
Ak-sky Dec 6, 2024
b01dee5
Merge branch 'main' into override_kibana_image_11649
Ak-sky Dec 9, 2024
9272b8b
Added new variable and changed the variable name
Dec 18, 2024
fafeac7
Added new variable and changed the variable name
Dec 18, 2024
87082bb
Merge branch 'main' into override_kibana_image_11649
aatreyee2506 Dec 19, 2024
c9e140c
changed the logic and updated the variable descriptions
Dec 19, 2024
9c7248e
fixed failures
Ak-sky Dec 20, 2024
e52df1b
Merge branch 'main' into override_kibana_image_11649
aatreyee2506 Dec 23, 2024
5d1e8c8
changed variable description
Dec 26, 2024
7f6481d
Merge branch 'main' into override_kibana_image_11649
imprateeksh Dec 28, 2024
dc7a5bd
Merge branch 'main' into override_kibana_image_11649
aatreyee2506 Jan 1, 2025
faa6320
updated variable description
Jan 1, 2025
898ef22
updated variable description
Jan 1, 2025
f056e95
Merge branch 'main' into override_kibana_image_11649
aatreyee2506 Jan 6, 2025
6aa40bb
revert override
Aashiq-J Jan 7, 2025
850b302
changes
Aashiq-J Jan 7, 2025
e15d93e
format json
Aashiq-J Jan 7, 2025
8da70bb
Added variables in catalog.json
Jan 7, 2025
1300a28
Fixing Conflicts
Jan 7, 2025
29518ec
Revert "Added variables in catalog.json"
Jan 7, 2025
d1885f6
Added variables in catalog.json
Jan 7, 2025
9ceb0c8
c-d-v
Ak-sky Jan 8, 2025
034709f
updated test
Ak-sky Jan 8, 2025
9164478
Merge branch 'main' into override_kibana_image_11649
aatreyee2506 Jan 9, 2025
8f27c85
Resolved comments
Jan 9, 2025
df9092b
Merge branch 'main' into override_kibana_image_11649
aatreyee2506 Jan 12, 2025
4f5e4b5
Resolved comments
Jan 20, 2025
5c14a8f
added validation
Jan 20, 2025
128e919
resolved comments
Jan 20, 2025
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
3 changes: 3 additions & 0 deletions ibm_catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@
}
]
},
{
"key":"kibana_image_reference"
},
aatreyee2506 marked this conversation as resolved.
Show resolved Hide resolved
{
"key": "access_tags"
},
Expand Down
2 changes: 1 addition & 1 deletion solutions/standard/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 != null ? var.kibana_image_reference : "docker.elastic.co/kibana/kibana:${local.es_full_version}"
image_port = 5601
run_env_variables = [{
type = "literal"
Expand Down
10 changes: 8 additions & 2 deletions solutions/standard/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -345,12 +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."
aatreyee2506 marked this conversation as resolved.
Show resolved Hide resolved
default = false
}

variable "elasticsearch_full_version" {
aatreyee2506 marked this conversation as resolved.
Show resolved Hide resolved
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"
aatreyee2506 marked this conversation as resolved.
Show resolved Hide resolved
type = string
default = null
}

aatreyee2506 marked this conversation as resolved.
Show resolved Hide resolved
variable "kibana_image_reference" {
aatreyee2506 marked this conversation as resolved.
Show resolved Hide resolved
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."
aatreyee2506 marked this conversation as resolved.
Show resolved Hide resolved
type = string
default = null
aatreyee2506 marked this conversation as resolved.
Show resolved Hide resolved
}