Skip to content

Exposed CE project name and application name #422

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Mar 10, 2025
Merged

Exposed CE project name and application name #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5214e8c
Exposed CE project name and application name
luiof Mar 10, 2025
42b68b7
Exposed CE project name and application name
luiof Mar 10, 2025
e3ec3fd
CE project name and application name
luiof Mar 10, 2025
a00cbda
Update solutions/standard/main.tf
luiof Mar 10, 2025
675b620
Update solutions/standard/main.tf
luiof Mar 10, 2025
9808910
PR changes
luiof Mar 10, 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
6 changes: 6 additions & 0 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,12 @@
{
"key": "enable_kibana_dashboard"
},
{
"key": "kibana_code_engine_new_project_name"
},
{
"key": "kibana_code_engine_new_app_name"
},
{
"key": "existing_code_engine_project_id"
},
Expand Down
4 changes: 2 additions & 2 deletions solutions/standard/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,8 @@ module "secrets_manager_service_credentials" {

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 != "") ? "${var.prefix}-code-engine-kibana-project" : "ce-kibana-project"
code_engine_app_name = (var.prefix != null && var.prefix != "") ? "${var.prefix}-kibana-app" : "ce-kibana-app"
code_engine_project_name = local.code_engine_project_id != null ? null : (var.prefix != null && var.prefix != "") ? "${var.prefix}-${var.kibana_code_engine_new_project_name}" : var.kibana_code_engine_new_project_name
code_engine_app_name = (var.prefix != null && var.prefix != "") ? "${var.prefix}-${var.kibana_code_engine_new_app_name}" : var.kibana_code_engine_new_app_name
kibana_version = var.enable_kibana_dashboard ? jsondecode(data.http.es_metadata[0].response_body).version.number : null
}

Expand Down
12 changes: 12 additions & 0 deletions solutions/standard/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,18 @@ variable "admin_pass_secrets_manager_secret_name" {
# Kibana Configuration
##############################################################

variable "kibana_code_engine_new_project_name" {
type = string
description = "The Code Engine project name. If a prefix input variable is specified, the prefix is added to the name in the `<prefix>-<name>` format."
default = "ce-kibana-project"
}

variable "kibana_code_engine_new_app_name" {
type = string
description = "The Code Engine application name. If a prefix input variable is specified, the prefix is added to the name in the `<prefix>-<name>` format."
default = "ce-kibana-app"
}

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."
Expand Down