From 280aee8bfe35ec368a1ec279513972e5209f8775 Mon Sep 17 00:00:00 2001 From: lijia Date: Tue, 14 Sep 2021 11:35:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Etsg-os-provision=E9=85=8D?= =?UTF-8?q?=E7=BD=AEstream=5Fbypass=5Ftrigger=5Fcpu=5Fusage,=20=E6=96=B9?= =?UTF-8?q?=E4=BE=BF=E6=8E=A7=E5=88=B6bypass=E8=A7=A6=E5=8F=91=E9=98=88?= =?UTF-8?q?=E5=80=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/sapp/templates/sapp.toml.j2.j2 | 6 ++++-- .../config_sample/provision.default.yml.7400MCN0P01R01 | 1 + .../files/config_sample/provision.default.yml.9000NPBP01R01 | 1 + .../files/config_sample/provision.yml.sample.7400MCN0P01R01 | 1 + .../files/config_sample/provision.yml.sample.9000NPBP01R01 | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ansible/roles/sapp/templates/sapp.toml.j2.j2 b/ansible/roles/sapp/templates/sapp.toml.j2.j2 index bef1056f..0d910fc9 100644 --- a/ansible/roles/sapp/templates/sapp.toml.j2.j2 +++ b/ansible/roles/sapp/templates/sapp.toml.j2.j2 @@ -81,8 +81,10 @@ dictator_enable=1 {% endraw %} ### note, cpu usage value is percent, for example, config value is 85, means 85%, valid range: [1,100] -### sapp change to bypass state immediately when realtime cpu usage > bypass_trigger_cpu_usage - bypass_trigger_cpu_usage=90 +### sapp change to bypass state immediately when realtime cpu usage > bypass_trigger_cpu_usage +{% raw %}bypass_trigger_cpu_usage={{ feature.stream_bypass_trigger_cpu_usage }} +{% endraw %} + ### note, unit of get_cpu_usage_interval is milliseconds(ms) get_cpu_usage_interval=500 ### note, use the average of the last $smooth_avg_window times as current realtime value diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 index 22f804ea..1206ea0c 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 @@ -1,6 +1,7 @@ feature: enable_policy_local_cache: 1 enable_stream_bypass_under_ddos: 0 + stream_bypass_trigger_cpu_usage: 85 firewall: enable: 1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 index 06dccdb5..3ada6ef9 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 @@ -1,5 +1,6 @@ feature: enable_stream_bypass_under_ddos: 0 + stream_bypass_trigger_cpu_usage: 85 firewall: enable: 1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 index ac354e99..61cbec62 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 @@ -8,6 +8,7 @@ data_center: feature: enable_policy_local_cache: 1 enable_stream_bypass_under_ddos: 0 + stream_bypass_trigger_cpu_usage: 85 firewall: enable: 0/1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 index 4be092aa..d5bc70cb 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 @@ -7,6 +7,7 @@ data_center: feature: enable_stream_bypass_under_ddos: 0 + stream_bypass_trigger_cpu_usage: 85 firewall: enable: 0/1