fix(cloudmon): allow disable ping probe

This commit is contained in:
Qiu Jian
2022-08-19 10:38:00 +08:00
parent abce3a980d
commit bfdcfce287
3 changed files with 6 additions and 3 deletions
+3
View File
@@ -71,6 +71,9 @@ func (self *SPingProbeColectorReport) Report() error {
}
func pingProbeColector(s *mcclient.ClientSession, args *options.ReportOptions) error {
if args.DisablePingProbe {
return nil
}
isRoot := sysutils.IsRootPermission()
if !isRoot {
return errors.Error("require root permissions")
+2
View File
@@ -64,6 +64,8 @@ type PingProbeOptions struct {
Debug bool `help:"debug"`
ProbeCount int `help:"probe count, default is 3" default:"3"`
TimeoutSecond int `help:"probe timeout in second, default is 1 second" default:"1"`
DisablePingProbe bool `help:"enable ping probe"`
}
func GetArgumentParser() (*structarg.ArgumentParser, error) {
+1 -3
View File
@@ -36,7 +36,7 @@ func StartService() {
duration := time.Duration(opts.CloudproviderSyncInterval) * time.Minute
log.Errorf("CloudproviderSyncInterval: %d", opts.CloudproviderSyncInterval)
nextSync := time.Now()
for i, _ := range common.CustomizeMonTypeList {
for i := range common.CustomizeMonTypeList {
monType := common.CustomizeMonTypeList[i]
cutomizeOperatorChanmap[monType] = make(chan struct{})
cloudReportFactory, err := common.GetCloudReportFactory(monType)
@@ -95,7 +95,6 @@ func getCloudproviderList(ctx context.Context) ([]jsonutils.JSONObject, error) {
}
cloudProviderList := make([]jsonutils.JSONObject, 0)
for _, val := range common.SupportMetricBrands {
query.Add(jsonutils.NewString(val), "provider")
tmpList, err := common.ListAllResources(&modules.Cloudproviders, session, query)
if err != nil {
@@ -126,5 +125,4 @@ func syncCloudproviderChanMap(cloudproviderList []jsonutils.JSONObject) []jsonut
close(channel)
}
return newCloudprovider
}