更新sapp、tsg_master、quic、session_record:

This commit is contained in:
刘学利
2023-06-27 12:25:15 +00:00
committed by 付明卫
parent dce2dfb204
commit 3cd287f168
20 changed files with 127 additions and 134 deletions

View File

@@ -5,7 +5,7 @@ firewall_rpm_version:
capture_packet_plug: capture_packet_plug-5.0.5.2bb3788
conn_telemetry: conn_telemetry-1.0.3.4ef6df6
firewall: firewall-2.0.11.be7b83c
tsg_conn_sketch: tsg_conn_sketch-4.1.0.650515c
session_record: session_record-4.1.1.b9f3575
gtp_signaling_plug: gtp_signaling_plug-2.0.0.3f233d7
tsg_vulpes: tsg_vulpes-1.0.9.0d7c615
radius_collect_plug: radius_collect_plug-2.0.9.f1e08ad
@@ -16,7 +16,7 @@ firewall_rpm_version:
ftp: ftp-1.0.15.1fc64fe
http: http-2.0.12.0747ada
mail: mail-1.0.18.98773fe
quic: quic-2.0.5.96f9ce3
quic: quic-2.0.6.513732e
ssl: ssl-2.0.12.d55819b
rtp: rtp-1.0.7.530ac76
gtp: gtp-1.0.7.e1041b2
@@ -66,9 +66,9 @@ mrzcpd_rpm_version:
sapp_rpm_version:
sapp: sapp-4.3.11.d87b777
sapp: sapp-4.3.12.512bb58
tcpdump_mesa: tcpdump_mesa-1.0.13.6ec67f5
sapp-pr: sapp-pr-4.3.11.d87b777
sapp-pr: sapp-pr-4.3.12.512bb58
tfe_rpm_version:
tfe: tfe-4.8.30.fb0bc39
@@ -78,7 +78,7 @@ tsg_app_rpm_version:
app_sketch_local: app_sketch_local-5.0.5.221e296
tsg_master_rpm_version:
tsg_master: tsg_master-6.0.26.ca8eff0
tsg_master: tsg_master-6.0.27.b180303
shaping_master_rpm_version:
shaping_master: shaping_master-1.1.4.b434f47

View File

@@ -26,10 +26,10 @@
tags: template
when: runtime_env != 'TSG-X-P0906'
- name: "Template the /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf"
- name: "Template the /opt/tsg/sapp/plug/business/session_record/session_record.inf"
template:
src: "{{ role_path }}/templates/tsg_conn_sketch.inf.j2.j2"
dest: /opt/tsg/tsg-os-provision/templates/tsg_conn_sketch.inf.j2
src: "{{ role_path }}/templates/session_record.inf.j2.j2"
dest: /opt/tsg/tsg-os-provision/templates/session_record.inf.j2
tags: template
when: runtime_env != 'TSG-X-P0906'

View File

@@ -91,7 +91,7 @@ DEVICE_SEQ_IN_DATA_CENTER={{ session_id_generator.snowflake_worker_id_offset }}
{% endraw %}
FEATURE_TAMPER=1
[TSG_CONN_SKETCH]
[SESSION_RECORD]
interim_intervals_time = 120
sendlog_in_tcp_close=1
send_dns_rr_switch=0

View File

@@ -1,76 +1,76 @@
[PLUGINFO]
PLUGNAME=TSG_CONN_SKETCH
SO_PATH=./plug/business/tsg_conn_sketch/tsg_conn_sketch.so
INIT_FUNC=tsg_conn_record_init
DESTROY_FUNC=tsg_conn_record_destroy
PLUGNAME=session_record
SO_PATH=./plug/business/session_record/session_record.so
INIT_FUNC=session_record_init
DESTROY_FUNC=session_record_destroy
[TCP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_tcp_entry
FUNC_NAME=session_record_tcp_entry
[TCP_ALL]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_tcpall_entry
FUNC_NAME=session_record_tcpall_entry
[UDP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_udp_entry
FUNC_NAME=session_record_udp_entry
[HTTP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_http_entry
FUNC_NAME=session_record_http_entry
[SSL]
FUNC_FLAG=SSL_CLIENT_HELLO,SSL_SERVER_HELLO,SSL_APPLICATION_DATA,SSL_CERTIFICATE_DETAIL
FUNC_NAME=tsg_record_ssl_entry
FUNC_NAME=session_record_ssl_entry
{% raw %}{% if sessionrecord.enable_dns_record == 1 %}
[DNS]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_dns_entry
FUNC_NAME=session_record_dns_entry
{% endif %}
{% endraw %}
[MAIL]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_mail_entry
FUNC_NAME=session_record_mail_entry
{% raw %}{% if sessionrecord.enable_rtp_record == 1 %}
[RTP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_rtp_entry
FUNC_NAME=session_record_rtp_entry
{% endif %}
{% endraw %}
[SIP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_sip_entry
FUNC_NAME=session_record_sip_entry
[FTP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_ftp_entry
FUNC_NAME=session_record_ftp_entry
[QUIC]
FUNC_FLAG=QUIC_CLIENT_HELLO,QUIC_SERVER_HELLO,QUIC_CACHED_CERT,QUIC_COMM_CERT,QUIC_CERT_CHAIN,QUIC_VERSION,QUIC_APPLICATION_DATA
FUNC_NAME=tsg_record_quic_entry
FUNC_NAME=session_record_quic_entry
[SSH]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_ssh_entry
FUNC_NAME=session_record_ssh_entry
[STRATUM]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_stratum_entry
FUNC_NAME=session_record_stratum_entry
[RDP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_rdp_entry
FUNC_NAME=session_record_rdp_entry
[BGP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_bgp_entry
FUNC_NAME=session_record_bgp_entry
[DTLS]
FUNC_FLAG=DTLS_CLIENT_HELLO,DTLS_SERVER_HELLO,DTLS_HELLO_VERIFY_REQUEST,DTLS_CLIENT_EXTENSION
FUNC_NAME=tsg_record_dtls_entry
FUNC_NAME=session_record_dtls_entry

View File

@@ -51,11 +51,11 @@
{% endif %}
{% if connsketch.enable is defined %}
{% if connsketch.enable == 1 %}
./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
./plug/business/session_record/session_record.inf
{% endif %}
{% else %}
{% if sessionrecord.enable == 1 %}
./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
./plug/business/session_record/session_record.inf
{% endif %}
{% endif %}
{% if capturepacket.enable == 1 %}

View File

@@ -20,7 +20,7 @@
./plug/protocol/rdp/rdp.inf
./plug/protocol/bgp/bgp.inf
./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf 1
./plug/business/session_record/session_record.inf 1
./plug/business/capture_packet_plug/capture_packet_plug.inf 1
./plug/business/kni/kni.inf
./plug/business/fw_dns_plug/fw_dns_plug.inf

View File

@@ -176,40 +176,36 @@ dictator_enable=0
[PROFILING]
[profiling.pkt_latency]
enabled=0
### note, threshold unit is microseconds (us)
threshold=1000000
[profiling.sanity_check]
raw_pkt_broken_enabled=0
symbol_conflict_enabled=0
[profiling.log]
level=20
interval=5
[profiling.log.local]
enabled=1
### note, if "file_truncate_open_enabled=1", file will be truncated, otherwise open the file for appending.
file_truncate_enabled = 1
#log_file_name = "log/fs2_sysinfo.log"
#log_conf_name = "etc/sapp_log.conf"
[profiling.log.remote]
enabled=0
server_ip=127.0.0.1
server_port=8100
sapp_log_category="log/sapp_log"
sapp_plugin_log_category="log/sapp_plugin_log"
#for profiling-related API control, e.g printaddr
enabled_log_level=20
[profiling.log.remote.field_stat2]
### note, is valid when "remote_send_out_type=field_stat2"
### note, metric_type option value: [default, json]
metric_type = default
app_name=sapp
[profiling.log.prometheus]
prometheus_enabled=1
[profiling.metric]
[profiling.metric.fs2]
enabled=0
prometheus_port=9273
prometheus_url_path="/metrics"
local_file="fs2_sysinfo.metrics"
refresh_interval_s=1
[profiling.metric.fs3]
enabled=1
prometheus_port=9373
prometheus_url_path="/metrics"
local_file="fs3_sysinfo.metrics"
refresh_interval_s=1
[profiling.process_latency]
log_category="log/sapp_process_latency_log"
enabled_log_level=10
### note, threshold unit is microseconds (us)
threshold_us=100000
[profiling.sanity_check]
raw_pkt_broken_enabled=0
symbol_conflict_enabled=0
[TOOLS]
[tools.pkt_dump]

View File

@@ -11,7 +11,8 @@ STOP=40
other = "%d(%c), %V, %F, %U, %m%n"
plugin = "%d(%c), %m%n"
[rules]
__log_runtimelog.fatal "./log/runtimelog.%d(%F)"
__log_runtimelog_plugin.fatal >stdout; plugin
__log_runtimelog_plugin.info "./log/plugin.log.%d(%F)"; plugin
sapp_log.info "./log/runtimelog.%d(%F)"
sapp_plugin_log.fatal >stdout; plugin
sapp_plugin_log.info "./log/plugin.log"; plugin
sapp_process_latency_log.info "./log/sapp_process_latency.log"
!.fatal "./log/%c.%d(%F)"; other

View File

@@ -76,7 +76,7 @@
./plug/business/tsg_vulpes/tsg_vulpes.inf
{{- end }}
{{- if eq .Values.sessionrecord.enable .Values.define_enable_val_yes }}
./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
./plug/business/session_record/session_record.inf
{{- end }}
{{- if eq .Values.packet_capture.enable .Values.define_enable_val_yes }}
./plug/business/capture_packet_plug/capture_packet_plug.inf

View File

@@ -84,7 +84,7 @@ SHAPING_SID={{ .Values.sid.shaping }}
PROXY_SID={{ .Values.sid.proxy }}
{{- end }}
[TSG_CONN_SKETCH]
[SESSION_RECORD]
interim_intervals_time = {{ .Values.sessionrecord.interim_record.intervals_in_sec }}
sendlog_in_tcp_close=1
send_dns_rr_switch=0

View File

@@ -20,7 +20,7 @@
./plug/protocol/rdp/rdp.inf
./plug/protocol/bgp/bgp.inf
./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf 1
./plug/business/session_record/session_record.inf 1
./plug/business/capture_packet_plug/capture_packet_plug.inf 1
./plug/business/kni/kni.inf
./plug/business/fw_dns_plug/fw_dns_plug.inf

View File

@@ -169,40 +169,36 @@ bypass_trigger_cpu_usage={{ .Values.overload_protection.detect_threshold_cpu_usa
[PROFILING]
[profiling.pkt_latency]
enabled=0
### note, threshold unit is microseconds (us)
threshold=1000000
[profiling.sanity_check]
raw_pkt_broken_enabled=0
symbol_conflict_enabled=0
[profiling.log]
level=20
interval=5
sapp_log_category="log/sapp_log"
sapp_plugin_log_category="log/sapp_plugin_log"
#for profiling-related API control, e.g printaddr
enabled_log_level=20
[profiling.log.local]
enabled=1
### note, if "file_truncate_open_enabled=1", file will be truncated, otherwise open the file for appending.
file_truncate_enabled = 1
#log_file_name = "log/fs2_sysinfo.log"
#log_conf_name = "etc/sapp_log.conf"
[profiling.log.remote]
[profiling.metric]
[profiling.metric.fs2]
enabled=0
server_ip=127.0.0.1
server_port=8100
[profiling.log.remote.field_stat2]
### note, is valid when "remote_send_out_type=field_stat2"
### note, metric_type option value: [default, json]
metric_type = default
app_name=sapp
[profiling.log.prometheus]
prometheus_enabled=1
prometheus_port=9273
prometheus_url_path="/metrics"
local_file="fs2_sysinfo.metrics"
refresh_interval_s=1
[profiling.metric.fs3]
enabled=1
prometheus_port=9373
prometheus_url_path="/metrics"
local_file="fs3_sysinfo.metrics"
refresh_interval_s=1
[profiling.process_latency]
log_category="log/sapp_process_latency_log"
enabled_log_level=10
### note, threshold unit is microseconds (us)
threshold_us=100000
[profiling.sanity_check]
raw_pkt_broken_enabled=0
symbol_conflict_enabled=0
[TOOLS]
[tools.pkt_dump]

View File

@@ -1,109 +1,109 @@
[PLUGINFO]
PLUGNAME=TSG_CONN_SKETCH
SO_PATH=./plug/business/tsg_conn_sketch/tsg_conn_sketch.so
INIT_FUNC=tsg_conn_record_init
DESTROY_FUNC=tsg_conn_record_destroy
PLUGNAME=session_record
SO_PATH=./plug/business/session_record/session_record.so
INIT_FUNC=session_record_init
DESTROY_FUNC=session_record_destroy
[TCP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_tcp_entry
FUNC_NAME=session_record_tcp_entry
[TCP_ALL]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_tcpall_entry
FUNC_NAME=session_record_tcpall_entry
[UDP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_udp_entry
FUNC_NAME=session_record_udp_entry
{{- if eq .Values.decoders.HTTP .Values.define_enable_val_yes }}
[HTTP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_http_entry
FUNC_NAME=session_record_http_entry
{{- end }}
{{- if eq .Values.decoders.SSL .Values.define_enable_val_yes }}
[SSL]
FUNC_FLAG=SSL_CLIENT_HELLO,SSL_SERVER_HELLO,SSL_APPLICATION_DATA,SSL_CERTIFICATE_DETAIL
FUNC_NAME=tsg_record_ssl_entry
FUNC_NAME=session_record_ssl_entry
{{- end }}
{{- if eq .Values.decoders.DNS .Values.define_enable_val_yes }}
[DNS]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_dns_entry
FUNC_NAME=session_record_dns_entry
{{- end }}
{{- if eq .Values.decoders.MAIL .Values.define_enable_val_yes }}
[MAIL]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_mail_entry
FUNC_NAME=session_record_mail_entry
{{- end }}
{{- if and (eq .Values.voip_record.enable_rtp .Values.define_enable_val_yes) (eq .Values.decoders.RTP .Values.define_enable_val_yes ) }}
[RTP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_rtp_entry
FUNC_NAME=session_record_rtp_entry
{{- end }}
{{- if and (eq .Values.voip_record.enable_sip .Values.define_enable_val_yes) (eq .Values.decoders.SIP .Values.define_enable_val_yes ) }}
[SIP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_sip_entry
FUNC_NAME=session_record_sip_entry
{{- end }}
{{- if eq .Values.decoders.FTP .Values.define_enable_val_yes }}
[FTP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_ftp_entry
FUNC_NAME=session_record_ftp_entry
{{- end }}
{{- if eq .Values.decoders.QUIC .Values.define_enable_val_yes }}
[QUIC]
FUNC_FLAG=QUIC_CLIENT_HELLO,QUIC_SERVER_HELLO,QUIC_CACHED_CERT,QUIC_COMM_CERT,QUIC_CERT_CHAIN,QUIC_VERSION,QUIC_APPLICATION_DATA
FUNC_NAME=tsg_record_quic_entry
FUNC_NAME=session_record_quic_entry
{{- end }}
{{- if eq .Values.decoders.SSH .Values.define_enable_val_yes }}
[SSH]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_ssh_entry
FUNC_NAME=session_record_ssh_entry
{{- end }}
{{- if eq .Values.decoders.STRATUM .Values.define_enable_val_yes }}
[STRATUM]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_stratum_entry
FUNC_NAME=session_record_stratum_entry
{{- end }}
{{- if eq .Values.decoders.RDP .Values.define_enable_val_yes }}
[RDP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_rdp_entry
FUNC_NAME=session_record_rdp_entry
{{- end }}
{{- if and (eq .Values.bgp_record.enable .Values.define_enable_val_yes) (eq .Values.decoders.BGP .Values.define_enable_val_yes) }}
[BGP]
FUNC_FLAG=ALL
FUNC_NAME=tsg_record_bgp_entry
FUNC_NAME=session_record_bgp_entry
{{- end }}
{{- if eq .Values.decoders.DTLS .Values.define_enable_val_yes }}
[DTLS]
FUNC_FLAG=DTLS_CLIENT_HELLO,DTLS_SERVER_HELLO,DTLS_HELLO_VERIFY_REQUEST,DTLS_CLIENT_EXTENSION
FUNC_NAME=tsg_record_dtls_entry
FUNC_NAME=session_record_dtls_entry
{{- end }}

View File

@@ -142,7 +142,7 @@ enable_breakpad_upload=0
cp /opt/tsg/config/sapp.toml /opt/tsg/sapp/etc/sapp.toml
cp /opt/tsg/config/wangw.conf /opt/tsg/sapp/etc/wannat/wangw.conf
cp /opt/tsg/config/wire_graft.conf /opt/tsg/sapp/etc/wire_graft/wire_graft.conf
cp /opt/tsg/config/tsg_conn_sketch.inf /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
cp /opt/tsg/config/session_record.inf /opt/tsg/sapp/plug/business/session_record/session_record.inf
cp /opt/tsg/config/send_raw_pkt.conf /opt/tsg/sapp/etc/send_raw_pkt.conf
cp /opt/tsg/config/tsg_device_tag.json /opt/tsg/etc/tsg_device_tag.json
cp /opt/tsg/config/app_sketch_local.inf /opt/tsg/sapp/plug/business/app_sketch_local/app_sketch_local.inf

View File

@@ -8,7 +8,7 @@ data:
gdev.conf: {{ tpl (.Files.Get "conf/gdev.conf") . | quote }}
main.conf: {{ tpl (.Files.Get "conf/main.conf") . | quote }}
maat.conf: {{ tpl (.Files.Get "conf/maat.conf") . | quote }}
tsg_conn_sketch.inf: {{ tpl (.Files.Get "conf/tsg_conn_sketch.inf") . | quote }}
session_record.inf: {{ tpl (.Files.Get "conf/session_record.inf") . | quote }}
sapp.toml: {{ tpl (.Files.Get "conf/sapp.toml") . | quote }}
send_raw_pkt.conf: {{ tpl (.Files.Get "conf/send_raw_pkt.conf") . | quote }}
wangw.conf: {{ tpl (.Files.Get "conf/wangw.conf") . | quote }}

View File

@@ -153,10 +153,10 @@
dest: /opt/tsg/sapp/tsgconf/maat.conf
tags: firewall
- name: "tsg-os-provision: Template the tsg_conn_sketch.inf"
- name: "tsg-os-provision: Template the session_record.inf"
template:
src: "../templates/tsg_conn_sketch.inf.j2"
dest: /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
src: "../templates/session_record.inf.j2"
dest: /opt/tsg/sapp/plug/business/session_record/session_record.inf
tags: firewall
- name: "tsg-os-provision: Template the sapp.toml"

View File

@@ -103,10 +103,10 @@
dest: /opt/tsg/sapp/tsgconf/maat.conf
tags: firewall
- name: "tsg-os-provision: Template the tsg_conn_sketch.inf"
- name: "tsg-os-provision: Template the session_record.inf"
template:
src: "../templates/tsg_conn_sketch.inf.j2"
dest: /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
src: "../templates/session_record.inf.j2"
dest: /opt/tsg/sapp/plug/business/session_record/session_record.inf
tags: firewall
- name: "tsg-os-provision: Template the sapp.toml"

View File

@@ -87,10 +87,10 @@
dest: /opt/tsg/sapp/tsgconf/maat.conf
tags: firewall
- name: "tsg-os-provision: Template the tsg_conn_sketch.inf"
- name: "tsg-os-provision: Template the session_record.inf"
template:
src: "../templates/tsg_conn_sketch.inf.j2"
dest: /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
src: "../templates/session_record.inf.j2"
dest: /opt/tsg/sapp/plug/business/session_record/session_record.inf
tags: firewall
- name: "tsg-os-provision: Template the sapp.toml"

View File

@@ -159,10 +159,10 @@
dest: /opt/tsg/sapp/tsgconf/maat.conf
tags: firewall
- name: "tsg-os-provision: Template the tsg_conn_sketch.inf"
- name: "tsg-os-provision: Template the session_record.inf"
template:
src: "../templates/tsg_conn_sketch.inf.j2"
dest: /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
src: "../templates/session_record.inf.j2"
dest: /opt/tsg/sapp/plug/business/session_record/session_record.inf
tags: firewall
- name: "tsg-os-provision: Template the sapp.toml"

View File

@@ -72,10 +72,10 @@
dest: /opt/tsg/sapp/tsgconf/maat.conf
tags: firewall
- name: "tsg-os-provision: Template the tsg_conn_sketch.inf"
- name: "tsg-os-provision: Template the session_record.inf"
template:
src: "../templates/tsg_conn_sketch.inf.j2"
dest: /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
src: "../templates/session_record.inf.j2"
dest: /opt/tsg/sapp/plug/business/session_record/session_record.inf
tags: firewall
- name: "tsg-os-provision: Template the sapp.toml"