Skip to content

feat: use code editor for auto scale configuration #525

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 7 commits into from
Oct 3, 2025
Merged

feat: use code editor for auto scale configuration #525

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
ae7fc5e
fix: use code editor in IBM catalog for maps/objects
shemau Sep 10, 2025
7bcc6fb
fix: include cbr_rules with code editor
shemau Sep 10, 2025
f207e11
feat: use code editor for auto scale configuration
shemau Sep 10, 2025
c302db4
Merge branch 'main' into autoscale-editor
shemau Sep 12, 2025
d8a4884
Merge branch 'main' into autoscale-editor
rajatagarwal-ibm Sep 23, 2025
1d8c4d0
Merge branch 'main' into autoscale-editor
shemau Oct 1, 2025
2aecaa2
fix: tidy system/app login password
shemau Oct 2, 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
14 changes: 12 additions & 2 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,12 @@
"key": "member_host_flavor"
},
{
"key": "auto_scaling"
"key": "auto_scaling",
"custom_config": {
"type": "code_editor",
"grouping": "deployment",
"original_grouping": "deployment"
}
},
{
"key": "service_endpoints",
Expand Down Expand Up @@ -710,7 +715,12 @@
"key": "member_host_flavor"
},
{
"key": "auto_scaling"
"key": "auto_scaling",
"custom_config": {
"type": "code_editor",
"grouping": "deployment",
"original_grouping": "deployment"
}
},
{
"key": "deletion_protection"
Expand Down
4 changes: 2 additions & 2 deletions solutions/fully-configurable/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,8 @@ locals {
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
kibana_system_password = var.enable_kibana_dashboard ? random_password.kibana_system_password[0].result : null
kibana_app_login_password = var.enable_kibana_dashboard ? random_password.kibana_app_login_password[0].result : null
kibana_system_password = var.enable_kibana_dashboard ? startswith(random_password.kibana_system_password[0].result, "-") ? "J${substr(random_password.kibana_system_password[0].result, 1, -1)}" : startswith(random_password.kibana_system_password[0].result, "_") ? "K${substr(random_password.kibana_system_password[0].result, 1, -1)}" : random_password.kibana_system_password[0].result : null
kibana_app_login_password = var.enable_kibana_dashboard ? startswith(random_password.kibana_app_login_password[0].result, "-") ? "J${substr(random_password.kibana_app_login_password[0].result, 1, -1)}" : startswith(random_password.kibana_app_login_password[0].result, "_") ? "K${substr(random_password.kibana_app_login_password[0].result, 1, -1)}" : random_password.kibana_app_login_password[0].result : null
}

data "http" "es_metadata" {
Expand Down
23 changes: 22 additions & 1 deletion solutions/fully-configurable/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,28 @@ variable "auto_scaling" {
})
})
description = "Optional rules to allow the database to increase resources in response to usage. Only a single autoscaling block is allowed. Make sure you understand the effects of autoscaling, especially for production environments. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-icd-elasticsearch/blob/main/solutions/fully-configurable/DA-types.md#autoscaling)"
default = null
default = {
disk = {
capacity_enabled = false
free_space_less_than_percent = 10
io_above_percent = 90
io_enabled = false
io_over_period = "15m"
rate_increase_percent = 10
rate_limit_mb_per_member = 3670016
rate_period_seconds = 900
rate_units = "mb"
}
memory = {
io_above_percent = 90
io_enabled = false
io_over_period = "15m"
rate_increase_percent = 10
rate_limit_mb_per_member = 114688
rate_period_seconds = 900
rate_units = "mb"
}
}
}

#############################################################################
Expand Down
23 changes: 22 additions & 1 deletion solutions/security-enforced/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,28 @@ variable "auto_scaling" {
})
})
description = "Optional rules to allow the database to increase resources in response to usage. Only a single autoscaling block is allowed. Make sure you understand the effects of autoscaling, especially for production environments. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-icd-elasticsearch/tree/main/solutions/fully-configurable/DA-types.md#autoscaling)"
default = null
default = {
disk = {
capacity_enabled = false
free_space_less_than_percent = 10
io_above_percent = 90
io_enabled = false
io_over_period = "15m"
rate_increase_percent = 10
rate_limit_mb_per_member = 3670016
rate_period_seconds = 900
rate_units = "mb"
}
memory = {
io_above_percent = 90
io_enabled = false
io_over_period = "15m"
rate_increase_percent = 10
rate_limit_mb_per_member = 114688
rate_period_seconds = 900
rate_units = "mb"
}
}
}

#############################################################################
Expand Down