diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go index 1e5dd3610..4e9fea74e 100644 --- a/config/configStructs/tapConfig.go +++ b/config/configStructs/tapConfig.go @@ -252,6 +252,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 236b85968..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 @@ -138,6 +134,7 @@ tap: - syscall - ws - ldap + customMacros: {} metrics: port: 49100 pprof: diff --git a/manifests/complete.yaml b/manifests/complete.yaml index 7224a231c..5e40a2317 100644 --- a/manifests/complete.yaml +++ b/manifests/complete.yaml @@ -256,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'