diff --git a/src/elk-monitoring/00_secret.tf b/src/elk-monitoring/00_secret.tf index 9781290cb..7cf114b7a 100644 --- a/src/elk-monitoring/00_secret.tf +++ b/src/elk-monitoring/00_secret.tf @@ -4,7 +4,7 @@ data "azurerm_key_vault" "core_kv" { } data "azurerm_key_vault_secret" "apm_api_key" { - count = var.otel_collector_cloud_migration ? 1 : 0 + count = var.otel_collector_cloud_migration ? 1 : 0 key_vault_id = data.azurerm_key_vault.core_kv.id name = "otel-collector-es-api-key" } diff --git a/src/elk-monitoring/05_elastic_stack.tf b/src/elk-monitoring/05_elastic_stack.tf index 0cddb2e4d..8093ac5ff 100644 --- a/src/elk-monitoring/05_elastic_stack.tf +++ b/src/elk-monitoring/05_elastic_stack.tf @@ -189,7 +189,7 @@ resource "kubectl_manifest" "otel_collector" { yaml_body = templatefile("${path.module}/env/opentelemetry_operator_helm/otel.yaml", { namespace = local.elk_namespace - apm_endpoint = var.otel_collector_cloud_migration ? var.elastic_cloud_apm_endpoint : "http://quickstart-apm-http.elastic-system.svc.cluster.local:8200" + apm_endpoint = var.otel_collector_cloud_migration ? var.elastic_cloud_apm_endpoint : "http://quickstart-apm-http.elastic-system.svc.cluster.local:8200" apm_authorization = var.otel_collector_cloud_migration ? "ApiKey ${data.azurerm_key_vault_secret.apm_api_key[0].value}" : "Bearer ${data.kubernetes_secret.get_apm_token.data.secret-token}" }) diff --git a/src/elk-monitoring/99_variables.tf b/src/elk-monitoring/99_variables.tf index df8fa62af..e3e3da273 100644 --- a/src/elk-monitoring/99_variables.tf +++ b/src/elk-monitoring/99_variables.tf @@ -258,11 +258,11 @@ variable "snapshot_storage_replication_type" { variable "elastic_cloud_apm_endpoint" { - type = string + type = string description = "APM endpoint for elastic cloud instance" } variable "otel_collector_cloud_migration" { - type = bool + type = bool default = false } diff --git a/src/elk-monitoring/README.md b/src/elk-monitoring/README.md index fa8f24204..51467f47c 100644 --- a/src/elk-monitoring/README.md +++ b/src/elk-monitoring/README.md @@ -180,6 +180,8 @@ | [azuread_service_principal.iac_plan_legacy](https://registry.terraform.io/providers/hashicorp/azuread/2.21.0/docs/data-sources/service_principal) | data source | | [azurerm_application_insights.application_insights](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/application_insights) | data source | | [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source | +| [azurerm_key_vault.core_kv](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/key_vault) | data source | +| [azurerm_key_vault_secret.apm_api_key](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/key_vault_secret) | data source | | [azurerm_kubernetes_cluster.aks](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/kubernetes_cluster) | data source | | [azurerm_log_analytics_workspace.log_analytics](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/log_analytics_workspace) | data source | | [azurerm_monitor_action_group.email](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/monitor_action_group) | data source | @@ -202,6 +204,7 @@ | [apim\_dns\_zone\_prefix](#input\_apim\_dns\_zone\_prefix) | The dns subdomain for apim. | `string` | `null` | no | | [dns\_zone\_internal\_prefix](#input\_dns\_zone\_internal\_prefix) | The dns subdomain. | `string` | `null` | no | | [domain](#input\_domain) | n/a | `string` | n/a | yes | +| [elastic\_cloud\_apm\_endpoint](#input\_elastic\_cloud\_apm\_endpoint) | APM endpoint for elastic cloud instance | `string` | n/a | yes | | [elastic\_cold\_storage](#input\_elastic\_cold\_storage) | n/a |
object({
storage_type = string,
allow_volume_expansion = bool,
initialStorageSize = string
})
| n/a | yes | | [elastic\_hot\_storage](#input\_elastic\_hot\_storage) | n/a |
object({
storage_type = string,
allow_volume_expansion = bool,
initialStorageSize = string
})
| n/a | yes | | [elastic\_node\_pool](#input\_elastic\_node\_pool) | AKS node pool user configuration |
object({
enabled = bool,
name = string,
vm_size = string,
os_disk_type = string,
os_disk_size_gb = string,
node_count_min = number,
node_count_max = number,
node_labels = map(any),
node_taints = list(string),
node_tags = map(any),
elastic_pool_max_pods = number,
})
| n/a | yes | @@ -226,6 +229,7 @@ | [nginx\_helm](#input\_nginx\_helm) | nginx ingress helm chart configuration |
object({
version = string,
controller = object({
image = object({
registry = string,
image = string,
tag = string,
digest = string,
digestchroot = string,
}),
config = object({
proxy-body-size : string
})
})
})
| n/a | yes | | [nodeset\_config](#input\_nodeset\_config) | n/a |
map(object({
count = string
roles = list(string)
storage = string
storageClassName = string
requestMemory = string
requestCPU = string
limitsMemory = string
limitsCPU = string
}))
|
{
"default": {
"count": 1,
"limitsCPU": "1",
"limitsMemory": "2Gi",
"requestCPU": "1",
"requestMemory": "2Gi",
"roles": [
"master",
"data",
"data_content",
"data_hot",
"data_warm",
"data_cold",
"data_frozen",
"ingest",
"ml",
"remote_cluster_client",
"transform"
],
"storage": "5Gi",
"storageClassName": "standard"
}
}
| no | | [opentelemetry\_operator\_helm](#input\_opentelemetry\_operator\_helm) | open-telemetry/opentelemetry-operator helm chart configuration |
object({
chart_version = string,
values_file = string
})
| n/a | yes | +| [otel\_collector\_cloud\_migration](#input\_otel\_collector\_cloud\_migration) | n/a | `bool` | `false` | no | | [prefix](#input\_prefix) | n/a | `string` | n/a | yes | | [snapshot\_storage\_replication\_type](#input\_snapshot\_storage\_replication\_type) | (Optional) ELK snapshot storage replication type | `string` | `"LRS"` | no | | [subscription\_name](#input\_subscription\_name) | Subscription name | `string` | n/a | yes | diff --git a/src/elk-monitoring/env/weu-dev/terraform.tfvars b/src/elk-monitoring/env/weu-dev/terraform.tfvars index 5da428f1e..1b49651f1 100644 --- a/src/elk-monitoring/env/weu-dev/terraform.tfvars +++ b/src/elk-monitoring/env/weu-dev/terraform.tfvars @@ -149,5 +149,5 @@ opentelemetry_operator_helm = { values_file = "./env/opentelemetry_operator_helm/values.yaml" } -elastic_cloud_apm_endpoint = "https://0fbb6b488afc4677a39b9655f2caa1c2.apm.westeurope.azure.elastic-cloud.com:443" -otel_collector_cloud_migration = false +elastic_cloud_apm_endpoint = "https://0fbb6b488afc4677a39b9655f2caa1c2.apm.westeurope.azure.elastic-cloud.com:443" +otel_collector_cloud_migration = true