From 50555d89d3cac5b2423358d2894022bd74182fc6 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Wed, 11 Mar 2020 16:43:25 +0200 Subject: [PATCH] app/vmselect: add `-search.maxStalenessInterval` for tuning Prometheus data model closer to Influx-style data model --- app/vmselect/promql/rollup.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/vmselect/promql/rollup.go b/app/vmselect/promql/rollup.go index 96b943c036..977c7ec95d 100644 --- a/app/vmselect/promql/rollup.go +++ b/app/vmselect/promql/rollup.go @@ -1,6 +1,7 @@ package promql import ( + "flag" "fmt" "math" "strings" @@ -14,6 +15,10 @@ import ( "github.com/valyala/histogram" ) +var maxStalenessInterval = flag.Duration("search.maxStalenessInterval", 0, "The maximum interval for staleness calculations. "+ + "By default it is automatically calculated from the median interval between samples. This flag can be useful for tuning "+ + "Prometheus data model closer to Influx-style data model. See https://prometheus.io/docs/prometheus/latest/querying/basics/#staleness for details") + var rollupFuncs = map[string]newRollupFunc{ // Standard rollup funcs from PromQL. // See funcs accepting range-vector on https://prometheus.io/docs/prometheus/latest/querying/functions/ . @@ -440,6 +445,11 @@ func (rc *rollupConfig) doInternal(dstValues []float64, tsm *timeseriesMap, valu dstValues = decimal.ExtendFloat64sCapacity(dstValues, len(rc.Timestamps)) scrapeInterval := getScrapeInterval(timestamps) + if *maxStalenessInterval > 0 { + if si := maxStalenessInterval.Milliseconds(); scrapeInterval > si { + scrapeInterval = si + } + } maxPrevInterval := getMaxPrevInterval(scrapeInterval) if rc.LookbackDelta > 0 && maxPrevInterval > rc.LookbackDelta { maxPrevInterval = rc.LookbackDelta