opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(monitor): map interval to step

Browse Source
This commit is contained in:
Zexi Li
2023-12-06 15:32:40 +08:00
parent fb86463bbf
commit 4cbd9fcdfd
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/tsdb/driver/victoriametrics/vm.go
+16 -6
View File
@@ -20,6 +20,7 @@ import (
"fmt"
"strconv"
"strings"
"time"
"github.com/influxdata/influxql"
"github.com/influxdata/promql/v2/pkg/labels"
@@ -60,16 +61,22 @@ func (vm *vmAdapter) Query(ctx context.Context, ds *tsdb.DataSource, query *tsdb
return nil, errors.Wrapf(err, "get influxdb raw query: %#v", influxQs)
}
return queryByRaw(ctx, ds, rawQuery, query)
// TODO: use interval inside query
return queryByRaw(ctx, ds, rawQuery, query, influxQs[0].Interval)
}
func queryByRaw(ctx context.Context, ds *tsdb.DataSource, rawQuery string, query *tsdb.TsdbQuery) (*tsdb.Response, error) {
func queryByRaw(ctx context.Context, ds *tsdb.DataSource, rawQuery string, query *tsdb.TsdbQuery, interval time.Duration) (*tsdb.Response, error) {
promQL, tr, err := convertInfluxQL(rawQuery)
if err != nil {
return nil, errors.Wrap(err, "convert influxQL to promQL")
}
log.Infof("influxQL: %s, promQL: %s", rawQuery, promQL)
resp, err := queryRange(ctx, ds, tr, promQL)
start := time.Now()
defer func() {
log.Infof("influxQL: %s, promQL: %s, elapsed: %s", rawQuery, promQL, time.Now().Sub(start))
}()
resp, err := queryRange(ctx, ds, tr, promQL, interval)
if err != nil {
return nil, errors.Wrapf(err, "query VM range by: %s", promQL)
}
@@ -84,7 +91,7 @@ func queryByRaw(ctx context.Context, ds *tsdb.DataSource, rawQuery string, query
return tsdbRet, nil
}
func queryRange(ctx context.Context, ds *tsdb.DataSource, tr *influxql.TimeRange, promQL string) (*Response, error) {
func queryRange(ctx context.Context, ds *tsdb.DataSource, tr *influxql.TimeRange, promQL string, interval time.Duration) (*Response, error) {
cli, err := NewClient(ds.Url)
if err != nil {
return nil, errors.Wrap(err, "New VM client")
@@ -94,7 +101,10 @@ func queryRange(ctx context.Context, ds *tsdb.DataSource, tr *influxql.TimeRange
return nil, errors.Wrap(err, "GetHttpClient of data source")
}
vmTr := NewTimeRangeByInfluxTimeRange(tr)
return cli.QueryRange(ctx, httpCli, promQL, 0, vmTr, false)
if interval <= 0 {
interval = time.Minute * 5
}
return cli.QueryRange(ctx, httpCli, promQL, interval, vmTr, false)
}
func convertInfluxQL(influxQL string) (string, *influxql.TimeRange, error) {