更新stat_policy_enforcer: TSG-16619: 输出statistics_rule_hits的计数

2023-08-13 14:03:16 +08:00
parent 54e4c57561
commit 64e6d700e0
11 changed files with 35 additions and 23 deletions
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -29,7 +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.6.c68e45c
+  stat_policy_enforcer: stat_policy_enforcer-1.0.7.60a46ab

 framework_rpm_version:
  00_libcjson: libcjson-1.7.12.6c09dcf
--- a/ansible/roles/firewall/templates/maat.conf.j2.j2
+++ b/ansible/roles/firewall/templates/maat.conf.j2.j2
@@ -42,15 +42,15 @@ 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]
+[STAT_POLICY_ENFORCER_MAAT]
 ###file, json, redis
 MAAT_MODE=redis
 STAT_SWITCH=1
-PERF_SWITCH=1
-TABLE_INFO=tsgconf/statistics_metrics_tableinfo.json
-STAT_FILE=log/statistics_metrics.maat.status
+PERF_SWITCH=0
+TABLE_INFO=tsgconf/stat_policy_enforcer_tableinfo.json
+STAT_FILE=log/stat_policy_enforcer.maat.status
 EFFECT_INTERVAL_MS=1000
-GARBAGE_COLLECT_MS=6000
+GARBAGE_COLLECT_MS=60000
 RULE_UPDATE_CHECK_INTERVAL_MS=1000
 REDIS_IP={% raw %}{{ cm_policy_server_ip }}
 {% endraw %}
@@ -58,12 +58,11 @@ REDIS_PORT={% raw %}{{ cm_policy_server_port }}
 {% endraw %}
 {% raw %}REDIS_INDEX={{ vsys_id }}
 {% endraw %}
-JSON_CFG_FILE=tsgconf/statistics_metrics_maat.json
+JSON_CFG_FILE=tsgconf/stat_policy_enforcer_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"
+LOG_PATH="log/stat_policy_enforcer.maat"

 [CAPTURE]
 MAAT_MODE=2
--- a/ansible/roles/firewall/templates/main.conf.j2.j2
+++ b/ansible/roles/firewall/templates/main.conf.j2.j2
@@ -56,6 +56,12 @@ TELEGRAF_PORT=8400
 TELEGRAF_IP="127.0.0.1"
 APP_NAME="security_rule_hits"

+[STATISTICS_HITS_METRICS]
+CYCLE_INTERVAL_MS=1000
+TELEGRAF_PORT=8400
+TELEGRAF_IP="127.0.0.1"
+APP_NAME="statistics_rule_hits"
+
 [NETWORK_METRICS]
 CYCLE_INTERVAL_MS=5000
 TELEGRAF_PORT=8100
--- a/ansible/roles/sapp/templates/conflist.inf.j2.j2
+++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2
@@ -65,7 +65,7 @@
 ./plug/business/kni/kni.inf
 {% endif %}
 ./plug/business/conn_telemetry/conn_telemetry.inf
-./plug/business/statistics_metrics/statistics_metrics.inf
+./plug/business/stat_policy_enforcer/stat_policy_enforcer.inf
 {% if app.identify_by.user_defined_signature == 1 %}
 ./plug/business/app_sketch_local/app_sketch_local.inf
 {% endif %}
--- a/ansible/roles/sapp/templates/necessary_plug_list.conf.j2
+++ b/ansible/roles/sapp/templates/necessary_plug_list.conf.j2
@@ -32,4 +32,5 @@
 ./plug/platform/tsg_ddos_sketch/tsg_ddos_sketch.inf 1
 ./plug/business/radius_collect_plug/radius_collect_plug.inf
 ./plug/platform/shaping_master/shaping_master.inf
-./plug/business/firewall/firewall.inf
+./plug/business/firewall/firewall.inf
+./plug/business/stat_policy_enforcer/stat_policy_enforcer.inf
--- a/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2
+++ b/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2
@@ -70,4 +70,4 @@
  drop_original = true
  stats = ["sum"]
  fieldpass = ["hit_count", "in_bytes", "out_bytes", "in_pkts", "out_pkts"]
-  namepass = ["security_rule_hits"]   # only "pass" swap metrics through the aggregator.
+  namepass = ["security_rule_hits", "statistics_rule_hits"]   # only "pass" swap metrics through the aggregator.
--- a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf
+++ b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf
@@ -84,7 +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
+./plug/business/stat_policy_enforcer/stat_policy_enforcer.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
--- a/ansible/roles/traffic-engine/files/helm/conf/maat.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/maat.conf
@@ -36,25 +36,24 @@ 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]
+[STAT_POLICY_ENFORCER_MAAT]
 ###file, json, redis
 MAAT_MODE=redis
 STAT_SWITCH=1
-PERF_SWITCH=1
-TABLE_INFO=tsgconf/statistics_metrics_tableinfo.json
-STAT_FILE=log/statistics_metrics.maat.status
+PERF_SWITCH=0
+TABLE_INFO=tsgconf/stat_policy_enforcer_tableinfo.json
+STAT_FILE=log/stat_policy_enforcer.maat.status
 EFFECT_INTERVAL_MS=1000
-GARBAGE_COLLECT_MS=6000
+GARBAGE_COLLECT_MS=60000
 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
+JSON_CFG_FILE=tsgconf/stat_policy_enforcer_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"
+LOG_PATH="log/stat_policy_enforcer.maat"

 [CAPTURE]
 MAAT_MODE=2
--- a/ansible/roles/traffic-engine/files/helm/conf/main.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/main.conf
@@ -52,6 +52,12 @@ TELEGRAF_PORT=8400
 TELEGRAF_IP="127.0.0.1"
 APP_NAME="security_rule_hits"

+[STATISTICS_HITS_METRICS]
+CYCLE_INTERVAL_MS=1000
+TELEGRAF_PORT=8400
+TELEGRAF_IP="127.0.0.1"
+APP_NAME="statistics_rule_hits"
+
 [NETWORK_METRICS]
 CYCLE_INTERVAL_MS=5000
 TELEGRAF_PORT=8100
--- a/ansible/roles/traffic-engine/files/helm/conf/necessary_plug_list.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/necessary_plug_list.conf
@@ -32,4 +32,5 @@
 ./plug/platform/tsg_ddos_sketch/tsg_ddos_sketch.inf 1
 ./plug/business/radius_collect_plug/radius_collect_plug.inf
 ./plug/platform/shaping_master/shaping_master.inf
-./plug/business/firewall/firewall.inf
+./plug/business/firewall/firewall.inf
+./plug/business/stat_policy_enforcer/stat_policy_enforcer.inf
--- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf
@@ -63,4 +63,4 @@
  drop_original = true
  stats = ["sum"]
  fieldpass = ["hit_count", "in_bytes", "out_bytes", "in_pkts", "out_pkts"]
-  namepass = ["security_rule_hits"]   # only "pass" swap metrics through the aggregator.
+  namepass = ["security_rule_hits", "statistics_rule_hits"]   # only "pass" swap metrics through the aggregator.