Merge pull request #1560 from imuxin/fix-iss/1559

add periodic-report cmd arg

Author: kmesh-bot

daemon/options/bpf.go

@@ -26,13 +26,14 @@ import (
 )
 
 type BpfConfig struct {
-	Mode             string
-	BpfFsPath        string
-	Cgroup2Path      string
-	EnableMda        bool
-	EnableMonitoring bool
-	EnableProfiling  bool
-	EnableIPsec      bool
+	Mode                 string
+	BpfFsPath            string
+	Cgroup2Path          string
+	EnableMda            bool
+	EnableMonitoring     bool
+	EnablePeriodicReport bool
+	EnableProfiling      bool
+	EnableIPsec          bool
 }
 
 func (c *BpfConfig) AttachFlags(cmd *cobra.Command) {
@@ -41,6 +42,7 @@ func (c *BpfConfig) AttachFlags(cmd *cobra.Command) {
 	cmd.PersistentFlags().StringVar(&c.Mode, "mode", "dual-engine", "controller plane mode, valid values are [kernel-native, dual-engine]")
 	cmd.PersistentFlags().BoolVar(&c.EnableMda, "enable-mda", false, "enable mda")
 	cmd.PersistentFlags().BoolVar(&c.EnableMonitoring, "monitoring", true, "enable kmesh traffic monitoring in daemon process")
+	cmd.PersistentFlags().BoolVar(&c.EnablePeriodicReport, "periodic-report", false, "enable kmesh periodic report in daemon process")
 	cmd.PersistentFlags().BoolVar(&c.EnableProfiling, "profiling", false, "whether to enable profiling or not, default to false")
 	cmd.PersistentFlags().BoolVar(&c.EnableIPsec, "enable-ipsec", false, "enable ipsec encryption and authentication between nodes")
 }

pkg/controller/controller.go

@@ -158,6 +158,13 @@ func (c *Controller) Start(stopCh <-chan struct{}) error {
 			return fmt.Errorf("failed to update config in order to start metric: %v", err)
 		}
 	}
+	// kmeshConfigMap.PeriodicReport initialized to uint32(0).
+	// If the startup parameter is true, update the kmeshConfigMap.
+	if c.bpfConfig.EnablePeriodicReport && c.bpfConfig.EnableMonitoring {
+		if err := c.loader.UpdateEnablePeriodicReport(constants.ENABLED); err != nil {
+			return fmt.Errorf("failed to update config in order to start periodic report: %v", err)
+		}
+	}
 
 	c.client, err = NewXdsClient(c.mode, c.bpfAdsObj, c.bpfWorkloadObj, c.bpfConfig.EnableMonitoring, c.bpfConfig.EnableProfiling)
 	if err != nil {

pkg/status/status_server.go

@@ -262,12 +262,7 @@ func (s *Server) monitoringHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, fmt.Sprintf("update bpf monitoring failed: %v", err), http.StatusBadRequest)
 		return
 	}
-
-	enablePeriodicReport := constants.DISABLED
-	if enabled {
-		enablePeriodicReport = constants.ENABLED
-	}
-	if err := s.loader.UpdateEnablePeriodicReport(enablePeriodicReport); err != nil {
+	if err := s.loader.UpdateEnablePeriodicReport(enableMonitoring); err != nil {
 		http.Error(w, fmt.Sprintf("update enable periodic report failed: %v", err), http.StatusBadRequest)
 		return
 	}