mirror of
https://github.com/hanzoai/metrics.git
synced 2026-10-30 20:03:39 +00:00
6a860132ba
This change validates that QueryRange() method for prometheus datasource receives response with `matrix` data type. It would throw an error otherwise. The change is needed to avoid confusions like in https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9779. The fix is not elegant, but it should be simple from code support perspective. So each API has its own parsing function. Even if some processing code is repeated. --------- Signed-off-by: hagen1778 <[email protected]> Co-authored-by: Andrii Chubatiuk <[email protected]>
82 lines
2.7 KiB
Go
82 lines
2.7 KiB
Go
package datasource
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"time"
|
|
)
|
|
|
|
func (c *Client) setVLogsInstantReqParams(r *http.Request, query string, timestamp time.Time) {
|
|
// there is no type path prefix in victorialogs APIs right now, ignore appendTypePrefix.
|
|
if !*disablePathAppend {
|
|
r.URL.Path += "/select/logsql/stats_query"
|
|
}
|
|
q := r.URL.Query()
|
|
// set `time` param explicitly, it will be used as the timestamp of query results.
|
|
q.Set("time", timestamp.Format(time.RFC3339))
|
|
// set the `start` and `end` params if applyIntervalAsTimeFilter is enabled(time filter is missing in the rule expr),
|
|
// so the query will be executed in time range [timestamp - evaluationInterval, timestamp].
|
|
if c.applyIntervalAsTimeFilter && c.evaluationInterval > 0 {
|
|
q.Set("start", timestamp.Add(-c.evaluationInterval).Format(time.RFC3339))
|
|
q.Set("end", timestamp.Format(time.RFC3339))
|
|
}
|
|
r.URL.RawQuery = q.Encode()
|
|
c.setReqParams(r, query)
|
|
}
|
|
|
|
func (c *Client) setVLogsRangeReqParams(r *http.Request, query string, start, end time.Time) {
|
|
// there is no type path prefix in victorialogs APIs right now, ignore appendTypePrefix.
|
|
if !*disablePathAppend {
|
|
r.URL.Path += "/select/logsql/stats_query_range"
|
|
}
|
|
q := r.URL.Query()
|
|
q.Add("start", start.Format(time.RFC3339))
|
|
q.Add("end", end.Format(time.RFC3339))
|
|
// set step as evaluationInterval by default
|
|
if c.evaluationInterval > 0 {
|
|
q.Set("step", fmt.Sprintf("%ds", int(c.evaluationInterval.Seconds())))
|
|
}
|
|
r.URL.RawQuery = q.Encode()
|
|
c.setReqParams(r, query)
|
|
}
|
|
|
|
func parseVLogsInstantResponse(resp *http.Response) (res Result, err error) {
|
|
res, err = parsePrometheusInstantResponse(resp)
|
|
if err != nil {
|
|
return Result{}, err
|
|
}
|
|
for i := range res.Data {
|
|
m := &res.Data[i]
|
|
for j := range m.Labels {
|
|
// reserve the stats func result name with a new label `stats_result` instead of dropping it,
|
|
// since there could be multiple stats results in a single query, for instance:
|
|
// _time:5m | stats quantile(0.5, request_duration_seconds) p50, quantile(0.9, request_duration_seconds) p90
|
|
if m.Labels[j].Name == "__name__" {
|
|
m.Labels[j].Name = "stats_result"
|
|
break
|
|
}
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func parseVLogsRangeResponse(resp *http.Response) (res Result, err error) {
|
|
res, err = parsePrometheusRangeResponse(resp)
|
|
if err != nil {
|
|
return Result{}, err
|
|
}
|
|
for i := range res.Data {
|
|
m := &res.Data[i]
|
|
for j := range m.Labels {
|
|
// reserve the stats func result name with a new label `stats_result` instead of dropping it,
|
|
// since there could be multiple stats results in a single query, for instance:
|
|
// _time:5m | stats quantile(0.5, request_duration_seconds) p50, quantile(0.9, request_duration_seconds) p90
|
|
if m.Labels[j].Name == "__name__" {
|
|
m.Labels[j].Name = "stats_result"
|
|
break
|
|
}
|
|
}
|
|
}
|
|
return
|
|
}
|