opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 06:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(monitor): support monitor overview influxdb query pass through

Browse Source 
1.监控总览支持查询穿透
This commit is contained in:
zhaoxiangchun
2021-01-13 16:12:10 +08:00
parent 81cb23f5df
commit 33975b5c12
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/monitor/commalert.go
+5 -4
View File
@@ -120,10 +120,11 @@ type CommonAlertDetails struct {
}
type CommonAlertMetricDetails struct {
Comparator string `json:"comparator"`
Threshold float64 `json:"threshold"`
ConditionType string `json:"condition_type"`
ThresholdStr string `json:"threshold_str"`
Comparator string `json:"comparator"`
Threshold float64 `json:"threshold"`
WithinRange []float64 `json:"within_range"`
ConditionType string `json:"condition_type"`
ThresholdStr string `json:"threshold_str"`
// metric points'value的运算方式
Reduce string `json:"reduce"`
DB string `json:"db"`
pkg/monitor/models/unifiedmonitor.go
+11 -2
View File
@@ -191,7 +191,7 @@ func (self *SUnifiedMonitorManager) AllowPerformQuery(ctx context.Context, userC
func (self *SUnifiedMonitorManager) PerformQuery(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
tmp := jsonutils.DeepCopy(data)
self.handleDataPreSignature(tmp)
self.handleDataPreSignature(ctx, tmp)
if err := ValidateQuerySignature(tmp); err != nil {
return nil, errors.Wrap(err, "ValidateQuerySignature")
}
@@ -235,19 +235,28 @@ func (self *SUnifiedMonitorManager) PerformQuery(ctx context.Context, userCred m
return jsonutils.Marshal(rtn), nil
}
func (self *SUnifiedMonitorManager) handleDataPreSignature(data jsonutils.JSONObject) {
func (self *SUnifiedMonitorManager) handleDataPreSignature(ctx context.Context, data jsonutils.JSONObject) {
scope, _ := data.GetString("scope")
isIdentityName, _ := data.Bool("identity_name")
switch scope {
case "system":
case "domain":
domain, err := data.GetString("project_domain")
if err == nil {
domainObj, _ := db.DefaultDomainFetcher(ctx, domain)
if isIdentityName {
domain = domainObj.Name
}
data.(*jsonutils.JSONDict).Remove("project_domain")
data.(*jsonutils.JSONDict).Set("domain_id", jsonutils.NewString(domain))
}
default:
project, err := data.GetString("project")
if err == nil {
tenant, _ := db.DefaultProjectFetcher(ctx, project)
if isIdentityName {
project = tenant.Name
}
data.(*jsonutils.JSONDict).Remove("project")
data.(*jsonutils.JSONDict).Set("project_id", jsonutils.NewString(project))
}