From 2e3725e8a25abaac216289926fbfe59c30be058a Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 3 Oct 2023 22:56:33 +0200 Subject: staging: disable jaeger; update diplonat --- cluster/staging/app/core/deploy/diplonat.hcl | 2 +- cluster/staging/app/garage/config/garage.toml | 2 +- cluster/staging/app/telemetry/deploy/telemetry-service.hcl | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cluster/staging/app/core/deploy/diplonat.hcl b/cluster/staging/app/core/deploy/diplonat.hcl index be51f60..d8f13b2 100644 --- a/cluster/staging/app/core/deploy/diplonat.hcl +++ b/cluster/staging/app/core/deploy/diplonat.hcl @@ -22,7 +22,7 @@ job "core-diplonat" { "#iptables", "#bash", "#coreutils", - "git+https://git.deuxfleurs.fr/Deuxfleurs/diplonat.git?ref=stun&rev=f5fc635b75dfa17b83a8db4893a7be206b4f9892" + "git+https://git.deuxfleurs.fr/Deuxfleurs/diplonat.git?ref=main&rev=05872634a42bf0aef3ab0a2760e2be4590bc8b73" ] command = "diplonat" } diff --git a/cluster/staging/app/garage/config/garage.toml b/cluster/staging/app/garage/config/garage.toml index 26e0361..6c92bf3 100644 --- a/cluster/staging/app/garage/config/garage.toml +++ b/cluster/staging/app/garage/config/garage.toml @@ -38,4 +38,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://jaeger-otlp-grpc.service.staging.consul:4317" +# trace_sink = "http://jaeger-otlp-grpc.service.staging.consul:4317" diff --git a/cluster/staging/app/telemetry/deploy/telemetry-service.hcl b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl index c3b0b50..b09796a 100644 --- a/cluster/staging/app/telemetry/deploy/telemetry-service.hcl +++ b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl @@ -206,6 +206,7 @@ GF_SECURITY_ADMIN_PASSWORD={{ key "secrets/telemetry/grafana/admin_password" }} } } +/* group "jaeger" { count = 1 @@ -301,4 +302,5 @@ EOH } } } + */ } -- cgit v1.2.3