diff --git a/src/handler/http/request/search/mod.rs b/src/handler/http/request/search/mod.rs index 9601ce8549..1380383f75 100644 --- a/src/handler/http/request/search/mod.rs +++ b/src/handler/http/request/search/mod.rs @@ -24,7 +24,7 @@ use config::{ search::{SearchEventType, SearchHistoryHitResponse}, sql::resolve_stream_names, stream::StreamType, - usage::{RequestStats, UsageType}, + usage::{RequestStats, UsageType, USAGE_STREAM}, }, metrics, utils::{base64, json}, @@ -1486,7 +1486,7 @@ pub async fn search_history( req.user_email = user_id.clone(); // Search - let stream_name = "usage"; + let stream_name = USAGE_STREAM; let search_query_req = match req.to_query_req(stream_name, &cfg.common.column_timestamp) { Ok(r) => r, Err(e) => { @@ -1522,7 +1522,7 @@ pub async fn search_history( .with_label_values(&[&org_id]) .dec(); - let history_org_id = "_meta"; + let history_org_id = &cfg.common.usage_org; let stream_type = StreamType::Logs; let search_res = SearchService::search( &trace_id, @@ -1612,7 +1612,7 @@ pub async fn search_history( let num_fn = search_query_req.query.query_fn.is_some() as u16; report_request_usage_stats( req_stats, - &org_id, + history_org_id, stream_name, StreamType::Logs, UsageType::SearchHistory, diff --git a/src/handler/http/request/status/mod.rs b/src/handler/http/request/status/mod.rs index 088d9fc152..3cf4169186 100644 --- a/src/handler/http/request/status/mod.rs +++ b/src/handler/http/request/status/mod.rs @@ -110,6 +110,8 @@ struct ConfigResponse<'a> { quick_mode_enabled: bool, user_defined_schemas_enabled: bool, all_fields_name: String, + usage_enabled: bool, + usage_publish_interval: i64, } #[derive(Serialize)] @@ -267,6 +269,8 @@ pub async fn zo_config() -> Result { quick_mode_enabled: cfg.limit.quick_mode_enabled, user_defined_schemas_enabled: cfg.common.allow_user_defined_schemas, all_fields_name: cfg.common.column_all.to_string(), + usage_enabled: cfg.common.usage_enabled, + usage_publish_interval: cfg.common.usage_publish_interval, })) } diff --git a/web/src/plugins/logs/SearchHistory.vue b/web/src/plugins/logs/SearchHistory.vue index ddd3b31b84..609bd3cfb8 100644 --- a/web/src/plugins/logs/SearchHistory.vue +++ b/web/src/plugins/logs/SearchHistory.vue @@ -18,6 +18,12 @@
+
+ +
+ Search History might be delayed by {{ delayMessage }} +
+
- + + @@ -122,7 +129,7 @@