diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2022-08-03 13:47:35 +0000 |
|---|---|---|
| committer |   Peter Mikus <peter.mikus@protonmail.ch> | 2022-08-03 13:52:27 +0000 |
| commit | 1f0d4ffc8d3fabe2bd7452760425e005c2970ff6 (patch) | |
| tree | 2150ef9875eea989a3005bcf15f96e2993f9d9d5 /fdio.infra.terraform | |
| parent | 9206429bf975b0a33aabb7741d2f59545a5cb372 (diff) | |
fix(terraform): IP addresses
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Iac8d82bf741b2f8a2fb366f024e3f1b92cfd8662
Diffstat (limited to 'fdio.infra.terraform')
6 files changed, 25 insertions, 64 deletions
diff --git a/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/variables.tf b/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/variables.tf index 7d5be09d21..569ba29c87 100644 --- a/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/variables.tf +++ b/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/variables.tf @@ -7,7 +7,7 @@ variable "nomad_acl" { variable "nomad_provider_address" { description = "FD.io Nomad cluster address." type = string - default = "http://10.32.8.14:4646" + default = "http://10.30.51.23:4646" } variable "nomad_provider_ca_file" { @@ -31,7 +31,7 @@ variable "nomad_provider_key_file" { variable "vault_provider_address" { description = "Vault cluster address." type = string - default = "http://10.30.51.28:8200" + default = "http://10.30.51.23:8200" } variable "vault_provider_skip_tls_verify" { diff --git a/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/versions.tf b/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/versions.tf index 385c5c3f18..0cabc3c6e5 100644 --- a/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/versions.tf +++ b/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/versions.tf @@ -1,6 +1,6 @@ terraform { backend "consul" { - address = "10.32.8.14:8500" + address = "consul.service.consul:8500" scheme = "http" path = "terraform/alertmanager" } diff --git a/fdio.infra.terraform/terraform-nomad-prometheus/conf/nomad/prometheus.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-prometheus/conf/nomad/prometheus.hcl.tftpl index 1e1cd0863d..e3c508dd32 100644 --- a/fdio.infra.terraform/terraform-nomad-prometheus/conf/nomad/prometheus.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-prometheus/conf/nomad/prometheus.hcl.tftpl @@ -466,62 +466,27 @@ scrape_configs: - job_name: 'Consul Cluster' static_configs: + - targets: [ '10.30.51.16:8500' ] + - targets: [ '10.30.51.17:8500' ] + - targets: [ '10.30.51.18:8500' ] + - targets: [ '10.30.51.19:8500' ] + - targets: [ '10.30.51.20:8500' ] + - targets: [ '10.30.51.21:8500' ] - targets: [ '10.30.51.22:8500' ] + - targets: [ '10.30.51.23:8500' ] - targets: [ '10.30.51.24:8500' ] - targets: [ '10.30.51.25:8500' ] - targets: [ '10.30.51.26:8500' ] - - targets: [ '10.30.51.28:8500' ] - - targets: [ '10.30.51.29:8500' ] - - targets: [ '10.30.51.30:8500' ] - - targets: [ '10.30.51.39:8500' ] - - targets: [ '10.30.51.40:8500' ] - targets: [ '10.30.51.50:8500' ] - targets: [ '10.30.51.51:8500' ] - - targets: [ '10.30.51.65:8500' ] - - targets: [ '10.30.51.66:8500' ] - - targets: [ '10.30.51.67:8500' ] - - targets: [ '10.30.51.68:8500' ] - targets: [ '10.30.51.70:8500' ] - targets: [ '10.30.51.71:8500' ] - - targets: [ '10.32.8.14:8500' ] - - targets: [ '10.32.8.15:8500' ] - - targets: [ '10.32.8.16:8500' ] - - targets: [ '10.32.8.17:8500' ] + - targets: [ '10.30.51.91:8500' ] + - targets: [ '10.30.51.92:8500' ] metrics_path: /v1/agent/metrics params: format: [ 'prometheus' ] - - job_name: 'Blackbox Exporter (icmp)' - static_configs: - - targets: [ 'gerrit.fd.io' ] - - targets: [ 'jenkins.fd.io' ] - - targets: [ '10.32.8.17' ] - params: - module: [ 'icmp_v4' ] - relabel_configs: - - source_labels: [__address__] - target_label: __param_target - - source_labels: [__param_target] - target_label: instance - - target_label: __address__ - replacement: localhost:9115 - metrics_path: /probe - - - job_name: 'Blackbox Exporter (http)' - static_configs: - - targets: [ 'gerrit.fd.io' ] - - targets: [ 'jenkins.fd.io' ] - params: - module: [ 'http_2xx' ] - relabel_configs: - - source_labels: [__address__] - target_label: __param_target - - source_labels: [__param_target] - target_label: instance - - target_label: __address__ - replacement: localhost:9115 - metrics_path: /probe - - job_name: 'Jenkins Job Health Exporter' static_configs: - targets: [ '10.30.51.22:9186' ] @@ -538,27 +503,23 @@ scrape_configs: - job_name: 'Node Exporter' static_configs: + - targets: [ '10.30.51.16:9100' ] + - targets: [ '10.30.51.17:9100' ] + - targets: [ '10.30.51.18:9100' ] + - targets: [ '10.30.51.19:9100' ] + - targets: [ '10.30.51.20:9100' ] + - targets: [ '10.30.51.21:9100' ] - targets: [ '10.30.51.22:9100' ] + - targets: [ '10.30.51.23:9100' ] - targets: [ '10.30.51.24:9100' ] - targets: [ '10.30.51.25:9100' ] - targets: [ '10.30.51.26:9100' ] - - targets: [ '10.30.51.28:9100' ] - - targets: [ '10.30.51.29:9100' ] - - targets: [ '10.30.51.30:9100' ] - - targets: [ '10.30.51.39:9100' ] - - targets: [ '10.30.51.40:9100' ] - targets: [ '10.30.51.50:9100' ] - targets: [ '10.30.51.51:9100' ] - - targets: [ '10.30.51.65:9100' ] - - targets: [ '10.30.51.66:9100' ] - - targets: [ '10.30.51.67:9100' ] - - targets: [ '10.30.51.68:9100' ] - targets: [ '10.30.51.70:9100' ] - targets: [ '10.30.51.71:9100' ] - - targets: [ '10.32.8.14:9100' ] - - targets: [ '10.32.8.15:9100' ] - - targets: [ '10.32.8.16:9100' ] - - targets: [ '10.32.8.17:9100' ] + - targets: [ '10.30.51.91:9100' ] + - targets: [ '10.30.51.92:9100' ] - job_name: 'Alertmanager' consul_sd_configs: diff --git a/fdio.infra.terraform/terraform-nomad-prometheus/fdio/variables.tf b/fdio.infra.terraform/terraform-nomad-prometheus/fdio/variables.tf index 7d5be09d21..569ba29c87 100644 --- a/fdio.infra.terraform/terraform-nomad-prometheus/fdio/variables.tf +++ b/fdio.infra.terraform/terraform-nomad-prometheus/fdio/variables.tf @@ -7,7 +7,7 @@ variable "nomad_acl" { variable "nomad_provider_address" { description = "FD.io Nomad cluster address." type = string - default = "http://10.32.8.14:4646" + default = "http://10.30.51.23:4646" } variable "nomad_provider_ca_file" { @@ -31,7 +31,7 @@ variable "nomad_provider_key_file" { variable "vault_provider_address" { description = "Vault cluster address." type = string - default = "http://10.30.51.28:8200" + default = "http://10.30.51.23:8200" } variable "vault_provider_skip_tls_verify" { diff --git a/fdio.infra.terraform/terraform-nomad-prometheus/fdio/versions.tf b/fdio.infra.terraform/terraform-nomad-prometheus/fdio/versions.tf index f83709d154..409f47958f 100644 --- a/fdio.infra.terraform/terraform-nomad-prometheus/fdio/versions.tf +++ b/fdio.infra.terraform/terraform-nomad-prometheus/fdio/versions.tf @@ -1,6 +1,6 @@ terraform { backend "consul" { - address = "10.32.8.14:8500" + address = "consul.service.consul:8500" scheme = "http" path = "terraform/prometheus" } diff --git a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf index e36ed08473..ed4ecc007d 100644 --- a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf +++ b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf @@ -1,7 +1,7 @@ variable "vault_provider_address" { description = "Vault cluster address." type = string - default = "http://10.30.51.28:8200" + default = "vault.service.consul:8200" } variable "vault_provider_skip_tls_verify" { |