Skip to content

Commit

Permalink
feat: Migrated dev otel to cloud (#2812)
Browse files Browse the repository at this point in the history
* migrated dev otel to cloud

* precommit
  • Loading branch information
mamari90 authored Feb 19, 2025
1 parent 502a15d commit 8fec75e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/elk-monitoring/00_secret.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion src/elk-monitoring/05_elastic_stack.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
})

Expand Down
4 changes: 2 additions & 2 deletions src/elk-monitoring/99_variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 4 additions & 0 deletions src/elk-monitoring/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -202,6 +204,7 @@
| <a name="input_apim_dns_zone_prefix"></a> [apim\_dns\_zone\_prefix](#input\_apim\_dns\_zone\_prefix) | The dns subdomain for apim. | `string` | `null` | no |
| <a name="input_dns_zone_internal_prefix"></a> [dns\_zone\_internal\_prefix](#input\_dns\_zone\_internal\_prefix) | The dns subdomain. | `string` | `null` | no |
| <a name="input_domain"></a> [domain](#input\_domain) | n/a | `string` | n/a | yes |
| <a name="input_elastic_cloud_apm_endpoint"></a> [elastic\_cloud\_apm\_endpoint](#input\_elastic\_cloud\_apm\_endpoint) | APM endpoint for elastic cloud instance | `string` | n/a | yes |
| <a name="input_elastic_cold_storage"></a> [elastic\_cold\_storage](#input\_elastic\_cold\_storage) | n/a | <pre>object({<br/> storage_type = string,<br/> allow_volume_expansion = bool,<br/> initialStorageSize = string<br/> })</pre> | n/a | yes |
| <a name="input_elastic_hot_storage"></a> [elastic\_hot\_storage](#input\_elastic\_hot\_storage) | n/a | <pre>object({<br/> storage_type = string,<br/> allow_volume_expansion = bool,<br/> initialStorageSize = string<br/> })</pre> | n/a | yes |
| <a name="input_elastic_node_pool"></a> [elastic\_node\_pool](#input\_elastic\_node\_pool) | AKS node pool user configuration | <pre>object({<br/> enabled = bool,<br/> name = string,<br/> vm_size = string,<br/> os_disk_type = string,<br/> os_disk_size_gb = string,<br/> node_count_min = number,<br/> node_count_max = number,<br/> node_labels = map(any),<br/> node_taints = list(string),<br/> node_tags = map(any),<br/> elastic_pool_max_pods = number,<br/> })</pre> | n/a | yes |
Expand All @@ -226,6 +229,7 @@
| <a name="input_nginx_helm"></a> [nginx\_helm](#input\_nginx\_helm) | nginx ingress helm chart configuration | <pre>object({<br/> version = string,<br/> controller = object({<br/> image = object({<br/> registry = string,<br/> image = string,<br/> tag = string,<br/> digest = string,<br/> digestchroot = string,<br/> }),<br/> config = object({<br/> proxy-body-size : string<br/> })<br/> })<br/> })</pre> | n/a | yes |
| <a name="input_nodeset_config"></a> [nodeset\_config](#input\_nodeset\_config) | n/a | <pre>map(object({<br/> count = string<br/> roles = list(string)<br/> storage = string<br/> storageClassName = string<br/> requestMemory = string<br/> requestCPU = string<br/> limitsMemory = string<br/> limitsCPU = string<br/> }))</pre> | <pre>{<br/> "default": {<br/> "count": 1,<br/> "limitsCPU": "1",<br/> "limitsMemory": "2Gi",<br/> "requestCPU": "1",<br/> "requestMemory": "2Gi",<br/> "roles": [<br/> "master",<br/> "data",<br/> "data_content",<br/> "data_hot",<br/> "data_warm",<br/> "data_cold",<br/> "data_frozen",<br/> "ingest",<br/> "ml",<br/> "remote_cluster_client",<br/> "transform"<br/> ],<br/> "storage": "5Gi",<br/> "storageClassName": "standard"<br/> }<br/>}</pre> | no |
| <a name="input_opentelemetry_operator_helm"></a> [opentelemetry\_operator\_helm](#input\_opentelemetry\_operator\_helm) | open-telemetry/opentelemetry-operator helm chart configuration | <pre>object({<br/> chart_version = string,<br/> values_file = string<br/> })</pre> | n/a | yes |
| <a name="input_otel_collector_cloud_migration"></a> [otel\_collector\_cloud\_migration](#input\_otel\_collector\_cloud\_migration) | n/a | `bool` | `false` | no |
| <a name="input_prefix"></a> [prefix](#input\_prefix) | n/a | `string` | n/a | yes |
| <a name="input_snapshot_storage_replication_type"></a> [snapshot\_storage\_replication\_type](#input\_snapshot\_storage\_replication\_type) | (Optional) ELK snapshot storage replication type | `string` | `"LRS"` | no |
| <a name="input_subscription_name"></a> [subscription\_name](#input\_subscription\_name) | Subscription name | `string` | n/a | yes |
Expand Down
4 changes: 2 additions & 2 deletions src/elk-monitoring/env/weu-dev/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 8fec75e

Please sign in to comment.