From e7b8b993ebb686f055f88a4bdef0508faa4b4304 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 28 Feb 2025 12:47:07 -0500 Subject: [PATCH] update prom internal url input value --- .../eks-keycloak/terragrunt.hcl | 2 +- .../platform-eng-eks-mcm/eks-kiali/terragrunt.hcl | 6 +++++- .../eks-postgresql/terragrunt.hcl | 13 ++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl index 8be8f8ba..fc0d1ab7 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl @@ -42,7 +42,7 @@ dependency "eks_postgresql" { config_path = "../eks-postgresql" mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { - internal_endpoint { + internal_endpoint = { url = "mock-internal-endpoint-url" } } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl index a3757cb9..c36c773c 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl @@ -80,7 +80,11 @@ dependency "eks_prometheus" { config_path = "../eks-prometheus" mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { - prometheus_internal_url = "mock-internal-url" + prometheus_server_internal_endpoint = { + hostname = "prometheus.mock.svc.cluster.local" + port_number = "80" + url = "https://prometheus.mock.svc.cluster.local:80/" + } } } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl index 209b827f..4429d04a 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl @@ -16,7 +16,8 @@ dependencies { paths = [ "../eks", "../eks-config", - "../eks-dns" + "../eks-dns", + "../eks-prometheus", ] } @@ -58,16 +59,18 @@ inputs = { rwo_storage_class = dependency.eks_config.outputs.rwo_storage_class # PostgreSQL Configuration - service_name = "postgresql" + namespace = include.root.inputs.namespaces["postgresql"] os_shell_tag = include.root.inputs.os_shell_tag + pgpool_tag = include.root.inputs.pgpool_tag postgres_exporter_tag = include.root.inputs.postgres_exporter_tag - postgresql_tag = include.root.inputs.postgresql_tag postgresql_repmgr_tag = include.root.inputs.postgresql_repmgr_tag - pgpool_tag = include.root.inputs.pgpool_tag - namespace = include.root.inputs.namespaces["postgresql"] + postgresql_tag = include.root.inputs.postgresql_tag + service_name = "postgresql" + telemetry_namespace = include.root.inputs.telemetry_namespace # Database Consumer Configuration postgresql_database = include.root.inputs.postgresql_database postgresql_username = include.root.inputs.postgresql_username postgresql_password = include.root.inputs.postgresql_password + }