diff --git a/common/interface_to_all.go b/common/interface_to_all.go index cda77839..0ee2a4f0 100644 --- a/common/interface_to_all.go +++ b/common/interface_to_all.go @@ -29,6 +29,8 @@ func FmtIntFromInterface(val interface{}) int64 { return int64(ret) case int: return int64(ret) + case float64: + return int64(ret) default: return 0 } diff --git a/module/monitor/driver/influxdb-v2/executor.go b/module/monitor/driver/influxdb-v2/executor.go index e939279c..bd2ca864 100644 --- a/module/monitor/driver/influxdb-v2/executor.go +++ b/module/monitor/driver/influxdb-v2/executor.go @@ -446,7 +446,7 @@ func (e *executor) aggregateSummary(ctx context.Context, start time.Time, end ti a.Avg = int64(v.(float64)) } if v, ok := maxRes[field+"_max"]; ok { - a.Min = v.(int64) + a.Max = v.(int64) } if v, ok := minRes[field+"_min"]; ok { a.Min = v.(int64) diff --git a/module/monitor/driver/influxdb-v2/flux/flux.go b/module/monitor/driver/influxdb-v2/flux/flux.go index 02b3b73f..b847a450 100644 --- a/module/monitor/driver/influxdb-v2/flux/flux.go +++ b/module/monitor/driver/influxdb-v2/flux/flux.go @@ -159,8 +159,7 @@ func (f *fluxQuery) CommonTendency(ctx context.Context, queryApi api.QueryAPI, s resultMap[field] = append(resultMap[field], common.FmtIntFromInterface(res[field])) } t, _ := res["_time"].(time.Time) - - dates = append(dates, t) + dates = append(dates, t.In(time.Local)) } return dates, resultMap, nil diff --git a/module/monitor/driver/influxdb-v2/flux/tasks/day.yaml b/module/monitor/driver/influxdb-v2/flux/tasks/day.yaml index 0ed5c8fe..4d2fd468 100644 --- a/module/monitor/driver/influxdb-v2/flux/tasks/day.yaml +++ b/module/monitor/driver/influxdb-v2/flux/tasks/day.yaml @@ -13,7 +13,8 @@ or r._field == "timing" or r._field == "request" or r._field == "response" or r._field == - "retry", + "retry" + or r._field == "total_token" or r._field == "input_token" or r._field == "output_token", ) |> group( columns: [ diff --git a/module/monitor/driver/influxdb-v2/flux/tasks/hour.yaml b/module/monitor/driver/influxdb-v2/flux/tasks/hour.yaml index 611a8f37..f12235bd 100644 --- a/module/monitor/driver/influxdb-v2/flux/tasks/hour.yaml +++ b/module/monitor/driver/influxdb-v2/flux/tasks/hour.yaml @@ -13,7 +13,8 @@ or r._field == "timing" or r._field == "request" or r._field == "response" or r._field == - "retry", + "retry" + or r._field == "total_token" or r._field == "input_token" or r._field == "output_token", ) |> group( columns: [ diff --git a/module/monitor/driver/influxdb-v2/flux/tasks/week.yaml b/module/monitor/driver/influxdb-v2/flux/tasks/week.yaml index a535ff37..d61bcef4 100644 --- a/module/monitor/driver/influxdb-v2/flux/tasks/week.yaml +++ b/module/monitor/driver/influxdb-v2/flux/tasks/week.yaml @@ -13,7 +13,8 @@ or r._field == "timing" or r._field == "request" or r._field == "response" or r._field == - "retry", + "retry" + or r._field == "total_token" or r._field == "input_token" or r._field == "output_token", ) |> group( columns: [