From 8a277feada4c55c1fbbc07e7b5e74d8fcc55de53 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Wed, 19 Jul 2023 18:27:24 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:TSG-16265:=E6=96=B0=E5=A2=9Etelegraf=20a?= =?UTF-8?q?ggregators=20grace=E5=92=8Cdelay=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../telegraf_statistic/templates/telegraf_proxy.conf.j2.j2 | 2 ++ .../telegraf_statistic/templates/telegraf_security.conf.j2.j2 | 2 ++ .../telegraf_statistic/templates/telegraf_shaping.conf.j2.j2 | 2 ++ .../telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 | 2 ++ .../roles/traffic-engine/files/helm/conf/telegraf_proxy.conf | 2 ++ ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf | 2 ++ .../roles/traffic-engine/files/helm/conf/telegraf_security.conf | 2 ++ .../roles/traffic-engine/files/helm/conf/telegraf_shaping.conf | 2 ++ .../traffic-engine/files/helm/conf/telegraf_statistic.conf | 2 ++ 9 files changed, 18 insertions(+) diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2 index 3a0ee41f..30c59a2d 100644 --- a/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2 +++ b/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2 @@ -61,6 +61,8 @@ [[aggregators.basicstats]] period = "1s" + delay = "1s" + grace = "1s" drop_original = true stats = ["sum"] fieldpass = ["hit_count", "in_bytes", "out_bytes", "in_pkts", "out_pkts"] diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2 index a3996453..7bdc1c0a 100644 --- a/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2 +++ b/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2 @@ -65,6 +65,8 @@ [[aggregators.basicstats]] period = "1s" + delay = "1s" + grace = "1s" drop_original = true stats = ["sum"] fieldpass = ["hit_count", "in_bytes", "out_bytes", "in_pkts", "out_pkts"] diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2 index 242a3944..1470a1d6 100644 --- a/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2 +++ b/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2 @@ -105,6 +105,8 @@ [[aggregators.basicstats]] period = "1s" + delay = "1s" + grace = "1s" drop_original = true stats = ["sum", "max"] diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 index 8a2fe78d..99fef355 100644 --- a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 +++ b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 @@ -41,6 +41,8 @@ [[aggregators.basicstats]] period = "1s" + delay = "1s" + grace = "1s" drop_original = true stats = ["sum"] fieldpass = ["sessions", "in_bytes", "out_bytes", "in_pkts", "out_pkts", "c2s_pkts", "s2c_pkts", "c2s_bytes", "s2c_bytes", "c2s_fragments", "s2c_fragments", diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf index 97cc93a1..57aa77f8 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf @@ -53,6 +53,8 @@ [[aggregators.basicstats]] period = "1s" + delay = "1s" + grace = "1s" drop_original = true stats = ["sum"] fieldpass = ["hit_count", "in_bytes", "out_bytes", "in_pkts", "out_pkts"] 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 43eee1b4..10bc7156 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf @@ -49,6 +49,8 @@ [[aggregators.basicstats]] period = "1s" + delay = "1s" + grace = "1s" drop_original = true stats = ["sum"] fieldpass = ["sent_pkts", "sent_bytes", "recv_pkts", "recv_bytes"] diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf index 69f5efcb..d1e2d11e 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf @@ -58,6 +58,8 @@ [[aggregators.basicstats]] period = "1s" + delay = "1s" + grace = "1s" drop_original = true stats = ["sum"] fieldpass = ["hit_count", "in_bytes", "out_bytes", "in_pkts", "out_pkts"] diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf index ddb8ba05..16e2ec0b 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf @@ -81,6 +81,8 @@ [[aggregators.basicstats]] period = "1s" + delay = "1s" + grace = "1s" drop_original = true stats = ["sum", "max"] diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf index 206c9604..83d3677f 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf @@ -33,6 +33,8 @@ [[aggregators.basicstats]] period = "1s" + delay = "1s" + grace = "1s" drop_original = true stats = ["sum"] fieldpass = ["sessions", "in_bytes", "out_bytes", "in_pkts", "out_pkts", "c2s_pkts", "s2c_pkts", "c2s_bytes", "s2c_bytes", "c2s_fragments", "s2c_fragments",