From bb0dd71c59d373a40ba4f23ca557216fbc4d2394 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Wed, 28 Sep 2022 14:22:58 -0700
Subject: [PATCH] Fix jaeger badger config and uid

Apparently "30d" as a ttl value breaks badger, but "720h" is okay.

Also, run the process as the jaeger user.

Change-Id: I00ad6b529aa86b0051343f828e05df8212b34656
---
 playbooks/roles/jaeger/templates/docker-compose.yaml.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/playbooks/roles/jaeger/templates/docker-compose.yaml.j2 b/playbooks/roles/jaeger/templates/docker-compose.yaml.j2
index 467e956041..d9388ba584 100644
--- a/playbooks/roles/jaeger/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/jaeger/templates/docker-compose.yaml.j2
@@ -12,7 +12,7 @@ services:
       - BADGER_EPHEMERAL=false
       - BADGER_DIRECTORY_VALUE=/badger/data
       - BADGER_DIRECTORY_KEY=/badger/key
-      - BADGER_SPAN_STORE_TTL=30d
+      - BADGER_SPAN_STORE_TTL=720h
       - COLLECTOR_OTLP_ENABLED=true
       - COLLECTOR_OTLP_GRPC_TLS_ENABLED=true
       - COLLECTOR_OTLP_GRPC_TLS_CERT=/tls/certs/cert.pem
@@ -21,3 +21,4 @@ services:
     volumes:
       - /var/jaeger/badger:/badger
       - /var/jaeger/tls:/tls
+    user: "{{ jaeger_uid }}:{{ jaeger_gid }}"