Commit 5ff787c2 authored by Craig Furman's avatar Craig Furman

Merge branch 'craigf/prom-disks-reflect-reality' into 'master'

Change prometheus disk config to reflect reality

See merge request !858
parents deed54d1 9e6dcafd
......@@ -1254,7 +1254,7 @@ module "prometheus" {
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus]\""
data_disk_size = "${var.data_disk_sizes["prometheus"]}"
data_disk_type = "pd-ssd"
data_disk_type = "pd-standard"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
......@@ -1283,7 +1283,7 @@ module "prometheus-app" {
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus-app]\""
data_disk_size = "${var.data_disk_sizes["prometheus"]}"
data_disk_type = "pd-ssd"
data_disk_type = "pd-standard"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
......@@ -1311,8 +1311,8 @@ module "prometheus-db" {
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus-db]\""
data_disk_size = "${var.data_disk_sizes["prometheus"]}"
data_disk_type = "pd-ssd"
data_disk_size = "${var.data_disk_sizes["prometheus-db"]}"
data_disk_type = "pd-standard"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
......
......@@ -313,11 +313,12 @@ variable "data_disk_sizes" {
type = "map"
default = {
"file" = "16000"
"share" = "20000"
"pages" = "16000"
"patroni" = "4000"
"prometheus" = "100"
"file" = "16000"
"share" = "20000"
"pages" = "16000"
"patroni" = "4000"
"prometheus" = "4000"
"prometheus-db" = "2000"
}
}
......
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