[Fix][dataset] 完善active-sessions：filter ==> (filter)

1 files changed, 1 insertions, 1 deletions

diff --git a/config/flyway/tsg/R__init_datasets.sql b/config/flyway/tsg/R__init_datasets.sql
index 39b01c21..c9170853 100644
--- a/config/flyway/tsg/R__init_datasets.sql
+++ b/config/flyway/tsg/R__init_datasets.sql
@@ -46,7 +46,7 @@ INSERT INTO `dataset` (`identifier_name`, `category`, `backend_engine`, `type`,
 INSERT INTO `dataset` (`identifier_name`, `category`, `backend_engine`, `type`, `template`, `description`) VALUES ('network-throughput-bit-per-second', 'traffic_general_stat', 'qgw', 'sql', '{ "statement": "SELECT FROM_UNIXTIME(TIME_FLOOR_WITH_FILL( stat_time, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), ''zero'')) AS stat_time, AVG( in_bytes_per_sec )* 8 AS avg_in_bits_per_sec, AVG( out_bytes_per_sec )* 8 AS avg_out_bits_per_sec, AVG( bytes_per_sec )* 8 AS avg_bits_per_sec, MAX( in_bytes_per_sec )* 8 AS max_in_bits_per_sec, MAX( out_bytes_per_sec )* 8 AS max_out_bits_per_sec, MAX( bytes_per_sec )* 8 AS max_bits_per_sec, MIN( in_bytes_per_sec )* 8 AS min_in_bits_per_sec, MIN( out_bytes_per_sec )* 8 AS min_out_bits_per_sec, MIN( bytes_per_sec )* 8 AS min_bits_per_sec FROM( SELECT TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time), SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}'')) AS stat_time, RATE( in_bytes, SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}''), 1) AS in_bytes_per_sec, RATE( out_bytes, SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}''), 1) AS out_bytes_per_sec, RATE( in_bytes + out_bytes, SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}''), 1) AS bytes_per_sec FROM traffic_general_stat WHERE __time >= ''${start_time}'' AND __time < ''${end_time}'' AND vsys_id IN ( ${vsys_id} ) AND ( ${filter} ) GROUP BY TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time), SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}'')) ) GROUP BY FROM_UNIXTIME(TIME_FLOOR_WITH_FILL( stat_time, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), ''zero'' )) ORDER BY stat_time ASC LIMIT ${limit}" }','System Overview-Traffic-AVG, MAX, MIN. To calculate network throughput, supports metric types "bytes" and "packets," and offers aggregation methods including "average"(avg), "maximum" (max), and "minimum" (min). Based on MAX and MIN values can reveal abnormal traffic patterns, such as peak and valley outliers.');
 INSERT INTO `dataset` (`identifier_name`, `category`, `backend_engine`, `type`, `template`, `description`) VALUES ('network-throughput-byte-per-second', 'traffic_general_stat', 'qgw', 'sql', '{ "statement": "SELECT FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(stat_time, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), ''zero'')) AS stat_time, AVG( in_bytes_per_sec) AS avg_in_bytes_per_sec, AVG( out_bytes_per_sec ) AS avg_out_bytes_per_sec, AVG( bytes_per_sec ) AS avg_bytes_per_sec, MAX( in_bytes_per_sec ) AS max_in_bytes_per_sec, MAX( out_bytes_per_sec ) AS max_out_bytes_per_sec, MAX( bytes_per_sec ) AS max_bytes_per_sec, MIN( in_bytes_per_sec ) AS min_in_bytes_per_sec, MIN( out_bytes_per_sec ) AS min_out_bytes_per_sec, MIN( bytes_per_sec ) AS min_bytes_per_sec FROM( SELECT TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time), SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}'')) AS stat_time, RATE( in_bytes, SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}''), 1) AS in_bytes_per_sec, RATE( out_bytes, SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}''), 1) AS out_bytes_per_sec, RATE( in_bytes + out_bytes, SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}''), 1) AS bytes_per_sec FROM traffic_general_stat WHERE __time >= ''${start_time}'' AND __time < ''${end_time}'' AND vsys_id IN ( ${vsys_id} ) AND ( ${filter} ) GROUP BY TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time), SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}'')) ) GROUP BY FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(stat_time, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), ''zero'')) ORDER BY stat_time ASC LIMIT ${limit}" }','System Overview-Traffic-AVG, MAX, MIN. To calculate network throughput, supports metric types "bytes" and "packets," and offers aggregation methods including "average"(avg), "maximum" (max), and "minimum" (min). Based on MAX and MIN values can reveal abnormal traffic patterns, such as peak and valley outliers.');
 INSERT INTO `dataset` (`identifier_name`, `category`, `backend_engine`, `type`, `template`, `description`) VALUES ('new-sessions-per-second', 'traffic_general_stat', 'qgw', 'sql', '{ "statement": "SELECT FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(stat_time, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), ''zero'')) AS stat_time, AVG( sessions_per_sec) AS avg_sessions_per_sec, MAX( sessions_per_sec ) AS max_sessions_per_sec, MIN( sessions_per_sec ) AS min_sessions_per_sec FROM( SELECT TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time), SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}'')) AS stat_time, RATE( sessions, SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}''), 1) AS sessions_per_sec FROM traffic_general_stat WHERE __time >= ''${start_time}'' AND __time < ''${end_time}'' AND vsys_id IN ( ${vsys_id} ) AND ( ${filter} ) GROUP BY TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time), SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}'')) ) GROUP BY FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(stat_time, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), ''zero'')) ORDER BY stat_time ASC LIMIT ${limit}" }','System Overview-New-AVG, MAX, MIN.');
-INSERT INTO `dataset` (`identifier_name`, `category`, `backend_engine`, `type`, `template`, `description`) VALUES ('active-sessions', 'traffic_general_stat', 'qgw', 'sql', '{ "statement": "SELECT FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(stat_time, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), ''zero'')) AS stat_time , AVG(active_sessions_per_sec) AS avg_active_sessions, MAX(active_sessions_per_sec) AS max_active_sessions , MIN(active_sessions_per_sec) AS min_active_sessions FROM ( SELECT stat_time, SUM(max_active_sessions) AS active_sessions_per_sec FROM ( SELECT TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time), SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}'')) AS stat_time , device_id, vsys_id, MAX(active_sessions) AS max_active_sessions FROM traffic_general_stat WHERE __time >= ''${start_time}'' AND __time < ''${end_time}'' AND vsys_id IN (${vsys_id}) AND ${filter} GROUP BY TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time), SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}'')), device_id, vsys_id ) GROUP BY stat_time ) GROUP BY FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(stat_time, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), ''zero'')) ORDER BY stat_time ASC LIMIT ${limit}" }',null);
+INSERT INTO `dataset` (`identifier_name`, `category`, `backend_engine`, `type`, `template`, `description`) VALUES ('active-sessions', 'traffic_general_stat', 'qgw', 'sql', '{ "statement": "SELECT FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(stat_time, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), ''zero'')) AS stat_time , AVG(active_sessions_per_sec) AS avg_active_sessions, MAX(active_sessions_per_sec) AS max_active_sessions , MIN(active_sessions_per_sec) AS min_active_sessions FROM ( SELECT stat_time, SUM(max_active_sessions) AS active_sessions_per_sec FROM ( SELECT TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time), SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}'')) AS stat_time , device_id, vsys_id, MAX(active_sessions) AS max_active_sessions FROM traffic_general_stat WHERE __time >= ''${start_time}'' AND __time < ''${end_time}'' AND vsys_id IN (${vsys_id}) AND (${filter}) GROUP BY TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time), SAMPLE_GRANULARITY(''${start_time}'', ''${end_time}'')), device_id, vsys_id ) GROUP BY stat_time ) GROUP BY FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(stat_time, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), ''zero'')) ORDER BY stat_time ASC LIMIT ${limit}" }',null);
 INSERT INTO `dataset` (`identifier_name`, `category`, `backend_engine`, `type`, `template`, `description`) VALUES ('asymmetric-flows', 'traffic_general_stat', 'qgw', 'sql', '{ "statement": "SELECT FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time),CHART_GRANULARITY(''${start_time}'', ''${end_time}''),''zero'')) AS stat_time, RATE(in_bytes + out_bytes, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), 1) * 8 AS avg_bits_per_sec, round( CASE WHEN SUM(closed_sessions) = 0 THEN 0 ELSE SUM( asymmetric_c2s_flows + asymmetric_s2c_flows) * 100.0 / SUM(closed_sessions) END,2) AS percent_asymmetric_flows FROM traffic_general_stat WHERE __time >= ''${start_time}'' AND __time < ''${end_time}'' AND vsys_id IN(${vsys_id}) AND (${filter}) GROUP BY FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time),CHART_GRANULARITY(''${start_time}'', ''${end_time}''),''zero'')) ORDER BY stat_time ASC LIMIT ${limit}" }',null);
 INSERT INTO `dataset` (`identifier_name`, `category`, `backend_engine`, `type`, `template`, `description`) VALUES ('traffic-statistics-metrics', 'traffic_general_stat', 'qgw', 'sql', '{ "statement": "SELECT COUNT(DISTINCT(device_id)) AS device_num, SUM(sum_bytes) AS total_bytes_transferred, SUM(sum_pkts) AS total_packets_transferred, SUM(sum_sessions) AS total_new_sessions , SUM(sum_closed_sessions) AS total_closed_sessions, SUM(sum_sessions)/ ${timestampdiff_second} AS avg_new_sessions_per_second, SUM(sum_bytes)* 8 / ${timestampdiff_second} AS avg_bits_per_second, SUM(sum_pkts)/ ${timestampdiff_second} AS avg_packets_per_second, SUM(avg_active_sessions) AS avg_active_sessions, round(CASE WHEN SUM(sum_closed_sessions) = 0 THEN 0 ELSE SUM(sum_asymmetric_flows) * 100.0 / SUM(sum_closed_sessions) END, 2) AS percent_asymmetric_flows FROM( SELECT device_id, vsys_id, SUM(in_bytes + out_bytes) AS sum_bytes, SUM(in_pkts + out_pkts) AS sum_pkts, SUM(sessions) AS sum_sessions, SUM(closed_sessions) AS sum_closed_sessions, AVG(active_sessions) AS avg_active_sessions, SUM(asymmetric_c2s_flows + asymmetric_s2c_flows) AS sum_asymmetric_flows FROM traffic_general_stat WHERE __time >= ''${start_time}'' AND __time <''${end_time}'' AND vsys_id IN ( ${vsys_id}) AND ( ${filter} ) GROUP BY device_id, vsys_id )" }','predefined dataset for the report.');
 INSERT INTO `dataset` (`identifier_name`, `category`, `backend_engine`, `type`, `template`, `description`) VALUES ('traffic-summary-throughput', 'traffic_general_stat', 'qgw', 'sql', '{ "statement": "SELECT FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time),CHART_GRANULARITY(''${start_time}'', ''${end_time}''),''zero'')) AS stat_time , RATE(in_bytes, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), 1) * 8 AS avg_in_bits_per_sec, RATE(out_bytes, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), 1) * 8 AS avg_out_bits_per_sec, RATE(in_bytes + out_bytes, CHART_GRANULARITY(''${start_time}'', ''${end_time}''), 1) * 8 AS avg_bits_per_sec FROM traffic_general_stat WHERE __time >= ''${start_time}'' AND __time < ''${end_time}'' AND vsys_id IN(${vsys_id}) AND (${filter}) GROUP BY FROM_UNIXTIME(TIME_FLOOR_WITH_FILL(UNIX_TIMESTAMP(__time),CHART_GRANULARITY(''${start_time}'', ''${end_time}''),''zero'')) ORDER BY stat_time ASC LIMIT ${limit}" }','predefined dataset for the report.');