Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5669,6 +5669,11 @@ enum RumActions {
help = "RUM query filter (e.g. '@type:error @application.name:\"My App\"')"
)]
query: Option<String>,
#[arg(
long,
help = "Filter to a specific user by email — prepends @usr.email:<value> to the query"
)]
user_email: Option<String>,
#[arg(long, default_value = "1h", help = "Start time")]
from: String,
#[arg(long, default_value = "now", help = "End time")]
Expand Down Expand Up @@ -12066,16 +12071,29 @@ async fn main_inner() -> anyhow::Result<()> {
},
RumActions::Aggregate {
query,
user_email,
from,
to,
compute,
group_by,
limit,
} => {
let base_query = query.unwrap_or_default();
let effective_query = match user_email {
Some(email) => {
let email_filter = format!("@usr.email:{email}");
if base_query.is_empty() {
email_filter
} else {
format!("{email_filter} {base_query}")
}
}
None => base_query,
};
commands::rum::aggregate(
&cfg,
commands::rum::RumAggregateArgs {
query: query.unwrap_or_default(),
query: effective_query,
from,
to,
compute: commands::rum::split_rum_compute_args(&compute),
Expand Down
Loading