From b888dafa6631c340ad7b515a1bdeb6b1e94bb7e9 Mon Sep 17 00:00:00 2001 From: amki Date: Fri, 5 Feb 2021 16:38:58 +0100 Subject: [PATCH] Stop distorting x axis --- ISPChk/Properties/launchSettings.json | 2 +- ISPChk/ispchk.db | Bin 724992 -> 753664 bytes ISPChk/wwwroot/index.html | 2 +- ISPChk/wwwroot/ispchk.js | 20 ++++++++++++++------ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ISPChk/Properties/launchSettings.json b/ISPChk/Properties/launchSettings.json index aa1c757..ff9b0c6 100644 --- a/ISPChk/Properties/launchSettings.json +++ b/ISPChk/Properties/launchSettings.json @@ -4,7 +4,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://0.0.0.0:4223", + "applicationUrl": "http://localhost:4223", "sslPort": 0 } }, diff --git a/ISPChk/ispchk.db b/ISPChk/ispchk.db index 976d864fd9f2384e88cbd094f2ac0e2ce113ee97..9ebe7c8d110e0a807b4fcae4222a7bd4e71e9ee4 100644 GIT binary patch delta 20835 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 x5W)@0z?C<2m|GA{vS3_b{+r# delta 1696 zcmYL}dr(wW9LMju_xC$z?_KsDL{w0)RS?+SFtyRpFkeLAgH;Eohc=&Q|PKIOH4h!3%wjC0-FNK#;PBo%xzD#L1gsn=lr7f|o=TB4m8K~)M z@lQd0D{J6=#qRCHWs4_GeAOmGktI5xL1f1AFs>TL5caVNkHMN`CRp$X`$XV&!>MRpWiq#3i-@))@V1tsNdNxMZQ7TKO>Iq0; zs%N$KeYmt#iY(33u7+DKlhR4`6pCRjEVlF5NWa2}yd9DLVnqwe(b7M(M*W zPc!ooYjGP}NP49Wu*XU3XG>~LMD|ByUqp8AYiAG*hjFSRGM^{it(0;yO)G&+7yy01 z3(3$O;vfd1_!ItsxAE)z3cL%2Pyla0KIB0TzsS$dtfK8F*Hij1Rza?4 zchq2X-7PVBGx;HSF*G1}yFL&LiO>Z)fK%?^srFdAuic?7!9|DiN?ggV?yfjjj4R4T z;RqauMz{oL;RallOMVDu?TPARlI~}u@R5s5v;{(titWMg^r^m=?I!h`_tYumAYw3JdL4F3iuB`!n^bm zJws2?qqLqLpdngGx6(2yXn?MwAJGr!TsoZ=(zobqY$FS@HEcQikiE}}**k0so5=Fn z7?#b3ung9hd07%mV4axB7*ptDdXL_cH3krvh+kUM9j|8ldQzKMg?Kao@AzIm}l&ZcNqCf zoM)B&n~|!B>&tDxAZ)`D*LZR=R9v0K$N7;Kev zF-EJ_@z{EV=nw@}7!&H?UdgOt-5H?&0aGiq(f|Me diff --git a/ISPChk/wwwroot/index.html b/ISPChk/wwwroot/index.html index 084602c..717aec1 100644 --- a/ISPChk/wwwroot/index.html +++ b/ISPChk/wwwroot/index.html @@ -5,7 +5,7 @@ ISPChk - +
diff --git a/ISPChk/wwwroot/ispchk.js b/ISPChk/wwwroot/ispchk.js index 6ebaed7..eafa15d 100644 --- a/ISPChk/wwwroot/ispchk.js +++ b/ISPChk/wwwroot/ispchk.js @@ -47,11 +47,12 @@ async function fetchPings(hostId, start, end) { async function transformChartData(pings) { var res = { date: [], min: [], avg: [], max: [], failures: []}; for (let ping of pings) { - res.date.push(ping.date); - res.min.push(ping.min); - res.avg.push(ping.avg); - res.max.push(ping.max); - res.failures.push(ping.failures); + var jsDate = new Date(ping.date); + //res.date.push(ping.date); + res.min.push({ x: jsDate, y: ping.min }); + res.avg.push({ x: jsDate, y: ping.avg }); + res.max.push({ x: jsDate, y: ping.max }); + res.failures.push({ x: jsDate, y: ping.failures }); } return res; } @@ -71,7 +72,7 @@ async function updateGraphs() { charts[host.hostId] = new Chart(ctx, { type: 'line', data: { - labels: val.date, + //labels: val.date, datasets: [ { label: 'min', @@ -102,6 +103,13 @@ async function updateGraphs() { text: host.name }, scales: { + xAxes: [{ + type: 'time', + distribution: 'linear', + time: { + unit: 'hour' + } + }], yAxes: [ { id: "y-latency",