From 3f7e684ddc15c8a44d68a79a98c4254ca0b918e7 Mon Sep 17 00:00:00 2001 From: ioito Date: Mon, 26 Sep 2022 14:56:55 +0800 Subject: [PATCH] fix(monitor): influx query --- pkg/monitor/models/unifiedmonitor.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/monitor/models/unifiedmonitor.go b/pkg/monitor/models/unifiedmonitor.go index b48fd63506..f6fc6ae4c1 100644 --- a/pkg/monitor/models/unifiedmonitor.go +++ b/pkg/monitor/models/unifiedmonitor.go @@ -511,7 +511,7 @@ func fillSerieTags(series *tsdb.TimeSeriesSlice) { } func (self *SUnifiedMonitorManager) GetPropertySimpleQuery(ctx context.Context, userCred mcclient.TokenCredential, - input *monitor.SimpleQueryInput) ([]monitor.SimpleQueryOutput, error) { + input *monitor.SimpleQueryInput) (jsonutils.JSONObject, error) { if len(input.Database) == 0 { input.Database = "telegraf" } @@ -543,7 +543,7 @@ func (self *SUnifiedMonitorManager) GetPropertySimpleQuery(ctx context.Context, et := input.EndTime.Format("2006-01-02T15:04:05Z") conditions := []string{} for k, v := range input.Tags { - conditions = append(conditions, fmt.Sprintf("%s = %s", k, v)) + conditions = append(conditions, fmt.Sprintf("%s = '%s'", k, v)) } conditions = append(conditions, fmt.Sprintf("time >= '%s'", st)) conditions = append(conditions, fmt.Sprintf("time <= '%s'", et)) @@ -591,5 +591,5 @@ func (self *SUnifiedMonitorManager) GetPropertySimpleQuery(ctx context.Context, } } } - return ret, nil + return jsonutils.Marshal(map[string]interface{}{"values": ret}), nil }