From eb7dae4583b28ace35e5faa314738f7e011a7251 Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Wed, 7 Jun 2023 17:32:36 +0200 Subject: [PATCH] Loki: Improve error message when step too low (#9641) **What this PR does / why we need it**: In https://github.com/grafana/grafana/pull/69648 we are in Grafana introducing a step editor in Loki. Unfortunately, the error message when user sets too low step parameter is hard to understand, so I am proposing following change to make it more understandable and actionable. Let me know what do you think. --------- Co-authored-by: J Stickler --- pkg/loghttp/query.go | 2 +- pkg/querier/queryrange/queryrangebase/query_range.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/loghttp/query.go b/pkg/loghttp/query.go index acd37c341283..bc3b8a1265de 100644 --- a/pkg/loghttp/query.go +++ b/pkg/loghttp/query.go @@ -18,7 +18,7 @@ import ( var ( errEndBeforeStart = errors.New("end timestamp must not be before or equal to start time") errNegativeStep = errors.New("zero or negative query resolution step widths are not accepted. Try a positive integer") - errStepTooSmall = errors.New("exceeded maximum resolution of 11,000 points per timeseries. Try decreasing the query resolution (?step=XX)") + errStepTooSmall = errors.New("exceeded maximum resolution of 11,000 points per time series. Try increasing the value of the step parameter") errNegativeInterval = errors.New("interval must be >= 0") ) diff --git a/pkg/querier/queryrange/queryrangebase/query_range.go b/pkg/querier/queryrange/queryrangebase/query_range.go index 5e7ad793ca29..35b26b5df6a5 100644 --- a/pkg/querier/queryrange/queryrangebase/query_range.go +++ b/pkg/querier/queryrange/queryrangebase/query_range.go @@ -38,7 +38,7 @@ var ( }.Froze() errEndBeforeStart = httpgrpc.Errorf(http.StatusBadRequest, "end timestamp must not be before start time") errNegativeStep = httpgrpc.Errorf(http.StatusBadRequest, "zero or negative query resolution step widths are not accepted. Try a positive integer") - errStepTooSmall = httpgrpc.Errorf(http.StatusBadRequest, "exceeded maximum resolution of 11,000 points per timeseries. Try decreasing the query resolution (?step=XX)") + errStepTooSmall = httpgrpc.Errorf(http.StatusBadRequest, "exceeded maximum resolution of 11,000 points per time series. Try increasing the value of the step parameter") // PrometheusCodec is a codec to encode and decode Prometheus query range requests and responses. PrometheusCodec Codec = &prometheusCodec{}