From bc0601ad0ae43d5535afe96ea9a3a06b8121cf41 Mon Sep 17 00:00:00 2001 From: DJTJWillia Date: Thu, 9 Sep 2021 15:17:30 -0600 Subject: [PATCH] fix: updating vars for prometheus in shared svc (#504) * fix: updating vars * fix: cleanup of the cluster_name var --- stages/apps/sharedsvc/kube-prometheus-stack.tf | 8 ++++---- stages/apps/sharedsvc/variables.tf | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/stages/apps/sharedsvc/kube-prometheus-stack.tf b/stages/apps/sharedsvc/kube-prometheus-stack.tf index 51bec5dc1..1dad9a123 100644 --- a/stages/apps/sharedsvc/kube-prometheus-stack.tf +++ b/stages/apps/sharedsvc/kube-prometheus-stack.tf @@ -6,8 +6,8 @@ module "monitoring_namespace" { source = "../../../modules/common/namespace" namespace = var.monitoring_namespace annotations = { - name = var.monitoring_namespace - cluster = var.cluster_name + name = var.monitoring_namespace + cluster = var.eks_cluster_id } } @@ -15,7 +15,7 @@ module "kube_prometheus_stack" { source = "../../../modules/tools/kube-prometheus-stack" namespace = module.monitoring_namespace.name - grafana_hostname = "grafana.${var.toolchain_namespace}.${var.cluster_name}.${var.root_zone_name}" + grafana_hostname = "grafana.${var.internal_cluster_domain}" prometheus_slack_webhook_url = data.vault_generic_secret.prometheus.data["slack-webhook-url"] prometheus_slack_channel = var.prometheus_slack_channel ingress_annotations = local.common_ingress_annotations @@ -24,7 +24,7 @@ module "kube_prometheus_stack" { module "dashboard" { source = "../../../modules/lead/dashboard" - enabled = var.enable_dashboard + enabled = true namespace = module.monitoring_namespace.name dashboard_version = var.dashboard_version } diff --git a/stages/apps/sharedsvc/variables.tf b/stages/apps/sharedsvc/variables.tf index f5b86d390..55fe73236 100644 --- a/stages/apps/sharedsvc/variables.tf +++ b/stages/apps/sharedsvc/variables.tf @@ -25,6 +25,9 @@ variable "monitoring_namespace" { default = "monitoring" } +variable "prometheus_slack_channel" { +} + variable "uptime" { default = "Mon-Fri 05:00-19:00 America/Los_Angeles" }