diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 9b4f3860..99cb3574 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -4,8 +4,8 @@ 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.14.e78add7 - session_record: session_record-4.1.7.5733614 + firewall: firewall-2.0.15.2c5842b + 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 radius_collect_plug: radius_collect_plug-2.0.11.47a51f3 @@ -14,10 +14,10 @@ firewall_rpm_version: tsg_ddos_sketch: tsg_ddos_sketch-1.3.5.447bcc2 dns: dns-2.1.6.8cfb357 ftp: ftp-1.0.15.1fc64fe - http: http-2.0.13.5efe313 + http: http-2.0.15.e949298 mail: mail-1.0.19.e982b44 - quic: quic-2.0.6.513732e - ssl: ssl-3.0.1.8c0ec9f + quic: quic-2.0.8.4d73180 + ssl: ssl-3.0.2.2919874 rtp: rtp-1.0.7.530ac76 gtp: gtp-1.0.7.e1041b2 ssh: ssh-2.1.7.b053e65 @@ -78,7 +78,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.43.39ed85f + tsg_master: tsg_master-6.0.46.e089f98 shaping_master_rpm_version: shaping_master: shaping_master-1.1.4.b434f47 diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index d0fb55f6..2a7e54a3 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -50,27 +50,27 @@ TCP_MIN_BYTES=5 UDP_MIN_PKTS=3 UDP_MIN_BYTES=5 -[SECURITY_HITS] -CYCLE=1000 +[SECURITY_HITS_METRICS] +CYCLE_INTERVAL_MS=1000 TELEGRAF_PORT=8400 TELEGRAF_IP="127.0.0.1" APP_NAME="security_rule_hits" -[STATISTIC] -CYCLE=5 +[NETWORK_METRICS] +CYCLE_INTERVAL_MS=5000 TELEGRAF_PORT=8100 TELEGRAF_IP="127.0.0.1" OUTPUT_PATH="log/master.metrics" APP_NAME="statistic" -[APP_METRIC] -CYCLE=1000 +[APPLICATION_METRICS] +CYCLE_INTERVAL_MS=1000 TELEGRAF_PORT=8100 TELEGRAF_IP="127.0.0.1" APP_NAME="app_metric" -[FIELD_STAT] -CYCLE=5 +[MASTER_STATUS] +CYCLE_INTERVAL_MS=30000 #TELEGRAF_PORT=8200 #TELEGRAF_IP="127.0.0.1" OUTPUT_PATH="log/master.status" diff --git a/ansible/roles/traffic-engine/files/helm/conf/main.conf b/ansible/roles/traffic-engine/files/helm/conf/main.conf index 4e3357b4..1cc3fa3a 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/main.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/main.conf @@ -46,27 +46,27 @@ UDP_MIN_PKTS=3 UDP_MIN_BYTES=5 RAPIDJSON_CHUNK_CAPACITY={{ .Values.firewall.rapidjson_chunk_capacity }} -[SECURITY_HITS] -CYCLE=1000 +[SECURITY_HITS_METRICS] +CYCLE_INTERVAL_MS=1000 TELEGRAF_PORT=8400 TELEGRAF_IP="127.0.0.1" APP_NAME="security_rule_hits" -[STATISTIC] -CYCLE=5 +[NETWORK_METRICS] +CYCLE_INTERVAL_MS=5000 TELEGRAF_PORT=8100 TELEGRAF_IP="127.0.0.1" OUTPUT_PATH="log/master.metrics" APP_NAME="statistic" -[APP_METRIC] -CYCLE=1000 +[APPLICATION_METRICS] +CYCLE_INTERVAL_MS=1000 TELEGRAF_PORT=8100 TELEGRAF_IP="127.0.0.1" APP_NAME="app_metric" -[FIELD_STAT] -CYCLE=5 +[MASTER_STATUS] +CYCLE_INTERVAL_MS=30000 #TELEGRAF_PORT=8200 #TELEGRAF_IP="127.0.0.1" OUTPUT_PATH="log/master.status"