diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 6ef71291..3a65c888 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -104,7 +104,7 @@ tsg_os_clixon_rpm_version: tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.0.35.36d8bc9 sce_rpm_version: - sce: sce-1.0.8.29755f2 + sce: sce-1.0.9.0aa8f70 bfdd_rpm_version: bfdd: bfdd-1.0.2-release diff --git a/ansible/roles/traffic-engine/files/helm/conf/sce.conf b/ansible/roles/traffic-engine/files/helm/conf/sce.conf index 314ca2b1..14eda7a2 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/sce.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/sce.conf @@ -3,6 +3,7 @@ nr_worker_threads={{- include "traffic-engine.sce.workerthread" . }} cpu_affinity_mask={{- include "traffic-engine.sce.cpu-affinity" . }} firewall_sids={{ .Values.sid.firewall }} enable_debug=0 +enable_send_log=1 ts_update_interval_ms=1 # Only when (disable_coredump == 1 || (enable_breakpad == 1 && enable_breakpad_upload == 1)) is satisfied, the core will not be generated locally @@ -15,6 +16,9 @@ breakpad_upload_tools=/opt/tsg/framework/bin/minidump_upload [maat] # 0:json 1:redis 2:iris input_mode=1 +# LOG_LEVEL_TRACE = 0; LOG_LEVEL_DEBUG = 1; LOG_LEVEL_INFO = 2; +# LOG_LEVEL_WARN = 3; LOG_LEVEL_ERROR = 4; LOG_LEVEL_FATAL = 5; +log_level=5 stat_switch=1 perf_switch=1 scan_detail=0 @@ -33,8 +37,11 @@ redis_port_range={{ .Values.external_resources.cm.port }} max_chaining_size=32 [packet_io] -# bypass_all_traffic:1 NF2NF and SF2SF -bypass_all_traffic=0 +# bypass_traffic:0 disable +# bypass_traffic:1 bypass all traffic +# bypass_traffic:2 bypass raw traffic +# bypass_traffic:3 bypass decrypted traffic +bypass_traffic=0 rx_burst_max=128 app_symbol=sce_{{ .Values.app_symbol_index }} dev_endpoint={{ .Values.sce_config.endpoint_nic }} @@ -57,13 +64,15 @@ prometheus_listen_port=9006 prometheus_listen_url=/metrics [metrics] -# Kafka Topic: SERVICE-CHAINING-METRICS +# Kafka Topic: POLICY-RULE-METRICS enable=1 interval_s=1 telegraf_bind_address=127.0.0.1 telegraf_listen_port=8300 [bfdd] +enable=1 path=/run/frr/bfdd.vty device={{ .Values.sce_config.endpoint_nic }} +local_address=127.0.0.1 gateway={{ .Values.sce_config.endpoint_gateway }} \ 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 index e6899bb8..305ee3b9 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf @@ -6,7 +6,6 @@ {{ $key }} = {{ $val | quote }} {{- end }} {{- end }} - vsys_id = {{ .Values.vsys_id | quote }} [agent] interval = "1s" round_interval = true @@ -53,22 +52,18 @@ drop_original = true stats = ["sum"] fieldpass = ["sent_pkts", "sent_bytes", "recv_pkts", "recv_bytes"] - namepass = ["service_chaining_metrics"] # only "pass" swap metrics through the aggregator. + namepass = ["service_chaining_rule_hits"] # only "pass" swap metrics through the aggregator. #[[outputs.file]] # files = ["/tmp/sce_metrics.json", "stdout"] # data_format = "json" -# json_transformation = ''' -# $merge([{"timestamp": timestamp}, tags, fields]) -# ''' +# 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.olap-address" (list . "\",\"") }}" ] - topic = "SERVICE-CHAINING-METRICS" + topic = "POLICY-RULE-METRICS" data_format = "json" - json_transformation = ''' - $merge([{"timestamp": timestamp}, tags, fields]) - ''' + json_timestamp_units = "1ms"