From 8bbf852fcb0372785045cab2b6a542df48d17b2e Mon Sep 17 00:00:00 2001 From: fumingwei Date: Fri, 26 Jul 2024 16:21:20 +0800 Subject: [PATCH] feature:TSG-21883:Sync sce support fs4 modify in OS. --- .../traffic-engine/files/helm/conf/sce.conf | 20 +++-- .../files/helm/conf/telegraf_sce.conf | 77 ------------------- .../files/helm/templates/configmap-sce.yaml | 2 + .../helm/templates/configmap-telegraf.yaml | 1 - .../files/helm/templates/deployment-sce.yaml | 29 +------ 5 files changed, 18 insertions(+), 111 deletions(-) delete mode 100644 ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf diff --git a/ansible/roles/traffic-engine/files/helm/conf/sce.conf b/ansible/roles/traffic-engine/files/helm/conf/sce.conf index 2bf79d92..b580b357 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/sce.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/sce.conf @@ -73,9 +73,17 @@ prometheus_listen_url=/metrics [metrics] output_fs_interval_ms=500 output_kafka_interval_ms=1000 -data_center=center-xxg-tsgx -device_group=group-xxg-tsgx -device_id=9800165603247024 +{{- range .Values.device.tags -}} +{{- range $key,$val := . }} +{{- if eq $key "data_center" }} +data_center={{ $val }} +{{- end }} +{{- if eq $key "device_group" }} +device_group={{ $val }} +{{- end }} +{{- end }} +{{- end }} +device_id=DEVICE_ID_PLACE_HOLDER_MARK [bfdd] enable=1 @@ -88,7 +96,7 @@ gateway={{ .Values.sce_config.vxlan_config.endpoint_gateway }} icmp_cycle_time_s=10 [kafka] -brokerlist=192.168.40.224:9092 -sasl_username=admin -sasl_passwd=galaxy2019 +brokerlist={{- include "traffic-engine.config.addresses.converter" (list .Values.external_resources.olap.kafka_brokers.addresses "\",\"") }} +sasl_username={{ .Values.external_resources.olap.kafka_brokers.sasl_username }} +sasl_passwd={{ .Values.external_resources.olap.kafka_brokers.sasl_password }} topic_name=POLICY-RULE-METRIC \ No newline at end of file diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf deleted file mode 100644 index 01a87cd6..00000000 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf +++ /dev/null @@ -1,77 +0,0 @@ -# Telegraf Configuration -[global_tags] - device_id = "${device_id}" -{{- range .Values.device.tags -}} -{{- range $key,$val := . }} - {{ $key }} = {{ $val | quote }} -{{- end }} -{{- end }} -[agent] - interval = "1s" - round_interval = true - metric_batch_size = 1000 - metric_buffer_limit = 100000 - collection_jitter = "0s" - flush_interval = "1s" - flush_jitter = "0s" - precision = "" - debug = false - quiet = false - logfile = "" - hostname = "" - omit_hostname = true - - -[[inputs.socket_listener]] - service_address = "udp://:8300" - data_format = "influx" - read_buffer_size = "32MiB" - -#[[processors.converter]] -# [processors.converter.tags] -# measurement = ["topic"] - -[[processors.rename]] - [[processors.rename.replace]] - field = "sent_pkts_sum" - dest = "sent_pkts" - - [[processors.rename.replace]] - field = "sent_bytes_sum" - dest = "sent_bytes" - - [[processors.rename.replace]] - field = "recv_pkts_sum" - dest = "recv_pkts" - - [[processors.rename.replace]] - field = "recv_bytes_sum" - dest = "recv_bytes" - -[[aggregators.basicstats]] - period = "1s" - delay = "1s" - grace = "1s" - drop_original = true - stats = ["sum"] - fieldpass = ["sent_pkts", "sent_bytes", "recv_pkts", "recv_bytes"] - namepass = ["service_chaining_rule_hits"] # only "pass" swap metrics through the aggregator. - -#[[outputs.file]] -# files = ["/tmp/sce_metrics.json", "stdout"] -# data_format = "json" -# json_timestamp_units = "1ms" -# - -[[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.addresses.converter" (list .Values.external_resources.olap.kafka_brokers.addresses "\",\"") }}" ] - topic = "POLICY-RULE-METRIC" - client_id = "POLICY-RULE-METRIC" - data_format = "json" - json_timestamp_units = "1ms" - json_transformation = ''' - $merge([$, { "timestamp_ms": timestamp}]) ~> |$|{}, ['timestamp']| - ''' - diff --git a/ansible/roles/traffic-engine/files/helm/templates/configmap-sce.yaml b/ansible/roles/traffic-engine/files/helm/templates/configmap-sce.yaml index 26f8825a..c3be794e 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/configmap-sce.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/configmap-sce.yaml @@ -1,3 +1,4 @@ +{{- if eq .Values.service_chaining.enable .Values.define_enable_val_yes }} apiVersion: v1 kind: ConfigMap metadata: @@ -6,3 +7,4 @@ metadata: data: sce.conf: {{ tpl (.Files.Get "conf/sce.conf") . | quote }} tsg_device_tag.json: {{ tpl (.Files.Get "conf/tsg_device_tag.json") . | quote }} +{{- end }} \ No newline at end of file diff --git a/ansible/roles/traffic-engine/files/helm/templates/configmap-telegraf.yaml b/ansible/roles/traffic-engine/files/helm/templates/configmap-telegraf.yaml index c90c17bf..46aa87fe 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/configmap-telegraf.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/configmap-telegraf.yaml @@ -5,5 +5,4 @@ metadata: namespace: default data: telegraf_shaping.conf: {{ tpl (.Files.Get "conf/telegraf_shaping.conf") . | quote }} - telegraf_sce.conf: {{ tpl (.Files.Get "conf/telegraf_sce.conf") . | quote }} telegraf_proxy.conf: {{ tpl (.Files.Get "conf/telegraf_proxy.conf") . | quote }} \ No newline at end of file diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-sce.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-sce.yaml index e0b7b254..17861e01 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/deployment-sce.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-sce.yaml @@ -151,29 +151,6 @@ spec: mountPath: /run/frr {{- include "public.sync-host-timezone.volume-mount" . | nindent 8 }} - - name: telegraf-sce - image: "registry.gdnt-cloud.website/tsg-telegraf:{{ .Chart.AppVersion }}" - imagePullPolicy: Never - command: - - "bash" - - "-ec" - - | - source /etc/profile.d/device_id.sh - /usr/bin/telegraf -config /etc/telegraf/telegraf_sce.conf -config-directory /etc/telegraf/telegraf_statistic.d - securityContext: - privileged: true - volumeMounts: - - name: telegraf-configs-volume - mountPath: "/etc/telegraf/telegraf_sce.conf" - subPath: "telegraf_sce.conf" - - name: shared-configs-volume - mountPath: "/opt/tsg/etc/tsg_sn.json" - subPath: "tsg_sn.json" - - name: shared-configs-volume - mountPath: "/etc/profile.d/device_id.sh" - subPath: "device_id.sh" - {{- include "public.sync-host-timezone.volume-mount" . | nindent 8 }} - - name: log-dir-hook image: "registry.gdnt-cloud.website/tsg-sce:{{ .Chart.AppVersion }}" imagePullPolicy: Never @@ -230,11 +207,12 @@ spec: imagePullPolicy: Never command: - "bash" - - "-ec" + - "-ecx" - | cp -r /opt/tsg/configs/* /opt/tsg/shared-configs/ {{- include "public.prepare-access-API" . | nindent 12 }} {{- include "public.serialize-node-annotations" . | nindent 12 }} + sed -Ei -c "s|DEVICE_ID_PLACE_HOLDER_MARK|${DEVICE_SN?}|g" /opt/tsg/shared-configs/sce/sce.conf {{- if .Values.sce_config.vxlan_config.endpoint_nic }} ip tuntap add dev {{ .Values.sce_config.vxlan_config.endpoint_nic }} mode tap ip link set dev {{ .Values.sce_config.vxlan_config.endpoint_nic }} up @@ -269,9 +247,6 @@ spec: hostPath: path: /run/systemd/journal type: Directory - - name: telegraf-configs-volume - configMap: - name: telegraf-{{ .Release.Name }} - name: sce-configs-volume configMap: name: sce-{{ .Release.Name }}