johanels/akvorado
1
0
Fork 0
mirror of https://github.com/akvorado/akvorado.git synced 2025-12-11 22:14:02 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

console: only return complete intervals for the graph widget

Browse Source
This commit is contained in:
Vincent Bernat
2022-04-22 11:45:10 +02:00
parent 987e0a0b7e
commit 39fcd1396b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
console/widgets.go
View File

@@ -178,10 +178,11 @@ SELECT
toStartOfInterval(TimeReceived, INTERVAL %d second) AS Time,
SUM(Bytes*SamplingRate*8/%d)/1000/1000/1000 AS Gbps
FROM flows
WHERE TimeReceived > date_sub(hour, 24, now())
WHERE TimeReceived > toStartOfInterval(date_sub(hour, 24, now()), INTERVAL %d second)
AND TimeReceived < toStartOfInterval(now(), INTERVAL %d second)
AND InIfBoundary = 'external'
GROUP BY Time
ORDER BY Time`, interval, interval)
ORDER BY Time`, interval, interval, interval, interval)
results := []struct {
Time time.Time `json:"t"`

3
console/widgets_test.go
View File

@@ -293,7 +293,8 @@ SELECT
toStartOfInterval(TimeReceived, INTERVAL 864 second) AS Time,
SUM(Bytes*SamplingRate*8/864)/1000/1000/1000 AS Gbps
FROM flows
WHERE TimeReceived > date_sub(hour, 24, now())
WHERE TimeReceived > toStartOfInterval(date_sub(hour, 24, now()), INTERVAL 864 second)
AND TimeReceived < toStartOfInterval(now(), INTERVAL 864 second)
AND InIfBoundary = 'external'
GROUP BY Time
ORDER BY Time`).