[Create Environment] Adding ec module #1742
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| locals { | ||
| version = var.stack_version | ||
| region = var.region | ||
| name_prefix = var.deployment_name_prefix | ||
| deployment_template = var.deployment_template | ||
| es_docker_image = lookup(var.docker_image, "elasticsearch", "") | ||
| es_docker_image_tag_override = lookup(var.docker_image_tag_override, "elasticsearch", "") | ||
| kibana_docker_image = lookup(var.docker_image, "kibana", "") | ||
| kibana_docker_image_tag_override = lookup(var.docker_image_tag_override, "kibana", "") | ||
| apm_docker_image = lookup(var.docker_image, "apm", "") | ||
| apm_docker_image_tag_override = lookup(var.docker_image_tag_override, "apm", "") | ||
|
Comment on lines
+6
to
+11
There was a problem hiding this comment. Do we really have a usecase of overriding these? There was a problem hiding this comment. The main use case is to support pinned BC versions. As described in this task, if we provide just the version (e.g., 8.12.0) and a new BC candidate is released, the stack will be updated with the newest version underneath. To prevent that, we should provide the exact version to be deployed. Unfortunately, the There was a problem hiding this comment. why do we even need the apm component? There was a problem hiding this comment. The default |
||
| } | ||
|
|
||
| data "ec_stack" "deployment_version" { | ||
| version_regex = local.version | ||
| region = local.region | ||
| } | ||
|
|
||
| resource "ec_deployment" "deployment" { | ||
| name = "${local.name_prefix}-${data.ec_stack.deployment_version.version}" | ||
| version = data.ec_stack.deployment_version.version | ||
| region = local.region | ||
| deployment_template_id = local.deployment_template | ||
| tags = var.tags | ||
|
|
||
| elasticsearch = { | ||
| autoscale = var.elasticsearch_autoscale | ||
| strategy = "rolling_all" | ||
| config = { | ||
| docker_image = local.es_docker_image_tag_override != "" ? "${local.es_docker_image}:${local.es_docker_image_tag_override}" : null | ||
| } | ||
|
|
||
| cold = { | ||
| autoscaling = {} | ||
| } | ||
|
|
||
| frozen = { | ||
| autoscaling = {} | ||
| } | ||
|
|
||
| hot = { | ||
| autoscaling = { | ||
| max_size = "128g" | ||
| max_size_resource = "memory" | ||
| } | ||
| size = var.elasticsearch_size | ||
| zone_count = var.elasticsearch_zone_count | ||
| } | ||
|
|
||
| warm = { | ||
| autoscaling = {} | ||
| } | ||
| } | ||
|
|
||
| kibana = { | ||
| config = { | ||
| docker_image = local.kibana_docker_image_tag_override != "" ? "${local.kibana_docker_image}:${local.kibana_docker_image_tag_override}" : null | ||
| } | ||
| } | ||
|
|
||
| integrations_server = { | ||
| config = { | ||
| docker_image = local.apm_docker_image_tag_override != "" ? "${local.apm_docker_image}:${local.apm_docker_image_tag_override}" : null | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| output "kibana_url" { | ||
| value = ec_deployment.deployment.kibana.https_endpoint | ||
| description = "The secure Kibana URL" | ||
| } | ||
|
|
||
| output "elasticsearch_url" { | ||
| value = ec_deployment.deployment.elasticsearch.https_endpoint | ||
| description = "The secure Elasticsearch URL" | ||
| } | ||
|
|
||
| output "elasticsearch_username" { | ||
| value = ec_deployment.deployment.elasticsearch_username | ||
| sensitive = true | ||
| description = "The Elasticsearch username" | ||
| } | ||
|
|
||
| output "elasticsearch_password" { | ||
| value = ec_deployment.deployment.elasticsearch_password | ||
| sensitive = true | ||
| description = "The Elasticsearch password" | ||
| } | ||
|
|
||
| output "stack_version" { | ||
|
There was a problem hiding this comment. Nice, we should start using it instead of the "requested" version. |
||
| value = data.ec_stack.deployment_version.version | ||
| description = "The matching stack pack version from the provided stack_version" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| terraform { | ||
| required_version = ">= 1.3, <2.0.0" | ||
|
|
||
| required_providers { | ||
| ec = { | ||
| source = "elastic/ec" | ||
| version = ">=0.9.0" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| variable "ec_api_key" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "stack_version" { | ||
| description = "Optional version of the Elastic Cloud deployment" | ||
| type = string | ||
| default = "latest" | ||
| } | ||
|
|
||
| variable "region" { | ||
| description = "Optional region of the Elastic Cloud deployment" | ||
| type = string | ||
| default = "gcp-us-west2" | ||
| } | ||
|
|
||
| variable "deployment_template" { | ||
| description = "Optional defaults to the CPU optimized template for GCP" | ||
| type = string | ||
| default = "gcp-compute-optimized-v3" | ||
| } | ||
|
|
||
| variable "deployment_name_prefix" { | ||
| description = "Prefix for the Elastic Cloud deployment name" | ||
| type = string | ||
| default = "cloud-security" | ||
| } | ||
|
|
||
| variable "tags" { | ||
| type = map(string) | ||
| default = { | ||
| "deployment" = "cloud-security", | ||
| "environment" = "test-enviroment", | ||
| } | ||
| description = "Optional set of tags to use for all deployments" | ||
| } | ||
|
|
||
| variable "elasticsearch_size" { | ||
| default = "8g" | ||
| type = string | ||
| description = "Optional Elasticsearch instance size" | ||
| } | ||
|
|
||
| variable "elasticsearch_zone_count" { | ||
| default = 2 | ||
| type = number | ||
| description = "Optional Elasticsearch zone count" | ||
| } | ||
|
|
||
| variable "elasticsearch_autoscale" { | ||
| default = false | ||
| type = bool | ||
| description = "Optional autoscale the Elasticsearch cluster" | ||
| } | ||
|
|
||
| # Docker image overrides | ||
|
|
||
| variable "docker_image_tag_override" { | ||
|
There was a problem hiding this comment. Please add comments on why those are needed especially when deploying BC versions. |
||
| default = { | ||
| "elasticsearch" = "", | ||
| "kibana" = "", | ||
| "apm" = "", | ||
|
Comment on lines
+64
to
+66
There was a problem hiding this comment. Yes, each stack component may use a different image tag |
||
| } | ||
| description = "Optional docker image tag overrides, The full map needs to be specified" | ||
| type = map(string) | ||
| } | ||
|
|
||
| variable "docker_image" { | ||
| default = { | ||
| "elasticsearch" = "docker.elastic.co/cloud-release/elasticsearch-cloud-ess", | ||
| "kibana" = "docker.elastic.co/cloud-release/kibana-cloud", | ||
| "apm" = "docker.elastic.co/cloud-release/elastic-agent-cloud", | ||
| } | ||
| type = map(string) | ||
| description = "Optional docker image overrides. The full map needs to be specified" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ terraform { | |
|
|
||
| ec = { | ||
| source = "elastic/ec" | ||
| version = ">=0.9.0" | ||
| } | ||
|
|
||
| restapi = { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would consider getting the hash on a different optional parameter,
PIN_VERSIONfor example.This way we will avoid the cleaning code implemented both in bash and terraform, and the flow of using the pinned version will be more straight forward
PIN_VERSION != "".There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@amirbenun I have refactored the code to support a separate
pin_versionTerraform variable. This eliminates the need for cleanup version in Terraform code. I've updated the step action responsible for initializing and updatingTF_varsand provided comments for clarity. Additionally, I have improved the documentation to make it more clear.