From 78ffddc0ae7753cd70397f5d2cbb40e3b1471ac9 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Wed, 10 Apr 2024 16:22:11 +0800 Subject: [PATCH] refactor:replace traffic-engine.config.olap-address with traffic-engine.config.addresses.converter. --- .../roles/traffic-engine/files/helm/conf/main.conf | 2 +- .../files/helm/conf/telegraf_proxy.conf | 2 +- .../traffic-engine/files/helm/conf/telegraf_sce.conf | 2 +- .../files/helm/conf/telegraf_shaping.conf | 2 +- .../roles/traffic-engine/files/helm/conf/tfe.conf | 2 +- .../traffic-engine/files/helm/templates/_config.tpl | 12 ------------ 6 files changed, 5 insertions(+), 17 deletions(-) diff --git a/ansible/roles/traffic-engine/files/helm/conf/main.conf b/ansible/roles/traffic-engine/files/helm/conf/main.conf index 8b703755..e0abb652 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/main.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/main.conf @@ -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 diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf index a6e85847..4ea9d492 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf @@ -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" diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf index 9d6a5d04..acdeb2cc 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf @@ -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" diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf index 32b39f2b..f3b0db62 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf @@ -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" diff --git a/ansible/roles/traffic-engine/files/helm/conf/tfe.conf b/ansible/roles/traffic-engine/files/helm/conf/tfe.conf index 270073c0..127fe562 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/tfe.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/tfe.conf @@ -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 diff --git a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl index cd8fb74e..ed7477cf 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl +++ b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl @@ -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 -}}