Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5bf18a8

Browse files
committed
fix: remove metrics series limit
1 parent60b3cac commit5bf18a8

File tree

3 files changed

+3
-19
lines changed

3 files changed

+3
-19
lines changed

‎src/config/src/config.rs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,8 +1324,6 @@ pub struct Limit {
13241324
pubmetrics_leader_push_interval:u64,
13251325
#[env_config(name ="ZO_METRICS_LEADER_ELECTION_INTERVAL",default =30)]
13261326
pubmetrics_leader_election_interval:i64,
1327-
#[env_config(name ="ZO_METRICS_MAX_SERIES_PER_QUERY",default =30000)]
1328-
pubmetrics_max_series_per_query:usize,
13291327
#[env_config(name ="ZO_METRICS_MAX_POINTS_PER_SERIES",default =30000)]
13301328
pubmetrics_max_points_per_series:usize,
13311329
#[env_config(name ="ZO_METRICS_CACHE_MAX_ENTRIES",default =10000)]
@@ -2365,9 +2363,6 @@ fn check_common_config(cfg: &mut Config) -> Result<(), anyhow::Error> {
23652363
}
23662364

23672365
// check for metrics limit
2368-
if cfg.limit.metrics_max_series_per_query ==0{
2369-
cfg.limit.metrics_max_series_per_query =30_000;
2370-
}
23712366
if cfg.limit.metrics_max_points_per_series ==0{
23722367
cfg.limit.metrics_max_points_per_series =30_000;
23732368
}

‎src/service/promql/engine.rs‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use datafusion::{
2828
datatypes::{DataType,Schema},
2929
},
3030
error::{DataFusionError,Result},
31-
functions_aggregate::min_max::max,
31+
functions_aggregate::min_max::min,
3232
prelude::{DataFrame,SessionContext, col, lit},
3333
};
3434
use futures::{TryStreamExt, future::try_join_all};
@@ -48,8 +48,7 @@ use super::{
4848
utils::{apply_label_selector, apply_matchers},
4949
};
5050
usecrate::service::promql::{
51-
DEFAULT_MAX_SERIES_PER_QUERY, aggregations, binaries, functions, micros,
52-
rewrite::remove_filter_all, value::*,
51+
aggregations, binaries, functions, micros, rewrite::remove_filter_all, value::*,
5352
};
5453

5554
pubstructEngine{
@@ -1122,7 +1121,6 @@ async fn selector_load_data_from_datafusion(
11221121
label_selector:&Option<HashSet<String>>,
11231122
query_exemplars:bool,
11241123
) ->Result<HashMap<HashLabelValue,RangeValue>>{
1125-
let cfg = config::get_config();
11261124
let table_name = selector.name.as_ref().unwrap();
11271125
letmut df_group =match ctx.table(table_name).await{
11281126
Ok(v) => v.filter(
@@ -1168,22 +1166,14 @@ async fn selector_load_data_from_datafusion(
11681166
})
11691167
.collect::<Vec<_>>();
11701168

1171-
let max_series =if cfg.limit.metrics_max_series_per_query >0{
1172-
cfg.limit.metrics_max_series_per_query
1173-
}else{
1174-
DEFAULT_MAX_SERIES_PER_QUERY
1175-
};
1176-
11771169
// get hash & timestamp
11781170
let start_time = std::time::Instant::now();
11791171
let sub_batch = df_group
11801172
.clone()
11811173
.aggregate(
11821174
vec![col(HASH_LABEL)],
1183-
vec![max(col(TIMESTAMP_COL_NAME)).alias(TIMESTAMP_COL_NAME)],
1175+
vec![min(col(TIMESTAMP_COL_NAME)).alias(TIMESTAMP_COL_NAME)],
11841176
)?
1185-
.sort(vec![col(HASH_LABEL).sort(true,true)])?
1186-
.limit(0,Some(max_series))?
11871177
.collect()
11881178
.await?;
11891179

‎src/service/promql/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ pub(crate) const DEFAULT_LOOKBACK: Duration = Duration::from_secs(300); // 5m
4646
pub(crate)constMINIMAL_INTERVAL:Duration =Duration::from_secs(1);// 1s
4747
pub(crate)constMAX_DATA_POINTS:i64 =256;// Width of panel: window.innerWidth / 4
4848
pub(crate)constDEFAULT_MAX_POINTS_PER_SERIES:usize =30000;// Maximum number of points per series
49-
constDEFAULT_MAX_SERIES_PER_QUERY:usize =30000;// Maximum number of series in a single query
5049
constDEFAULT_STEP:Duration =Duration::from_secs(15);// default step in seconds
5150
constMIN_TIMESERIES_POINTS_FOR_TIME_ROUNDING:i64 =10;// Adjust this value as needed
5251

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp