Commit 113f753b authored by John Jarvis's avatar John Jarvis

Merge branch 'master' into jarv/add-pre-ha

parents f1acda05 4ac6a7df
...@@ -770,7 +770,7 @@ module "sd-exporter" { ...@@ -770,7 +770,7 @@ module "sd-exporter" {
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
} }
module "thanos" { module "thanos-store" {
bootstrap_version = "${var.bootstrap_script_version}" bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}" chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-thanos-store]\"" chef_run_list = "\"role[${var.environment}-infra-thanos-store]\""
...@@ -779,12 +779,38 @@ module "thanos" { ...@@ -779,12 +779,38 @@ module "thanos" {
dns_zone_name = "${var.dns_zone_name}" dns_zone_name = "${var.dns_zone_name}"
egress_ports = "${var.egress_ports}" egress_ports = "${var.egress_ports}"
environment = "${var.environment}" environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["thanos"]}" ip_cidr_range = "${var.subnetworks["thanos-store"]}"
kernel_version = "${var.default_kernel_version}" kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["thanos"]}" machine_type = "${var.machine_types["thanos-store"]}"
monitoring_whitelist = "${var.monitoring_whitelist_thanos}" monitoring_whitelist = "${var.monitoring_whitelist_thanos}"
name = "thanos" name = "thanos-store"
node_count = "${var.node_count["thanos"]}" node_count = "${var.node_count["thanos-store"]}"
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.2"
tier = "inf"
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 = 100
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["thanos-compact"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["thanos-compact"]}"
monitoring_whitelist = "${var.monitoring_whitelist_thanos}"
name = "thanos-compact"
node_count = "${var.node_count["thanos-compact"]}"
persistent_disk_path = "/opt/prometheus" persistent_disk_path = "/opt/prometheus"
project = "${var.project}" project = "${var.project}"
public_ports = "${var.public_ports["thanos"]}" public_ports = "${var.public_ports["thanos"]}"
......
...@@ -286,7 +286,8 @@ variable "machine_types" { ...@@ -286,7 +286,8 @@ variable "machine_types" {
"sidekiq-realtime" = "n1-highmem-16" "sidekiq-realtime" = "n1-highmem-16"
"sidekiq-traces" = "n1-standard-8" "sidekiq-traces" = "n1-standard-8"
"stor" = "n1-standard-32" "stor" = "n1-standard-32"
"thanos" = "n1-highmem-16" "thanos-store" = "n1-highmem-8"
"thanos-compact" = "n1-standard-2"
"web" = "n1-standard-8" "web" = "n1-standard-8"
# pages and share should eventually be upgraded # pages and share should eventually be upgraded
...@@ -324,7 +325,8 @@ variable "node_count" { ...@@ -324,7 +325,8 @@ variable "node_count" {
"sidekiq-pullmirror" = 0 "sidekiq-pullmirror" = 0
"sidekiq-realtime" = 0 "sidekiq-realtime" = 0
"sidekiq-traces" = 0 "sidekiq-traces" = 0
"thanos" = 1 "thanos-compact" = 1
"thanos-store" = 1
"stor" = 1 "stor" = 1
"multizone-stor" = 31 "multizone-stor" = 31
"web" = 3 "web" = 3
...@@ -353,9 +355,11 @@ variable "subnetworks" { ...@@ -353,9 +355,11 @@ variable "subnetworks" {
"redis" = "10.251.5.0/24" "redis" = "10.251.5.0/24"
"sidekiq" = "10.251.25.0/24" "sidekiq" = "10.251.25.0/24"
"stor" = "10.251.28.0/24" "stor" = "10.251.28.0/24"
"thanos" = "10.251.31.0/24" "thanos-store" = "10.251.31.0/24"
"web" = "10.251.26.0/24" "web" = "10.251.26.0/24"
"pages" = "10.251.30.0/24" "pages" = "10.251.30.0/24"
"thanos-compact" = "10.251.32.0/24"
} }
} }
......
...@@ -357,7 +357,8 @@ variable "machine_types" { ...@@ -357,7 +357,8 @@ variable "machine_types" {
"sidekiq-realtime" = "n1-highmem-16" "sidekiq-realtime" = "n1-highmem-16"
"sidekiq-traces" = "n1-standard-8" "sidekiq-traces" = "n1-standard-8"
"stor" = "n1-standard-32" "stor" = "n1-standard-32"
"thanos" = "n1-highmem-16" "thanos-compact" = "n1-standard-2"
"thanos-store" = "n1-highmem-16"
"web" = "n1-standard-16" "web" = "n1-standard-16"
"web-pages" = "n1-standard-8" "web-pages" = "n1-standard-8"
...@@ -408,7 +409,8 @@ variable "node_count" { ...@@ -408,7 +409,8 @@ variable "node_count" {
"sidekiq-realtime" = 4 "sidekiq-realtime" = 4
"sidekiq-traces" = 2 "sidekiq-traces" = 2
"stor" = 20 "stor" = 20
"thanos" = 1 "thanos-compact" = 1
"thanos-store" = 1
"contributors" = 1 "contributors" = 1
"multizone-stor" = 12 "multizone-stor" = 12
"web" = 28 "web" = 28
...@@ -454,7 +456,8 @@ variable "subnetworks" { ...@@ -454,7 +456,8 @@ variable "subnetworks" {
"git" = "10.220.4.0/23" "git" = "10.220.4.0/23"
"singleton-svcs" = "10.219.4.0/24" "singleton-svcs" = "10.219.4.0/24"
"sidekiq" = "10.220.6.0/23" "sidekiq" = "10.220.6.0/23"
"thanos" = "10.220.17.0/24" "thanos-compact" = "10.220.18.0/24"
"thanos-store" = "10.220.17.0/24"
"web" = "10.220.8.0/23" "web" = "10.220.8.0/23"
"web-pages" = "10.220.12.0/23" "web-pages" = "10.220.12.0/23"
"stor" = "10.221.2.0/23" "stor" = "10.221.2.0/23"
......
...@@ -349,7 +349,8 @@ variable "machine_types" { ...@@ -349,7 +349,8 @@ variable "machine_types" {
"sidekiq-realtime" = "n1-highmem-16" "sidekiq-realtime" = "n1-highmem-16"
"sidekiq-traces" = "n1-standard-8" "sidekiq-traces" = "n1-standard-8"
"stor" = "n1-standard-32" "stor" = "n1-standard-32"
"thanos" = "n1-highmem-16" "thanos-compact" = "n1-standard-2"
"thanos-store" = "n1-highmem-8"
"web" = "n1-standard-16" "web" = "n1-standard-16"
"web-pages" = "n1-standard-4" "web-pages" = "n1-standard-4"
...@@ -402,7 +403,8 @@ variable "node_count" { ...@@ -402,7 +403,8 @@ variable "node_count" {
"sidekiq-realtime" = 1 "sidekiq-realtime" = 1
"sidekiq-traces" = 1 "sidekiq-traces" = 1
"stor" = 2 "stor" = 2
"thanos" = 1 "thanos-compact" = 1
"thanos-store" = 1
"multizone-stor" = 0 "multizone-stor" = 0
"web" = 3 "web" = 3
"web-pages" = 2 "web-pages" = 2
...@@ -448,7 +450,8 @@ variable "subnetworks" { ...@@ -448,7 +450,8 @@ variable "subnetworks" {
"runner" = "10.224.16.0/24" "runner" = "10.224.16.0/24"
"sidekiq" = "10.225.1.0/24" "sidekiq" = "10.225.1.0/24"
"stor" = "10.224.2.0/23" "stor" = "10.224.2.0/23"
"thanos" = "10.226.4.0/24" "thanos-compact" = "10.226.5.0/24"
"thanos-store" = "10.226.4.0/24"
"web" = "10.224.1.0/24" "web" = "10.224.1.0/24"
"singleton-svcs" = "10.224.5.0/24" "singleton-svcs" = "10.224.5.0/24"
"web-pages" = "10.224.26.0/24" "web-pages" = "10.224.26.0/24"
......
...@@ -334,7 +334,7 @@ module "blackbox" { ...@@ -334,7 +334,7 @@ module "blackbox" {
use_external_ip = true use_external_ip = true
} }
module "thanos" { module "thanos-store" {
bootstrap_version = "6" bootstrap_version = "6"
chef_provision = "${var.chef_provision}" chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-thanos-store]\"" chef_run_list = "\"role[${var.environment}-infra-thanos-store]\""
...@@ -342,11 +342,33 @@ module "thanos" { ...@@ -342,11 +342,33 @@ module "thanos" {
data_disk_type = "pd-ssd" data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}" dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}" environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["thanos"]}" ip_cidr_range = "${var.subnetworks["thanos-store"]}"
kernel_version = "${var.default_kernel_version}" machine_type = "${var.machine_types["thanos-store"]}"
machine_type = "${var.machine_types["thanos"]}" name = "thanos-store"
name = "thanos" node_count = "${var.node_count["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.1"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
module "thanos-compact" {
bootstrap_version = "6"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-thanos-compact]\""
data_disk_size = 100
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["thanos-compact"]}"
machine_type = "${var.machine_types["thanos-compact"]}"
name = "thanos-compact"
node_count = "${var.node_count["thanos-compact"]}"
persistent_disk_path = "/opt/prometheus" persistent_disk_path = "/opt/prometheus"
project = "${var.project}" project = "${var.project}"
public_ports = "${var.public_ports["thanos"]}" public_ports = "${var.public_ports["thanos"]}"
......
...@@ -49,10 +49,11 @@ variable "machine_types" { ...@@ -49,10 +49,11 @@ variable "machine_types" {
"blackbox" = "n1-standard-1" "blackbox" = "n1-standard-1"
"sentry" = "n1-standard-16" "sentry" = "n1-standard-16"
"sd-exporter" = "n1-standard-1" "sd-exporter" = "n1-standard-1"
"thanos" = "n1-highmem-16" "thanos-compact" = "n1-standard-2"
"thanos-query" = "n1-standard-1" "thanos-query" = "n1-standard-2"
"thanos-store" = "n1-highmem-8"
"gke-runner" = "n1-standard-2" "gke-runner" = "n1-standard-2"
"nessus" = "n1-standard-1" "nessus" = "n1-standard-4"
} }
} }
...@@ -95,7 +96,8 @@ variable "subnetworks" { ...@@ -95,7 +96,8 @@ variable "subnetworks" {
"sd-exporter" = "10.250.15.0/24" "sd-exporter" = "10.250.15.0/24"
"gke-runner" = "10.250.16.0/24" "gke-runner" = "10.250.16.0/24"
"runner-snapshots" = "10.250.17.0/24" "runner-snapshots" = "10.250.17.0/24"
"thanos" = "10.250.18.0/24" "thanos-store" = "10.250.18.0/24"
"thanos-compact" = "10.250.19.0/24"
} }
} }
...@@ -133,8 +135,9 @@ variable "node_count" { ...@@ -133,8 +135,9 @@ variable "node_count" {
"runner" = 1 "runner" = 1
"sentry" = 1 "sentry" = 1
"sd-exporter" = 1 "sd-exporter" = 1
"thanos" = 1 "thanos-compact" = 1
"thanos-query" = 1 "thanos-query" = 1
"thanos-store" = 1
} }
} }
......
...@@ -1385,31 +1385,56 @@ module "influxdb" { ...@@ -1385,31 +1385,56 @@ module "influxdb" {
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
} }
module "thanos" { module "thanos-store" {
allow_stopping_for_update = true bootstrap_version = "${var.bootstrap_script_version}"
bootstrap_version = "${var.bootstrap_script_version}" chef_provision = "${var.chef_provision}"
chef_provision = "${var.chef_provision}" chef_run_list = "\"role[${var.environment}-infra-thanos-store]\""
chef_run_list = "\"role[${var.environment}-infra-thanos-store]\"" data_disk_size = 100
data_disk_size = 100 data_disk_type = "pd-ssd"
data_disk_type = "pd-ssd" dns_zone_name = "${var.dns_zone_name}"
dns_zone_name = "${var.dns_zone_name}" egress_ports = "${var.egress_ports}"
egress_ports = "${var.egress_ports}" environment = "${var.environment}"
environment = "${var.environment}" ip_cidr_range = "${var.subnetworks["thanos-store"]}"
ip_cidr_range = "${var.subnetworks["thanos"]}" kernel_version = "${var.default_kernel_version}"
kernel_version = "${var.default_kernel_version}" machine_type = "${var.machine_types["thanos-store"]}"
machine_type = "${var.machine_types["thanos"]}" monitoring_whitelist = "${var.monitoring_whitelist_thanos}"
monitoring_whitelist = "${var.monitoring_whitelist_thanos}" name = "thanos-store"
name = "thanos" node_count = "${var.node_count["thanos-store"]}"
node_count = "${var.node_count["thanos"]}" persistent_disk_path = "/opt/prometheus"
persistent_disk_path = "/opt/prometheus" project = "${var.project}"
project = "${var.project}" public_ports = "${var.public_ports["thanos"]}"
public_ports = "${var.public_ports["thanos"]}" region = "${var.region}"
region = "${var.region}" service_account_email = "${var.service_account_email}"
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.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.1" tier = "inf"
tier = "inf" use_new_node_name = true
use_new_node_name = true vpc = "${module.network.self_link}"
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 = 100
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["thanos-compact"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["thanos-compact"]}"
monitoring_whitelist = "${var.monitoring_whitelist_thanos}"
name = "thanos-compact"
node_count = "${var.node_count["thanos-compact"]}"
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.1"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
} }
################################## ##################################
......
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