diff --git a/app/vmselect/promql/eval.go b/app/vmselect/promql/eval.go index db480a41d6..bd093dfa76 100644 --- a/app/vmselect/promql/eval.go +++ b/app/vmselect/promql/eval.go @@ -626,7 +626,7 @@ func getRollupConfigs(name string, rf rollupFunc, start, end, step, window int64 deltaValues(values) } rcs = appendRollupConfigs(rcs) - case "candlestick": + case "rollup_candlestick": rcs = append(rcs, newRollupConfig(rollupFirst, "open")) rcs = append(rcs, newRollupConfig(rollupLast, "close")) rcs = append(rcs, newRollupConfig(rollupMin, "low")) diff --git a/app/vmselect/promql/exec_test.go b/app/vmselect/promql/exec_test.go index 4c7cccbc03..9612778fe8 100644 --- a/app/vmselect/promql/exec_test.go +++ b/app/vmselect/promql/exec_test.go @@ -3213,9 +3213,9 @@ func TestExecSuccess(t *testing.T) { resultExpected := []netstorage.Result{r} f(q, resultExpected) }) - t.Run(`candlestick()`, func(t *testing.T) { + t.Run(`rollup_candlestick()`, func(t *testing.T) { t.Parallel() - q := `sort(candlestick(round(rand(0),0.01)[:10s]))` + q := `sort(rollup_candlestick(round(rand(0),0.01)[:10s]))` r1 := netstorage.Result{ MetricName: metricNameExpected, Values: []float64{0.02, 0.02, 0.03, 0, 0.03, 0.02}, diff --git a/app/vmselect/promql/rollup.go b/app/vmselect/promql/rollup.go index f0d707bd58..f7bda8e73d 100644 --- a/app/vmselect/promql/rollup.go +++ b/app/vmselect/promql/rollup.go @@ -50,7 +50,7 @@ var rollupFuncs = map[string]newRollupFunc{ "rollup_deriv": newRollupFuncOneArg(rollupFake), "rollup_delta": newRollupFuncOneArg(rollupFake), "rollup_increase": newRollupFuncOneArg(rollupFake), // + rollupFuncsRemoveCounterResets - "candlestick": newRollupFuncOneArg(rollupFake), + "rollup_candlestick": newRollupFuncOneArg(rollupFake), } var rollupFuncsMayAdjustWindow = map[string]bool{