IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13659 from grafana/graph-time-format-fix

Browse Source 
fix for graph time formating for Last 24h ranges
This commit is contained in:
Torkel Ödegaard 2018-10-14 10:16:37 +02:00 committed by GitHub
commit 37548792f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/panel/graph/graph.ts
View File

@ -713,7 +713,9 @@ class GraphElement {
if (min && max && ticks) { if (min && max && ticks) {
const range = max - min; const range = max - min;
const secPerTick = range / ticks / 1000; const secPerTick = range / ticks / 1000;
const oneDay = 86400000; // Need have 10 milisecond margin on the day range
// As sometimes last 24 hour dashboard evaluates to more than 86400000
const oneDay = 86400010;
const oneYear = 31536000000; const oneYear = 31536000000;
if (secPerTick <= 45) { if (secPerTick <= 45) {