diff --git a/config/configStruct.go b/config/configStruct.go index 952755eee..190ebd604 100644 --- a/config/configStruct.go +++ b/config/configStruct.go @@ -113,6 +113,7 @@ type ConfigStruct struct { Scripting configStructs.ScriptingConfig `yaml:"scripting" json:"scripting"` Manifests ManifestsConfig `yaml:"manifests,omitempty" json:"manifests,omitempty"` Timezone string `yaml:"timezone" json:"timezone"` + LogLevel string `yaml:"logLevel" json:"logLevel" default:"warning"` } func (config *ConfigStruct) ImagePullPolicy() v1.PullPolicy { diff --git a/helm-chart/templates/04-hub-deployment.yaml b/helm-chart/templates/04-hub-deployment.yaml index b25d78e8e..e3bf8d08d 100644 --- a/helm-chart/templates/04-hub-deployment.yaml +++ b/helm-chart/templates/04-hub-deployment.yaml @@ -31,9 +31,8 @@ spec: - ./hub - -port - "8080" - {{- if .Values.tap.debug }} - - -debug - {{- end }} + - -loglevel + - '{{ .Values.logLevel | default "warning" }}' env: - name: POD_NAME valueFrom: diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml index 90adec81b..eaf5ebdd9 100644 --- a/helm-chart/templates/09-worker-daemon-set.yaml +++ b/helm-chart/templates/09-worker-daemon-set.yaml @@ -36,6 +36,8 @@ spec: - '{{ .Values.tap.metrics.port }}' - -packet-capture - '{{ .Values.tap.packetCapture }}' + - -loglevel + - '{{ .Values.logLevel | default "warning" }}' {{- if .Values.tap.tls }} - -unixsocket {{- end }} @@ -54,9 +56,6 @@ spec: - '{{ .Values.tap.misc.resolutionStrategy }}' - -staletimeout - '{{ .Values.tap.misc.staleTimeoutSeconds }}' - {{- if .Values.tap.debug }} - - -debug - {{- end }} {{- if .Values.tap.docker.overrideImage.worker }} image: '{{ .Values.tap.docker.overrideImage.worker }}' {{- else if .Values.tap.docker.overrideTag.worker }} @@ -156,9 +155,6 @@ spec: {{- if ne .Values.tap.packetCapture "ebpf" }} - -disable-ebpf {{- end }} - {{- if .Values.tap.debug }} - - -debug - {{- end }} {{- if .Values.tap.disableTlsLog }} - -disable-tls-log {{- end }} @@ -166,6 +162,8 @@ spec: - -port - '{{ add .Values.tap.proxy.worker.srvPort 1 }}' {{- end }} + - -loglevel + - '{{ .Values.logLevel | default "warning" }}' {{- if .Values.tap.docker.overrideTag.worker }} image: '{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.overrideTag.worker }}{{ include "kubeshark.dockerTagDebugVersion" . }}' {{ else }} diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 0281ba93e..39dcd67eb 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -178,3 +178,4 @@ scripting: active: [] console: true timezone: "" +logLevel: warning