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

Merge branch 'shrink-prometheus-data-disks' into 'master'

Shrink Prometheus data disks

See merge request !750
parents da75b6bd aafce15e
......@@ -685,12 +685,11 @@ module "monitoring-lb" {
#######################
module "prometheus" {
attach_data_disk = true
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus]\""
data_disk_size = 1500
data_disk_type = "pd-standard"
data_disk_size = 50
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
......@@ -707,7 +706,7 @@ module "prometheus" {
service_account_email = "${var.service_account_email}"
service_path = "/graph"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus"))}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.2"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.3"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -716,12 +715,11 @@ module "prometheus" {
}
module "prometheus-app" {
attach_data_disk = true
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus-app]\""
data_disk_size = 1000
data_disk_type = "pd-standard"
data_disk_size = 50
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
......@@ -738,7 +736,7 @@ module "prometheus-app" {
service_account_email = "${var.service_account_email}"
service_path = "/graph"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus-app"))}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.2"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.3"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......
......@@ -312,10 +312,11 @@ variable "data_disk_sizes" {
type = "map"
default = {
"file" = "16000"
"share" = "20000"
"pages" = "16000"
"patroni" = "4000"
"file" = "16000"
"share" = "20000"
"pages" = "16000"
"patroni" = "4000"
"prometheus" = "100"
}
}
......
......@@ -304,10 +304,11 @@ variable "data_disk_sizes" {
type = "map"
default = {
"file" = "2000"
"share" = "1500"
"pages" = "16000"
"patroni" = "1500"
"file" = "2000"
"share" = "1500"
"pages" = "16000"
"patroni" = "1500"
"prometheus" = "50"
}
}
......
......@@ -182,12 +182,11 @@ module "monitoring-lb" {
#######################
module "prometheus" {
attach_data_disk = true
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus]\""
data_disk_size = 1000
data_disk_type = "pd-standard"
data_disk_size = 50
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
machine_type = "${var.machine_types["monitoring"]}"
......@@ -201,7 +200,7 @@ module "prometheus" {
service_account_email = "${var.service_account_email}"
service_path = "/graph"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus"))}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.3"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -209,12 +208,11 @@ module "prometheus" {
}
module "prometheus-app" {
attach_data_disk = true
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus-app]\""
data_disk_size = 1000
data_disk_type = "pd-standard"
data_disk_size = 50
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
machine_type = "${var.machine_types["monitoring"]}"
......@@ -228,7 +226,7 @@ module "prometheus-app" {
service_account_email = "${var.service_account_email}"
service_path = "/graph"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus-app"))}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.3"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -236,7 +234,6 @@ module "prometheus-app" {
}
module "alerts" {
attach_data_disk = true
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-alerts]\""
......@@ -262,7 +259,6 @@ module "alerts" {
}
module "thanos-query" {
attach_data_disk = true
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-thanos-query]\""
......
......@@ -88,11 +88,10 @@ module "monitoring-lb" {
#######################
module "prometheus" {
attach_data_disk = true
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus]\""
data_disk_size = 1000
data_disk_size = 50
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
......@@ -119,11 +118,10 @@ module "prometheus" {
}
module "prometheus-app" {
attach_data_disk = true
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus-app]\""
data_disk_size = 1000
data_disk_size = 50
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
......
......@@ -1190,12 +1190,11 @@ module "monitoring-lb" {
#######################
module "prometheus" {
attach_data_disk = true
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus]\""
data_disk_size = 4000
data_disk_type = "pd-standard"
data_disk_size = "${var.data_disk_sizes["prometheus"]}"
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
......@@ -1212,7 +1211,7 @@ module "prometheus" {
service_account_email = "${var.service_account_email}"
service_path = "/graph"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus"))}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.3"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -1221,12 +1220,11 @@ module "prometheus" {
}
module "prometheus-app" {
attach_data_disk = true
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus-app]\""
data_disk_size = 4000
data_disk_type = "pd-standard"
data_disk_size = "${var.data_disk_sizes["prometheus"]}"
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
......@@ -1243,7 +1241,7 @@ module "prometheus-app" {
service_account_email = "${var.service_account_email}"
service_path = "/graph"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus-app"))}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.3"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -1252,12 +1250,11 @@ module "prometheus-app" {
}
module "prometheus-db" {
attach_data_disk = true
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus-db]\""
data_disk_size = 2000
data_disk_type = "pd-standard"
data_disk_size = "${var.data_disk_sizes["prometheus"]}"
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
......@@ -1274,7 +1271,7 @@ module "prometheus-db" {
service_account_email = "${var.service_account_email}"
service_path = "/graph"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus-db"))}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.3"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -1283,7 +1280,6 @@ module "prometheus-db" {
}
module "alerts" {
attach_data_disk = true
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-alerts]\""
......
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