From 2eeabd5381720277b1f8b03854ba526548d9ab58 Mon Sep 17 00:00:00 2001 From: David Craven Date: Mon, 10 Feb 2025 16:15:59 +0100 Subject: [PATCH] Add since argument. --- tc-cli/src/lib.rs | 4 ++-- tc-cli/src/loki.rs | 4 ++-- tc-cli/src/main.rs | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tc-cli/src/lib.rs b/tc-cli/src/lib.rs index 374cf253e..462f09774 100644 --- a/tc-cli/src/lib.rs +++ b/tc-cli/src/lib.rs @@ -1071,8 +1071,8 @@ impl Tc { self.msg.text(id, line.into()).await } - pub async fn log(&self, query: Query) -> Result { - let logs = loki::logs(query).await?; + pub async fn log(&self, query: Query, since: String) -> Result { + let logs = loki::logs(query, since).await?; self.print_table(None, "logs", logs).await } } diff --git a/tc-cli/src/loki.rs b/tc-cli/src/loki.rs index 40feaeca9..d3ad5517d 100644 --- a/tc-cli/src/loki.rs +++ b/tc-cli/src/loki.rs @@ -176,7 +176,7 @@ impl std::str::FromStr for Log { } } -pub async fn logs(query: Query) -> Result> { +pub async fn logs(query: Query, since: String) -> Result> { let query = query.to_string(); log::info!("{query}"); let env = Loki::from_env()?; @@ -185,7 +185,7 @@ pub async fn logs(query: Query) -> Result> { let req = client .get(url) .basic_auth(env.loki_username, Some(env.loki_password)) - .query(&Request { query, since: "30d".into() }) + .query(&Request { query, since }) .build() .context("invalid request")?; log::debug!("GET {}", req.url()); diff --git a/tc-cli/src/main.rs b/tc-cli/src/main.rs index b6fd64e5f..9eb767836 100644 --- a/tc-cli/src/main.rs +++ b/tc-cli/src/main.rs @@ -169,6 +169,8 @@ enum Command { Log { #[clap(subcommand)] query: Query, + #[arg(long, default_value = "7d")] + since: String, }, ForceShardOffline { shard_id: ShardId, @@ -420,8 +422,8 @@ async fn real_main() -> Result<()> { } } }, - Command::Log { query } => { - tc.log(query).await?; + Command::Log { query, since } => { + tc.log(query, since).await?; }, Command::ForceShardOffline { shard_id } => { tc.force_shard_offline(shard_id).await?;