Skip to content
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
6b2f184
fix: updated Kibana app endpoint to private
Ak-sky Nov 20, 2024
00f5f47
Merge branch 'main' into kibana_enpoint
Ak-sky Nov 20, 2024
b6b0b71
Merge branch 'main' into kibana_enpoint
Ak-sky Nov 20, 2024
3151fe7
Merge branch 'main' into kibana_enpoint
Ak-sky Nov 24, 2024
d6558c2
Merge branch 'main' into kibana_enpoint
Ak-sky Nov 26, 2024
92ba79a
update endpoint and port variable
Ak-sky Nov 27, 2024
7baebc1
Merge remote-tracking branch 'origin/main' into kibana_enpoint
Ak-sky Dec 5, 2024
9ea08f7
addressed review comments
Ak-sky Dec 5, 2024
f3297b6
addressed review comments
Ak-sky Dec 5, 2024
139845e
addressed review comments
Ak-sky Dec 5, 2024
29facca
addressed review comments
Ak-sky Dec 5, 2024
a0ecf7e
updated readme to set VPN
Ak-sky Dec 6, 2024
6374543
updated readme to set VPN
Ak-sky Dec 6, 2024
7c415a8
updated DA readme docs
Ak-sky Dec 7, 2024
c53fe66
Removed Kibana from the ref. architecture
Ak-sky Dec 7, 2024
d25c07a
Merge branch 'main' into kibana_enpoint
Ak-sky Dec 9, 2024
7f21221
Merge remote-tracking branch 'origin/main' into kibana_enpoint
Ak-sky Dec 13, 2024
aeb404d
fixes
Ak-sky Dec 13, 2024
b868cd3
Merge branch 'main' into kibana_enpoint
Ak-sky Dec 18, 2024
7d9b9d8
Merge branch 'main' into kibana_enpoint
Ak-sky Dec 19, 2024
b6b720d
minor fixes
Ak-sky Dec 20, 2024
ae17ad2
Merge branch 'main' into kibana_enpoint
Ak-sky Jan 6, 2025
47bf091
Merge branch 'main' into kibana_enpoint
Ak-sky Jan 8, 2025
e4d7307
Merge branch 'main' into kibana_enpoint
Ak-sky Jan 14, 2025
268ba1a
Merge remote-tracking branch 'origin/main' into kibana_enpoint
Ak-sky Jan 24, 2025
eaa0a0d
addressed review comments
Ak-sky Jan 24, 2025
444ed93
fixed indentation
Ak-sky Jan 30, 2025
6c40223
Merge branch 'main' into kibana_enpoint
Ak-sky Feb 1, 2025
4e01a9f
addressed review comments
Ak-sky Feb 3, 2025
dd1c0b8
Merge branch 'main' into kibana_enpoint
Ak-sky Feb 4, 2025
ec81eb4
Update solutions/standard/variables.tf
Ak-sky Feb 4, 2025
728aa89
Merge branch 'main' into kibana_enpoint
ocofaigh Feb 4, 2025
c15c093
pc fixes
Ak-sky Feb 4, 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
20 changes: 20 additions & 0 deletions ibm_catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,26 @@
},
{
"key": "kibana_image_digest"
},
{
"key": "kibana_image_port"
},
{
"key": "kibana_visibility",
"options": [
{
"displayname": "local_public",
"value": "local_public"
},
{
"displayname": "local_private",
"value": "local_private"
},
{
"displayname": "local",
"value": "local"
}
]
}
]
}
Expand Down
3 changes: 3 additions & 0 deletions solutions/standard/DA-types.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,6 @@ The following example includes all the configuration options for four service cr
}
]
```
### Options for kibana_visibility

When the Kibana application visibility is changed from private to public using kibana_visibility variable, it will become accessible from the public Internet. However, access via the IBM Cloud private network will no longer be available. This change takes effect immediately, potentially impacting active users or integrations. It is important to consider the associated security implications before proceeding.
7 changes: 6 additions & 1 deletion solutions/standard/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ This architecture creates an instance of IBM Cloud Databases for Elasticsearch a
- A KMS root key, if one is not passed in.
- An IBM Cloud Databases for Elasticsearch instance with KMS encryption.
- Autoscaling rules for the database instance, if provided.
- Kibana dashboard for Elasticsearch.
- Install and start the Elastic's Natural Language Processing model, if enabled.
- Kibana dashboard for Elasticsearch, if enabled.

**Note on accessing Kibana:** If Kibana is enabled, you can access the Kibana application over a IBM private network using the method outlined [here](https://cloud.ibm.com/docs/codeengine?topic=codeengine-vpe).

**Note on setting kibana_visibility:** When the Kibana application visibility is changed from private to public using kibana_visibility variable, it will become accessible from the public Internet. However, access via the IBM Cloud private network will no longer be available. This change takes effect immediately, potentially impacting active users or integrations. It is important to consider the associated security implications before proceeding.

![fscloud-elastic-search](../../reference-architecture/deployable-architecture-elasticsearch.svg)

Expand Down
7 changes: 4 additions & 3 deletions solutions/standard/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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_registry_namespace_image}:${local.kibana_version}"
image_port = 5601
image_port = var.kibana_image_port
run_env_variables = [{
type = "literal"
name = "ELASTICSEARCH_HOSTS"
Expand Down Expand Up @@ -496,8 +496,9 @@ module "code_engine_kibana" {
value = "none"
}
]
scale_min_instances = 1
scale_max_instances = 3
scale_min_instances = 1
scale_max_instances = 3
managed_domain_mappings = var.kibana_visibility
}
}
}
15 changes: 15 additions & 0 deletions solutions/standard/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -380,3 +380,18 @@ variable "kibana_image_digest" {


}
variable "kibana_image_port" {
description = "Specify the port number used to connect to the Kibana service exposed by the container image. Default port is 5601 and it is only applicable if `enable_kibana_dashboard` is true"
type = number
default = 5601
}

variable "kibana_visibility" {
description = "Specify the visibility of Kibana application in order to define which endpoint is available for receiving the requests. Valid values are 'local_public', 'local_private' and 'local' and it is only applicable if `enable_kibana_dashboard` is true. See https://cloud.ibm.com/docs/codeengine?topic=codeengine-application-workloads#optionsvisibility. If Kibana is enabled, you can access the Kibana application over a IBM private network using the method outlined here https://cloud.ibm.com/docs/codeengine?topic=codeengine-vpe."
type = string
default = "local_private"
validation {
condition = can(regex("local_public|local_private|local", var.kibana_visibility))
error_message = "Valid values are 'local_public', 'local_private', or 'local'."
}
}