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): wrong tag filter when get metric measurement

Browse Source
This commit is contained in:
Zexi Li
2023-04-13 11:40:44 +08:00
parent 13ad64a3b4
commit fca6a97886
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/models/datasource.go
+1 -1
View File
@@ -658,7 +658,7 @@ func (self *SDataSourceManager) filterRtnTags(output *monitor.InfluxMeasurement)
}
for _, tag := range []string{"source", "status", hostconsts.TELEGRAF_TAG_KEY_HOST_TYPE,
hostconsts.TELEGRAF_TAG_KEY_RES_TYPE, "is_vm", "os_type", hostconsts.TELEGRAF_TAG_KEY_PLATFORM,
hostconsts.TELEGRAF_TAG_KEY_HYPERVISOR, "domain_name", "region"} {
hostconsts.TELEGRAF_TAG_KEY_HYPERVISOR, "domain_name", "region", "ips", "vip", "vip_eip", "eip", "eip_mode"} {
if _, ok := output.TagValue[tag]; ok {
delete(output.TagValue, tag)
}
pkg/monitor/models/unifiedmonitor.go
+2 -4
View File
@@ -121,7 +121,6 @@ func filterByScope(ctx context.Context, userCred mcclient.TokenCredential, scope
projectId = userCred.GetProjectId()
}
return getProjectIdFilterByProject(projectId)
}
}
@@ -159,12 +158,11 @@ func getProjectIdsFilterByDomain(domainId string) (string, error) {
//}
//buffer.WriteString(" )")
//return buffer.String(), nil
return fmt.Sprintf(`"%s" =~ /%s/`, "domain_id", domainId), nil
return fmt.Sprintf(`%s =~ /%s/`, "domain_id", domainId), nil
}
func getProjectIdFilterByProject(projectId string) (string, error) {
return fmt.Sprintf(`"%s" =~ /%s/`, "tenant_id", projectId), nil
return fmt.Sprintf(`%s =~ /%s/`, "tenant_id", projectId), nil
}
func (self *SUnifiedMonitorManager) GetPropertyMetricMeasurement(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (jsonutils.JSONObject, error) {