diff options
| author | wangwei <[email protected]> | 2022-12-14 09:31:56 +0800 |
|---|---|---|
| committer | wangwei <[email protected]> | 2022-12-14 10:01:37 +0800 |
| commit | 5335f4baaa4df2647b233389db89a326cbbb3b81 (patch) | |
| tree | ea2bbac75e0de17dfe246e769ac238f04f85a27e | |
| parent | 90b6e2a52266ab508f1f6c64a9537ce8a888df5d (diff) | |
Revert "fix(362):TSG-13037 修复Live Chart-Table View 中APP的Sessions、Bytes高于原始日志对应统计"362
This reverts commit 24a0032a7dee2de00f745739c1e554bc30dfbe64.
| -rw-r--r-- | docs/release/release-362.md | 3 | ||||
| -rw-r--r-- | src/main/java/com/mesalab/network/service/impl/NetworkMonitorServiceImpl.java | 2 | ||||
| -rw-r--r-- | src/main/resources/http-sql-template.sql | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/docs/release/release-362.md b/docs/release/release-362.md index 360fd7ac..d102786d 100644 --- a/docs/release/release-362.md +++ b/docs/release/release-362.md @@ -4,5 +4,4 @@ Release 362 (TSG-22.12) * 升级工具类galaxy-tool版本，由1.1.0 升级到1.1.1 * 新增自定义函数，增加IP_TO_ASN、IP_TO_ISP等自定义函数(GAL-241) * 新增Live Traffic Charts应用为中心的接口(TSG-12670) -* 修复OLAP Statistics统计任务，top10和top100的统计前10有差别问题(TSG-11984) -* 修复Live Chart-Table View 中APP的Sessions、Bytes高于原始日志对应统计(TSG-13037)
\ No newline at end of file +* 修复OLAP Statistics统计任务，top10和top100的统计前10有差别问题(TSG-11984)
\ No newline at end of file diff --git a/src/main/java/com/mesalab/network/service/impl/NetworkMonitorServiceImpl.java b/src/main/java/com/mesalab/network/service/impl/NetworkMonitorServiceImpl.java index dc05639f..e8d61bb7 100644 --- a/src/main/java/com/mesalab/network/service/impl/NetworkMonitorServiceImpl.java +++ b/src/main/java/com/mesalab/network/service/impl/NetworkMonitorServiceImpl.java @@ -449,7 +449,7 @@ public class NetworkMonitorServiceImpl implements NetworkMonitorService { Integer limit = dslObject.getQuery().getLimit(); Integer offset = dslObject.getQuery().getOffset(); String sql = String.format(Objects.requireNonNull(environment.getProperty("APP_DATA_SUMMARY")), - period.toStandardSeconds().getSeconds(), dslObject.getQuery().getDataSource(), whereOfTime, whereOfExactly, Constants.PROTOCOL_ETHERNET_NODE, granularity, StringUtil.isEmpty(limit) ? "" : " LIMIT " + ((StringUtil.isEmpty(offset)) ? "" : offset + " ,") + limit); + period.toStandardSeconds().getSeconds(), dslObject.getQuery().getDataSource(), whereOfTime, whereOfExactly, granularity, StringUtil.isEmpty(limit) ? "" : " LIMIT " + ((StringUtil.isEmpty(offset)) ? "" : offset + " ,") + limit); Map<String, String> dataResult = executeQuery(sql); if (String.valueOf(ResultStatusEnum.SUCCESS.getCode()).equals(dataResult.get("status"))) { return JsonMapper.fromJsonString(dataResult.get("result"), BaseResult.class); diff --git a/src/main/resources/http-sql-template.sql b/src/main/resources/http-sql-template.sql index 7d46a4a3..9be811bb 100644 --- a/src/main/resources/http-sql-template.sql +++ b/src/main/resources/http-sql-template.sql @@ -17,7 +17,7 @@ union all #end #sql("APP_DATA_SUMMARY") -SELECT app_name as app_name, SUM(bytes) as bytes, SUM(sessions) as sessions, MAX(bytes_rate) as max_rate, AVG(bytes_rate) as avg_rate FROM ( SELECT app_name as app_name, SUM(sessions) as sessions, SUM(c2s_byte_num + s2c_byte_num) as bytes, SUM(c2s_byte_num + s2c_byte_num) * 8 / %s as bytes_rate FROM %s WHERE %s %s AND notEmpty(app_name) AND protocol_id = '%s' GROUP BY app_name, time_floor(TIMESTAMP_TO_MILLIS(__time), '%s') ORDER BY bytes DESC ) GROUP BY app_name ORDER BY bytes DESC %s +SELECT app_name as app_name, SUM(bytes) as bytes, SUM(sessions) as sessions, MAX(bytes_rate) as max_rate, AVG(bytes_rate) as avg_rate FROM ( SELECT app_name as app_name, SUM(sessions) as sessions, SUM(c2s_byte_num + s2c_byte_num) as bytes, SUM(c2s_byte_num + s2c_byte_num) * 8 / %s as bytes_rate FROM %s WHERE %s %s AND notEmpty(app_name) GROUP BY app_name, time_floor(TIMESTAMP_TO_MILLIS(__time), '%s') ORDER BY bytes DESC ) GROUP BY app_name ORDER BY bytes DESC %s #end #sql("APP_INTERNAL_IP_SUMMARY") |