Commit b84284be authored by John Skarbek's avatar John Skarbek
Browse files

Merge branch 'bjk/smaller_am_nodes' into 'master'

Use smaller nodes for monitoring.

See merge request !583
parents 90beb025 a9b2e042
......@@ -324,6 +324,7 @@ variable "machine_types" {
type = "map"
default = {
"alerts" = "n1-standard-1"
"api" = "n1-standard-16"
"bastion" = "g1-small"
"blackbox" = "n1-standard-1"
......
......@@ -315,6 +315,7 @@ variable "machine_types" {
type = "map"
default = {
"alerts" = "n1-standard-1"
"api" = "n1-standard-16"
"bastion" = "g1-small"
"blackbox" = "n1-standard-1"
......
......@@ -233,7 +233,7 @@ module "alerts" {
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
health_check = "tcp"
machine_type = "${var.machine_types["monitoring"]}"
machine_type = "${var.machine_types["alerts"]}"
name = "alerts"
node_count = "${var.node_count["alerts"]}"
oauth2_client_id = "${var.oauth2_client_id_monitoring}"
......
......@@ -32,13 +32,14 @@ variable "machine_types" {
type = "map"
default = {
"alerts" = "n1-standard-1"
"log-proxy" = "n1-standard-1"
"proxy" = "n1-standard-1"
"bastion" = "n1-standard-1"
"dashboards" = "n1-standard-4"
"dashboards-com" = "n1-highmem-16"
"dashboards" = "n1-standard-2"
"dashboards-com" = "n1-standard-4"
"monitor" = "n1-standard-8"
"monitoring" = "n1-standard-8"
"monitoring" = "n1-standard-2"
"gitlab-ops" = "n1-standard-16"
"runner-build" = "n1-standard-32"
"runner-chatops" = "n1-standard-8"
......
......@@ -1295,7 +1295,7 @@ module "alerts" {
fw_whitelist_ports = "${var.monitoring_whitelist_alerts["ports"]}"
health_check = "tcp"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["monitoring"]}"
machine_type = "${var.machine_types["alerts"]}"
name = "alerts"
node_count = "${var.node_count["alerts"]}"
oauth2_client_id = "${var.oauth2_client_id_monitoring}"
......
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