diff --git a/cmd/hubble/daemon_main_linux.go b/cmd/hubble/daemon_main_linux.go index 49d6248c9e..0a56c2a1d0 100644 --- a/cmd/hubble/daemon_main_linux.go +++ b/cmd/hubble/daemon_main_linux.go @@ -219,7 +219,7 @@ func initLogging() { k8sCfg, _ := sharedconfig.GetK8sConfig() zapLogger := setupZapLogger(retinaConfig, k8sCfg) setupLoggingHooks(logger, zapLogger) - bootstrapLogging(logger) + bootstrapLogging(retinaConfig, logger) } func setupDefaultLogger() *logrus.Logger { @@ -280,10 +280,16 @@ func setupLoggingHooks(logger *logrus.Logger, zapLogger *log.ZapLogger) { } } -func bootstrapLogging(logger *logrus.Logger) { +func bootstrapLogging(retinaConfig *config.Config, logger *logrus.Logger) { if err := logging.SetupLogging(option.Config.LogDriver, logging.LogOptions(option.Config.LogOpt), "retina-agent", option.Config.Debug); err != nil { logger.Fatal(err) } + + logLevel, err := logrus.ParseLevel(retinaConfig.LogLevel) + if err != nil { + logLevel = logrus.InfoLevel + } + logger.SetLevel(logLevel) } func initDaemonConfig(vp *viper.Viper) { diff --git a/operator/cmd/cilium-crds/zap_linux.go b/operator/cmd/cilium-crds/zap_linux.go index 0da3ad3e55..dbb2c66ba2 100644 --- a/operator/cmd/cilium-crds/zap_linux.go +++ b/operator/cmd/cilium-crds/zap_linux.go @@ -46,6 +46,13 @@ func setupZapHook(p params) { // discard default logger output in favor of zap logging.DefaultLogger.SetOutput(io.Discard) + level, err := logrus.ParseLevel(p.DaemonCfg.LogOpt[logging.LevelOpt]) + if err != nil { + p.Logger.WithError(err).Error("failed to parse log level") + } else { + logging.DefaultLogger.SetLevel(level) + } + lOpts := &log.LogOpts{ Level: p.DaemonCfg.LogOpt[logging.LevelOpt], File: false, @@ -62,7 +69,7 @@ func setupZapHook(p params) { zap.String("apiserver", p.K8sCfg.Host), } - _, err := log.SetupZapLogger(lOpts, persistentFields...) + _, err = log.SetupZapLogger(lOpts, persistentFields...) if err != nil { fmt.Printf("failed to setup zap logger: %v", err) }