Commit 0dab551f authored by Ahmad Sherif's avatar Ahmad Sherif

Add Sentry to Ops

parent 03e96fbd
......@@ -422,6 +422,52 @@ module "runner" {
vpc = "${module.network.self_link}"
}
##################################
#
# Sentry
#
##################################
module "sentry-lb" {
environment = "${var.environment}"
forwarding_port_ranges = "${var.tcp_lbs_sentry["forwarding_port_ranges"]}"
fqdns = ["sentry.gitlab.net"]
gitlab_zone_id = "${var.gitlab_net_zone_id}"
health_check_ports = "${var.tcp_lbs_sentry["health_check_ports"]}"
health_check_request_paths = "${var.tcp_lbs_sentry["health_check_request_paths"]}"
instances = ["${module.sentry.instances_self_link}"]
lb_count = "${length(var.tcp_lbs_sentry["names"])}"
name = "ops-gcp-tcp-lb-sentry"
names = "${var.tcp_lbs_sentry["names"]}"
project = "${var.project}"
region = "${var.region}"
source = "../../modules/google/tcp-lb"
targets = ["sentry"]
}
module "sentry" {
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-sentry]\""
data_disk_size = 2000
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["sentry"]}"
machine_type = "${var.machine_types["sentry"]}"
name = "sentry"
node_count = "${var.node_count["sentry"]}"
persistent_disk_path = "/var/lib/postgresql"
project = "${var.project}"
public_ports = "${var.public_ports["sentry"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "../../modules/google/generic-stor"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
##################################
#
# Google storage buckets
......
......@@ -37,6 +37,7 @@ variable "machine_types" {
"gitlab-ops" = "n1-standard-16"
"runner" = "n1-standard-2"
"blackbox" = "n1-standard-1"
"sentry" = "n1-standard-16"
}
}
......@@ -70,6 +71,7 @@ variable "subnetworks" {
"monitor" = "10.250.6.0/24"
"runner" = "10.250.7.0/24"
"monitoring" = "10.250.8.0/24"
"sentry" = "10.250.9.0/24"
}
}
......@@ -84,6 +86,7 @@ variable "public_ports" {
"gitlab-ops" = [443, 80, 22, 5005]
"runner" = []
"blackbox" = []
"sentry" = [443, 80]
}
}
......@@ -99,6 +102,7 @@ variable "node_count" {
"prometheus" = 1
"prometheus-app" = 1
"runner" = 1
"sentry" = 1
}
}
......@@ -153,6 +157,17 @@ variable "tcp_lbs_bastion" {
}
}
variable "tcp_lbs_sentry" {
type = "map"
default = {
"names" = ["http", "https"]
"forwarding_port_ranges" = ["80", "443"]
"health_check_ports" = ["9000", "9000"]
"health_check_request_paths" = ["/auth/login/gitlab/", "/auth/login/gitlab/"]
}
}
variable "log_gitlab_net_cert_link" {
default = "projects/gitlab-ops/global/sslCertificates/log-gitlab-net"
}
......
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