vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-01 16:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix grafana endpoint error: field 'sec' is not an integer

Browse source 
Fixes #2207
This commit is contained in:
emanuele-f 2018-12-07 10:40:45 +01:00
parent 5c3488bf6f
commit 94603367e8
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/lua/modules/grafana_utils.lua
View file

@ -30,6 +30,7 @@ function toEpoch(datestring)
local pattern = "(%d+)%-(%d+)%-(%d+)%a(%d+)%:(%d+)%:([%d%.]+)([Z%p])"
local year, month, day, hour, minute, seconds, tzoffset = datestring:match(pattern)
assert(tzoffset == "Z")
seconds = seconds:gsub("%..*", "")
local timestamp = os.time( { year=year, month=month, day=day, hour=hour, min=minute, sec=seconds })
-- convert to localtime
@ -37,7 +38,7 @@ function toEpoch(datestring)
local d1 = os.date("*t", timestamp)
local d2 = os.date("!*t", timestamp)
d1.isdst = false
local zone_diff = os.difftime(os.time(d1), os.time(d2))
local zone_diff = math.floor(os.difftime(os.time(d1), os.time(d2)))
-- now we can perform the conversion (dt -> ux_time):
timestamp = timestamp + zone_diff