X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=terraform-ci-infra%2F1n_nmd%2Fmain.tf;h=eda1fbdb0b8d97fbb1ae5fb1cbb36a8794b2b5bf;hb=refs%2Fchanges%2F08%2F31208%2F1;hp=4e0b7537c419ecb06e3444bd1706244b9c69e11f;hpb=a44eef233de959c5679602dc6cd1ed866d6abc14;p=csit.git

diff --git a/terraform-ci-infra/1n_nmd/main.tf b/terraform-ci-infra/1n_nmd/main.tf
index 4e0b7537c4..eda1fbdb0b 100644
--- a/terraform-ci-infra/1n_nmd/main.tf
+++ b/terraform-ci-infra/1n_nmd/main.tf
@@ -5,57 +5,33 @@
 # and have them automatically associated with the root provider
 # configurations.
 module "alertmanager" {
-  source                         = "./alertmanager"
-  providers                      = {
+  source                             = "./alertmanager"
+  providers                          = {
     nomad = nomad.yul1
   }
 
   # nomad
-  nomad_datacenters              = [ "yul1" ]
+  nomad_datacenters                  = [ "yul1" ]
 
   # alertmanager
-  alertmanager_job_name          = "prod-alertmanager"
-  alertmanager_use_canary        = true
-  alertmanager_group_count       = 1
-  alertmanager_vault_secret      = {
-    use_vault_provider           = false,
-    vault_kv_policy_name         = "kv-secret",
-    vault_kv_path                = "secret/data/prometheus",
-    vault_kv_field_access_key    = "access_key",
-    vault_kv_field_secret_key    = "secret_key"
-  }
-  alertmanager_version           = "0.21.0"
-  alertmanager_cpu               = 1000
-  alertmanager_mem               = 1024
-  alertmanager_port              = 9093
-  alertmanager_slack_api_url     = "https://hooks.slack.com/services/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"
-  alertmanager_slack_channel     = "fdio-infra-monitoring"
-}
-
-module "exporter" {
-  source                         = "./exporter"
-  providers                      = {
-    nomad = nomad.yul1
+  alertmanager_job_name              = "prod-alertmanager"
+  alertmanager_use_canary            = true
+  alertmanager_group_count           = 1
+  alertmanager_vault_secret          = {
+    use_vault_provider               = false,
+    vault_kv_policy_name             = "kv-secret",
+    vault_kv_path                    = "secret/data/prometheus",
+    vault_kv_field_access_key        = "access_key",
+    vault_kv_field_secret_key        = "secret_key"
   }
-
-  # nomad
-  nomad_datacenters              = [ "yul1" ]
-
-  # exporter
-  exporter_job_name              = "prod-exporter"
-  exporter_use_canary            = false
-
-  # node
-  node_version                   = "1.0.1"
-  node_port                      = 9100
-
-  # blackbox
-  blackbox_version               = "0.18.0"
-  blackbox_port                  = 9115
-
-  # cadvisor
-  cadvisor_image                 = "gcr.io/cadvisor/cadvisor:latest"
-  cadvisor_port                  = 8080
+  alertmanager_version               = "0.21.0"
+  alertmanager_cpu                   = 1000
+  alertmanager_mem                   = 1024
+  alertmanager_port                  = 9093
+  alertmanager_slack_jenkins_api_key = "TE07RD1V1/B01LPL8KM0F/KAd80wc9vS8CPMtrNtmQqCfT"
+  alertmanager_slack_jenkins_channel = "fdio-jobs-monitoring"
+  alertmanager_slack_default_api_key = "TE07RD1V1/B01L7PQK9S8/hkn7cWKiARfh1H0ppC5aYtbr"
+  alertmanager_slack_default_channel = "fdio-infra-monitoring"
 }
 
 module "grafana" {
@@ -74,12 +50,12 @@ module "grafana" {
   grafana_vault_secret           = {
     use_vault_provider           = false,
     vault_kv_policy_name         = "kv-secret",
-    vault_kv_path                = "secret/data/prometheus",
+    vault_kv_path                = "secret/data/grafana",
     vault_kv_field_access_key    = "access_key",
     vault_kv_field_secret_key    = "secret_key"
   }
   grafana_container_image        = "grafana/grafana:7.3.7"
-  grafana_cpu                    = 2000
+  grafana_cpu                    = 1000
   grafana_mem                    = 2048
   grafana_port                   = 3000
 }