From 75bb77a08d2c0d234032359d27bacb7d8f47a6e2 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Sun, 6 Aug 2023 21:45:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0sapp=E3=80=81tsg=5Fmaster?= =?UTF-8?q?=E3=80=81firewall=E3=80=81statistics=5Fmetrics=E3=80=81libfield?= =?UTF-8?q?stat4=E3=80=81libstatistics,=20=E6=94=AF=E6=8C=81:=20TSG-16060:?= =?UTF-8?q?=20=E6=94=AF=E6=8C=81=E8=BE=93=E5=87=BA=E5=91=BD=E4=B8=ADStatis?= =?UTF-8?q?tics=20Policy=E5=92=8Cobject=E7=9A=84Metrics?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../install_config/group_vars/rpm_version.yml | 11 +++++---- .../roles/firewall/templates/maat.conf.j2.j2 | 23 +++++++++++++++++++ .../roles/sapp/templates/conflist.inf.j2.j2 | 1 + .../files/helm/conf/conflist.inf | 1 + .../traffic-engine/files/helm/conf/maat.conf | 20 ++++++++++++++++ 5 files changed, 52 insertions(+), 4 deletions(-) diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 17b2d508..ce655050 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -4,7 +4,7 @@ certstore_rpm_version: firewall_rpm_version: capture_packet_plug: capture_packet_plug-5.0.6.1820f69 conn_telemetry: conn_telemetry-1.0.3.4ef6df6 - firewall: firewall-2.0.15.2c5842b + firewall: firewall-2.1.0.9f868a5 session_record: session_record-4.1.8.962ec30 gtp_signaling_plug: gtp_signaling_plug-2.0.0.3f233d7 tsg_vulpes: tsg_vulpes-1.0.9.0d7c615 @@ -29,6 +29,7 @@ firewall_rpm_version: rdp: rdp-1.0.3.f392ffd bgp: bgp-1.1.2.356c17d session_flags: session_flags-2.1.5.348c692 + statistics_metrics: statistics_metrics-1.0.2.05cfd7e framework_rpm_version: 00_libcjson: libcjson-1.7.12.6c09dcf @@ -54,6 +55,8 @@ framework_rpm_version: 20_libfieldstat3: libfieldstat3-3.0.9.fa7cd7e 21_libmaat4: libmaat4-4.0.31.73887d5 22_libMESA_sts: libMESA_sts-1.0.1.663f190 + 23_libfieldstat4: libfieldstat4-4.0.1.1851db6 + 24_libstatistics: libstatistics-1.0.2.382c385 kni_rpm_version: kni: kni-5.1.8.ce6433e @@ -66,9 +69,9 @@ mrzcpd_rpm_version: sapp_rpm_version: - sapp: sapp-4.3.20.73cf957 + sapp: sapp-4.3.21.738415d tcpdump_mesa: tcpdump_mesa-1.0.13.6ec67f5 - sapp-pr: sapp-pr-4.3.20.73cf957 + sapp-pr: sapp-pr-4.3.21.738415d tfe_rpm_version: tfe: tfe-4.8.32.2451bd7 @@ -78,7 +81,7 @@ tsg_app_rpm_version: app_sketch_local: app_sketch_local-5.0.6.cc02934 tsg_master_rpm_version: - tsg_master: tsg_master-6.0.46.e089f98 + tsg_master: tsg_master-6.1.0.79ca2d2 shaping_master_rpm_version: shaping_master: shaping_master-1.1.4.b434f47 diff --git a/ansible/roles/firewall/templates/maat.conf.j2.j2 b/ansible/roles/firewall/templates/maat.conf.j2.j2 index d9cc6037..433109d2 100644 --- a/ansible/roles/firewall/templates/maat.conf.j2.j2 +++ b/ansible/roles/firewall/templates/maat.conf.j2.j2 @@ -42,6 +42,29 @@ FULL_CFG_DIR=tsgrule/full/index/ EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json LOG_PATH="log/app_sketch.maat" +[STATISTICS_METRICS_MAAT] +###file, json, redis +MAAT_MODE=redis +STAT_SWITCH=1 +PERF_SWITCH=1 +TABLE_INFO=tsgconf/statistics_metrics_tableinfo.json +STAT_FILE=statistics_metrics.maat.status +EFFECT_INTERVAL_MS=1000 +GARBAGE_COLLECT_MS=6000 +RULE_UPDATE_CHECK_INTERVAL_MS=1000 +REDIS_IP={% raw %}{{ cm_policy_server_ip }} +{% endraw %} +REDIS_PORT={% raw %}{{ cm_policy_server_port }} +{% endraw %} +{% raw %}REDIS_INDEX={{ vsys_id }} +{% endraw %} +JSON_CFG_FILE=tsgconf/statistics_metrics_maat.json +INC_CFG_DIR=tsgrule/inc/index/ +FULL_CFG_DIR=tsgrule/full/index/ +EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json +LOG_LEVEL=0 +LOG_PATH="log/statistics_metrics.maat" + [CAPTURE] MAAT_MODE=2 STAT_SWITCH=1 diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2 b/ansible/roles/sapp/templates/conflist.inf.j2.j2 index 9390ad2f..38a36083 100644 --- a/ansible/roles/sapp/templates/conflist.inf.j2.j2 +++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2 @@ -65,6 +65,7 @@ ./plug/business/kni/kni.inf {% endif %} ./plug/business/conn_telemetry/conn_telemetry.inf +./plug/business/statistics_metrics/statistics_metrics.inf {% if app.identify_by.user_defined_signature == 1 %} ./plug/business/app_sketch_local/app_sketch_local.inf {% endif %} diff --git a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf index 12ecf90f..30a8607f 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf +++ b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf @@ -84,6 +84,7 @@ {{- if eq .Values.decoders.GTPC .Values.define_enable_val_yes }} ./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf {{- end }} +./plug/business/statistics_metrics/statistics_metrics.inf {{- if eq .Values.appsketch.enable .Values.define_enable_val_yes }} {{- if eq .Values.appsketch.user_defined_signature .Values.define_enable_val_yes }} ./plug/business/app_sketch_local/app_sketch_local.inf diff --git a/ansible/roles/traffic-engine/files/helm/conf/maat.conf b/ansible/roles/traffic-engine/files/helm/conf/maat.conf index 348c3985..4c28c393 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/maat.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/maat.conf @@ -36,6 +36,26 @@ FULL_CFG_DIR=tsgrule/full/index/ EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json LOG_PATH="log/app_sketch.maat" +[STATISTICS_METRICS_MAAT] +###file, json, redis +MAAT_MODE=redis +STAT_SWITCH=1 +PERF_SWITCH=1 +TABLE_INFO=tsgconf/statistics_metrics_tableinfo.json +STAT_FILE=statistics_metrics.maat.status +EFFECT_INTERVAL_MS=1000 +GARBAGE_COLLECT_MS=6000 +RULE_UPDATE_CHECK_INTERVAL_MS=1000 +REDIS_IP={{- include "traffic-engine.global.cm.server-ip" . }} +REDIS_PORT={{- include "traffic-engine.global.cm.server-port" . }} +REDIS_INDEX={{ .Values.vsys_id }} +JSON_CFG_FILE=tsgconf/statistics_metrics_maat.json +INC_CFG_DIR=tsgrule/inc/index/ +FULL_CFG_DIR=tsgrule/full/index/ +EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json +LOG_LEVEL=0 +LOG_PATH="log/statistics_metrics.maat" + [CAPTURE] MAAT_MODE=2 STAT_SWITCH=1