#26 Fixed local variables and domain names

Author: halfb00t

terraform/layer2-k8s/examples/eks-kube-prometheus-stack.tf

@@ -1,23 +1,23 @@
 locals {
   grafana_password         = random_string.grafana_password.result
-  grafana_domain_name      = "grafana.${local.domain_name}"
-  prometheus_domain_name   = "prometheus.${local.domain_name}"
-  alertmanager_domain_name = "alertmanager.${local.domain_name}"
+  grafana_domain_name      = "grafana-${local.domain_suffix}"
+  prometheus_domain_name   = "prometheus-${local.domain_suffix}"
+  alertmanager_domain_name = "alertmanager-${local.domain_suffix}"
 
   kube_prometheus_stack_template = templatefile("${path.module}/templates/prometheus-values.tmpl",
     {
-      prometheus_domain_name               = local.prometheus_domain_name
-      alertmanager_domain_name             = local.alertmanager_domain_name
-      ip_whitelist                         = local.ip_whitelist
-      default_region                       = local.region
-      grafana_domain_name                  = local.grafana_domain_name
-      grafana_password                     = local.grafana_password
-      role_arn                             = module.aws_iam_grafana.role_arn
-      gitlab_client_id                     = local.grafana_gitlab_client_id
-      gitlab_client_secret                 = local.grafana_gitlab_client_secret
-      alertmanager_slack_url               = local.alertmanager_slack_url
-      alertmanager_slack_channel           = var.alertmanager_slack_channel
-      loki_datasource_for_prometheus_stack = var.loki_datasource_for_prometheus_stack
+      prometheus_domain_name     = local.prometheus_domain_name
+      alertmanager_domain_name   = local.alertmanager_domain_name
+      ip_whitelist               = local.ip_whitelist
+      default_region             = local.region
+      grafana_domain_name        = local.grafana_domain_name
+      grafana_password           = local.grafana_password
+      role_arn                   = module.aws_iam_grafana.role_arn
+      gitlab_client_id           = local.grafana_gitlab_client_id
+      gitlab_client_secret       = local.grafana_gitlab_client_secret
+      gitlab_group               = local.grafana_gitlab_group
+      alertmanager_slack_url     = local.alertmanager_slack_url
+      alertmanager_slack_channel = local.alertmanager_slack_channel
   })
 }
 

terraform/layer2-k8s/examples/eks-loki-stack.tf

@@ -3,18 +3,18 @@ locals {
 
   loki_stack_template = templatefile("${path.module}/templates/loki-stack-values.tmpl",
     {
-      grafana_domain_name  = "grafana.${local.domain_name}"
+      grafana_domain_name  = "grafana-${local.domain_suffix}"
       grafana_password     = local.grafana_loki_password
       gitlab_client_id     = local.grafana_gitlab_client_id
       gitlab_client_secret = local.grafana_gitlab_client_secret
-      gitlab_oauth_group   = var.grafana_gitlab_group
+      gitlab_group         = local.grafana_gitlab_group
   })
 }
 
 resource "helm_release" "loki_stack" {
   name       = "loki-stack"
   chart      = "loki-stack"
-  repository = local.helm_repo_loki_stack
+  repository = local.helm_repo_grafana
   namespace  = kubernetes_namespace.monitoring.id
   version    = var.loki_stack
   wait       = false
@@ -28,4 +28,3 @@ resource "random_string" "grafana_loki_password" {
   length  = 20
   special = true
 }
-

terraform/layer2-k8s/examples/eks-oauth2-proxy.tf

@@ -22,7 +22,7 @@ data "template_file" "oauth2_proxy" {
 
   vars = {
     domain_name  = local.kibana_domain_name
-    gitlab_group = var.kibana_gitlab_group
+    gitlab_group = local.kibana_gitlab_group
   }
 }
 

terraform/layer2-k8s/templates/loki-stack-values.tmpl

@@ -94,7 +94,7 @@ grafana:
     GF_AUTH_GITLAB_AUTH_URL: "https://gitlab.com/oauth/authorize"
     GF_AUTH_GITLAB_TOKEN_URL: "https://gitlab.com/oauth/token"
     GF_AUTH_GITLAB_API_URL: "https://gitlab.com/api/v4"
-    GF_AUTH_GITLAB_ALLOWED_GROUPS: "${gitlab_oauth_group}"
+    GF_AUTH_GITLAB_ALLOWED_GROUPS: "${gitlab_group}"
 
   datasources:
     datasources.yaml: