mirror of
https://github.com/kubeshark/kubeshark.git
synced 2025-08-25 11:59:35 +00:00
Set the default log level for Agent to INFO
and change it to DEBUG
if dump-logs=true
is provided
This commit is contained in:
parent
58e9363fda
commit
c5e43313da
@ -12,6 +12,7 @@ require (
|
|||||||
github.com/go-playground/validator/v10 v10.5.0
|
github.com/go-playground/validator/v10 v10.5.0
|
||||||
github.com/google/martian v2.1.0+incompatible
|
github.com/google/martian v2.1.0+incompatible
|
||||||
github.com/gorilla/websocket v1.4.2
|
github.com/gorilla/websocket v1.4.2
|
||||||
|
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect
|
||||||
github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231
|
github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231
|
||||||
github.com/patrickmn/go-cache v2.1.0+incompatible
|
github.com/patrickmn/go-cache v2.1.0+incompatible
|
||||||
github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7
|
github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7
|
||||||
|
@ -22,6 +22,7 @@ import (
|
|||||||
"github.com/gin-contrib/static"
|
"github.com/gin-contrib/static"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
|
"github.com/op/go-logging"
|
||||||
"github.com/up9inc/mizu/shared"
|
"github.com/up9inc/mizu/shared"
|
||||||
"github.com/up9inc/mizu/shared/logger"
|
"github.com/up9inc/mizu/shared/logger"
|
||||||
"github.com/up9inc/mizu/tap"
|
"github.com/up9inc/mizu/tap"
|
||||||
@ -40,7 +41,12 @@ var extensions []*tapApi.Extension // global
|
|||||||
var extensionsMap map[string]*tapApi.Extension // global
|
var extensionsMap map[string]*tapApi.Extension // global
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
logger.InitLoggerStderrOnly()
|
logLevel := logging.INFO
|
||||||
|
debugMode := os.Getenv(shared.DebugModeEnvVar) == "1"
|
||||||
|
if debugMode {
|
||||||
|
logLevel = logging.DEBUG
|
||||||
|
}
|
||||||
|
logger.InitLoggerStderrOnly(logLevel)
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
loadExtensions()
|
loadExtensions()
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@ import (
|
|||||||
|
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
|
"github.com/up9inc/mizu/cli/config"
|
||||||
"github.com/up9inc/mizu/cli/mizu"
|
"github.com/up9inc/mizu/cli/mizu"
|
||||||
"github.com/up9inc/mizu/shared"
|
"github.com/up9inc/mizu/shared"
|
||||||
"github.com/up9inc/mizu/tap/api"
|
"github.com/up9inc/mizu/tap/api"
|
||||||
@ -195,6 +196,11 @@ func (provider *Provider) CreateMizuApiServerPod(ctx context.Context, opts *ApiS
|
|||||||
|
|
||||||
port := intstr.FromInt(shared.DefaultApiServerPort)
|
port := intstr.FromInt(shared.DefaultApiServerPort)
|
||||||
|
|
||||||
|
debugMode := ""
|
||||||
|
if config.Config.DumpLogs {
|
||||||
|
debugMode = "1"
|
||||||
|
}
|
||||||
|
|
||||||
pod := &core.Pod{
|
pod := &core.Pod{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: opts.PodName,
|
Name: opts.PodName,
|
||||||
@ -223,6 +229,10 @@ func (provider *Provider) CreateMizuApiServerPod(ctx context.Context, opts *ApiS
|
|||||||
Name: shared.MaxEntriesDBSizeBytesEnvVar,
|
Name: shared.MaxEntriesDBSizeBytesEnvVar,
|
||||||
Value: strconv.FormatInt(opts.MaxEntriesDBSizeBytes, 10),
|
Value: strconv.FormatInt(opts.MaxEntriesDBSizeBytes, 10),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
Name: shared.DebugModeEnvVar,
|
||||||
|
Value: debugMode,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
Resources: core.ResourceRequirements{
|
Resources: core.ResourceRequirements{
|
||||||
Limits: core.ResourceList{
|
Limits: core.ResourceList{
|
||||||
@ -524,6 +534,11 @@ func (provider *Provider) ApplyMizuTapperDaemonSet(ctx context.Context, namespac
|
|||||||
"--nodefrag",
|
"--nodefrag",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
debugMode := ""
|
||||||
|
if config.Config.DumpLogs {
|
||||||
|
debugMode = "1"
|
||||||
|
}
|
||||||
|
|
||||||
agentContainer := applyconfcore.Container()
|
agentContainer := applyconfcore.Container()
|
||||||
agentContainer.WithName(tapperPodName)
|
agentContainer.WithName(tapperPodName)
|
||||||
agentContainer.WithImage(podImage)
|
agentContainer.WithImage(podImage)
|
||||||
@ -531,6 +546,7 @@ func (provider *Provider) ApplyMizuTapperDaemonSet(ctx context.Context, namespac
|
|||||||
agentContainer.WithSecurityContext(applyconfcore.SecurityContext().WithPrivileged(true))
|
agentContainer.WithSecurityContext(applyconfcore.SecurityContext().WithPrivileged(true))
|
||||||
agentContainer.WithCommand(mizuCmd...)
|
agentContainer.WithCommand(mizuCmd...)
|
||||||
agentContainer.WithEnv(
|
agentContainer.WithEnv(
|
||||||
|
applyconfcore.EnvVar().WithName(shared.DebugModeEnvVar).WithValue(debugMode),
|
||||||
applyconfcore.EnvVar().WithName(shared.HostModeEnvVar).WithValue("1"),
|
applyconfcore.EnvVar().WithName(shared.HostModeEnvVar).WithValue("1"),
|
||||||
applyconfcore.EnvVar().WithName(shared.TappedAddressesPerNodeDictEnvVar).WithValue(string(nodeToTappedPodIPMapJsonStr)),
|
applyconfcore.EnvVar().WithName(shared.TappedAddressesPerNodeDictEnvVar).WithValue(string(nodeToTappedPodIPMapJsonStr)),
|
||||||
applyconfcore.EnvVar().WithName(shared.GoGCEnvVar).WithValue("12800"),
|
applyconfcore.EnvVar().WithName(shared.GoGCEnvVar).WithValue("12800"),
|
||||||
|
@ -11,4 +11,5 @@ const (
|
|||||||
RulePolicyFileName = "enforce-policy.yaml"
|
RulePolicyFileName = "enforce-policy.yaml"
|
||||||
GoGCEnvVar = "GOGC"
|
GoGCEnvVar = "GOGC"
|
||||||
DefaultApiServerPort = 8899
|
DefaultApiServerPort = 8899
|
||||||
|
DebugModeEnvVar = "MIZU_DEBUG"
|
||||||
)
|
)
|
||||||
|
@ -29,13 +29,10 @@ func InitLogger(logPath string) {
|
|||||||
logging.SetBackend(backend1Leveled, backend2Formatter)
|
logging.SetBackend(backend1Leveled, backend2Formatter)
|
||||||
}
|
}
|
||||||
|
|
||||||
func InitLoggerStderrOnly() {
|
func InitLoggerStderrOnly(level logging.Level) {
|
||||||
consoleLog := logging.NewLogBackend(os.Stderr, "", 0)
|
backend := logging.NewLogBackend(os.Stderr, "", 0)
|
||||||
|
backendFormatter := logging.NewBackendFormatter(backend, format)
|
||||||
|
|
||||||
backend1Formatter := logging.NewBackendFormatter(consoleLog, format)
|
logging.SetBackend(backendFormatter)
|
||||||
|
logging.SetLevel(level, "")
|
||||||
backend1Leveled := logging.AddModuleLevel(consoleLog)
|
|
||||||
backend1Leveled.SetLevel(logging.DEBUG, "")
|
|
||||||
|
|
||||||
logging.SetBackend(backend1Leveled, backend1Formatter)
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user