From 703af2b8a38d85d46b7a002894587ca5e5edb1e7 Mon Sep 17 00:00:00 2001 From: wangkuan Date: Wed, 4 Sep 2024 18:24:25 +0800 Subject: [PATCH] =?UTF-8?q?GAL-651=20Job=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6properties=20=E8=BF=81=E7=A7=BB=E8=87=B3env=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../groot_stream/templates/proxy_event.yaml.j2 | 10 +++++----- .../templates/session_record.yaml.j2 | 16 +++++----------- .../templates/transaction_record.yaml.j2 | 10 +++++----- .../groot_stream/templates/voip_record.yaml.j2 | 10 +++++----- 4 files changed, 20 insertions(+), 26 deletions(-) diff --git a/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/proxy_event.yaml.j2 b/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/proxy_event.yaml.j2 index 4b90a6d..ea38aa7 100644 --- a/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/proxy_event.yaml.j2 +++ b/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/proxy_event.yaml.j2 @@ -144,10 +144,10 @@ application: shade.identifier: aes pipeline: object-reuse: true - properties: - hos.bucket.name.rtp_file: traffic_rtp_file_bucket - hos.bucket.name.http_file: traffic_http_file_bucket - hos.bucket.name.eml_file: traffic_eml_file_bucket - hos.bucket.name.policy_capture_file: traffic_policy_capture_file_bucket + properties: + hos.bucket.name.rtp_file: traffic_rtp_file_bucket + hos.bucket.name.http_file: traffic_http_file_bucket + hos.bucket.name.eml_file: traffic_eml_file_bucket + hos.bucket.name.policy_capture_file: traffic_policy_capture_file_bucket {{ topology }} diff --git a/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/session_record.yaml.j2 b/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/session_record.yaml.j2 index 62d337a..327bdd3 100644 --- a/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/session_record.yaml.j2 +++ b/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/session_record.yaml.j2 @@ -143,15 +143,9 @@ application: shade.identifier: aes pipeline: object-reuse: true + properties: + hos.bucket.name.rtp_file: traffic_rtp_file_bucket + hos.bucket.name.http_file: traffic_http_file_bucket + hos.bucket.name.eml_file: traffic_eml_file_bucket + hos.bucket.name.policy_capture_file: traffic_policy_capture_file_bucket {{ topology }} - properties: - hos.bucket.name.rtp_file: traffic_rtp_file_bucket - hos.bucket.name.http_file: traffic_http_file_bucket - hos.bucket.name.eml_file: traffic_eml_file_bucket - hos.bucket.name.policy_capture_file: traffic_policy_capture_file_bucket -# topology: -# - name: kafka_source -# downstream: [etl_processor] -# - name: etl_processor -# downstream: [clickhouse_sink] -# - name: clickhouse_sink diff --git a/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/transaction_record.yaml.j2 b/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/transaction_record.yaml.j2 index 2c8eb06..6bed1a7 100644 --- a/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/transaction_record.yaml.j2 +++ b/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/transaction_record.yaml.j2 @@ -143,9 +143,9 @@ application: shade.identifier: aes pipeline: object-reuse: true - properties: - hos.bucket.name.rtp_file: traffic_rtp_file_bucket - hos.bucket.name.http_file: traffic_http_file_bucket - hos.bucket.name.eml_file: traffic_eml_file_bucket - hos.bucket.name.policy_capture_file: traffic_policy_capture_file_bucket + properties: + hos.bucket.name.rtp_file: traffic_rtp_file_bucket + hos.bucket.name.http_file: traffic_http_file_bucket + hos.bucket.name.eml_file: traffic_eml_file_bucket + hos.bucket.name.policy_capture_file: traffic_policy_capture_file_bucket {{ topology }} diff --git a/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/voip_record.yaml.j2 b/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/voip_record.yaml.j2 index 722b7d7..17fb5b0 100644 --- a/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/voip_record.yaml.j2 +++ b/tsg_olap/upgrade/TSG-24.09/groot_stream/templates/voip_record.yaml.j2 @@ -143,9 +143,9 @@ application: shade.identifier: aes pipeline: object-reuse: true - properties: - hos.bucket.name.rtp_file: traffic_rtp_file_bucket - hos.bucket.name.http_file: traffic_http_file_bucket - hos.bucket.name.eml_file: traffic_eml_file_bucket - hos.bucket.name.policy_capture_file: traffic_policy_capture_file_bucket + properties: + hos.bucket.name.rtp_file: traffic_rtp_file_bucket + hos.bucket.name.http_file: traffic_http_file_bucket + hos.bucket.name.eml_file: traffic_eml_file_bucket + hos.bucket.name.policy_capture_file: traffic_policy_capture_file_bucket {{ topology }} \ No newline at end of file