Commit d53632e1 authored by Ahmad Sherif's avatar Ahmad Sherif

Add thanos

parent 803389e4
...@@ -770,6 +770,31 @@ module "sd-exporter" { ...@@ -770,6 +770,31 @@ module "sd-exporter" {
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
} }
module "thanos" {
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-thanos-store]\""
data_disk_size = 50
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"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["thanos"]}"
name = "thanos"
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://[email protected]/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}"
}
################################## ##################################
# #
# Console # Console
......
...@@ -206,6 +206,7 @@ variable "public_ports" { ...@@ -206,6 +206,7 @@ variable "public_ports" {
"redis" = [] "redis" = []
"sd-exporter" = [] "sd-exporter" = []
"sidekiq" = [] "sidekiq" = []
"thanos" = []
"stor" = [] "stor" = []
"web" = [] "web" = []
"monitoring" = [] "monitoring" = []
...@@ -285,6 +286,7 @@ variable "machine_types" { ...@@ -285,6 +286,7 @@ 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-standard-8"
"web" = "n1-standard-8" "web" = "n1-standard-8"
# pages and share should eventually be upgraded # pages and share should eventually be upgraded
...@@ -322,6 +324,7 @@ variable "node_count" { ...@@ -322,6 +324,7 @@ variable "node_count" {
"sidekiq-pullmirror" = 0 "sidekiq-pullmirror" = 0
"sidekiq-realtime" = 0 "sidekiq-realtime" = 0
"sidekiq-traces" = 0 "sidekiq-traces" = 0
"thanos" = 1
"stor" = 1 "stor" = 1
"multizone-stor" = 31 "multizone-stor" = 31
"web" = 3 "web" = 3
...@@ -350,6 +353,7 @@ variable "subnetworks" { ...@@ -350,6 +353,7 @@ 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"
"web" = "10.251.26.0/24" "web" = "10.251.26.0/24"
"pages" = "10.251.30.0/24" "pages" = "10.251.30.0/24"
} }
......
...@@ -262,6 +262,7 @@ variable "public_ports" { ...@@ -262,6 +262,7 @@ variable "public_ports" {
"sidekiq" = [] "sidekiq" = []
"sd-exporter" = [] "sd-exporter" = []
"stor" = [] "stor" = []
"thanos" = []
"contributors" = [80, 443] "contributors" = [80, 443]
"web" = [] "web" = []
"web-pages" = [] "web-pages" = []
...@@ -355,6 +356,7 @@ variable "machine_types" { ...@@ -355,6 +356,7 @@ 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-standard-8"
"web" = "n1-standard-16" "web" = "n1-standard-16"
"web-pages" = "n1-standard-8" "web-pages" = "n1-standard-8"
...@@ -405,6 +407,7 @@ variable "node_count" { ...@@ -405,6 +407,7 @@ variable "node_count" {
"sidekiq-realtime" = 4 "sidekiq-realtime" = 4
"sidekiq-traces" = 2 "sidekiq-traces" = 2
"stor" = 20 "stor" = 20
"thanos" = 1
"contributors" = 1 "contributors" = 1
"multizone-stor" = 12 "multizone-stor" = 12
"web" = 28 "web" = 28
...@@ -450,6 +453,7 @@ variable "subnetworks" { ...@@ -450,6 +453,7 @@ 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"
"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"
......
...@@ -254,6 +254,7 @@ variable "public_ports" { ...@@ -254,6 +254,7 @@ variable "public_ports" {
"sidekiq" = [] "sidekiq" = []
"sd-exporter" = [] "sd-exporter" = []
"stor" = [] "stor" = []
"thanos" = []
"contributors" = [80, 443] "contributors" = [80, 443]
"web" = [] "web" = []
"web-pages" = [] "web-pages" = []
...@@ -347,6 +348,7 @@ variable "machine_types" { ...@@ -347,6 +348,7 @@ 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-standard-4"
"web" = "n1-standard-16" "web" = "n1-standard-16"
"web-pages" = "n1-standard-4" "web-pages" = "n1-standard-4"
...@@ -399,6 +401,7 @@ variable "node_count" { ...@@ -399,6 +401,7 @@ variable "node_count" {
"sidekiq-realtime" = 1 "sidekiq-realtime" = 1
"sidekiq-traces" = 1 "sidekiq-traces" = 1
"stor" = 2 "stor" = 2
"thanos" = 1
"multizone-stor" = 0 "multizone-stor" = 0
"web" = 3 "web" = 3
"web-pages" = 2 "web-pages" = 2
...@@ -444,6 +447,7 @@ variable "subnetworks" { ...@@ -444,6 +447,7 @@ 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"
"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"
......
...@@ -308,6 +308,30 @@ module "blackbox" { ...@@ -308,6 +308,30 @@ module "blackbox" {
use_external_ip = true use_external_ip = true
} }
module "thanos" {
bootstrap_version = "6"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-thanos-store]\""
data_disk_size = 50
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["thanos"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["thanos"]}"
name = "thanos"
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://[email protected]/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}"
}
####################################################### #######################################################
# #
# Tenable.IO local Nessus scanner # Tenable.IO local Nessus scanner
......
...@@ -49,6 +49,7 @@ variable "machine_types" { ...@@ -49,6 +49,7 @@ 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-standard-2"
"gke-runner" = "n1-standard-2" "gke-runner" = "n1-standard-2"
"nessus" = "n1-standard-1" "nessus" = "n1-standard-1"
} }
...@@ -93,6 +94,7 @@ variable "subnetworks" { ...@@ -93,6 +94,7 @@ 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"
} }
} }
...@@ -110,6 +112,7 @@ variable "public_ports" { ...@@ -110,6 +112,7 @@ variable "public_ports" {
"blackbox" = [] "blackbox" = []
"sentry" = [443, 80] "sentry" = [443, 80]
"sd-exporter" = [] "sd-exporter" = []
"thanos" = []
"nessus" = [8834] "nessus" = [8834]
} }
} }
...@@ -129,6 +132,7 @@ variable "node_count" { ...@@ -129,6 +132,7 @@ variable "node_count" {
"runner" = 1 "runner" = 1
"sentry" = 1 "sentry" = 1
"sd-exporter" = 1 "sd-exporter" = 1
"thanos" = 1
} }
} }
......
...@@ -1385,6 +1385,31 @@ module "influxdb" { ...@@ -1385,6 +1385,31 @@ module "influxdb" {
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
} }
module "thanos" {
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-thanos-store]\""
data_disk_size = 50
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"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["thanos"]}"
name = "thanos"
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://[email protected]/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}"
}
################################## ##################################
# #
# Console # Console
......
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