From e213b97b3012b00b781e00e1be5b710163ea1ef3 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Wed, 21 Aug 2024 14:36:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86groot=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../groot_stream/templates/data_transporter.yaml.j2 | 1 - .../templates/datapath_telemetry_record.yaml.j2 | 2 -- .../templates/dos_event_kafka_to_clickhouse | 10 ++++++---- .../flink/groot_stream/templates/proxy_event.yaml.j2 | 1 - .../groot_stream/templates/session_record.yaml.j2 | 9 ++++++++- .../templates/traffic_sketch_metric.yaml.j2 | 1 - .../templates/traffic_sketch_metric.yaml.j2 | 4 ++-- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/tsg_olap/installation/flink/groot_stream/templates/data_transporter.yaml.j2 b/tsg_olap/installation/flink/groot_stream/templates/data_transporter.yaml.j2 index 5bb3aa3..928a7b4 100644 --- a/tsg_olap/installation/flink/groot_stream/templates/data_transporter.yaml.j2 +++ b/tsg_olap/installation/flink/groot_stream/templates/data_transporter.yaml.j2 @@ -50,7 +50,6 @@ application: shade.identifier: aes pipeline: object-reuse: true - topology: {{ topology }} diff --git a/tsg_olap/installation/flink/groot_stream/templates/datapath_telemetry_record.yaml.j2 b/tsg_olap/installation/flink/groot_stream/templates/datapath_telemetry_record.yaml.j2 index 2d64c1f..61542b8 100644 --- a/tsg_olap/installation/flink/groot_stream/templates/datapath_telemetry_record.yaml.j2 +++ b/tsg_olap/installation/flink/groot_stream/templates/datapath_telemetry_record.yaml.j2 @@ -73,7 +73,5 @@ application: shade.identifier: aes pipeline: object-reuse: true - topology: {{ topology }} - diff --git a/tsg_olap/installation/flink/groot_stream/templates/dos_event_kafka_to_clickhouse b/tsg_olap/installation/flink/groot_stream/templates/dos_event_kafka_to_clickhouse index 5152734..f67c9e9 100644 --- a/tsg_olap/installation/flink/groot_stream/templates/dos_event_kafka_to_clickhouse +++ b/tsg_olap/installation/flink/groot_stream/templates/dos_event_kafka_to_clickhouse @@ -42,9 +42,11 @@ application: shade.identifier: aes pipeline: object-reuse: true # [boolean] Object Reuse, default is false - topology: - - name: kafka_source - downstream: [clickhouse_sink] - - name: clickhouse_sink + {{ topology }} + +# topology: +# - name: kafka_source +# downstream: [clickhouse_sink] +# - name: clickhouse_sink diff --git a/tsg_olap/installation/flink/groot_stream/templates/proxy_event.yaml.j2 b/tsg_olap/installation/flink/groot_stream/templates/proxy_event.yaml.j2 index 716667d..b57343a 100644 --- a/tsg_olap/installation/flink/groot_stream/templates/proxy_event.yaml.j2 +++ b/tsg_olap/installation/flink/groot_stream/templates/proxy_event.yaml.j2 @@ -143,6 +143,5 @@ application: shade.identifier: aes pipeline: object-reuse: true - topology: {{ topology }} diff --git a/tsg_olap/installation/flink/groot_stream/templates/session_record.yaml.j2 b/tsg_olap/installation/flink/groot_stream/templates/session_record.yaml.j2 index 6cbbc40..f3a6237 100644 --- a/tsg_olap/installation/flink/groot_stream/templates/session_record.yaml.j2 +++ b/tsg_olap/installation/flink/groot_stream/templates/session_record.yaml.j2 @@ -143,4 +143,11 @@ application: shade.identifier: aes pipeline: object-reuse: true - {{ topology }} \ No newline at end of file + {{ topology }} + +# topology: +# - name: kafka_source +# downstream: [etl_processor] +# - name: etl_processor +# downstream: [clickhouse_sink] +# - name: clickhouse_sink diff --git a/tsg_olap/installation/flink/groot_stream/templates/traffic_sketch_metric.yaml.j2 b/tsg_olap/installation/flink/groot_stream/templates/traffic_sketch_metric.yaml.j2 index 5e49ac6..774dd3b 100644 --- a/tsg_olap/installation/flink/groot_stream/templates/traffic_sketch_metric.yaml.j2 +++ b/tsg_olap/installation/flink/groot_stream/templates/traffic_sketch_metric.yaml.j2 @@ -105,4 +105,3 @@ application: object-reuse: true # [boolean] Object Reuse, default is false {{ topology }} - diff --git a/tsg_olap/upgrade/TSG-24.08/groot_stream/templates/traffic_sketch_metric.yaml.j2 b/tsg_olap/upgrade/TSG-24.08/groot_stream/templates/traffic_sketch_metric.yaml.j2 index a13aad9..b0b8ca4 100644 --- a/tsg_olap/upgrade/TSG-24.08/groot_stream/templates/traffic_sketch_metric.yaml.j2 +++ b/tsg_olap/upgrade/TSG-24.08/groot_stream/templates/traffic_sketch_metric.yaml.j2 @@ -16,7 +16,7 @@ sources: format: json processing_pipelines: - pre_etl_processor: # [object] Processing Pipeline + etl_processor: # [object] Processing Pipeline type: projection remove_fields: output_fields: @@ -58,7 +58,7 @@ sinks: kafka.compression.type: snappy kafka.security.protocol: SASL_PLAINTEXT kafka.sasl.mechanism: PLAIN - kafka.sasl.jaas.config: 454f65ea6eef1256e3067104f82730e737b68959560966b811e7ff364116b03124917eb2b0f3596f14733aa29ebad9352644ce1a5c85991c6f01ba8a5e8f177a7ff0b2d3889a424249967b3870b50993d9644f239f0de82cdb13bdb502959e16afadffa49ef1e1d2b9c9b5113e619817 + kafka.sasl.jaas.config: 454f65ea6eef1256e3067104f82730e737b68959560966b811e7ff364116b03124917eb2b0f3596f14733aa29ebad9352644ce1a5c85991c6f01ba8a5e8f177a80bea937958aaa485c2acc2b475603495a23eb59f055e037c0b186acb22886bd0275ca91f1633441d9943e7962942252 format: json json.ignore.parse.errors: false log.failures.only: true