From 32658ff4d3bf3c45be307a8b6eef9a64872d4bd5 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 26 Sep 2022 15:53:32 +0200 Subject: Add jaeger service to staging to view Garage traces --- cluster/staging/app/garage/config/garage.toml | 2 +- cluster/staging/app/garage/deploy/garage.hcl | 2 +- cluster/staging/app/telemetry/deploy/telemetry.hcl | 125 ++++++++++++++++++--- 3 files changed, 111 insertions(+), 18 deletions(-) (limited to 'cluster/staging') diff --git a/cluster/staging/app/garage/config/garage.toml b/cluster/staging/app/garage/config/garage.toml index 19ee22f..1cb3c6f 100644 --- a/cluster/staging/app/garage/config/garage.toml +++ b/cluster/staging/app/garage/config/garage.toml @@ -30,4 +30,4 @@ index = "index.html" api_bind_addr = "0.0.0.0:3909" admin_token = "{{ key "secrets/garage-staging/admin_token" | trimSpace }}" metrics_token = "{{ key "secrets/garage-staging/metrics_token" | trimSpace }}" -#trace_sink = "http://{{ env "attr.unique.network.ip-address" }}:4317" +trace_sink = "http://jaeger-otlp-grpc.service.staging.consul:4317" diff --git a/cluster/staging/app/garage/deploy/garage.hcl b/cluster/staging/app/garage/deploy/garage.hcl index fee8b59..55f8d75 100644 --- a/cluster/staging/app/garage/deploy/garage.hcl +++ b/cluster/staging/app/garage/deploy/garage.hcl @@ -79,7 +79,7 @@ job "garage-staging" { resources { memory = 2000 memory_max = 3000 - cpu = 1000 + cpu = 500 } kill_signal = "SIGINT" diff --git a/cluster/staging/app/telemetry/deploy/telemetry.hcl b/cluster/staging/app/telemetry/deploy/telemetry.hcl index cfd26f3..b141781 100644 --- a/cluster/staging/app/telemetry/deploy/telemetry.hcl +++ b/cluster/staging/app/telemetry/deploy/telemetry.hcl @@ -44,7 +44,7 @@ job "telemetry" { resources { memory = 500 - cpu = 500 + cpu = 200 } service { @@ -102,8 +102,8 @@ job "telemetry" { } resources { - memory = 200 - cpu = 1000 + memory = 100 + cpu = 100 } } @@ -114,36 +114,36 @@ job "telemetry" { network_mode = "host" ports = [ "grafana" ] volumes = [ - "../alloc/data:/var/lib/grafana", + "../alloc/data:/var/lib/grafana", "secrets/prometheus.yaml:/etc/grafana/provisioning/datasources/prometheus.yaml" ] } template { data = file("../config/grafana-datasource-prometheus.yaml") - destination = "secrets/prometheus.yaml" + destination = "secrets/prometheus.yaml" } template { data = <