Unverified Commit edd47ef9 authored by Yun Guo's avatar Yun Guo
Browse files

Merge branch 'master' into gstg-prometheus-db

parents 8b1e6eab 3bb62ffc
......@@ -636,6 +636,27 @@ resource "google_compute_subnetwork" "monitoring" {
region = "${var.region}"
}
#######################
#
# load balancer for all hosts in this section
#
#######################
module "monitoring-lb" {
cert_link = "${var.monitoring_cert_link}"
environment = "${var.environment}"
gitlab_net_zone_id = "${var.gitlab_net_zone_id}"
hosts = ["${var.monitoring_hosts["names"]}"]
name = "monitoring-lb"
project = "${var.project}"
region = "${var.region}"
service_ports = ["${var.monitoring_hosts["ports"]}"]
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-lb.git"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
targets = ["${var.monitoring_hosts["names"]}"]
url_map = "${google_compute_url_map.monitoring-lb.self_link}"
}
#######################
module "prometheus" {
attach_data_disk = true
......
......@@ -3,7 +3,6 @@ variable "oauth2_client_secret_monitoring" {}
variable "gitlab_net_zone_id" {}
variable "gitlab_com_zone_id" {}
variable "gitlab_io_zone_id" {}
variable "default_kernel_version" {
default = "4.15.0-1015"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment