feature:TSG-11765:新增provision.yml配置项，配置会话日志的Transcation和interim开关v22.07.3rel-22.07dev-22.07

11 files changed, 30 insertions, 0 deletions

diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2
index 33a4aed2..b03e4429 100644
--- a/ansible/roles/firewall/templates/main.conf.j2.j2
+++ b/ansible/roles/firewall/templates/main.conf.j2.j2
@@ -97,8 +97,18 @@ udp_min_bytes=5
 log_service=2
 interim_service=6
 transaction_service=7
+{% raw %}
+{% if sessionrecord.enable_interim_record == 1 %}
 interim_service_switch=1
+{% else %}
+interim_service_switch=0
+{% endif %}
+{% if sessionrecord.enable_transcation_record == 1 %}
 transaction_service_switch=1
+{% else %}
+transaction_service_switch=0
+{% endif %}
+{% endraw %}
 interim_intervals_time = 120
 sendlog_in_tcp_close=1
 
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 a9fed924..764a30de 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
@@ -14,6 +14,8 @@ sessionrecord:
   enable: 1
   enable_dns_record: 1
   enable_rtp_record: 1
+  enable_interim_record: 1
+  enable_transcation_record: 1
 
 capturepacket:
   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 1ac2facb..aa526c7b 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
@@ -13,6 +13,8 @@ sessionrecord:
   enable: 1
   enable_dns_record: 1
   enable_rtp_record: 1
+  enable_interim_record: 1
+  enable_transcation_record: 1
 
 capturepacket:
   enable: 1
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER
index ba60b925..ba4a7b63 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER
@@ -13,6 +13,8 @@ sessionrecord:
   enable: 1
   enable_dns_record: 1
   enable_rtp_record: 1
+  enable_interim_record: 1
+  enable_transcation_record: 1
 
 capturepacket:
   enable: 1
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804
index 51fef03c..b00ca0cd 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804
@@ -14,6 +14,8 @@ sessionrecord:
   enable: 1
   enable_dns_record: 1
   enable_rtp_record: 1
+  enable_interim_record: 1
+  enable_transcation_record: 1
 
 capturepacket:
   enable: 1
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403
index 37089d7a..b0dfc6af 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403
@@ -14,6 +14,8 @@ sessionrecord:
   enable: 1
   enable_dns_record: 1
   enable_rtp_record: 1
+  enable_interim_record: 1
+  enable_transcation_record: 1
 
 capturepacket:
   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 a63a439b..8ba01803 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
@@ -23,6 +23,8 @@ sessionrecord:
   enable: 0/1
   enable_dns_record: 0/1
   enable_rtp_record: 0/1
+  enable_interim_record: 0/1
+  enable_transcation_record: 0/1
 
 capturepacket:
   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 1574783d..9f0075a6 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
@@ -23,6 +23,8 @@ sessionrecord:
   enable: 0/1
   enable_dns_record: 0/1
   enable_rtp_record: 0/1
+  enable_interim_record: 0/1
+  enable_transcation_record: 0/1
 
 capturepacket:
   enable: 0/1
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.SERVER b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.SERVER
index ec6a5d24..6387ff25 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.SERVER
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.SERVER
@@ -23,6 +23,8 @@ sessionrecord:
   enable: 0/1
   enable_dns_record: 0/1
   enable_rtp_record: 0/1
+  enable_interim_record: 0/1
+  enable_transcation_record: 0/1
 
 capturepacket:
   enable: 0/1
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P0804 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P0804
index 1dc91dc5..34cf25ed 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P0804
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P0804
@@ -22,6 +22,8 @@ sessionrecord:
   enable: 0/1
   enable_dns_record: 0/1
   enable_rtp_record: 0/1
+  enable_interim_record: 0/1
+  enable_transcation_record: 0/1
 
 capturepacket:
   enable: 0/1
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P1403 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P1403
index 1ba868b1..7afe75ec 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P1403
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P1403
@@ -20,6 +20,8 @@ sessionrecord:
   enable: 0/1
   enable_dns_record: 0/1
   enable_rtp_record: 0/1
+  enable_interim_record: 0/1
+  enable_transcation_record: 0/1
 
 capturepacket:
   enable: 0/1