aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cluster/prod/app/telemetry/config/prometheus.yml12
-rw-r--r--cluster/prod/app/telemetry/deploy/telemetry-service.hcl (renamed from cluster/prod/app/telemetry/deploy/telemetry.hcl)10
2 files changed, 11 insertions, 11 deletions
diff --git a/cluster/prod/app/telemetry/config/prometheus.yml b/cluster/prod/app/telemetry/config/prometheus.yml
index 6525513..fd426cc 100644
--- a/cluster/prod/app/telemetry/config/prometheus.yml
+++ b/cluster/prod/app/telemetry/config/prometheus.yml
@@ -12,7 +12,7 @@ scrape_configs:
services:
- 'node-exporter'
tls_config:
- ca_file: /etc/prometheus/consul.crt
+ ca_file: /etc/prometheus/consul-ca.crt
cert_file: /etc/prometheus/consul-client.crt
key_file: /etc/prometheus/consul-client.key
@@ -22,7 +22,7 @@ scrape_configs:
services:
- 'tricot-metrics'
tls_config:
- ca_file: /etc/prometheus/consul.crt
+ ca_file: /etc/prometheus/consul-ca.crt
cert_file: /etc/prometheus/consul-client.crt
key_file: /etc/prometheus/consul-client.key
@@ -35,7 +35,7 @@ scrape_configs:
services:
- 'garage-admin'
tls_config:
- ca_file: /etc/prometheus/consul.crt
+ ca_file: /etc/prometheus/consul-ca.crt
cert_file: /etc/prometheus/consul-client.crt
key_file: /etc/prometheus/consul-client.key
@@ -48,7 +48,7 @@ scrape_configs:
services:
- 'drone'
tls_config:
- ca_file: /etc/prometheus/consul.crt
+ ca_file: /etc/prometheus/consul-ca.crt
cert_file: /etc/prometheus/consul-client.crt
key_file: /etc/prometheus/consul-client.key
@@ -63,7 +63,7 @@ scrape_configs:
format: ['prometheus']
scheme: 'https'
tls_config:
- ca_file: /etc/prometheus/nomad.crt
+ ca_file: /etc/prometheus/nomad-ca.crt
cert_file: /etc/prometheus/nomad-client.crt
key_file: /etc/prometheus/nomad-client.key
insecure_skip_verify: true
@@ -72,6 +72,6 @@ scrape_configs:
services:
- 'nomad-client'
tls_config:
- ca_file: /etc/prometheus/consul.crt
+ ca_file: /etc/prometheus/consul-ca.crt
cert_file: /etc/prometheus/consul-client.crt
key_file: /etc/prometheus/consul-client.key
diff --git a/cluster/prod/app/telemetry/deploy/telemetry.hcl b/cluster/prod/app/telemetry/deploy/telemetry-service.hcl
index 8a7dbcc..4790cbd 100644
--- a/cluster/prod/app/telemetry/deploy/telemetry.hcl
+++ b/cluster/prod/app/telemetry/deploy/telemetry-service.hcl
@@ -1,4 +1,4 @@
-job "telemetry" {
+job "telemetry-service" {
datacenters = ["neptune", "bespin"]
type = "service"
@@ -40,8 +40,8 @@ job "telemetry" {
}
template {
- data = "{{ key \"secrets/consul/consul.crt\" }}"
- destination = "secrets/consul.crt"
+ data = "{{ key \"secrets/consul/consul-ca.crt\" }}"
+ destination = "secrets/consul-ca.crt"
}
template {
@@ -55,8 +55,8 @@ job "telemetry" {
}
template {
- data = "{{ key \"secrets/nomad/nomad.crt\" }}"
- destination = "secrets/nomad.crt"
+ data = "{{ key \"secrets/nomad/nomad-ca.crt\" }}"
+ destination = "secrets/nomad-ca.crt"
}
template {