Skip to content

Commit 5b4fada

Browse files
authored
Merge pull request #1372 from yp969803/issue1366
fix: enableConnMetric knob at monitoring handler
2 parents 15a8137 + 77a6ac8 commit 5b4fada

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

pkg/status/status_server.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,17 +253,24 @@ func (s *Server) monitoringHandler(w http.ResponseWriter, r *http.Request) {
253253
_, _ = w.Write([]byte(fmt.Sprintf("invalid monitoring enable=%s", info)))
254254
return
255255
}
256-
var enableMonitoring uint32
256+
enableMonitoring := constants.DISABLED
257257
if enabled {
258258
enableMonitoring = constants.ENABLED
259-
} else {
260-
enableMonitoring = constants.DISABLED
261259
}
262260
if err := s.loader.UpdateEnableMonitoring(enableMonitoring); err != nil {
263261
http.Error(w, fmt.Sprintf("update bpf monitoring failed: %v", err), http.StatusBadRequest)
264262
return
265263
}
266264

265+
enablePeriodicReport := constants.DISABLED
266+
if enabled {
267+
enablePeriodicReport = constants.ENABLED
268+
}
269+
if err := s.loader.UpdateEnablePeriodicReport(enablePeriodicReport); err != nil {
270+
http.Error(w, fmt.Sprintf("update enable periodic report failed: %v", err), http.StatusBadRequest)
271+
return
272+
}
273+
267274
s.xdsClient.WorkloadController.SetMonitoringTrigger(enabled)
268275
s.xdsClient.WorkloadController.SetAccesslogTrigger(enabled)
269276
s.xdsClient.WorkloadController.SetWorkloadMetricTrigger(enabled)

0 commit comments

Comments
 (0)