opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-30 18:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(monitor): not add scope to query resource from region service

Browse Source
This commit is contained in:
Zexi Li
2023-12-08 12:30:53 +08:00
parent 8853aa50b1
commit be3dd3d939
5 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/alerting/conditions/metricquery.go
+2 -2
View File
@@ -73,7 +73,7 @@ func NewMetricQueryCondition(models []*monitor.AlertCondition) (*MetricQueryCond
return cond, nil
}
func (query *MetricQueryCondition) ExecuteQuery(userCred mcclient.TokenCredential, skipCheckSeries bool) (*monitor.MetricsQueryResult, error) {
func (query *MetricQueryCondition) ExecuteQuery(userCred mcclient.TokenCredential, scope string, skipCheckSeries bool) (*monitor.MetricsQueryResult, error) {
firstCond := query.QueryCons[0]
timeRange := tsdb.NewTimeRange(firstCond.Query.From, firstCond.Query.To)
ctx := gocontext.Background()
@@ -137,7 +137,7 @@ func (query *MetricQueryCondition) ExecuteQuery(userCred mcclient.TokenCredentia
}()
s := auth.GetSession(ctx, userCred, "")
ress, regionErr = firstCond.getOnecloudResources(s, false)
ress, regionErr = firstCond.getOnecloudResources(s, scope, false)
if err != nil {
regionErr = errors.Wrap(regionErr, "get resources from region")
return
pkg/monitor/alerting/conditions/nodataquery.go
+1 -1
View File
@@ -88,7 +88,7 @@ serLoop:
}
}
}
allResources, err := c.GetQueryResources(auth.GetAdminSession(context.Ctx, ""), true)
allResources, err := c.GetQueryResources(auth.GetAdminSession(context.Ctx, ""), "system", true)
if err != nil {
return nil, errors.Wrap(err, "GetQueryResources err")
}
pkg/monitor/alerting/conditions/query.go
+25 -20
View File
@@ -552,8 +552,8 @@ func (c *QueryCondition) setResType() {
}
}
func (c *QueryCondition) GetQueryResources(s *mcclient.ClientSession, showDetails bool) ([]jsonutils.JSONObject, error) {
allRes, err := c.getOnecloudResources(s, showDetails)
func (c *QueryCondition) GetQueryResources(s *mcclient.ClientSession, scope string, showDetails bool) ([]jsonutils.JSONObject, error) {
allRes, err := c.getOnecloudResources(s, scope, showDetails)
if err != nil {
return nil, errors.Wrap(err, "getOnecloudResources error")
}
@@ -561,10 +561,7 @@ func (c *QueryCondition) GetQueryResources(s *mcclient.ClientSession, showDetail
return allRes, nil
}
func (c *QueryCondition) getOnecloudResources(s *mcclient.ClientSession, showDetails bool) ([]jsonutils.JSONObject, error) {
var err error
allResources := make([]jsonutils.JSONObject, 0)
func (c *QueryCondition) getOnecloudResources(s *mcclient.ClientSession, scope string, showDetails bool) ([]jsonutils.JSONObject, error) {
query := jsonutils.NewDict()
query.Add(jsonutils.NewStringArray([]string{"running", "ready"}), "status")
// query.Add(jsonutils.NewString("true"), "admin")
@@ -574,53 +571,61 @@ func (c *QueryCondition) getOnecloudResources(s *mcclient.ClientSession, showDet
// return nil, errors.Wrap(err, "NoDataQueryCondition convertTagsQuery error")
// }
//}
var (
err error
manager modulebase.Manager
allResources = make([]jsonutils.JSONObject, 0)
)
switch c.ResType {
case monitor.METRIC_RES_TYPE_HOST:
query := jsonutils.NewDict()
query.Set("host_type", jsonutils.NewString(hostconsts.TELEGRAF_TAG_KEY_HYPERVISOR))
query.Set("enabled", jsonutils.NewInt(1))
allResources, err = ListAllResources(s, &mc_mds.Hosts, query, showDetails)
manager = &mc_mds.Hosts
case monitor.METRIC_RES_TYPE_GUEST:
allResources, err = ListAllResources(s, &mc_mds.Servers, query, showDetails)
manager = &mc_mds.Servers
case monitor.METRIC_RES_TYPE_AGENT:
allResources, err = ListAllResources(s, &mc_mds.Servers, query, showDetails)
manager = &mc_mds.Servers
case monitor.METRIC_RES_TYPE_RDS:
allResources, err = ListAllResources(s, &mc_mds.DBInstance, query, showDetails)
manager = &mc_mds.DBInstance
case monitor.METRIC_RES_TYPE_REDIS:
allResources, err = ListAllResources(s, &mc_mds.ElasticCache, query, showDetails)
manager = &mc_mds.ElasticCache
case monitor.METRIC_RES_TYPE_OSS:
allResources, err = ListAllResources(s, &mc_mds.Buckets, query, showDetails)
manager = &mc_mds.Buckets
case monitor.METRIC_RES_TYPE_CLOUDACCOUNT:
query.Remove("status")
query.Add(jsonutils.NewBool(true), "enabled")
allResources, err = ListAllResources(s, &mc_mds.Cloudaccounts, query, showDetails)
manager = &mc_mds.Cloudaccounts
case monitor.METRIC_RES_TYPE_TENANT:
allResources, err = ListAllResources(s, &identity.Projects, query, showDetails)
manager = &identity.Projects
case monitor.METRIC_RES_TYPE_DOMAIN:
allResources, err = ListAllResources(s, &identity.Domains, query, showDetails)
manager = &identity.Domains
case monitor.METRIC_RES_TYPE_STORAGE:
query.Remove("status")
allResources, err = ListAllResources(s, &mc_mds.Storages, query, showDetails)
manager = &mc_mds.Storages
default:
query := jsonutils.NewDict()
query.Set("brand", jsonutils.NewString(hostconsts.TELEGRAF_TAG_ONECLOUD_BRAND))
query.Set("host-type", jsonutils.NewString(hostconsts.TELEGRAF_TAG_KEY_HYPERVISOR))
allResources, err = ListAllResources(s, &mc_mds.Hosts, query, showDetails)
manager = &mc_mds.Hosts
}
allResources, err = ListAllResources(s, manager, query, scope, showDetails)
if err != nil {
return nil, errors.Wrap(err, "NoDataQueryCondition Host list error")
return nil, errors.Wrapf(err, "ListAllResources for %s with query %s, scope: %s, showDetails: %v", manager.GetKeyword(), query, scope, showDetails)
}
return allResources, nil
}
func ListAllResources(s *mcclient.ClientSession, manager modulebase.Manager, params *jsonutils.JSONDict, showDetails bool) ([]jsonutils.JSONObject, error) {
func ListAllResources(s *mcclient.ClientSession, manager modulebase.Manager, params *jsonutils.JSONDict, scope string, showDetails bool) ([]jsonutils.JSONObject, error) {
if params == nil {
params = jsonutils.NewDict()
}
if s.GetToken().HasSystemAdminPrivilege() {
params.Add(jsonutils.NewString("system"), "scope")
}
if scope != "" {
params.Add(jsonutils.NewString(scope), "scope")
}
params.Add(jsonutils.NewInt(int64(options.Options.APIListBatchSize)), "limit")
params.Add(jsonutils.NewBool(showDetails), "details")
var count int
pkg/monitor/metricquery/interfaces.go
+1 -1
View File
@@ -20,7 +20,7 @@ import (
)
type MetricQuery interface {
ExecuteQuery(userCred mcclient.TokenCredential, forceCheckSeries bool) (*monitor.MetricsQueryResult, error)
ExecuteQuery(userCred mcclient.TokenCredential, scope string, forceCheckSeries bool) (*monitor.MetricsQueryResult, error)
}
type QueryFactory func(model []*monitor.AlertCondition) (MetricQuery, error)
pkg/monitor/models/unifiedmonitor.go
+1 -1
View File
@@ -338,7 +338,7 @@ func doQuery(userCred mcclient.TokenCredential, query monitor.MetricQueryInput)
if err != nil {
return nil, errors.Wrap(err, "factory")
}
metrics, err := metricQ.ExecuteQuery(userCred, query.SkipCheckSeries)
metrics, err := metricQ.ExecuteQuery(userCred, query.Scope, query.SkipCheckSeries)
if err != nil {
return nil, errors.Wrap(err, "ExecuteQuery")
}