Commit d30a4ac4 authored by John Jarvis's avatar John Jarvis

Merge branch 'jts/adds-thanos-stuff' into 'master'

Adds thanos infra to the pre environment

See merge request !810
parents abe9dacf 5dae5b80
......@@ -835,3 +835,51 @@ module "gitaly" {
use_new_node_name = true
vpc = "${module.network.self_link}"
}
module "thanos-compact" {
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-thanos-compact]\""
data_disk_size = 200
dns_zone_name = "${var.dns_zone_name}"
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["thanos-compact"]}"
machine_type = "${var.machine_types["thanos"]}"
monitoring_whitelist = "${var.monitoring_whitelist_thanos}"
name = "thanos-compact"
node_count = "${var.node_count["thanos"]}"
persistent_disk_path = "/opt/prometheus"
project = "${var.project}"
public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
module "thanos-store" {
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-thanos-store]\""
data_disk_size = 100
dns_zone_name = "${var.dns_zone_name}"
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["thanos-store"]}"
machine_type = "${var.machine_types["thanos"]}"
monitoring_whitelist = "${var.monitoring_whitelist_thanos}"
name = "thanos-store"
node_count = "${var.node_count["thanos"]}"
persistent_disk_path = "/opt/prometheus"
project = "${var.project}"
public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
......@@ -48,6 +48,7 @@ variable "machine_types" {
"deploy" = "n1-standard-1"
"consul" = "n1-standard-1"
"proxy" = "n1-standard-1"
"thanos" = "n1-standard-1"
}
}
......@@ -125,6 +126,8 @@ variable "subnetworks" {
"consul" = "10.232.22.0/24"
"pubsubbeat" = "10.232.23.0/24"
"proxy" = "10.232.24.0/24"
"thanos-compact" = "10.232.25.0/24"
"thanos-store" = "10.232.26.0/24"
"gitlab-gke-pod-cidr" = "10.235.0.0/16"
"gitlab-gke-service-cidr" = "10.236.0.0/16"
......@@ -186,6 +189,7 @@ variable "public_ports" {
"consul" = []
"pubsubbeat" = []
"proxy" = []
"thanos" = []
}
}
......@@ -210,6 +214,7 @@ variable "node_count" {
"gitaly" = 1
"deploy" = 1
"consul" = 1
"thanos" = 1
}
}
......
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