diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go index 40b44f6a8..7dd1577f1 100644 --- a/config/configStructs/tapConfig.go +++ b/config/configStructs/tapConfig.go @@ -245,6 +245,7 @@ type TapConfig struct { Capabilities CapabilitiesConfig `yaml:"capabilities" json:"capabilities"` GlobalFilter string `yaml:"globalFilter" json:"globalFilter" default:""` EnabledDissectors []string `yaml:"enabledDissectors" json:"enabledDissectors"` + CustomMacros map[string]string `yaml:"customMacros" json:"customMacros"` Metrics MetricsConfig `yaml:"metrics" json:"metrics"` Pprof PprofConfig `yaml:"pprof" json:"pprof"` Misc MiscConfig `yaml:"misc" json:"misc"` diff --git a/helm-chart/templates/12-config-map.yaml b/helm-chart/templates/12-config-map.yaml index 63462ec9d..1ad5490cf 100644 --- a/helm-chart/templates/12-config-map.yaml +++ b/helm-chart/templates/12-config-map.yaml @@ -50,6 +50,7 @@ data: {{- end }}' DUPLICATE_TIMEFRAME: '{{ .Values.tap.misc.duplicateTimeframe }}' ENABLED_DISSECTORS: '{{ gt (len .Values.tap.enabledDissectors) 0 | ternary (join "," .Values.tap.enabledDissectors) "" }}' + CUSTOM_MACROS: '{{ toJson .Values.tap.customMacros }}' DISSECTORS_UPDATING_ENABLED: '{{ .Values.dissectorsUpdatingEnabled | ternary "true" "false" }}' DETECT_DUPLICATES: '{{ .Values.tap.misc.detectDuplicates | ternary "true" "false" }}' PCAP_DUMP_ENABLE: '{{ .Values.pcapdump.enabled }}' diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 15b1638c4..4d367a0a3 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -85,10 +85,6 @@ tap: filter: "" canDownloadPCAP: true canUseScripting: true - scriptingPermissions: - canSave: true - canActivate: true - canDelete: true canUpdateTargetedPods: true canStopTrafficCapturing: true showAdminConsoleLink: true @@ -121,7 +117,6 @@ tap: - SYS_ADMIN - SYS_PTRACE - DAC_OVERRIDE - - IPC_LOCK ebpfCapture: - SYS_ADMIN - SYS_PTRACE @@ -139,6 +134,7 @@ tap: - syscall - ws - ldap + customMacros: {} metrics: port: 49100 pprof: @@ -165,6 +161,7 @@ pcapdump: maxTime: 1h maxSize: 500MB pcapSrcDir: pcapdump + time: time kube: configPath: "" context: "" diff --git a/manifests/complete.yaml b/manifests/complete.yaml index 945e2bda7..19da8db4c 100644 --- a/manifests/complete.yaml +++ b/manifests/complete.yaml @@ -1,5 +1,5 @@ --- -# Source: kubeshark/templates/16-network-policies.yaml +# Source: kubeshark/templates/17-network-policies.yaml apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: @@ -23,10 +23,13 @@ spec: - ports: - protocol: TCP port: 8080 + - ports: + - protocol: TCP + port: 9100 egress: - {} --- -# Source: kubeshark/templates/16-network-policies.yaml +# Source: kubeshark/templates/17-network-policies.yaml apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: @@ -53,7 +56,7 @@ spec: egress: - {} --- -# Source: kubeshark/templates/16-network-policies.yaml +# Source: kubeshark/templates/17-network-policies.yaml apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: @@ -253,6 +256,7 @@ data: CLOUD_LICENSE_ENABLED: 'true' DUPLICATE_TIMEFRAME: '200ms' ENABLED_DISSECTORS: 'amqp,dns,http,icmp,kafka,redis,sctp,syscall,ws,ldap' + CUSTOM_MACROS: '{}' DISSECTORS_UPDATING_ENABLED: 'true' DETECT_DUPLICATES: 'false' PCAP_DUMP_ENABLE: 'true' @@ -457,6 +461,35 @@ spec: port: 49100 targetPort: 49100 --- +# Source: kubeshark/templates/16-hub-service-metrics.yaml +kind: Service +apiVersion: v1 +metadata: + labels: + helm.sh/chart: kubeshark-52.3.92 + app.kubernetes.io/name: kubeshark + app.kubernetes.io/instance: kubeshark + app.kubernetes.io/version: "52.3.92" + app.kubernetes.io/managed-by: Helm + annotations: + prometheus.io/scrape: 'true' + prometheus.io/port: '9100' + name: kubeshark-hub-metrics + namespace: default +spec: + selector: + app.kubeshark.co/app: hub + helm.sh/chart: kubeshark-52.3.92 + app.kubernetes.io/name: kubeshark + app.kubernetes.io/instance: kubeshark + app.kubernetes.io/version: "52.3.92" + app.kubernetes.io/managed-by: Helm + ports: + - name: metrics + protocol: TCP + port: 9100 + targetPort: 9100 +--- # Source: kubeshark/templates/09-worker-daemon-set.yaml apiVersion: apps/v1 kind: DaemonSet @@ -526,6 +559,8 @@ spec: - '49100' - -packet-capture - 'best' + - -loglevel + - 'warning' - -unixsocket - -servicemesh - -procfs @@ -584,7 +619,6 @@ spec: - SYS_ADMIN - SYS_PTRACE - DAC_OVERRIDE - - IPC_LOCK drop: - ALL readinessProbe: @@ -616,6 +650,8 @@ spec: - /hostproc - -disable-ebpf - -disable-tls-log + # - -loglevel + # - 'warning' image: 'docker.io/kubeshark/worker:v52.3.92' imagePullPolicy: Always name: tracer @@ -751,6 +787,8 @@ spec: - ./hub - -port - "8080" + - -loglevel + - 'warning' env: - name: POD_NAME valueFrom: