Commit 030660e5 authored by John Jarvis's avatar John Jarvis

Merge branch 'jarv/dashboards-com' into 'master'

Use dashboards.gitlab.com for public monitoring.

See merge request !512
parents 6d890252 f30b22cc
......@@ -262,24 +262,24 @@ module "dashboards" {
#######################################################
#
# Load balancer and VM for monitor.gitlab.net
# Load balancer and VM for dashboards.gitlab.com
#
#######################################################
module "monitor-lb" {
module "dashboards-com-lb" {
environment = "${var.environment}"
source = "../../modules/google/web-iap"
name = "monitor"
name = "dashboards-com"
project = "${var.project}"
region = "${var.region}"
gitlab_zone_id = "${var.gitlab_net_zone_id}"
cert_link = "${var.dashboards_gitlab_net_cert_link}"
backend_service_link = "${module.monitor.google_compute_backend_service_noiap_self_link}"
web_ip_fqdn = "monitor-gcp.gitlab.net"
gitlab_zone_id = "${var.gitlab_com_zone_id}"
cert_link = "${var.dashboards_gitlab_com_cert_link}"
backend_service_link = "${module.dashboards-com.google_compute_backend_service_noiap_self_link}"
web_ip_fqdn = "dashboards.gitlab.com"
service_ports = ["3000"]
}
module "monitor" {
module "dashboards-com" {
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-public-dashboards]\""
......@@ -291,7 +291,7 @@ module "monitor" {
health_check = "http"
ip_cidr_range = "${var.subnetworks["monitor"]}"
machine_type = "${var.machine_types["monitor"]}"
name = "monitor"
name = "dashboards-com"
node_count = 1
oauth2_client_id = "${var.oauth2_client_id_dashboards}"
oauth2_client_secret = "${var.oauth2_client_secret_dashboards}"
......
......@@ -165,6 +165,10 @@ variable "dashboards_gitlab_net_cert_link" {
default = "projects/gitlab-ops/global/sslCertificates/dashboards-gitlab-net"
}
variable "dashboards_gitlab_com_cert_link" {
default = "projects/gitlab-ops/global/sslCertificates/dashboards-gitlab-com"
}
variable "gcs_service_account_email" {
type = "string"
default = "[email protected]"
......
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