Skip to content

Commit

Permalink
update central_observability_monitoring variable from dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
muzammil360 committed Jun 7, 2024
1 parent 637aa15 commit 8a885f4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
3 changes: 1 addition & 2 deletions terraform/gitops/k8s-cluster-config/monitoring.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module "generate_monitoring_files" {
cluster_label = var.cluster_name # cluster identifier in central observability stack
enable_central_observability_write = try(var.common_var_map.enable_central_observability_write, local.enable_central_observability_write)
enable_central_observability_read = try(var.common_var_map.enable_central_observability_read, local.enable_central_observability_read)
central_observability_endpoint = try(var.common_var_map.central_observability_endpoint, local.central_observability_endpoint)
central_observability_endpoint = var.central_observability_endpoint
central_observability_tenant_id = try(var.common_var_map.central_observability_tenant_id, local.central_observability_tenant_id)
}
file_list = [for f in fileset(local.monitoring_template_path, "**/*.tpl") : trimsuffix(f, ".tpl") if !can(regex(local.monitoring_app_file, f))]
Expand Down Expand Up @@ -145,6 +145,5 @@ locals {
grafana_istio_wildcard_gateway_name = local.grafana_wildcard_gateway == "external" ? local.istio_external_wildcard_gateway_name : local.istio_internal_wildcard_gateway_name
enable_central_observability_write = false
enable_central_observability_read = false
central_observability_endpoint = "http://to-be-updated"
central_observability_tenant_id = "infitx"
}
5 changes: 5 additions & 0 deletions terraform/gitops/k8s-cluster-config/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@ variable "minio_api_url" {
description = "minio_api_url"
}

variable "central_observability_endpoint" {
type = string
description = "central observability endpoint (mimir api)"
}

variable "default_ssl_certificate" {
type = string
description = "default_ssl_certificate"
Expand Down
1 change: 1 addition & 0 deletions terraform/k8s/gitops-build/terragrunt.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ inputs = {
transit_vault_key_name = local.TRANSIT_VAULT_UNSEAL_KEY_NAME
transit_vault_url = "http://${dependency.k8s_deploy.outputs.haproxy_server_fqdn}:8200"
minio_api_url = "${dependency.k8s_deploy.outputs.haproxy_server_fqdn}:9000"
central_observability_endpoint = "${dependency.k8s_deploy.outputs.haproxy_server_fqdn}:${get_env("MIMIR_LISTENING_PORT")}"
managed_db_host = "${dependency.k8s_deploy.outputs.haproxy_server_fqdn}"
private_network_cidr = dependency.k8s_deploy.outputs.private_network_cidr
dns_provider = dependency.k8s_deploy.outputs.dns_provider
Expand Down

0 comments on commit 8a885f4

Please sign in to comment.