1、增加libbreakpad_mini 安装 2、修改kni 部署

7 files changed, 10 insertions, 3 deletions

diff --git a/roles/framework/files/libbreakpad_mini-1.0.1.cb61125-2.el7.x86_64.rpm b/roles/framework/files/libbreakpad_mini-1.0.1.cb61125-2.el7.x86_64.rpm
new file mode 100644
index 0000000..1fcef58
--- /dev/null
+++ b/roles/framework/files/libbreakpad_mini-1.0.1.cb61125-2.el7.x86_64.rpm
diff --git a/roles/framework/tasks/main.yml b/roles/framework/tasks/main.yml
index 96f50ec..6dea9c1 100644
--- a/roles/framework/tasks/main.yml
+++ b/roles/framework/tasks/main.yml
@@ -24,6 +24,7 @@
       - /tmp/ansible_deploy/libwiredcfg-2.0.6.67ae0ab-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libWiredLB-2.0.5.4629165-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/lz4-1.7.5-3.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libbreakpad_mini-1.0.1.cb61125-2.el7.x86_64.rpm
 
 - name: "mkdir /etc/ld.so.conf.d/"
   file:
diff --git a/roles/kni/files/kni-20.10.20201014.6d458ba-1.el7.x86_64.rpm b/roles/kni/files/kni-20.10.20201014.6d458ba-1.el7.x86_64.rpm
new file mode 100644
index 0000000..d19219b
--- /dev/null
+++ b/roles/kni/files/kni-20.10.20201014.6d458ba-1.el7.x86_64.rpm
diff --git a/roles/kni/files/kni-debug-20.10.20201014.6d458ba-1.el7.x86_64.rpm b/roles/kni/files/kni-debug-20.10.20201014.6d458ba-1.el7.x86_64.rpm
deleted file mode 100644
index c177123..0000000
--- a/roles/kni/files/kni-debug-20.10.20201014.6d458ba-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/kni/tasks/main.yml b/roles/kni/tasks/main.yml
index cbef026..266244a 100644
--- a/roles/kni/tasks/main.yml
+++ b/roles/kni/tasks/main.yml
@@ -7,7 +7,7 @@
 - name: "install kni rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/kni-debug-20.10.20201014.6d458ba-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/kni-20.10.20201014.6d458ba-1.el7.x86_64.rpm
     state: present
 
 - name: Template the kni.conf
diff --git a/roles/kni/templates/kni.conf.j2 b/roles/kni/templates/kni.conf.j2
index 076dec8..7183e7b 100644
--- a/roles/kni/templates/kni.conf.j2
+++ b/roles/kni/templates/kni.conf.j2
@@ -64,7 +64,7 @@ mho_hash_max_element_num = 2560000
 mho_expire_time = 30
 mho_eliminate_type = LRU
 
-//per thread
+#per thread
 [tuple2stream_htable]
 mho_screen_print_ctrl = 0
 mho_thread_safe = 0
@@ -81,9 +81,15 @@ remote_port = 58100
 local_path = ./fs2_kni.status
 stat_cycle = 1
 print_mode = 1
+# 1:FS_OUTPUT_STATSD; 2:FS_OUTPUT_INFLUX_LINE
 statsd_format = 2
 APP_NAME = fs2_kni
 
+#self test Shunt rules security policy id
+[tsg_diagnose]
+enabled = 1
+security_policy_id = 3,10
+
 
 [ssl_dynamic_bypass]
 enabled = 1
diff --git a/roles/sapp/templates/sapp.toml.j2 b/roles/sapp/templates/sapp.toml.j2
index d763260..50375c2 100644
--- a/roles/sapp/templates/sapp.toml.j2
+++ b/roles/sapp/templates/sapp.toml.j2
@@ -103,7 +103,7 @@ BSD_packet_filter=""
 ### note, if "file_truncate_open_enabled=1", file will be truncated, otherwise open the file for appending.	 
         file_truncate_enabled = 1
         log_file_name = "fs2_sysinfo.log"
-     
+        log_conf_name = "etc/sapp_log.conf"
         [profiling.log.remote]
         enabled=1
         server_ip=127.0.0.1