Skip to content
This repository has been archived by the owner on Aug 4, 2023. It is now read-only.

Commit

Permalink
fix: updating vars for prometheus in shared svc (#504)
Browse files Browse the repository at this point in the history
* fix: updating vars

* fix: cleanup of the cluster_name var
  • Loading branch information
djtjwillia authored Sep 9, 2021
1 parent 48915ee commit bc0601a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 4 additions & 4 deletions stages/apps/sharedsvc/kube-prometheus-stack.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ 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
}
}

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
Expand All @@ -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
}
3 changes: 3 additions & 0 deletions stages/apps/sharedsvc/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down

0 comments on commit bc0601a

Please sign in to comment.