Add CUSTOM_MACROS to ConfigMap (#1674)

Co-authored-by: Alon Girmonsky <1990761+alongir@users.noreply.github.com>
This commit is contained in:
M. Mert Yildiran 2024-12-26 03:45:03 +03:00 committed by GitHub
parent b377bfe35f
commit 639f1deb51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions

View File

@ -252,6 +252,7 @@ type TapConfig struct {
Capabilities CapabilitiesConfig `yaml:"capabilities" json:"capabilities"` Capabilities CapabilitiesConfig `yaml:"capabilities" json:"capabilities"`
GlobalFilter string `yaml:"globalFilter" json:"globalFilter" default:""` GlobalFilter string `yaml:"globalFilter" json:"globalFilter" default:""`
EnabledDissectors []string `yaml:"enabledDissectors" json:"enabledDissectors"` EnabledDissectors []string `yaml:"enabledDissectors" json:"enabledDissectors"`
CustomMacros map[string]string `yaml:"customMacros" json:"customMacros"`
Metrics MetricsConfig `yaml:"metrics" json:"metrics"` Metrics MetricsConfig `yaml:"metrics" json:"metrics"`
Pprof PprofConfig `yaml:"pprof" json:"pprof"` Pprof PprofConfig `yaml:"pprof" json:"pprof"`
Misc MiscConfig `yaml:"misc" json:"misc"` Misc MiscConfig `yaml:"misc" json:"misc"`

View File

@ -50,6 +50,7 @@ data:
{{- end }}' {{- end }}'
DUPLICATE_TIMEFRAME: '{{ .Values.tap.misc.duplicateTimeframe }}' DUPLICATE_TIMEFRAME: '{{ .Values.tap.misc.duplicateTimeframe }}'
ENABLED_DISSECTORS: '{{ gt (len .Values.tap.enabledDissectors) 0 | ternary (join "," .Values.tap.enabledDissectors) "" }}' 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" }}' DISSECTORS_UPDATING_ENABLED: '{{ .Values.dissectorsUpdatingEnabled | ternary "true" "false" }}'
DETECT_DUPLICATES: '{{ .Values.tap.misc.detectDuplicates | ternary "true" "false" }}' DETECT_DUPLICATES: '{{ .Values.tap.misc.detectDuplicates | ternary "true" "false" }}'
PCAP_DUMP_ENABLE: '{{ .Values.pcapdump.enabled }}' PCAP_DUMP_ENABLE: '{{ .Values.pcapdump.enabled }}'

View File

@ -85,10 +85,6 @@ tap:
filter: "" filter: ""
canDownloadPCAP: true canDownloadPCAP: true
canUseScripting: true canUseScripting: true
scriptingPermissions:
canSave: true
canActivate: true
canDelete: true
canUpdateTargetedPods: true canUpdateTargetedPods: true
canStopTrafficCapturing: true canStopTrafficCapturing: true
showAdminConsoleLink: true showAdminConsoleLink: true
@ -138,6 +134,7 @@ tap:
- syscall - syscall
- ws - ws
- ldap - ldap
customMacros: {}
metrics: metrics:
port: 49100 port: 49100
pprof: pprof:

View File

@ -256,6 +256,7 @@ data:
CLOUD_LICENSE_ENABLED: 'true' CLOUD_LICENSE_ENABLED: 'true'
DUPLICATE_TIMEFRAME: '200ms' DUPLICATE_TIMEFRAME: '200ms'
ENABLED_DISSECTORS: 'amqp,dns,http,icmp,kafka,redis,sctp,syscall,ws,ldap' ENABLED_DISSECTORS: 'amqp,dns,http,icmp,kafka,redis,sctp,syscall,ws,ldap'
CUSTOM_MACROS: '{}'
DISSECTORS_UPDATING_ENABLED: 'true' DISSECTORS_UPDATING_ENABLED: 'true'
DETECT_DUPLICATES: 'false' DETECT_DUPLICATES: 'false'
PCAP_DUMP_ENABLE: 'true' PCAP_DUMP_ENABLE: 'true'