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): influx query

Browse Source
This commit is contained in:
ioito
2022-09-26 15:01:03 +08:00
parent aa84e7894d
commit 3f7e684ddc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/models/unifiedmonitor.go
+3 -3
View File
@@ -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
}