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

Merge pull request #12273 from zhaoxiangchun/automated-cherry-pick-of-#12272-upstream-release-3.7

Browse Source 
Automated cherry pick of #12272: fix(monitor): fix cloudaccount monitor query return field err
This commit is contained in:
Zexi Li
2021-09-24 10:27:31 +08:00
committed by GitHub
parent 796cc7fd5e eef56df9b3
commit 48ed803d39
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/models/unifiedmonitor.go
+2 -2
View File
@@ -433,10 +433,10 @@ func checkQueryGroupBy(query *monitor.AlertQuery, inputQuery *monitor.MetricInpu
if len(query.Model.GroupBy) != 0 {
return
}
if query.Model.Database == monitor.METRIC_DATABASE_METER || inputQuery.Unit {
metricMeasurement, _ := MetricMeasurementManager.GetCache().Get(query.Model.Measurement)
if inputQuery.Unit || metricMeasurement == nil && query.Model.Database == monitor.METRIC_DATABASE_METER {
return
}
metricMeasurement, _ := MetricMeasurementManager.GetCache().Get(query.Model.Measurement)
tagId := ""
if metricMeasurement != nil {
tagId = monitor.MEASUREMENT_TAG_ID[metricMeasurement.ResType]