Merge pull request #11971 from zhaoxiangchun/feature/zxc-monitor-resource-master

fix(monitor): update apiHelper field and log

pkg/apihelper/interface.go

@@ -64,7 +64,7 @@ func SyncModelSets(mssOld IModelSets, s *mcclient.ClientSession, opt *Options) (
 
 			IncludeDetails:       opt.IncludeDetails,
 			IncludeEmulated:      includeEmulated,
-			InCludeOtherCloudEnv: opt.InCludeOtherCloudEnv,
+			InCludeOtherCloudEnv: opt.IncludeOtherCloudEnv,
 		})
 		if err != nil {
 			return

pkg/apihelper/options.go

@@ -24,5 +24,5 @@ type Options struct {
 	SyncInterval         int
 	ListBatchSize        int
 	IncludeDetails       bool
-	InCludeOtherCloudEnv bool
+	IncludeOtherCloudEnv bool
 }

pkg/monitor/tsdb/driver/influxdb/influxdb.go

@@ -94,7 +94,6 @@ func (e *InfluxdbExecutor) Query(ctx context.Context, dsInfo *tsdb.DataSource, t
 	}
 	dsInfo.Database = db
 
-	log.Errorf("rawQuery:%s", rawQuery)
 	req, err := e.createRequest(dsInfo, rawQuery)
 	if err != nil {
 		return nil, err

pkg/monitor/worker/worker.go

@@ -41,7 +41,7 @@ func NewWorker(opts *options.AlerterOptions) worker.IWorker {
 		SyncInterval:         opts.APISyncInterval,
 		ListBatchSize:        opts.APIListBatchSize,
 		IncludeDetails:       true,
-		InCludeOtherCloudEnv: true,
+		IncludeOtherCloudEnv: true,
 	}
 	apih, err := apihelper.NewAPIHelper(apiOpts, modelSets)
 	if err != nil {