From 97858a14337cf8412b6eb44188bdf1f7946e576b Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 8 Mar 2022 14:28:57 +0100
Subject: [PATCH] fix logging

---
 app/frontend/deploy/frontend-tricot.hcl | 2 +-
 app/garage-staging/deploy/garage.hcl    | 3 ---
 app/telemetry/config/filebeat.yml       | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/frontend/deploy/frontend-tricot.hcl b/app/frontend/deploy/frontend-tricot.hcl
index 988c3ee..e7e1106 100644
--- a/app/frontend/deploy/frontend-tricot.hcl
+++ b/app/frontend/deploy/frontend-tricot.hcl
@@ -58,7 +58,7 @@ TRICOT_CONSUL_HOST=https://localhost:8501
 TRICOT_CONSUL_CA_CERT=/etc/tricot/consul-ca.crt
 TRICOT_CONSUL_CLIENT_CERT=/etc/tricot/consul-client.crt
 TRICOT_CONSUL_CLIENT_KEY=/etc/tricot/consul-client.key
-RUST_LOG=tricot=trace
+RUST_LOG=tricot=debug
 EOH
         destination = "secrets/env"
         env = true
diff --git a/app/garage-staging/deploy/garage.hcl b/app/garage-staging/deploy/garage.hcl
index 8164edc..342d506 100644
--- a/app/garage-staging/deploy/garage.hcl
+++ b/app/garage-staging/deploy/garage.hcl
@@ -37,9 +37,6 @@ job "garage-staging" {
           "/mnt/ssd/garage-staging/meta:/meta",
           "secrets/garage.toml:/etc/garage.toml",
         ]
-        logging {
-          type = "journald"
-        }
       }
 
       template {
diff --git a/app/telemetry/config/filebeat.yml b/app/telemetry/config/filebeat.yml
index 6967d97..310afd1 100644
--- a/app/telemetry/config/filebeat.yml
+++ b/app/telemetry/config/filebeat.yml
@@ -33,8 +33,8 @@ processors:
 #========================== Elasticsearch output ===============================
 output.elasticsearch:
   hosts: ["localhost:9200"]
-  username: beats_system
-  password: {{ key "secrets/telemetry/elastic_passwords/beats_system" }}
+  username: elastic
+  password: {{ key "secrets/telemetry/elastic_passwords/elastic" }}
 
 #============================== Dashboards =====================================
 setup.dashboards: