change module to monitoring-with-count

environments/gprd/main.tf

@@ -722,72 +722,75 @@ module "monitoring-lb" {
 #######################
 
 module "performance" {
-  bootstrap_version    = 3
-  subnetwork_name      = "${google_compute_subnetwork.monitoring.name}"
   attach_data_disk     = true
-  data_disk_size       = 100
-  data_disk_type       = "pd-standard"
+  bootstrap_version    = 3
   chef_provision       = "${var.chef_provision}"
   chef_run_list        = "\"role[${var.environment}-private-grafana]\""
+  data_disk_size       = 100
+  data_disk_type       = "pd-standard"
   dns_zone_name        = "${var.dns_zone_name}"
   environment          = "${var.environment}"
   machine_type         = "${var.machine_types["monitoring"]}"
   name                 = "performance"
+  node_count           = 1
+  oauth2_client_id     = "${var.oauth2_client_id_performance}"
+  oauth2_client_secret = "${var.oauth2_client_secret_performance}"
+  persistent_disk_path = "/opt"
   project              = "${var.project}"
   region               = "${var.region}"
-  source               = "../../modules/google/monitoring"
-  tier                 = "inf"
-  persistent_disk_path = "/opt"
-  service_port         = "${var.monitoring_hosts["performance"]}"
   service_path         = "/login"
-  oauth2_client_id     = "${var.oauth2_client_id_performance}"
-  oauth2_client_secret = "${var.oauth2_client_secret_performance}"
+  service_port         = "${var.monitoring_hosts["performance"]}"
+  source               = "../../modules/google/monitoring-with-count"
+  subnetwork_name      = "${google_compute_subnetwork.monitoring.name}"
+  tier                 = "inf"
 }
 
 module "prometheus" {
-  bootstrap_version    = 3
-  subnetwork_name      = "${google_compute_subnetwork.monitoring.name}"
   attach_data_disk     = true
-  data_disk_size       = 1000
-  data_disk_type       = "pd-standard"
+  bootstrap_version    = 3
   chef_provision       = "${var.chef_provision}"
   chef_run_list        = "\"role[${var.environment}-infra-prometheus]\""
+  data_disk_size       = 1000
+  data_disk_type       = "pd-standard"
   dns_zone_name        = "${var.dns_zone_name}"
   environment          = "${var.environment}"
   machine_type         = "${var.machine_types["monitoring"]}"
   name                 = "prometheus"
+  node_count           = 1
+  oauth2_client_id     = "${var.oauth2_client_id_prometheus}"
+  oauth2_client_secret = "${var.oauth2_client_secret_prometheus}"
+  persistent_disk_path = "/opt/prometheus"
   project              = "${var.project}"
   region               = "${var.region}"
-  source               = "../../modules/google/monitoring"
-  tier                 = "inf"
-  persistent_disk_path = "/opt/prometheus"
-  service_port         = "${var.monitoring_hosts["prometheus"]}"
   service_path         = "/graph"
-  oauth2_client_id     = "${var.oauth2_client_id_prometheus}"
-  oauth2_client_secret = "${var.oauth2_client_secret_prometheus}"
+  service_port         = "${var.monitoring_hosts["prometheus"]}"
+  source               = "../../modules/google/monitoring-with-count"
+  subnetwork_name      = "${google_compute_subnetwork.monitoring.name}"
+  tier                 = "inf"
 }
 
 module "prometheus-app" {
-  bootstrap_version    = 3
-  subnetwork_name      = "${google_compute_subnetwork.monitoring.name}"
   attach_data_disk     = true
-  data_disk_size       = 1000
-  data_disk_type       = "pd-standard"
+  bootstrap_version    = 3
   chef_provision       = "${var.chef_provision}"
   chef_run_list        = "\"role[${var.environment}-infra-prometheus-app]\""
+  data_disk_size       = 1000
+  data_disk_type       = "pd-standard"
   dns_zone_name        = "${var.dns_zone_name}"
   environment          = "${var.environment}"
   machine_type         = "${var.machine_types["monitoring"]}"
   name                 = "prometheus-app"
+  node_count           = 1
+  oauth2_client_id     = "${var.oauth2_client_id_prometheus}"
+  oauth2_client_secret = "${var.oauth2_client_secret_prometheus}"
+  persistent_disk_path = "/opt/prometheus"
   project              = "${var.project}"
   region               = "${var.region}"
-  source               = "../../modules/google/monitoring"
-  tier                 = "inf"
-  persistent_disk_path = "/opt/prometheus"
-  service_port         = "${var.monitoring_hosts["prometheus-app"]}"
   service_path         = "/graph"
-  oauth2_client_id     = "${var.oauth2_client_id_prometheus}"
-  oauth2_client_secret = "${var.oauth2_client_secret_prometheus}"
+  service_port         = "${var.monitoring_hosts["prometheus-app"]}"
+  source               = "../../modules/google/monitoring-with-count"
+  subnetwork_name      = "${google_compute_subnetwork.monitoring.name}"
+  tier                 = "inf"
 }
 
 module "kibana" {