Commit 1ffb6206 authored by John Jarvis's avatar John Jarvis

Jarv/allow connections from dashboards

parent af661fb9
../../shared/gstg-gprd/variables.tf
\ No newline at end of file
......@@ -130,6 +130,8 @@ module "prometheus" {
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)}"
fw_whitelist_ports = "${var.monitoring_whitelist_prometheus["ports"]}"
machine_type = "${var.machine_types["monitoring"]}"
name = "prometheus"
node_count = "${var.node_count["prometheus"]}"
......@@ -147,6 +149,7 @@ module "prometheus" {
tier = "inf"
use_external_ip = true
use_new_node_name = true
vpc = "${module.network.self_link}"
}
module "prometheus-app" {
......@@ -158,6 +161,8 @@ module "prometheus-app" {
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)}"
fw_whitelist_ports = "${var.monitoring_whitelist_prometheus["ports"]}"
machine_type = "${var.machine_types["monitoring"]}"
name = "prometheus-app"
node_count = "${var.node_count["prometheus-app"]}"
......@@ -174,6 +179,7 @@ module "prometheus-app" {
tier = "inf"
use_external_ip = true
use_new_node_name = true
vpc = "${module.network.self_link}"
}
module "sd-exporter" {
......
......@@ -87,6 +87,15 @@ variable "internal_subnets" {
default = ["10.232.0.0/13", "10.250.7.0/24", "10.250.10.0/24", "10.250.12.0/24", "10.12.0.0/14"]
}
variable "other_monitoring_subnets" {
type = "list"
# 10.219.1.0/24: gprd
# 10.251.17.0/24: dr
# Left empty for preprod
default = []
}
# The pre network is allocated
# 10.232.0.0/13
# First IP: 10.232.0.0
......
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