gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor:replace traffic-engine.config.olap-address with traffic-engine.config.addresses.converter.

Browse Source
This commit is contained in:
fumingwei
2024-04-10 16:22:11 +08:00
parent 794e055898
commit 78ffddc0ae
6 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/traffic-engine/files/helm/conf/main.conf
View File

@@ -18,7 +18,7 @@ TRAFFIC_VSYSTEM_ID={{ .Values.vsys_id }}
COMPRESSION_TYPE="snappy"
SASL_USERNAME="{{ .Values.external_resources.olap.kafka_brokers.sasl_username }}"
SASL_PASSWD="{{ .Values.external_resources.olap.kafka_brokers.sasl_password }}"
BROKER_LIST="{{- include "traffic-engine.config.olap-address" (list . ",") }}"
BROKER_LIST="{{- include "traffic-engine.config.addresses.converter" (list .Values.external_resources.olap.kafka_brokers.addresses ",") }}"
{{- if eq .Values.firewall.logs.contains_app_id.enable .Values.define_enable_val_yes }}
SEND_APP_ID_SWITCH=1

2
ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf
View File

@@ -23,7 +23,7 @@
[[outputs.kafka]]
sasl_username = "{{ .Values.external_resources.olap.kafka_brokers.sasl_username }}"
sasl_password = "{{ .Values.external_resources.olap.kafka_brokers.sasl_password }}"
brokers = [ "{{- include "traffic-engine.config.olap-address" (list . "\",\"") }}" ]
brokers = [ "{{- include "traffic-engine.config.addresses.converter" (list .Values.external_resources.olap.kafka_brokers.addresses "\",\"") }}" ]
topic = "POLICY-RULE-METRIC"
data_format = "json"
json_timestamp_units = "1ms"

2
ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf
View File

@@ -66,7 +66,7 @@
[[outputs.kafka]]
sasl_username = "{{ .Values.external_resources.olap.kafka_brokers.sasl_username }}"
sasl_password = "{{ .Values.external_resources.olap.kafka_brokers.sasl_password }}"
brokers = [ "{{- include "traffic-engine.config.olap-address" (list . "\",\"") }}" ]
brokers = [ "{{- include "traffic-engine.config.addresses.converter" (list .Values.external_resources.olap.kafka_brokers.addresses "\",\"") }}" ]
topic = "POLICY-RULE-METRIC"
data_format = "json"
json_timestamp_units = "1ms"

2
ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf
View File

@@ -91,7 +91,7 @@
[[outputs.kafka]]
sasl_username = "{{ .Values.external_resources.olap.kafka_brokers.sasl_username }}"
sasl_password = "{{ .Values.external_resources.olap.kafka_brokers.sasl_password }}"
brokers = [ "{{- include "traffic-engine.config.olap-address" (list . "\",\"") }}" ]
brokers = [ "{{- include "traffic-engine.config.addresses.converter" (list .Values.external_resources.olap.kafka_brokers.addresses "\",\"") }}" ]
topic = "POLICY-RULE-METRIC"
fielddrop = ["*pkts*max", "*bytes*max", "*session*max", "*queue*max", "*latency*sum"]
data_format = "json"

2
ansible/roles/traffic-engine/files/helm/conf/tfe.conf
View File

@@ -177,7 +177,7 @@ default_vlan_id=0
[kafka]
enable=1
kafka_brokerlist={{- include "traffic-engine.config.olap-address" (list . ",") }}
kafka_brokerlist={{- include "traffic-engine.config.addresses.converter" (list .Values.external_resources.olap.kafka_brokers.addresses ",") }}
logger_send_topic=PROXY-EVENT
file_bucket_topic=TRAFFIC-FILE-STREAM-RECORD
mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT

12
ansible/roles/traffic-engine/files/helm/templates/_config.tpl
View File

@@ -1,15 +1,3 @@
{{- define "traffic-engine.config.olap-address" -}}
{{- $kafka_brokers := list -}}
{{- $separtor := index . 1 -}}
{{- with index . 0 }}
{{- range .Values.external_resources.olap.kafka_brokers.addresses -}}
{{- $broker_address := ( print .address ":" .port ) -}}
{{- $kafka_brokers = append $kafka_brokers $broker_address -}}
{{- end -}}
{{- end }}
{{- join $separtor $kafka_brokers }}
{{- end -}}
{{- define "traffic-engine.config.addresses.converter" -}}
{{- $addresses := list -}}
{{- $source := index . 0 -}}