From 7acd010f20436143bbdb87de504d19c82eec411f Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Sun, 21 Jul 2019 09:03:31 -0400 Subject: [PATCH 01/16] Add support for 5 minutes data --- index.php | 114 +++++++++++++++++++++++++++++++--------- vnstat.php | 149 ++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 198 insertions(+), 65 deletions(-) diff --git a/index.php b/index.php index 0eca23b..63ef1b5 100644 --- a/index.php +++ b/index.php @@ -86,18 +86,68 @@ function printTableStats($path, $type, $interface, $label) - + - - + + + +

Network Traffic ()

diff --git a/vnstat.php b/vnstat.php index d680fb3..33f48e2 100644 --- a/vnstat.php +++ b/vnstat.php @@ -43,7 +43,7 @@ function bytesToString($bytes, $wSuf = false, $magnitude = null) } if ($wSuf == true) { - return sprintf("%0.2f", ($bytes / pow(1024, $ui))); + return sprintf("%0.4f", ($bytes / pow(1024, $ui))); } else { return sprintf("%0.2f %s", ($bytes / pow(1024, $ui)), $units[$ui]); } @@ -107,7 +107,7 @@ function getLargestPrefix($bytes) return $units[getMagnitude($bytes)]; } -function getVnstatData($path, $type, $interface) +function getVnstatData($path, $type, $interface, $width = 800) { global $version; @@ -164,6 +164,9 @@ function getVnstatData($path, $type, $interface) if( $version > 1 ){ $i = 0; $j = 0; + $duration = floor(($width-200)/7); + if ($duration < 40) { $duration = 40; } + $duration = $duration * 180; foreach ($vnstatDecoded['interfaces'][0]['traffic']['fiveminute'] as $min) { if (is_array($min)) { ++$i; @@ -175,7 +178,7 @@ function getVnstatData($path, $type, $interface) $five[$i]['total'] = bytesToString($min['rx'] + $min['tx']); $five[$i]['time'] = mktime($min['time']['hour'], $min['time']['minute'], 0, $min['date']['month'], $min['date']['day'], $min['date']['year']); - if (time() - $five[$i]['time'] > 6 * 60 * 60) { + if (time() - $five[$i]['time'] > $duration) { continue; } ++$j; From 989c50b1d342fef0d5530f50ec39374af6fdc8ae Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Sun, 4 Aug 2019 16:18:04 -0400 Subject: [PATCH 05/16] Make daily graph use log Make graphs taller More digits in graph data --- index.php | 43 +++++++++++++++++++++++++++++++------------ vnstat.php | 8 ++++---- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/index.php b/index.php index 9413c75..71d4481 100644 --- a/index.php +++ b/index.php @@ -171,7 +171,7 @@ function drawFiveChart() orientation: 'horizontal', bar: { groupWidth: '90%' }, chartArea: { - left: 60, + left: 50, width: '85%' }, hAxis: { @@ -181,7 +181,8 @@ function drawFiveChart() title: 'Hour' }, vAxis: { - format: '##.## ', + format: '###.####', + textStyle: { fontSize: 12 }, scaleType: 'log', baseline: } @@ -226,7 +227,7 @@ function drawHourlyChart() orientation: 'horizontal', bar: { groupWidth: '90%' }, chartArea: { - left: 60, + left: 50, width: '85%' }, hAxis: { @@ -235,7 +236,8 @@ function drawHourlyChart() title: 'Day:Hour' }, vAxis: { - format: '##.## ', + format: '###.####', + textStyle: { fontSize: 12 }, scaleType: 'log', baseline: } @@ -248,13 +250,14 @@ function drawHourlyChart() function drawDailyChart() { let data = google.visualization.arrayToDataTable([ - ['Day', 'Traffic In', 'Traffic Out', 'Total Traffic'], + [{type: 'datetime', label: 'Date'}, 'Traffic In', 'Traffic Out', 'Total Traffic'], '} + orientation: 'horizontal', + bar: { groupWidth: '90%' }, + chartArea: { + left: 50, + width: '85%' + }, + hAxis: { + direction: -1, + format: 'M/d', + title: 'Date: Month/Day' + }, + vAxis: { + format: '###.####', + textStyle: { fontSize: 12 }, + scaleType: 'log', + baseline: + } }; - let chart = new google.charts.Bar(document.getElementById('dailyNetworkTrafficGraph')); - chart.draw(data, google.charts.Bar.convertOptions(options)); + let chart = new google.visualization.BarChart(document.getElementById('dailyNetworkTrafficGraph')); + chart.draw(data, options); } function drawMonthlyChart() @@ -350,20 +369,20 @@ function drawMonthlyChart()
1) { echo "
-
+
"; } ?>
id="hourlyGraph"> -
+
-
+
-
+
diff --git a/vnstat.php b/vnstat.php index 33f48e2..95b3614 100644 --- a/vnstat.php +++ b/vnstat.php @@ -43,7 +43,7 @@ function bytesToString($bytes, $wSuf = false, $magnitude = null) } if ($wSuf == true) { - return sprintf("%0.4f", ($bytes / pow(1024, $ui))); + return sprintf("%0.6f", ($bytes / pow(1024, $ui))); } else { return sprintf("%0.2f %s", ($bytes / pow(1024, $ui)), $units[$ui]); } @@ -102,7 +102,7 @@ function getSmallestValue($array) function getLargestPrefix($bytes) { - $units = ['B', 'KB', 'MB', 'GB', 'TB']; + $units = ['B', 'K', 'M', 'G', 'T']; return $units[getMagnitude($bytes)]; } @@ -164,7 +164,7 @@ function getVnstatData($path, $type, $interface, $width = 800) if( $version > 1 ){ $i = 0; $j = 0; - $duration = floor(($width-200)/7); + $duration = floor(($width-200)/9); if ($duration < 40) { $duration = 40; } $duration = $duration * 180; foreach ($vnstatDecoded['interfaces'][0]['traffic']['fiveminute'] as $min) { @@ -204,7 +204,7 @@ function getVnstatData($path, $type, $interface, $width = 800) $daily[$i]['total'] = bytesToString($day['rx'] + $day['tx']); $daily[$i]['time'] = mktime(0, 0, 0, $day['date']['month'], $day['date']['day'], $day['date']['year']); - $dailyGraph[$i]['label'] = date('jS', mktime(0, 0, 0, $day['date']['month'], $day['date']['day'], $day['date']['year'])); + $dailyGraph[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d)",$day['date']['year'],$day['date']['month']-1,$day['date']['day'],0,0); $dailyGraph[$i]['rx'] = $day['rx']; $dailyGraph[$i]['tx'] = $day['tx']; $dailyGraph[$i]['total'] = ($day['rx'] + $day['tx']); From 079aa21fcff6c3d959cc0bfd4fe3e05ad6819c85 Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Tue, 6 Aug 2019 22:54:16 -0400 Subject: [PATCH 06/16] Enable graph explorer Clean up base calculation --- index.php | 103 +++++++++++++++++++++++++++++++++++++++++------------ vnstat.php | 45 +++++++++++------------ 2 files changed, 104 insertions(+), 44 deletions(-) diff --git a/index.php b/index.php index 71d4481..e44c3e7 100644 --- a/index.php +++ b/index.php @@ -140,19 +140,30 @@ function drawFiveChart() if (isset($_COOKIE["width"])) { $width = $_COOKIE["width"]; } - $fiveGraph = getVnstatData($vnstat_cmd, "fiveGraph", $thisInterface, $width); + + // get duration in seconds for initial display based on screen width + $duration = floor(($width-200)/16); // number of samples + if ($duration < 24) { $duration = 24; } // minimum of 24 bar groups = 2 hours + $duration = $duration * 300; // in seconds + + $fiveGraph = getVnstatData($vnstat_cmd, "fiveGraph", $thisInterface); $fiveLargestValue = getLargestValue($fiveGraph); - $fiveSmallestValue = getSmallestValue($fiveGraph); $fiveLargestPrefix = getLargestPrefix($fiveLargestValue); $fiveMagnitude = getMagnitude($fiveLargestValue); + $fiveBase = getBaseValue($fiveGraph, $fiveMagnitude); $first = true; + $lastSample = 0; for ($i = 0; $i < count($fiveGraph); $i++) { $time = $fiveGraph[$i]['label']; $inTraffic = bytesToString($fiveGraph[$i]['rx'], true, $fiveMagnitude); $outTraffic = bytesToString($fiveGraph[$i]['tx'], true, $fiveMagnitude); $totalTraffic = bytesToString($fiveGraph[$i]['total'], true, $fiveMagnitude); + // can't just use duration/300 - there might be fewer or missing samples + if ($fiveGraph[0]['time'] - $fiveGraph[$i]['time'] < $duration) { + $lastSample = $i; + } if ($first) { $first = false; @@ -169,22 +180,28 @@ function drawFiveChart() title: 'Five minute Network Traffic', subtitle: 'over last 6 hours', orientation: 'horizontal', - bar: { groupWidth: '90%' }, + bar: { groupWidth: '85%' }, + explorer: { axis: 'horizontal', zoomDelta: 1.1, maxZoomIn: 0.10, maxZoomOut: 10 }, + legend: { position: 'bottom' }, chartArea: { left: 50, - width: '85%' + width: '95%' }, hAxis: { direction: -1, - format: 'H', + format: 'H:mm', minorGridlines: { count: 0 }, - title: 'Hour' + title: 'Hour:Minute', + viewWindow: { + min: new , + max: new + } }, vAxis: { format: '###.####', textStyle: { fontSize: 12 }, scaleType: 'log', - baseline: + baseline: } }; @@ -199,12 +216,23 @@ function drawHourlyChart() let data = google.visualization.arrayToDataTable([ [{type: 'datetime', label: 'Hour'}, 'Traffic In', 'Traffic Out', 'Total Traffic'], , + max: new + } }, vAxis: { format: '###.####', textStyle: { fontSize: 12 }, scaleType: 'log', - baseline: + baseline: } }; @@ -252,12 +292,23 @@ function drawDailyChart() let data = google.visualization.arrayToDataTable([ [{type: 'datetime', label: 'Date'}, 'Traffic In', 'Traffic Out', 'Total Traffic'], , + max: new + } }, vAxis: { format: '###.####', textStyle: { fontSize: 12 }, scaleType: 'log', - baseline: + baseline: } }; diff --git a/vnstat.php b/vnstat.php index 95b3614..6b1825b 100644 --- a/vnstat.php +++ b/vnstat.php @@ -76,11 +76,11 @@ function getLargestValue($array) }); } -function getSmallestValue($array) +function getBaseValue($array, $magnitude) { global $terraB; - $max = array_reduce($array, function ($a, $b) { + $sml = array_reduce($array, function ($a, $b) { if ((0 < $b['rx']) && ($b['rx'] < $b['tx'])) { $sml = $b['rx']; } else { @@ -93,11 +93,21 @@ function getSmallestValue($array) } }, $terraB); - if ($max < $terraB) { - return $max; + if ($sml >= $terraB) { + $sml = 1; } - return 1; + $base = pow(10,floor(round(log10($sml/pow(1024,$magnitude)),3))); + $baseByte = $base * pow(1024, $magnitude); + // if really close to smallest value use half so you can see the bar + if ($baseByte * 1.2 > $sml) { + $base = $base / 2; + // if smallest val is more than 6 times, use 5 times + } else if ($baseByte * 6 < $sml) { + $base = 5 * $base; + } + + return $base; } function getLargestPrefix($bytes) @@ -107,7 +117,7 @@ function getLargestPrefix($bytes) return $units[getMagnitude($bytes)]; } -function getVnstatData($path, $type, $interface, $width = 800) +function getVnstatData($path, $type, $interface) { global $version; @@ -163,10 +173,6 @@ function getVnstatData($path, $type, $interface, $width = 800) if( $version > 1 ){ $i = 0; - $j = 0; - $duration = floor(($width-200)/9); - if ($duration < 40) { $duration = 40; } - $duration = $duration * 180; foreach ($vnstatDecoded['interfaces'][0]['traffic']['fiveminute'] as $min) { if (is_array($min)) { ++$i; @@ -178,16 +184,11 @@ function getVnstatData($path, $type, $interface, $width = 800) $five[$i]['total'] = bytesToString($min['rx'] + $min['tx']); $five[$i]['time'] = mktime($min['time']['hour'], $min['time']['minute'], 0, $min['date']['month'], $min['date']['day'], $min['date']['year']); - if (time() - $five[$i]['time'] > $duration) { - continue; - } - ++$j; - - $fiveGraph[$j]['label'] = sprintf("Date(%d, %d, %d, %d, %d)",$min['date']['year'],$min['date']['month']-1,$min['date']['day'],$min['time']['hour'],$min['time']['minute']); - $fiveGraph[$j]['rx'] = $min['rx']; - $fiveGraph[$j]['tx'] = $min['tx']; - $fiveGraph[$j]['total'] = ($min['rx'] + $min['tx']); - $fiveGraph[$j]['time'] = mktime($min['time']['hour'], $min['time']['minute'], 0, $min['date']['month'], $min['date']['day'], $min['date']['year']); + $fiveGraph[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d)",$min['date']['year'],$min['date']['month']-1,$min['date']['day'],$min['time']['hour'],$min['time']['minute']); + $fiveGraph[$i]['rx'] = $min['rx']; + $fiveGraph[$i]['tx'] = $min['tx']; + $fiveGraph[$i]['total'] = ($min['rx'] + $min['tx']); + $fiveGraph[$i]['time'] = mktime($min['time']['hour'], $min['time']['minute'], 0, $min['date']['month'], $min['date']['day'], $min['date']['year']); } } } @@ -292,11 +293,11 @@ function getVnstatData($path, $type, $interface, $width = 800) case "five": return $five; case "hourlyGraph": - return array_slice($hourlyGraph, 0, 24, true); + return $hourlyGraph; case "hourly": return $hourly; case "dailyGraph": - return array_slice($dailyGraph, 0, 30, true); + return $dailyGraph; case "daily": return $daily; case "monthlyGraph": From a8ee57daf615805d29659e1505443d0bb1ca48c9 Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Wed, 7 Aug 2019 20:48:09 -0400 Subject: [PATCH 07/16] Fix vnstat v1 compatibility Add zoom/pan instructions --- index.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/index.php b/index.php index e44c3e7..dd50adc 100644 --- a/index.php +++ b/index.php @@ -191,11 +191,13 @@ function drawFiveChart() direction: -1, format: 'H:mm', minorGridlines: { count: 0 }, - title: 'Hour:Minute', - viewWindow: { - min: new , - max: new - } + title: 'Hour:Minute Scroll to zoom, Drag to pan' + 0) { + echo ", viewWindow: {"; + echo "min: new " . $fiveGraph[$lastSample]['label'] . ", "; + echo "max: new " . $fiveGraph[0]['label']; + echo "}"; + } ?> }, vAxis: { format: '###.####', @@ -269,7 +271,7 @@ function drawHourlyChart() direction: -1, format: 'd:H', minorGridlines: { count: 0 }, - title: 'Day:Hour', + title: 'Day:Hour Scroll to zoom, Drag to pan', viewWindow: { min: new , max: new @@ -346,7 +348,7 @@ function drawDailyChart() direction: -1, format: 'M/d', //minorGridlines: { count: 0 }, - title: 'Date: Month/Day', + title: 'Month/Day Scroll to zoom, Drag to pan', viewWindow: { min: new , max: new From c112999e8197555ef3ed2b70036952619bc408c6 Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Fri, 9 Aug 2019 10:52:27 -0400 Subject: [PATCH 08/16] Merge main with: support for vnstat v2 support for 5 minute data vnstat v1 compatible So far - graph in first tab is OK, other tabs are small and incomplete --- {css => app/assets/css}/style.css | 0 config.php => app/include/config.php | 0 vnstat.php => app/include/vnstat.php | 0 index.php => app/index.php | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {css => app/assets/css}/style.css (100%) rename config.php => app/include/config.php (100%) rename vnstat.php => app/include/vnstat.php (100%) rename index.php => app/index.php (100%) diff --git a/css/style.css b/app/assets/css/style.css similarity index 100% rename from css/style.css rename to app/assets/css/style.css diff --git a/config.php b/app/include/config.php similarity index 100% rename from config.php rename to app/include/config.php diff --git a/vnstat.php b/app/include/vnstat.php similarity index 100% rename from vnstat.php rename to app/include/vnstat.php diff --git a/index.php b/app/index.php similarity index 100% rename from index.php rename to app/index.php From 466cdf084ca1393ead23faf19fe7cfd1e160922e Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Fri, 9 Aug 2019 10:54:04 -0400 Subject: [PATCH 09/16] Merge main with: support for vnstat v2 support for 5 minute data vnstat v1 compatible So far - graph in first tab is OK, other tabs are small and incomplete --- app/assets/css/style.css | 2 +- app/include/config.php | 5 +- app/include/vnstat.php | 25 ++++-- app/index.php | 182 +++++++++++++++++++++++++++------------ 4 files changed, 147 insertions(+), 67 deletions(-) diff --git a/app/assets/css/style.css b/app/assets/css/style.css index 6e35c81..2daa638 100644 --- a/app/assets/css/style.css +++ b/app/assets/css/style.css @@ -1,5 +1,5 @@ /* -Copyright (C) 2016 Alex +Copyright (C) 2019 Alexander Marston (alexander.marston@gmail.com) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/app/include/config.php b/app/include/config.php index 4d1e6cd..98a5991 100644 --- a/app/include/config.php +++ b/app/include/config.php @@ -1,7 +1,7 @@ . */ +// Disable error reporting +error_reporting(0); + // Set the default system Timezone date_default_timezone_set('Europe/London'); diff --git a/app/include/vnstat.php b/app/include/vnstat.php index 6b1825b..774bdf8 100644 --- a/app/include/vnstat.php +++ b/app/include/vnstat.php @@ -1,7 +1,7 @@ $sml) { - $base = $base / 2; - // if smallest val is more than 6 times, use 5 times - } else if ($baseByte * 6 < $sml) { - $base = 5 * $base; + + // google chart sometimes refuses to draw y axis units when base is 5*10^x + + //if ($sml / $baseByte < 1.2) { + // $base = $base / 2; + // if smallest val is more than 6 times, use 5 times so smallest bar is not so big + //} else if ($sml / $baseByte > 6 ) { + // $base = 5 * $base; + //} + + if ($sml / $baseByte < 1.05) { + $base = $base / 10; } return $base; } -function getLargestPrefix($bytes) +function getLargestPrefix($magnitude) { $units = ['B', 'K', 'M', 'G', 'T']; - return $units[getMagnitude($bytes)]; + return $units[$magnitude]; } function getVnstatData($path, $type, $interface) diff --git a/app/index.php b/app/index.php index dd50adc..4fd3ca0 100644 --- a/app/index.php +++ b/app/index.php @@ -1,6 +1,6 @@ . */ -require('vnstat.php'); // The vnstat information parser -require('config.php'); // Include all the configuration information +require('includes/vnstat.php'); // The vnstat information parser +require('includes/config.php'); // Include all the configuration information function printOptions() { @@ -90,15 +90,17 @@ function printTableStats($path, $type, $interface, $label) Network Traffic - + - - - + + + + + - - + + - -
-
+

Network Traffic ()

-
-
    -
  • - 1) { echo "5Min
  • "; } ?> - Hourly
    • -
  • Daily
    • -
  • Monthly
    • +
    +
    1) { echo " -
    +
    - "; } ?> -
    id="hourlyGraph"> -
    +
    +
    +
    + "; } else { echo " +
    +
    + "; } ?> -
    +
    -
    +
    -
    -
      -
    • - 1) { echo "5Min
    • "; } ?> - Hourly
      • -
    • Daily
      • -
    • Monthly
      • -
    • Top 10
      • +
      + -
      +
      1) { echo " -
      "; +
      + "; printTableStats($vnstat_cmd, "five", $thisInterface, 'Time'); - echo "
      "; } ?> - -
      id="hourly"> - + echo " +
      +
      + "; + printTableStats($vnstat_cmd, "hourly", $thisInterface, 'Hour'); + echo " +
      + "; } else { echo " +
      + "; + printTableStats($vnstat_cmd, "hourly", $thisInterface, 'Hour'); + echo "
      -
      - + "; } ?> + +
      +
      -
      - +
      +
      -
      - +
      +
      From 7c11372f7dd2bd0c9a587f649bcd0b3a16b86703 Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Fri, 9 Aug 2019 10:57:54 -0400 Subject: [PATCH 10/16] Fix directory name typo --- app/{include => includes}/config.php | 0 app/{include => includes}/vnstat.php | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename app/{include => includes}/config.php (100%) rename app/{include => includes}/vnstat.php (100%) diff --git a/app/include/config.php b/app/includes/config.php similarity index 100% rename from app/include/config.php rename to app/includes/config.php diff --git a/app/include/vnstat.php b/app/includes/vnstat.php similarity index 100% rename from app/include/vnstat.php rename to app/includes/vnstat.php From 96b5f1c89c71a55f3c574207bf9ea9c1e59fa155 Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Tue, 8 Oct 2019 16:20:56 -0400 Subject: [PATCH 11/16] Merge with changes from upstream. Mostly working --- app/assets/css/style.css | 3 + app/composer.json | 5 + app/includes/vnstat.php | 3 + app/index.php | 612 +++++------------------------- app/templates/module_footer.tpl | 16 + app/templates/module_graph.tpl | 47 +++ app/templates/module_graph_js.tpl | 193 ++++++++++ app/templates/module_header.tpl | 33 ++ app/templates/module_table.tpl | 142 +++++++ app/templates/site_index.tpl | 7 + 10 files changed, 537 insertions(+), 524 deletions(-) create mode 100644 app/composer.json create mode 100644 app/templates/module_footer.tpl create mode 100644 app/templates/module_graph.tpl create mode 100644 app/templates/module_graph_js.tpl create mode 100644 app/templates/module_header.tpl create mode 100644 app/templates/module_table.tpl create mode 100644 app/templates/site_index.tpl diff --git a/app/assets/css/style.css b/app/assets/css/style.css index 2daa638..6ba73b5 100644 --- a/app/assets/css/style.css +++ b/app/assets/css/style.css @@ -45,3 +45,6 @@ body { .nav-tabs { margin-bottom: 10px; } +.navbar { + margin-bottom: 25px; +} diff --git a/app/composer.json b/app/composer.json new file mode 100644 index 0000000..6bc30dd --- /dev/null +++ b/app/composer.json @@ -0,0 +1,5 @@ +{ + "require": { + "smarty/smarty": "~3.1" + } +} diff --git a/app/includes/vnstat.php b/app/includes/vnstat.php index 774bdf8..3aac7b9 100644 --- a/app/includes/vnstat.php +++ b/app/includes/vnstat.php @@ -127,6 +127,7 @@ function getLargestPrefix($magnitude) function getVnstatData($path, $type, $interface) { global $version; + global $smarty; $vnstat_information = []; // Create an empty array for use later @@ -160,6 +161,8 @@ function getVnstatData($path, $type, $interface) $version = $vnstatDecoded['jsonversion']; } + $smarty->assign('version', $version); + $s=''; if( $version == 1 ){ $s = 's'; diff --git a/app/index.php b/app/index.php index 4fd3ca0..ed3555c 100644 --- a/app/index.php +++ b/app/index.php @@ -1,73 +1,22 @@ . - */ -require('includes/vnstat.php'); // The vnstat information parser -require('includes/config.php'); // Include all the configuration information +// Require includes +require __DIR__ . '/vendor/autoload.php'; +require __DIR__ . '/includes/vnstat.php'; +require __DIR__ . '/includes/config.php'; -function printOptions() -{ - global $interface_list; - - $i = 0; - foreach ($interface_list as $interface) { - $i++; - if ($i == count($interface_list)) { - echo "" . rawurlencode($interface) . ""; - } else { - echo "" . rawurlencode($interface) . ", "; - } - } -} +// Initiate Smarty +$smarty = new Smarty(); -function printTableStats($path, $type, $interface, $label) -{ - echo ' - - - - - - - - - '; - $data = getVnstatData($path, $type, $interface); - - for ($i = 0; $i < count($data); $i++) { - $label = $data[$i]['label']; - $totalReceived = $data[$i]['rx']; - $totalSent = $data[$i]['tx']; - $totalTraffic = $data[$i]['total']; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - - } - echo '
      ' . $label . 'ReceivedSentTotal
      ' . $label . '' . $totalReceived . '' . $totalSent . '' . $totalTraffic . '
      '; -} +// Set the current year +$smarty->assign('year', date("Y")); +// Set the current interface $thisInterface = ""; if (isset($_GET['i'])) { $interfaceChosen = rawurldecode($_GET['i']); + if (in_array($interfaceChosen, $interface_list, true)) { $thisInterface = $interfaceChosen; } else { @@ -84,476 +33,91 @@ function printTableStats($path, $type, $interface, $label) $vnstat_cmd = $vnstat_bin_dir; } -?> - - - - Network Traffic - - - - - - - - - - - - - - - -
      -
      -

      Network Traffic ()

      -
      -
      - -
      - - -
      - 1) { echo " -
      -
      -
      - -
      -
      -
      - "; } else { echo " -
      -
      -
      - "; } ?> - -
      -
      -
      - -
      -
      -
      -
      -
      - -
      - - -
      - 1) { echo " -
      - "; - printTableStats($vnstat_cmd, "five", $thisInterface, 'Time'); - echo " -
      -
      - "; - printTableStats($vnstat_cmd, "hourly", $thisInterface, 'Hour'); - echo " -
      - "; } else { echo " -
      - "; - printTableStats($vnstat_cmd, "hourly", $thisInterface, 'Hour'); - echo " -
      - "; } ?> +$fiveGraphData = getVnstatData($vnstat_cmd, 'fiveGraph', $thisInterface); +$fiveLargestValue = getLargestValue($fiveGraphData); +$fiveMagnitude = getMagnitude($fiveLargestValue); +$fiveLargestPrefix = getLargestPrefix($fiveMagnitude); +$fiveBase = getBaseValue($fiveGraphData, $fiveMagnitude); +if ($fiveBase < .01) +{ + $fiveMagnitude = $fiveMagnitude - 1; + $fiveLargestPrefix = getLargestPrefix($fiveMagnitude); + $fiveBase = getBaseValue($fiveGraphData, $fiveMagnitude); +} +$smarty->assign('fiveBase', $fiveBase); +$smarty->assign('fiveGraphData', $fiveGraphData); +$smarty->assign('fiveLargestPrefix', $fiveLargestPrefix); + +$hourlyGraphData = getVnstatData($vnstat_cmd, 'hourlyGraph', $thisInterface); +$hourlyLargestValue = getLargestValue($hourlyGraphData); +$hourlyMagnitude = getMagnitude($hourlyLargestValue); +$hourlyLargestPrefix = getLargestPrefix($hourlyMagnitude); +$hourlyBase = getBaseValue($hourlyGraphData, $hourlyMagnitude); +if ($hourlyBase < .01) +{ + $hourlyMagnitude = $hourlyMagnitude - 1; + $hourlyLargestPrefix = getLargestPrefix($hourlyMagnitude); + $hourlyBase = getBaseValue($hourlyGraphData, $hourlyMagnitude); +} +$smarty->assign('hourlyBase', $hourlyBase); +$smarty->assign('hourlyGraphData', $hourlyGraphData); +$smarty->assign('hourlyLargestPrefix', $hourlyLargestPrefix); + +$dailyGraphData = getVnstatData($vnstat_cmd, 'dailyGraph', $thisInterface); +$dailyLargestValue = getLargestValue($dailyGraphData); +$dailyMagnitude = getMagnitude($dailyLargestValue); +$dailyLargestPrefix = getLargestPrefix($dailyMagnitude); +$dailyBase = getBaseValue($dailyGraphData, $dailyMagnitude); +if ($dailyBase < .01) +{ + $dailyMagnitude = $dailyMagnitude - 1; + $dailyLargestPrefix = getLargestPrefix($dailyMagnitude); + $dailyBase = getBaseValue($dailyGraph, $dailyMagnitude); +} +$smarty->assign('dailyBase', $dailyBase); +$smarty->assign('dailyGraphData', $dailyGraphData); +$smarty->assign('dailyLargestPrefix', $dailyLargestPrefix); + +$monthlyGraphData = getVnstatData($vnstat_cmd, 'monthlyGraph', $thisInterface); +$monthlyLargestValue = getLargestValue($monthlyGraphData); +$monthlyMagnitude = getMagnitude($monthlyLargestValue); +$monthlyLargestPrefix = getLargestPrefix($monthlyMagnitude); +$monthlyBase = getBaseValue($monthlyGraphData, $monthlyMagnitude); +if ($monthlyBase < .01) +{ + $monthlyMagnitude = $monthlyMagnitude - 1; + $monthlyLargestPrefix = getLargestPrefix($monthlyMagnitude); + $monthlyBase = getBaseValue($monthlyGraph, $monthlyMagnitude); +} +$smarty->assign('monthlyBase', $monthlyBase); +$smarty->assign('monthlyGraphData', $monthlyGraphData); +$smarty->assign('monthlyLargestPrefix', $monthlyLargestPrefix); -
      - -
      -
      - -
      -
      - -
      -
      -
      +// Display the page +$smarty->display('templates/site_index.tpl'); - - - +?> diff --git a/app/templates/module_footer.tpl b/app/templates/module_footer.tpl new file mode 100644 index 0000000..748798e --- /dev/null +++ b/app/templates/module_footer.tpl @@ -0,0 +1,16 @@ + + + + + +{include file="module_graph_js.tpl"} + + + + diff --git a/app/templates/module_graph.tpl b/app/templates/module_graph.tpl new file mode 100644 index 0000000..89e4207 --- /dev/null +++ b/app/templates/module_graph.tpl @@ -0,0 +1,47 @@ +
      + + +
      + {if $version gt 1} +
      +
      +
      + +
      +
      +
      + {else} +
      +
      +
      + {/if} + +
      +
      +
      + +
      +
      +
      +
      +
      + diff --git a/app/templates/module_graph_js.tpl b/app/templates/module_graph_js.tpl new file mode 100644 index 0000000..390765e --- /dev/null +++ b/app/templates/module_graph_js.tpl @@ -0,0 +1,193 @@ + diff --git a/app/templates/module_header.tpl b/app/templates/module_header.tpl new file mode 100644 index 0000000..a0b47d2 --- /dev/null +++ b/app/templates/module_header.tpl @@ -0,0 +1,33 @@ + + + + Network Traffic + + + + + + + + + + + + + diff --git a/app/templates/module_table.tpl b/app/templates/module_table.tpl new file mode 100644 index 0000000..6cf8326 --- /dev/null +++ b/app/templates/module_table.tpl @@ -0,0 +1,142 @@ +
      + + +
      +
      + + + + + + + + + + +{foreach from=$fiveTableData key=key item=value} + + + + + + +{/foreach} + +
      TimeReceivedSentTotal
      {$value.label}{$value.rx}{$value.tx}{$value.total}
      +
      + +
      + + + + + + + + + + +{foreach from=$hourlyTableData key=key item=value} + + + + + + +{/foreach} + +
      HourReceivedSentTotal
      {$value.label}{$value.rx}{$value.tx}{$value.total}
      +
      + +
      + + + + + + + + + + +{foreach from=$dailyTableData key=key item=value} + + + + + + +{/foreach} + +
      DayReceivedSentTotal
      {$value.label}{$value.rx}{$value.tx}{$value.total}
      +
      + +
      + + + + + + + + + + +{foreach from=$monthlyTableData key=key item=value} + + + + + + +{/foreach} + +
      MonthReceivedSentTotal
      {$value.label}{$value.rx}{$value.tx}{$value.total}
      +
      + +
      + + + + + + + + + + +{foreach from=$top10TableData key=key item=value} + + + + + + +{/foreach} + +
      DayReceivedSentTotal
      {$value.label}{$value.rx}{$value.tx}{$value.total}
      +
      +
      +
      diff --git a/app/templates/site_index.tpl b/app/templates/site_index.tpl new file mode 100644 index 0000000..81201bf --- /dev/null +++ b/app/templates/site_index.tpl @@ -0,0 +1,7 @@ +{include file="module_header.tpl"} + +{include file="module_graph.tpl"} + +{include file="module_table.tpl"} + +{include file="module_footer.tpl"} From e70d5b60425e080aabc291a0af3b0c1f5cf4b829 Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Thu, 10 Oct 2019 15:41:26 -0400 Subject: [PATCH 12/16] Minimal change to add support for vnstat2 and it's 5 minute data. vnstat1 support is preserved (works with both) --- Dockerfile | 18 +- README.md | 41 ++- _config.yml | 1 + app/includes/config.php | 14 +- app/includes/utilities.php | 88 +++++ app/includes/vnstat.php | 546 ++++++++++++++---------------- app/index.php | 116 +++---- app/templates/module_graph.tpl | 81 +++-- app/templates/module_graph_js.tpl | 284 ++++++++-------- app/templates/module_header.tpl | 2 +- app/templates/module_table.tpl | 48 +-- docs/README.md | 0 12 files changed, 635 insertions(+), 604 deletions(-) create mode 100644 _config.yml create mode 100644 app/includes/utilities.php create mode 100644 docs/README.md diff --git a/Dockerfile b/Dockerfile index 4da5ff6..df538f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,17 @@ FROM php:7.0-apache -RUN mkdir -p /var/www/html/vnstat/ -ADD . /var/www/html/vnstat/ -RUN mkdir -p /var/lib/vnstat \ No newline at end of file +MAINTAINER Alex Marston + +# Install Git +RUN apt-get update && apt-get install -y git unzip + +# Install Composer to handle dependencies +RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer + +# Copy application source code to html directory +COPY ./app/ /var/www/html/ + +# Install dependencies +RUN composer install + +RUN mkdir -p /var/lib/vnstat diff --git a/README.md b/README.md index f22a803..fb3ec36 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,36 @@ -# vnstat-dashboard -[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Falexandermarston%2Fvnstat-dashboard.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Falexandermarston%2Fvnstat-dashboard?ref=badge_shield) +# What is vnstat-dashboard? +This dashboard is an adaptation of vnstat-php-frontend by bjd using Bootstrap written in PHP. It provides the following: - -An adaptation of vnstat-php-frontend by bjd using Bootstrap written in PHP. - -## Features * Hourly Statistics Chart (using Google Charts) * Daily & Monthly Statistics Overview * Top 10 Day Statistics * Automatically populated interface selection -## System Requirements -* PHP Version 5.4 +## Run it with Docker + +### How to build it +``$ docker build . -t amarston/vnstat-dashboard:latest`` -## How to run it with Docker -### Prerequisites -* Docker should be installed: - * https://docs.docker.com/install/ -* `vnstat` should be installed: - * https://www.linuxbabe.com/monitoring/install-vnstat-debian-8ubuntu-16-04-server-monitor-network-traffic - * https://github.com/vergoh/vnstat +### How to publish it +``$ docker push amarston/vnstat-dashboard:latest`` ### How to start it -1. `docker-compose up -d` -2. Open http://localhost/vnstat +``$ docker run --name vnstat-dashboard -p 80:80 -v /usr/bin/vnstat:/usr/bin/vnstat -v /var/lib/vnstat:/var/lib/vnstat -d amarston/vnstat-dashboard:latest`` ### How to stop it -`docker-compose down` +``$ docker stop vnstat-dashboard`` + +## Run it with Locally + +### How to run it +``` +$ cp -rp app/ /var/www/html/vnstat/ +$ cd /var/www/html/vnstat/ +$ composer install +``` ## Licensing -Copyright (C) 2016 Alexander Marston (alexander.marston@gmail.com) +Copyright (C) 2019 Alexander Marston (alexander.marston@gmail.com) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,5 +44,3 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . - -[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Falexandermarston%2Fvnstat-dashboard.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Falexandermarston%2Fvnstat-dashboard?ref=badge_large) diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..c741881 --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-slate \ No newline at end of file diff --git a/app/includes/config.php b/app/includes/config.php index 98a5991..6019c88 100644 --- a/app/includes/config.php +++ b/app/includes/config.php @@ -17,8 +17,9 @@ * along with this program. If not, see . */ -// Disable error reporting -error_reporting(0); +// Disable error reporting to screen +/*ini_set('display_errors', 0); +error_reporting(E_ALL);*/ // Set the default system Timezone date_default_timezone_set('Europe/London'); @@ -26,9 +27,6 @@ // Path of vnstat $vnstat_bin_dir = '/usr/bin/vnstat'; -// Uncomment to override default config file -//$vnstat_config = '/etc/vnstat.conf'; - // Set to true to set your own interfaces $use_predefined_interfaces = false; @@ -37,10 +35,4 @@ $interface_name['eth0'] = "Internal #1"; $interface_name['eth1'] = "Internal #2"; -} else { - $interface_list = getVnstatInterfaces($vnstat_bin_dir); - - foreach ($interface_list as $interface) { - $interface_name[$interface] = $interface; - } } diff --git a/app/includes/utilities.php b/app/includes/utilities.php new file mode 100644 index 0000000..351e376 --- /dev/null +++ b/app/includes/utilities.php @@ -0,0 +1,88 @@ +. + */ + +// Get the largest value in an array +function getLargestValue($array) { + return $max = array_reduce($array, function ($a, $b) { + return $a > $b['total'] ? $a : $b['total']; + }); +} + +function formatSize($bytes, $vnstatJsonVersion) { + // json version 1 = convert from KiB + // json version 2 = convert from bytes + if ($vnstatJsonVersion == 1) { + $bytes *= 1024; // convert from kibibytes to bytes + } + + return formatBytes($bytes); +} + +function formatBytes($bytes, $decimals = 2) { + $base = log(floatval($bytes), 1024); + $suffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; + + return round(pow(1024, $base - floor($base)), $decimals) .' '. $suffixes[floor($base)]; +} + +function formatBytesTo($bytes, $delimiter, $decimals = 2) { + if ($bytes == 0) { + return '0'; + } + + $k = 1024; + $dm = $decimals < 0 ? 0 : $decimals; + $sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; + + $i = array_search($delimiter, $sizes); + + return number_format(($bytes / pow($k, $i)), $decimals); +} + +function kibibytesToBytes($kibibytes, $vnstatJsonVersion) { + if ($vnstatJsonVersion == 1) { + return $kibibytes *= 1024; + } else { + return $kibibytes; + } +} + +function getLargestPrefix($kb) +{ + $units = ['TB', 'GB', 'MB', 'KB', 'B']; + $scale = 1024 * 1024 * 1024 * 1024; + $ui = 0; + + while ((($kb < $scale) && ($scale > 1))) { + $ui++; + $scale = $scale / 1024; + } + + return $units[$ui]; +} + +function sortingFunction($item1, $item2) { + if ($item1['time'] == $item2['time']) { + return 0; + } else { + return $item1['time'] > $item2['time'] ? -1 : 1; + } +}; + +?> diff --git a/app/includes/vnstat.php b/app/includes/vnstat.php index 3aac7b9..9f02d1d 100644 --- a/app/includes/vnstat.php +++ b/app/includes/vnstat.php @@ -17,306 +17,250 @@ * along with this program. If not, see . */ -$logk = log(1024); -$terraB = pow(1024,4); -$version = 1; - -function getMagnitude($bytes) -{ - global $logk; - - $ui = floor(round(log($bytes)/$logk,3)); - if ($ui < 0) { $ui = 0; } - if ($ui > 4) { $ui = 4; } - - return $ui; -} - -// $wSuf (without suffix MB, GB, etc) -function bytesToString($bytes, $wSuf = false, $magnitude = null) -{ - $units = ['B', 'KB', 'MB', 'GB', 'TB']; - if (isset($magnitude)) { - $ui = $magnitude; - } else { - $ui = getMagnitude($bytes); - } - - if ($wSuf == true) { - return sprintf("%0.8f", ($bytes / pow(1024, $ui))); - } else { - return sprintf("%0.2f %s", ($bytes / pow(1024, $ui)), $units[$ui]); - } +class vnStat { + protected $executablePath; + protected $vnstatVersion; + protected $vnstatJsonVersion; + protected $vnstatData; + + public function __construct ($executablePath) { + if (isset($executablePath)) { + $this->executablePath = $executablePath; + + // Execute a command to output a json dump of the vnstat data + $vnstatStream = popen("$this->executablePath --json", 'r'); + + // Is the stream valid? + if (is_resource($vnstatStream)) { + $streamBuffer = ''; + + while (!feof($vnstatStream)) { + $streamBuffer .= fgets($vnstatStream); + } + + // Close the handle + pclose($vnstatStream); + + $this->processVnstatData($streamBuffer); + } else { + + } + + + } else { + die(); + } + } + + private function processVnstatData($vnstatJson) { + $decodedJson = json_decode($vnstatJson, true); + + // Check the JSON is valid + if (json_last_error() != JSON_ERROR_NONE) { + throw new Exception('JSON is invalid'); + } + + $this->vnstatData = $decodedJson; + $this->vnstatVersion = $decodedJson['vnstatversion']; + $this->vnstatJsonVersion = $decodedJson['jsonversion']; + } + + public function getVnstatVersion() { + return $this->vnstatVersion; + } + + public function getVnstatJsonVersion() { + return $this->vnstatJsonVersion; + } + + public function getInterfaces() { + // Create a placeholder array + $vnstatInterfaces = []; + + foreach($this->vnstatData['interfaces'] as $interface) { + if ($this->vnstatJsonVersion == 1) { + array_push($vnstatInterfaces, $interface['id']); + } else { + array_push($vnstatInterfaces, $interface['name']); + } + } + + return $vnstatInterfaces; + } + + public function getInterfaceData($timeperiod, $type, $interface) { + // If json version equals 1, add an 's' onto the end of each type. + // e.g. 'top' becomes 'tops' + $typeAppend = ''; + if ($this->vnstatJsonVersion == 1) { + $typeAppend = 's'; + } + + // Blank placeholder + $trafficData = []; + $i = 0; + + // Get the array index for the chosen interface + $arrayIndex = array_search($interface, array_column($this->vnstatData['interfaces'], 'id')); + + if ($timeperiod == 'top10') { + if ($type == 'table') { + foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['top'.$typeAppend] as $traffic) { + if (is_array($traffic)) { + $i++; + + $trafficData[$i]['label'] = date('d/m/Y', strtotime($traffic['date']['month'] . "/" . $traffic['date']['day'] . "/" . $traffic['date']['year']));; + $trafficData[$i]['rx'] = formatSize($traffic['rx'], $this->vnstatJsonVersion); + $trafficData[$i]['tx'] = formatSize($traffic['tx'], $this->vnstatJsonVersion); + $trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); + $trafficData[$i]['totalraw'] = ($traffic['rx'] + $traffic['tx']); + } + } + } + } + + if ($timeperiod == 'five') { + if ($type == 'table') { + foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['fiveminute'] as $traffic) { + if (is_array($traffic)) { + $i++; + + $fiveHour = $traffic['time']['hour']; + $fiveMinute = $traffic['time']['minute']; + + $trafficData[$i]['label'] = date("d/m/Y H:i", mktime($traffic['time']['hour'], $traffic['time']['minute'], 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year'])); + $trafficData[$i]['time'] = mktime($traffic['time']['hour'], $traffic['time']['minute'], 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']); + $trafficData[$i]['rx'] = formatSize($traffic['rx'], $this->vnstatJsonVersion); + $trafficData[$i]['tx'] = formatSize($traffic['tx'], $this->vnstatJsonVersion); + $trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); + } + } + + } else if ($type == 'graph') { + foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['fiveminute'] as $traffic) { + if (is_array($traffic)) { + $i++; + + $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], $traffic['time']['hour'], $traffic['time']['minute'], 0); + $trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion); + $trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion); + $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); + } + } + } + } + + if ($timeperiod == 'hourly') { + if ($type == 'table') { + foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['hour'.$typeAppend] as $traffic) { + if (is_array($traffic)) { + $i++; + + if ($this->vnstatJsonVersion == 1) { + $hour = $traffic['id']; + } else { + $hour = $traffic['time']['hour']; + } + + $trafficData[$i]['label'] = date("d/m/Y H:i", mktime($hour, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year'])); + $trafficData[$i]['time'] = mktime($hour, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']); + $trafficData[$i]['rx'] = formatSize($traffic['rx'], $this->vnstatJsonVersion); + $trafficData[$i]['tx'] = formatSize($traffic['tx'], $this->vnstatJsonVersion); + $trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); + } + } + + if ($this->vnstatJsonVersion == 1) { + usort($trafficData, sortingFunction); + } + + } else if ($type == 'graph') { + foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['hour'.$typeAppend] as $traffic) { + if (is_array($traffic)) { + $i++; + + if ($this->vnstatJsonVersion == 1) { + $hour = $traffic['id']; + } else { + $hour = $traffic['time']['hour']; + } + + $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], $hour, 0, 0); + $trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion); + $trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion); + $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); + } + } + } + } + + if ($timeperiod == 'daily') { + if ($type == 'table') { + foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['day'.$typeAppend] as $traffic) { + if (is_array($traffic)) { + $i++; + + $trafficData[$i]['label'] = date('d/m/Y', mktime(0, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year'])); + $trafficData[$i]['rx'] = formatSize($traffic['rx'], $this->vnstatJsonVersion); + $trafficData[$i]['tx'] = formatSize($traffic['tx'], $this->vnstatJsonVersion); + $trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); + } + } + } else if ($type == 'graph') { + foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['day'.$typeAppend] as $traffic) { + if (is_array($traffic)) { + $i++; + + $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], 0, 0, 0); + $trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion); + $trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion); + $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); + } + } + } + } + + if ($timeperiod == 'monthly') { + if ($type == 'table') { + foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['month'.$typeAppend] as $traffic) { + if (is_array($traffic)) { + $i++; + + $trafficData[$i]['label'] = date('F Y', mktime(0, 0, 0, $traffic['date']['month'], 10, $traffic['date']['year'])); + $trafficData[$i]['rx'] = formatSize($traffic['rx'], $this->vnstatJsonVersion); + $trafficData[$i]['tx'] = formatSize($traffic['tx'], $this->vnstatJsonVersion); + $trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); + } + } + } else if ($type == 'graph') { + foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['month'.$typeAppend] as $traffic) { + if (is_array($traffic)) { + $i++; + + $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month'] - 1, 10, 0, 0, 0); + $trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion); + $trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion); + $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); + } + } + } + } + + if ($type == 'graph') { + // Get the largest value and then prefix (B, KB, MB, GB, etc) + $trafficLargestValue = getLargestValue($trafficData); + $trafficLargestPrefix = getLargestPrefix($trafficLargestValue); + + foreach($trafficData as $key => $value) { + $trafficData[$key]['rx'] = formatBytesTo($value['rx'], $trafficLargestPrefix); + $trafficData[$key]['tx'] = formatBytesTo($value['tx'], $trafficLargestPrefix); + $trafficData[$key]['total'] = formatBytesTo($value['total'], $trafficLargestPrefix); + $trafficData[$key]['delimiter'] = $trafficLargestPrefix; + } + } + + return $trafficData; + } } -function getVnstatInterfaces($path) -{ - $vnstat_interfaces = []; // Create an empty array - - $vnstatIF = popen("$path --iflist", "r"); - if (is_resource($vnstatIF)) { - $iBuffer = ''; - while (!feof($vnstatIF)) { - $iBuffer .= fgets($vnstatIF); - } - - $vnstat_temp = preg_replace("/\s+/", " ", preg_replace("/\([^)]+\)/", "", trim(str_replace("Available interfaces: ", "", $iBuffer)))); - - $vnstat_interfaces = explode(" ", $vnstat_temp); - pclose($vnstatIF); - } - - return $vnstat_interfaces; -} - -function getLargestValue($array) -{ - return $max = array_reduce($array, function ($a, $b) { - return $a > $b['total'] ? $a : $b['total']; - }); -} - -function getBaseValue($array, $magnitude) -{ - global $terraB; - - $sml = array_reduce($array, function ($a, $b) { - if ((0 < $b['rx']) && ($b['rx'] < $b['tx'])) { - $sml = $b['rx']; - } else { - $sml = $b['tx']; - } - if (($sml == 0) || ($a < $sml)) { - return $a; - } else { - return $sml; - } - }, $terraB); - - if ($sml >= $terraB) { - $sml = 1; - } - - $base = pow(10,floor(round(log10($sml/pow(1024,$magnitude)),3))); - $baseByte = $base * pow(1024, $magnitude); - // if really close to smallest value use half so you can see the bar - - // google chart sometimes refuses to draw y axis units when base is 5*10^x - - //if ($sml / $baseByte < 1.2) { - // $base = $base / 2; - // if smallest val is more than 6 times, use 5 times so smallest bar is not so big - //} else if ($sml / $baseByte > 6 ) { - // $base = 5 * $base; - //} - - if ($sml / $baseByte < 1.05) { - $base = $base / 10; - } - - return $base; -} - -function getLargestPrefix($magnitude) -{ - $units = ['B', 'K', 'M', 'G', 'T']; - - return $units[$magnitude]; -} - -function getVnstatData($path, $type, $interface) -{ - global $version; - global $smarty; - - $vnstat_information = []; // Create an empty array for use later - - $vnstatJSON = popen("$path --json -i $interface", "r"); - $vnstatDecoded = ""; - - if (is_resource($vnstatJSON)) { - $iBuffer = ''; - while (!feof($vnstatJSON)) { - $iBuffer .= fgets($vnstatJSON); - } - - $vnstatDecoded = $iBuffer; - - pclose($vnstatJSON); - } - - $vnstatDecoded = json_decode($vnstatDecoded, true); - - $fiveGraph = []; - $five = []; - $hourlyGraph = []; - $hourly = []; - $dailyGraph = []; - $daily = []; - $monthlyGraph = []; - $monthly = []; - $top10 = []; - - if( isset( $vnstatDecoded['jsonversion'] )){ - $version = $vnstatDecoded['jsonversion']; - } - - $smarty->assign('version', $version); - - $s=''; - if( $version == 1 ){ - $s = 's'; - } - - $i = 0; - foreach ($vnstatDecoded['interfaces'][0]['traffic']['top'.$s] as $top) { - if (is_array($top)) { - ++$i; - - $top10[$i]['label'] = date('d/m/Y', strtotime($top['date']['month'] . "/" . $top['date']['day'] . "/" . $top['date']['year'])); - $top10[$i]['rx'] = bytesToString($top['rx']); - $top10[$i]['tx'] = bytesToString($top['tx']); - $top10[$i]['totalraw'] = ($top['rx'] + $top['tx']); - $top10[$i]['total'] = bytesToString($top['rx'] + $top['tx']); - } - } - - if( $version > 1 ){ - $i = 0; - foreach ($vnstatDecoded['interfaces'][0]['traffic']['fiveminute'] as $min) { - if (is_array($min)) { - ++$i; - - $five[$i]['label'] = date('m/d G:i', mktime($min['time']['hour'], $min['time']['minute'], 0, $min['date']['month'], $min['date']['day'], $min['date']['year'])); - $five[$i]['rx'] = bytesToString($min['rx']); - $five[$i]['tx'] = bytesToString($min['tx']); - $five[$i]['totalraw'] = ($min['rx'] + $min['tx']); - $five[$i]['total'] = bytesToString($min['rx'] + $min['tx']); - $five[$i]['time'] = mktime($min['time']['hour'], $min['time']['minute'], 0, $min['date']['month'], $min['date']['day'], $min['date']['year']); - - $fiveGraph[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d)",$min['date']['year'],$min['date']['month']-1,$min['date']['day'],$min['time']['hour'],$min['time']['minute']); - $fiveGraph[$i]['rx'] = $min['rx']; - $fiveGraph[$i]['tx'] = $min['tx']; - $fiveGraph[$i]['total'] = ($min['rx'] + $min['tx']); - $fiveGraph[$i]['time'] = mktime($min['time']['hour'], $min['time']['minute'], 0, $min['date']['month'], $min['date']['day'], $min['date']['year']); - } - } - } - - $i = 0; - foreach ($vnstatDecoded['interfaces'][0]['traffic']['day'.$s] as $day) { - if (is_array($day)) { - ++$i; - - $daily[$i]['label'] = date('d/m/Y', mktime(0, 0, 0, $day['date']['month'], $day['date']['day'], $day['date']['year'])); - $daily[$i]['rx'] = bytesToString($day['rx']); - $daily[$i]['tx'] = bytesToString($day['tx']); - $daily[$i]['totalraw'] = ($day['rx'] + $day['tx']); - $daily[$i]['total'] = bytesToString($day['rx'] + $day['tx']); - $daily[$i]['time'] = mktime(0, 0, 0, $day['date']['month'], $day['date']['day'], $day['date']['year']); - - $dailyGraph[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d)",$day['date']['year'],$day['date']['month']-1,$day['date']['day'],0,0); - $dailyGraph[$i]['rx'] = $day['rx']; - $dailyGraph[$i]['tx'] = $day['tx']; - $dailyGraph[$i]['total'] = ($day['rx'] + $day['tx']); - $dailyGraph[$i]['time'] = mktime(0, 0, 0, $day['date']['month'], $day['date']['day'], $day['date']['year']); - } - } - - $i = 0; - foreach ($vnstatDecoded['interfaces'][0]['traffic']['hour'.$s] as $hour) { - if (is_array($hour)) { - ++$i; - - if( $version == 1 ){ - $h = $hour['id']; - } else { - $h = $hour['time']['hour']; - } - - $hourly[$i]['label'] = date('m/d G:i', mktime($h, 0, 0, $hour['date']['month'], $hour['date']['day'], $hour['date']['year'])); - $hourly[$i]['rx'] = bytesToString($hour['rx']); - $hourly[$i]['tx'] = bytesToString($hour['tx']); - $hourly[$i]['totalraw'] = ($hour['rx'] + $hour['tx']); - $hourly[$i]['total'] = bytesToString($hour['rx'] + $hour['tx']); - $hourly[$i]['time'] = mktime($h, 0, 0, $hour['date']['month'], $hour['date']['day'], $hour['date']['year']); - - $hourlyGraph[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d)",$hour['date']['year'],$hour['date']['month']-1,$hour['date']['day'],$h,0); - $hourlyGraph[$i]['rx'] = $hour['rx']; - $hourlyGraph[$i]['tx'] = $hour['tx']; - $hourlyGraph[$i]['total'] = ($hour['rx'] + $hour['tx']); - $hourlyGraph[$i]['time'] = mktime($h, 0, 0, $hour['date']['month'], $hour['date']['day'], $hour['date']['year']); - } - } - - asort($vnstatDecoded['interfaces'][0]['traffic']['month'.$s]); - - $i = 0; - foreach ($vnstatDecoded['interfaces'][0]['traffic']['month'.$s] as $month) { - if (is_array($month)) { - ++$i; - - $monthly[$i]['label'] = date('F', mktime(0, 0, 0, $month['date']['month'], 10)); - $monthly[$i]['rx'] = bytesToString($month['rx']); - $monthly[$i]['tx'] = bytesToString($month['tx']); - $monthly[$i]['totalraw'] = ($month['rx'] + $month['tx']); - $monthly[$i]['total'] = bytesToString($month['rx'] + $month['tx']); - $monthly[$i]['time'] = mktime(0, 0, 0, $month['date']['month'], 1, $month['date']['year']); - - $monthlyGraph[$i]['label'] = date('F', mktime(0, 0, 0, $month['date']['month'], 10)); - $monthlyGraph[$i]['rx'] = $month['rx']; - $monthlyGraph[$i]['tx'] = $month['tx']; - $monthlyGraph[$i]['total'] = ($month['rx'] + $month['tx']); - $monthlyGraph[$i]['time'] = mktime(0, 0, 0, $month['date']['month'], 1, $month['date']['year']); - } - } - - $sorting_function = function ($item1, $item2) { - if ($item1['time'] == $item2['time']) { - return 0; - } else { - return $item1['time'] > $item2['time'] ? -1 : 1; - } - }; - - usort($five, $sorting_function); - usort($fiveGraph, $sorting_function); - usort($hourly, $sorting_function); - usort($hourlyGraph, $sorting_function); - usort($daily, $sorting_function); - usort($dailyGraph, $sorting_function); - usort($monthly, $sorting_function); - usort($monthlyGraph, $sorting_function); - - // Sort Top 10 Days by Highest Total Usage first - usort($top10, function ($item1, $item2) { - if ($item1['totalraw'] == $item2['totalraw']) { - return 0; - } else { - return $item1['totalraw'] > $item2['totalraw'] ? -1 : 1; - } - }); - - switch ($type) { - case "fiveGraph": - return $fiveGraph; - case "five": - return $five; - case "hourlyGraph": - return $hourlyGraph; - case "hourly": - return $hourly; - case "dailyGraph": - return $dailyGraph; - case "daily": - return $daily; - case "monthlyGraph": - return array_slice($monthlyGraph, 0, 12, true); - case "monthly": - return $monthly; - case "top10": - return $top10; - } - - return false; -} +?> diff --git a/app/index.php b/app/index.php index ed3555c..1d93d33 100644 --- a/app/index.php +++ b/app/index.php @@ -1,16 +1,46 @@ . + */ + // Require includes require __DIR__ . '/vendor/autoload.php'; require __DIR__ . '/includes/vnstat.php'; +require __DIR__ . '/includes/utilities.php'; require __DIR__ . '/includes/config.php'; +if (isset($vnstat_config)) { + $vnstat_cmd = $vnstat_bin_dir.' --config '.$vnstat_config; +} else { + $vnstat_cmd = $vnstat_bin_dir; +} + +// Initiaite vnStat class +$vnstat = new vnStat($vnstat_cmd); + // Initiate Smarty $smarty = new Smarty(); // Set the current year $smarty->assign('year', date("Y")); +// Set the list of interfaces +$interface_list = $vnstat->getInterfaces(); + // Set the current interface $thisInterface = ""; @@ -27,95 +57,47 @@ $thisInterface = reset($interface_list); } -if (isset($vnstat_config)) { - $vnstat_cmd = $vnstat_bin_dir.' --config '.$vnstat_config; -} else { - $vnstat_cmd = $vnstat_bin_dir; -} $smarty->assign('current_interface', $thisInterface); // Assign interface options -global $interface_list; $smarty->assign('interface_list', $interface_list); +// JsonVersion +$smarty->assign('jsonVersion', $vnstat->getVnstatJsonVersion()); + // Populate table data -$fiveData = getVnstatData($vnstat_cmd, 'five', $thisInterface); +$fiveData = $vnstat->getInterfaceData('five', 'table', $thisInterface); $smarty->assign('fiveTableData', $fiveData); -$hourlyData = getVnstatData($vnstat_cmd, 'hourly', $thisInterface); +$hourlyData = $vnstat->getInterfaceData('hourly', 'table', $thisInterface); $smarty->assign('hourlyTableData', $hourlyData); -$dailyData = getVnstatData($vnstat_cmd, 'daily', $thisInterface); +$dailyData = $vnstat->getInterfaceData('daily', 'table', $thisInterface); $smarty->assign('dailyTableData', $dailyData); -$monthlyData = getVnstatData($vnstat_cmd, 'monthly', $thisInterface); +$monthlyData = $vnstat->getInterfaceData('monthly', 'table', $thisInterface); $smarty->assign('monthlyTableData', $monthlyData); -$top10Data = getVnstatData($vnstat_cmd, 'top10', $thisInterface); +$top10Data = $vnstat->getInterfaceData('top10', 'table', $thisInterface); $smarty->assign('top10TableData', $top10Data); // Populate graph data - -$fiveGraphData = getVnstatData($vnstat_cmd, 'fiveGraph', $thisInterface); -$fiveLargestValue = getLargestValue($fiveGraphData); -$fiveMagnitude = getMagnitude($fiveLargestValue); -$fiveLargestPrefix = getLargestPrefix($fiveMagnitude); -$fiveBase = getBaseValue($fiveGraphData, $fiveMagnitude); -if ($fiveBase < .01) -{ - $fiveMagnitude = $fiveMagnitude - 1; - $fiveLargestPrefix = getLargestPrefix($fiveMagnitude); - $fiveBase = getBaseValue($fiveGraphData, $fiveMagnitude); -} -$smarty->assign('fiveBase', $fiveBase); +$fiveGraphData = $vnstat->getInterfaceData('five', 'graph', $thisInterface); $smarty->assign('fiveGraphData', $fiveGraphData); -$smarty->assign('fiveLargestPrefix', $fiveLargestPrefix); - -$hourlyGraphData = getVnstatData($vnstat_cmd, 'hourlyGraph', $thisInterface); -$hourlyLargestValue = getLargestValue($hourlyGraphData); -$hourlyMagnitude = getMagnitude($hourlyLargestValue); -$hourlyLargestPrefix = getLargestPrefix($hourlyMagnitude); -$hourlyBase = getBaseValue($hourlyGraphData, $hourlyMagnitude); -if ($hourlyBase < .01) -{ - $hourlyMagnitude = $hourlyMagnitude - 1; - $hourlyLargestPrefix = getLargestPrefix($hourlyMagnitude); - $hourlyBase = getBaseValue($hourlyGraphData, $hourlyMagnitude); -} -$smarty->assign('hourlyBase', $hourlyBase); +$smarty->assign('fiveLargestPrefix', $fiveGraphData[1]['delimiter']); + +$hourlyGraphData = $vnstat->getInterfaceData('hourly', 'graph', $thisInterface); $smarty->assign('hourlyGraphData', $hourlyGraphData); -$smarty->assign('hourlyLargestPrefix', $hourlyLargestPrefix); - -$dailyGraphData = getVnstatData($vnstat_cmd, 'dailyGraph', $thisInterface); -$dailyLargestValue = getLargestValue($dailyGraphData); -$dailyMagnitude = getMagnitude($dailyLargestValue); -$dailyLargestPrefix = getLargestPrefix($dailyMagnitude); -$dailyBase = getBaseValue($dailyGraphData, $dailyMagnitude); -if ($dailyBase < .01) -{ - $dailyMagnitude = $dailyMagnitude - 1; - $dailyLargestPrefix = getLargestPrefix($dailyMagnitude); - $dailyBase = getBaseValue($dailyGraph, $dailyMagnitude); -} -$smarty->assign('dailyBase', $dailyBase); +$smarty->assign('hourlyLargestPrefix', $hourlyGraphData[1]['delimiter']); + +$dailyGraphData = $vnstat->getInterfaceData('daily', 'graph', $thisInterface); $smarty->assign('dailyGraphData', $dailyGraphData); -$smarty->assign('dailyLargestPrefix', $dailyLargestPrefix); - -$monthlyGraphData = getVnstatData($vnstat_cmd, 'monthlyGraph', $thisInterface); -$monthlyLargestValue = getLargestValue($monthlyGraphData); -$monthlyMagnitude = getMagnitude($monthlyLargestValue); -$monthlyLargestPrefix = getLargestPrefix($monthlyMagnitude); -$monthlyBase = getBaseValue($monthlyGraphData, $monthlyMagnitude); -if ($monthlyBase < .01) -{ - $monthlyMagnitude = $monthlyMagnitude - 1; - $monthlyLargestPrefix = getLargestPrefix($monthlyMagnitude); - $monthlyBase = getBaseValue($monthlyGraph, $monthlyMagnitude); -} -$smarty->assign('monthlyBase', $monthlyBase); +$smarty->assign('dailyLargestPrefix', $dailyGraphData[1]['delimiter']); + +$monthlyGraphData = $vnstat->getInterfaceData('monthly', 'graph', $thisInterface); $smarty->assign('monthlyGraphData', $monthlyGraphData); -$smarty->assign('monthlyLargestPrefix', $monthlyLargestPrefix); +$smarty->assign('monthlyLargestPrefix', $monthlyGraphData[1]['delimiter']); // Display the page $smarty->display('templates/site_index.tpl'); diff --git a/app/templates/module_graph.tpl b/app/templates/module_graph.tpl index 89e4207..a01f68c 100644 --- a/app/templates/module_graph.tpl +++ b/app/templates/module_graph.tpl @@ -1,47 +1,46 @@ -
      - +
      + -
      - {if $version gt 1} -
      -
      -
      +
      + {if $jsonVersion gt 1} +
      +
      +
      -
      -
      -
      - {else} -
      -
      -
      - {/if} +
      +
      +
      + {else} +
      +
      +
      + {/if} -
      -
      -
      +
      +
      +
      -
      -
      +
      +
      +
      -
      - diff --git a/app/templates/module_graph_js.tpl b/app/templates/module_graph_js.tpl index 390765e..33d5f02 100644 --- a/app/templates/module_graph_js.tpl +++ b/app/templates/module_graph_js.tpl @@ -1,193 +1,207 @@ diff --git a/app/templates/module_header.tpl b/app/templates/module_header.tpl index a0b47d2..7b1aa82 100644 --- a/app/templates/module_header.tpl +++ b/app/templates/module_header.tpl @@ -9,7 +9,7 @@ - + diff --git a/app/templates/module_table.tpl b/app/templates/module_table.tpl index 6cf8326..44cfde8 100644 --- a/app/templates/module_table.tpl +++ b/app/templates/module_table.tpl @@ -1,27 +1,27 @@ -
      - +
      +
      diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..e69de29 From 55146cad6cafeaa3560e39145217b516229ff5cd Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Tue, 15 Oct 2019 14:02:58 -0400 Subject: [PATCH 13/16] Set initial zoom to 2H/1D/30D for 5min/hour/day Allow wider range of zoom --- app/includes/vnstat.php | 27 +++++++----- app/index.php | 14 ++++--- app/templates/module_graph_js.tpl | 68 +++++++++++++++++++------------ app/templates/module_table.tpl | 4 ++ 4 files changed, 71 insertions(+), 42 deletions(-) diff --git a/app/includes/vnstat.php b/app/includes/vnstat.php index 9f02d1d..b15f2e3 100644 --- a/app/includes/vnstat.php +++ b/app/includes/vnstat.php @@ -98,7 +98,7 @@ public function getInterfaceData($timeperiod, $type, $interface) { // Blank placeholder $trafficData = []; - $i = 0; + $i = -1; // Get the array index for the chosen interface $arrayIndex = array_search($interface, array_column($this->vnstatData['interfaces'], 'id')); @@ -119,15 +119,12 @@ public function getInterfaceData($timeperiod, $type, $interface) { } } - if ($timeperiod == 'five') { + if (isset($this->vnstatData['interfaces'][0]['traffic']['fiveminute']) && ($timeperiod == 'five')) { if ($type == 'table') { foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['fiveminute'] as $traffic) { if (is_array($traffic)) { $i++; - $fiveHour = $traffic['time']['hour']; - $fiveMinute = $traffic['time']['minute']; - $trafficData[$i]['label'] = date("d/m/Y H:i", mktime($traffic['time']['hour'], $traffic['time']['minute'], 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year'])); $trafficData[$i]['time'] = mktime($traffic['time']['hour'], $traffic['time']['minute'], 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']); $trafficData[$i]['rx'] = formatSize($traffic['rx'], $this->vnstatJsonVersion); @@ -135,18 +132,20 @@ public function getInterfaceData($timeperiod, $type, $interface) { $trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } - + usort($trafficData, 'sortingFunction'); } else if ($type == 'graph') { foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['fiveminute'] as $traffic) { if (is_array($traffic)) { $i++; - $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], $traffic['time']['hour'], $traffic['time']['minute'], 0); + $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], $traffic['time']['hour'], $traffic['time']['minute']); + $trafficData[$i]['time'] = mktime($traffic['time']['hour'], $traffic['time']['minute'], 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']); $trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion); $trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion); $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } + usort($trafficData, 'sortingFunction'); } } @@ -170,9 +169,7 @@ public function getInterfaceData($timeperiod, $type, $interface) { } } - if ($this->vnstatJsonVersion == 1) { - usort($trafficData, sortingFunction); - } + usort($trafficData, 'sortingFunction'); } else if ($type == 'graph') { foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['hour'.$typeAppend] as $traffic) { @@ -186,11 +183,13 @@ public function getInterfaceData($timeperiod, $type, $interface) { } $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], $hour, 0, 0); + $trafficData[$i]['time'] = mktime($hour, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']); $trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion); $trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion); $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } + usort($trafficData, 'sortingFunction'); } } @@ -201,22 +200,26 @@ public function getInterfaceData($timeperiod, $type, $interface) { $i++; $trafficData[$i]['label'] = date('d/m/Y', mktime(0, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year'])); + $trafficData[$i]['time'] = mktime(0, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']); $trafficData[$i]['rx'] = formatSize($traffic['rx'], $this->vnstatJsonVersion); $trafficData[$i]['tx'] = formatSize($traffic['tx'], $this->vnstatJsonVersion); $trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } + usort($trafficData, 'sortingFunction'); } else if ($type == 'graph') { foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['day'.$typeAppend] as $traffic) { if (is_array($traffic)) { $i++; $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], 0, 0, 0); + $trafficData[$i]['time'] = mktime(0, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']); $trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion); $trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion); $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } + usort($trafficData, 'sortingFunction'); } } @@ -227,22 +230,26 @@ public function getInterfaceData($timeperiod, $type, $interface) { $i++; $trafficData[$i]['label'] = date('F Y', mktime(0, 0, 0, $traffic['date']['month'], 10, $traffic['date']['year'])); + $trafficData[$i]['time'] = mktime(0, 0, 0, $traffic['date']['month'], 10, $traffic['date']['year']); $trafficData[$i]['rx'] = formatSize($traffic['rx'], $this->vnstatJsonVersion); $trafficData[$i]['tx'] = formatSize($traffic['tx'], $this->vnstatJsonVersion); $trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } + usort($trafficData, 'sortingFunction'); } else if ($type == 'graph') { foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['month'.$typeAppend] as $traffic) { if (is_array($traffic)) { $i++; $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month'] - 1, 10, 0, 0, 0); + $trafficData[$i]['time'] = mktime(0, 0, 0, $traffic['date']['month'], 10, $traffic['date']['year']); $trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion); $trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion); $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } + usort($trafficData, 'sortingFunction'); } } diff --git a/app/index.php b/app/index.php index 1d93d33..cb01acd 100644 --- a/app/index.php +++ b/app/index.php @@ -19,8 +19,8 @@ // Require includes require __DIR__ . '/vendor/autoload.php'; -require __DIR__ . '/includes/vnstat.php'; require __DIR__ . '/includes/utilities.php'; +require __DIR__ . '/includes/vnstat.php'; require __DIR__ . '/includes/config.php'; if (isset($vnstat_config)) { @@ -84,20 +84,22 @@ // Populate graph data $fiveGraphData = $vnstat->getInterfaceData('five', 'graph', $thisInterface); -$smarty->assign('fiveGraphData', $fiveGraphData); -$smarty->assign('fiveLargestPrefix', $fiveGraphData[1]['delimiter']); +if (isset($fiveGraphData[0])) { + $smarty->assign('fiveGraphData', $fiveGraphData); + $smarty->assign('fiveLargestPrefix', $fiveGraphData[0]['delimiter']); +} $hourlyGraphData = $vnstat->getInterfaceData('hourly', 'graph', $thisInterface); $smarty->assign('hourlyGraphData', $hourlyGraphData); -$smarty->assign('hourlyLargestPrefix', $hourlyGraphData[1]['delimiter']); +$smarty->assign('hourlyLargestPrefix', $hourlyGraphData[0]['delimiter']); $dailyGraphData = $vnstat->getInterfaceData('daily', 'graph', $thisInterface); $smarty->assign('dailyGraphData', $dailyGraphData); -$smarty->assign('dailyLargestPrefix', $dailyGraphData[1]['delimiter']); +$smarty->assign('dailyLargestPrefix', $dailyGraphData[0]['delimiter']); $monthlyGraphData = $vnstat->getInterfaceData('monthly', 'graph', $thisInterface); $smarty->assign('monthlyGraphData', $monthlyGraphData); -$smarty->assign('monthlyLargestPrefix', $monthlyGraphData[1]['delimiter']); +$smarty->assign('monthlyLargestPrefix', $monthlyGraphData[0]['delimiter']); // Display the page $smarty->display('templates/site_index.tpl'); diff --git a/app/templates/module_graph_js.tpl b/app/templates/module_graph_js.tpl index 33d5f02..08cee67 100644 --- a/app/templates/module_graph_js.tpl +++ b/app/templates/module_graph_js.tpl @@ -9,9 +9,10 @@ function drawFiveChart() { + {if isset($fiveGraphData[0]['label'])} var data = new google.visualization.DataTable(); - data.addColumn('date', 'Time'); + data.addColumn('datetime', 'Time'); data.addColumn('number', 'Traffic In'); data.addColumn('number', 'Traffic Out'); data.addColumn('number', 'Total Traffic'); @@ -22,34 +23,36 @@ {/foreach} ]); + let endD = (new {$fiveGraphData[0]['label']}).getTime(); + let options = { title: 'Five minute Network Traffic', orientation: 'horizontal', legend: { position: 'right' }, explorer: { axis: 'horizontal', - maxZoomIn: 4.0, - maxZoomOut: 3.0 + zoomDelta: 1.1, + maxZoomIn: 0.1, + maxZoomOut: 10.0 }, vAxis: { - title: 'Data', format: '##.## {$fiveLargestPrefix}' }, hAxis: { - title: 'Hour', - format: 'HH:mm', direction: -1, - ticks: [ -{foreach from=$fiveGraphData key=key item=value} - new {$value.label}, -{/foreach} - ] + format: 'd/H:mm', + minorGridlines: { count: 0 }, + title: 'Day/Hour:Minute', + viewWindow: { + min: 'Date('+(endD-7200000).toString()+')', + max: 'Date('+(endD+150000).toString()+')' + } } }; - + var formatDate = new google.visualization.DateFormat({ pattern: 'dd/MM/yyyy HH:mm' }); formatDate.format(data, 0); - + var formatNumber = new google.visualization.NumberFormat({ pattern: '##.## {$fiveLargestPrefix}' }); formatNumber.format(data, 1); formatNumber.format(data, 2); @@ -57,6 +60,7 @@ let chart = new google.visualization.BarChart(document.getElementById('fiveNetworkTrafficGraph')); chart.draw(data, google.charts.Bar.convertOptions(options)); + {/if} } function drawHourlyChart() @@ -74,23 +78,29 @@ {/foreach} ]); + let endD = (new {$hourlyGraphData[0]['label']}).getTime(); + let options = { title: 'Hourly Network Traffic', orientation: 'horizontal', legend: { position: 'right' }, explorer: { axis: 'horizontal', - maxZoomIn: 4.0, - maxZoomOut: 3.0 + zoomDelta: 1.1, + maxZoomIn: 0.1, + maxZoomOut: 10.0 }, vAxis: { - title: 'Data', format: '##.## {$hourlyLargestPrefix}' }, hAxis: { - title: 'Hour', - format: 'HH:mm', + title: 'Day/Hour', + format: 'd/H', direction: -1, + viewWindow: { + min: 'Date('+(endD-86400000).toString()+')', + max: 'Date('+(endD+1800000).toString()+')' + }, ticks: [ {foreach from=$hourlyGraphData key=key item=value} new {$value.label}, @@ -125,27 +135,33 @@ [new {$value.label}, {$value.rx}, {$value.tx}, {$value.total}], {/foreach} ]); - + + let endD = (new {$dailyGraphData[0]['label']}).getTime(); + let options = { title: 'Daily Network Traffic', orientation: 'horizontal', legend: { position: 'right' }, explorer: { axis: 'horizontal', - maxZoomIn: 4.0, - maxZoomOut: 3.0 + zoomDelta: 1.1, + maxZoomIn: 0.1, + maxZoomOut: 10.0 }, vAxis: { - title: 'Data', format: '##.## {$dailyLargestPrefix}' }, hAxis: { title: 'Day', format: 'dd/MM/YYYY', + viewWindow: { + min: 'Date('+(endD-2592000000).toString()+')', + max: 'Date('+(endD+43200000).toString()+')' + }, direction: -1 } }; - + var formatDate = new google.visualization.DateFormat({ pattern: 'dd/MM/yyyy' }); formatDate.format(data, 0); @@ -179,11 +195,11 @@ legend: { position: 'right' }, explorer: { axis: 'horizontal', - maxZoomIn: 4.0, - maxZoomOut: 3.0 + zoomDelta: 1.1, + maxZoomIn: 0.1, + maxZoomOut: 10.0 }, vAxis: { - title: 'Data', format: '##.## {$monthlyLargestPrefix}' }, hAxis: { diff --git a/app/templates/module_table.tpl b/app/templates/module_table.tpl index 44cfde8..dfb200d 100644 --- a/app/templates/module_table.tpl +++ b/app/templates/module_table.tpl @@ -24,6 +24,7 @@
    + {if $jsonVersion gt 1}
    @@ -47,7 +48,10 @@
    +
    + {else}
    + {/if} From a220e708afc3f36e7b5ab970623250c039f15a5f Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Tue, 15 Oct 2019 17:05:45 -0400 Subject: [PATCH 14/16] Fix vnstat2 --- app/includes/vnstat.php | 29 ++++++++++++++--------------- app/index.php | 4 ++-- app/templates/module_graph_js.tpl | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/app/includes/vnstat.php b/app/includes/vnstat.php index b15f2e3..9b9b25e 100644 --- a/app/includes/vnstat.php +++ b/app/includes/vnstat.php @@ -101,7 +101,11 @@ public function getInterfaceData($timeperiod, $type, $interface) { $i = -1; // Get the array index for the chosen interface - $arrayIndex = array_search($interface, array_column($this->vnstatData['interfaces'], 'id')); + if ($this->vnstatJsonVersion == 1) { + $arrayIndex = array_search($interface, array_column($this->vnstatData['interfaces'], 'id')); + } else { + $arrayIndex = array_search($interface, array_column($this->vnstatData['interfaces'], 'name')); + } if ($timeperiod == 'top10') { if ($type == 'table') { @@ -119,7 +123,7 @@ public function getInterfaceData($timeperiod, $type, $interface) { } } - if (isset($this->vnstatData['interfaces'][0]['traffic']['fiveminute']) && ($timeperiod == 'five')) { + if (($this->vnstatJsonVersion > 1) && ($timeperiod == 'five')) { if ($type == 'table') { foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['fiveminute'] as $traffic) { if (is_array($traffic)) { @@ -132,7 +136,6 @@ public function getInterfaceData($timeperiod, $type, $interface) { $trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } - usort($trafficData, 'sortingFunction'); } else if ($type == 'graph') { foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['fiveminute'] as $traffic) { if (is_array($traffic)) { @@ -145,7 +148,6 @@ public function getInterfaceData($timeperiod, $type, $interface) { $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } - usort($trafficData, 'sortingFunction'); } } @@ -169,7 +171,6 @@ public function getInterfaceData($timeperiod, $type, $interface) { } } - usort($trafficData, 'sortingFunction'); } else if ($type == 'graph') { foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['hour'.$typeAppend] as $traffic) { @@ -189,7 +190,6 @@ public function getInterfaceData($timeperiod, $type, $interface) { $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } - usort($trafficData, 'sortingFunction'); } } @@ -206,7 +206,6 @@ public function getInterfaceData($timeperiod, $type, $interface) { $trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } - usort($trafficData, 'sortingFunction'); } else if ($type == 'graph') { foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['day'.$typeAppend] as $traffic) { if (is_array($traffic)) { @@ -219,7 +218,6 @@ public function getInterfaceData($timeperiod, $type, $interface) { $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } - usort($trafficData, 'sortingFunction'); } } @@ -236,7 +234,6 @@ public function getInterfaceData($timeperiod, $type, $interface) { $trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } - usort($trafficData, 'sortingFunction'); } else if ($type == 'graph') { foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['month'.$typeAppend] as $traffic) { if (is_array($traffic)) { @@ -249,21 +246,23 @@ public function getInterfaceData($timeperiod, $type, $interface) { $trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion); } } - usort($trafficData, 'sortingFunction'); } } + usort($trafficData, 'sortingFunction'); + if ($type == 'graph') { // Get the largest value and then prefix (B, KB, MB, GB, etc) $trafficLargestValue = getLargestValue($trafficData); $trafficLargestPrefix = getLargestPrefix($trafficLargestValue); - foreach($trafficData as $key => $value) { - $trafficData[$key]['rx'] = formatBytesTo($value['rx'], $trafficLargestPrefix); - $trafficData[$key]['tx'] = formatBytesTo($value['tx'], $trafficLargestPrefix); - $trafficData[$key]['total'] = formatBytesTo($value['total'], $trafficLargestPrefix); - $trafficData[$key]['delimiter'] = $trafficLargestPrefix; + foreach($trafficData as &$value) { + $value['rx'] = formatBytesTo($value['rx'], $trafficLargestPrefix); + $value['tx'] = formatBytesTo($value['tx'], $trafficLargestPrefix); + $value['total'] = formatBytesTo($value['total'], $trafficLargestPrefix); } + unset($value); + $trafficData[0]['delimiter'] = $trafficLargestPrefix; } return $trafficData; diff --git a/app/index.php b/app/index.php index cb01acd..79467b6 100644 --- a/app/index.php +++ b/app/index.php @@ -83,8 +83,8 @@ $smarty->assign('top10TableData', $top10Data); // Populate graph data -$fiveGraphData = $vnstat->getInterfaceData('five', 'graph', $thisInterface); -if (isset($fiveGraphData[0])) { +if ($vnstat->getVnstatJsonVersion() > 1) { + $fiveGraphData = $vnstat->getInterfaceData('five', 'graph', $thisInterface); $smarty->assign('fiveGraphData', $fiveGraphData); $smarty->assign('fiveLargestPrefix', $fiveGraphData[0]['delimiter']); } diff --git a/app/templates/module_graph_js.tpl b/app/templates/module_graph_js.tpl index 08cee67..9534ab7 100644 --- a/app/templates/module_graph_js.tpl +++ b/app/templates/module_graph_js.tpl @@ -9,7 +9,7 @@ function drawFiveChart() { - {if isset($fiveGraphData[0]['label'])} + {if $jsonVersion gt 1} var data = new google.visualization.DataTable(); data.addColumn('datetime', 'Time'); From 314896305824707522c20fa79c3c5bd54c7d9260 Mon Sep 17 00:00:00 2001 From: tangert Date: Tue, 15 Oct 2019 19:44:07 -0400 Subject: [PATCH 15/16] Don't sort top10 --- app/includes/vnstat.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/includes/vnstat.php b/app/includes/vnstat.php index 9b9b25e..f95ea5b 100644 --- a/app/includes/vnstat.php +++ b/app/includes/vnstat.php @@ -183,7 +183,7 @@ public function getInterfaceData($timeperiod, $type, $interface) { $hour = $traffic['time']['hour']; } - $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], $hour, 0, 0); + $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], $hour); $trafficData[$i]['time'] = mktime($hour, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']); $trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion); $trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion); @@ -211,7 +211,7 @@ public function getInterfaceData($timeperiod, $type, $interface) { if (is_array($traffic)) { $i++; - $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], 0, 0, 0); + $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day']); $trafficData[$i]['time'] = mktime(0, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']); $trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion); $trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion); @@ -239,7 +239,7 @@ public function getInterfaceData($timeperiod, $type, $interface) { if (is_array($traffic)) { $i++; - $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month'] - 1, 10, 0, 0, 0); + $trafficData[$i]['label'] = sprintf("Date(%d, %d, %d)", $traffic['date']['year'], $traffic['date']['month'] - 1, 10); $trafficData[$i]['time'] = mktime(0, 0, 0, $traffic['date']['month'], 10, $traffic['date']['year']); $trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion); $trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion); @@ -249,7 +249,9 @@ public function getInterfaceData($timeperiod, $type, $interface) { } } - usort($trafficData, 'sortingFunction'); + if ($timeperiod != 'top10') { + usort($trafficData, 'sortingFunction'); + } if ($type == 'graph') { // Get the largest value and then prefix (B, KB, MB, GB, etc) From 41400342e5d151d9ad0b3d6851fe9f3c8a784335 Mon Sep 17 00:00:00 2001 From: Tom Angert Date: Sat, 19 Oct 2019 20:46:35 -0400 Subject: [PATCH 16/16] Add logarithmic graph option. Fix occasional display error. Clean up some floatingpoint math --- app/includes/config.php | 13 ++++- app/includes/utilities.php | 91 ++++++++++++++++++++++--------- app/includes/vnstat.php | 18 ++++-- app/index.php | 14 ++++- app/templates/module_graph_js.tpl | 57 +++++++++++++++---- 5 files changed, 145 insertions(+), 48 deletions(-) diff --git a/app/includes/config.php b/app/includes/config.php index 6019c88..358143b 100644 --- a/app/includes/config.php +++ b/app/includes/config.php @@ -17,9 +17,10 @@ * along with this program. If not, see . */ -// Disable error reporting to screen -/*ini_set('display_errors', 0); -error_reporting(E_ALL);*/ +// Uncomment to enable error reporting to the screen +/*ini_set('display_errors', 1); +ini_set('display_startup_errors', 1); +ferror_reporting(E_ALL);*/ // Set the default system Timezone date_default_timezone_set('Europe/London'); @@ -27,6 +28,12 @@ // Path of vnstat $vnstat_bin_dir = '/usr/bin/vnstat'; +// Path of config file +/*$vnstat_config = '/etc/vnstat.conf';*/ + +// linear or logarithmic graphs. Uncomment for logarithmic +/*$graph_type = 'log';*/ + // Set to true to set your own interfaces $use_predefined_interfaces = false; diff --git a/app/includes/utilities.php b/app/includes/utilities.php index 351e376..01193c1 100644 --- a/app/includes/utilities.php +++ b/app/includes/utilities.php @@ -17,6 +17,19 @@ * along with this program. If not, see . */ +$logk = log(1024); + +function getScale($bytes) +{ + global $logk; + + $ui = floor(round(log($bytes)/$logk,3)); + if ($ui < 0) { $ui = 0; } + if ($ui > 8) { $ui = 8; } + + return $ui; +} + // Get the largest value in an array function getLargestValue($array) { return $max = array_reduce($array, function ($a, $b) { @@ -24,35 +37,73 @@ function getLargestValue($array) { }); } -function formatSize($bytes, $vnstatJsonVersion) { +function getBaseValue($array, $scale) +{ + $big = pow(1024,9); + + // Find the smallest non-zero value + $sml = array_reduce($array, function ($a, $b) { + if ((1 <= $b['rx']) && ($b['rx'] < $b['tx'])) { + $sm = $b['rx']; + } else { + $sm = $b['tx']; + } + if (($sm < 1) || ($a < $sm)) { + return $a; + } else { + return $sm; + } + }, $big); + + if ($sml >= $big/2) { + $sml = 1; + } + + // divide by scale then round down to a power of 10 + $base = pow(10,floor(round(log10($sml/pow(1024,$scale)),3))); + + // convert back to bytes + $baseByte = $base * pow(1024, $scale); + + // Don't make the bar invisable - must be > 5% difference + if ($sml / $baseByte < 1.05) { + $base = $base / 10; + } + + return $base; +} + +function formatSize($bytes, $vnstatJsonVersion, $decimals = 2) { + // json version 1 = convert from KiB // json version 2 = convert from bytes if ($vnstatJsonVersion == 1) { $bytes *= 1024; // convert from kibibytes to bytes } - return formatBytes($bytes); + return formatBytes($bytes, $decimals); } -function formatBytes($bytes, $decimals = 2) { - $base = log(floatval($bytes), 1024); +function getLargestPrefix($scale) +{ $suffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; + return $suffixes[$scale]; +} + +function formatBytes($bytes, $decimals = 3) { - return round(pow(1024, $base - floor($base)), $decimals) .' '. $suffixes[floor($base)]; + $scale = getScale($bytes); + + return round($bytes/pow(1024, $scale), $decimals) .' '. getLargestPrefix($scale); } -function formatBytesTo($bytes, $delimiter, $decimals = 2) { +function formatBytesTo($bytes, $scale, $decimals = 4) { + if ($bytes == 0) { return '0'; } - $k = 1024; - $dm = $decimals < 0 ? 0 : $decimals; - $sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; - - $i = array_search($delimiter, $sizes); - - return number_format(($bytes / pow($k, $i)), $decimals); + return number_format(($bytes / pow(1024, $scale)), $decimals, ".", ""); } function kibibytesToBytes($kibibytes, $vnstatJsonVersion) { @@ -63,20 +114,6 @@ function kibibytesToBytes($kibibytes, $vnstatJsonVersion) { } } -function getLargestPrefix($kb) -{ - $units = ['TB', 'GB', 'MB', 'KB', 'B']; - $scale = 1024 * 1024 * 1024 * 1024; - $ui = 0; - - while ((($kb < $scale) && ($scale > 1))) { - $ui++; - $scale = $scale / 1024; - } - - return $units[$ui]; -} - function sortingFunction($item1, $item2) { if ($item1['time'] == $item2['time']) { return 0; diff --git a/app/includes/vnstat.php b/app/includes/vnstat.php index f95ea5b..971fcf6 100644 --- a/app/includes/vnstat.php +++ b/app/includes/vnstat.php @@ -256,15 +256,25 @@ public function getInterfaceData($timeperiod, $type, $interface) { if ($type == 'graph') { // Get the largest value and then prefix (B, KB, MB, GB, etc) $trafficLargestValue = getLargestValue($trafficData); - $trafficLargestPrefix = getLargestPrefix($trafficLargestValue); + $trafficScale = getScale($trafficLargestValue); + $trafficLargestPrefix = getLargestPrefix($trafficScale); + $trafficBase = getBaseValue($trafficData, $trafficScale); + if (($trafficBase < .0099) && ($trafficScale >= 1)) + { + $trafficScale = $trafficScale - 1; + $trafficLargestPrefix = getLargestPrefix($trafficScale); + $trafficBase = getBaseValue($trafficData, $trafficScale); + } foreach($trafficData as &$value) { - $value['rx'] = formatBytesTo($value['rx'], $trafficLargestPrefix); - $value['tx'] = formatBytesTo($value['tx'], $trafficLargestPrefix); - $value['total'] = formatBytesTo($value['total'], $trafficLargestPrefix); + $value['rx'] = formatBytesTo($value['rx'], $trafficScale); + $value['tx'] = formatBytesTo($value['tx'], $trafficScale); + $value['total'] = formatBytesTo($value['total'], $trafficScale); } + unset($value); $trafficData[0]['delimiter'] = $trafficLargestPrefix; + $trafficData[0]['base'] = $trafficBase; } return $trafficData; diff --git a/app/index.php b/app/index.php index 79467b6..dfdd2c4 100644 --- a/app/index.php +++ b/app/index.php @@ -29,6 +29,10 @@ $vnstat_cmd = $vnstat_bin_dir; } +if (empty($graph_type)) { + $graph_type = 'linear'; +} + // Initiaite vnStat class $vnstat = new vnStat($vnstat_cmd); @@ -57,6 +61,7 @@ $thisInterface = reset($interface_list); } +$smarty->assign('graph_type', $graph_type); $smarty->assign('current_interface', $thisInterface); @@ -67,8 +72,10 @@ $smarty->assign('jsonVersion', $vnstat->getVnstatJsonVersion()); // Populate table data -$fiveData = $vnstat->getInterfaceData('five', 'table', $thisInterface); -$smarty->assign('fiveTableData', $fiveData); +if ($vnstat->getVnstatJsonVersion() > 1) { + $fiveData = $vnstat->getInterfaceData('five', 'table', $thisInterface); + $smarty->assign('fiveTableData', $fiveData); +} $hourlyData = $vnstat->getInterfaceData('hourly', 'table', $thisInterface); $smarty->assign('hourlyTableData', $hourlyData); @@ -87,15 +94,18 @@ $fiveGraphData = $vnstat->getInterfaceData('five', 'graph', $thisInterface); $smarty->assign('fiveGraphData', $fiveGraphData); $smarty->assign('fiveLargestPrefix', $fiveGraphData[0]['delimiter']); + $smarty->assign('fiveBase', $fiveGraphData[0]['base']); } $hourlyGraphData = $vnstat->getInterfaceData('hourly', 'graph', $thisInterface); $smarty->assign('hourlyGraphData', $hourlyGraphData); $smarty->assign('hourlyLargestPrefix', $hourlyGraphData[0]['delimiter']); +$smarty->assign('hourlyBase', $hourlyGraphData[0]['base']); $dailyGraphData = $vnstat->getInterfaceData('daily', 'graph', $thisInterface); $smarty->assign('dailyGraphData', $dailyGraphData); $smarty->assign('dailyLargestPrefix', $dailyGraphData[0]['delimiter']); +$smarty->assign('dailyBase', $dailyGraphData[0]['base']); $monthlyGraphData = $vnstat->getInterfaceData('monthly', 'graph', $thisInterface); $smarty->assign('monthlyGraphData', $monthlyGraphData); diff --git a/app/templates/module_graph_js.tpl b/app/templates/module_graph_js.tpl index 9534ab7..a99eed4 100644 --- a/app/templates/module_graph_js.tpl +++ b/app/templates/module_graph_js.tpl @@ -36,17 +36,29 @@ maxZoomOut: 10.0 }, vAxis: { - format: '##.## {$fiveLargestPrefix}' + format: '###.### {$fiveLargestPrefix}' + {if $graph_type == 'log'} + ,scaleType: 'log', + baseline: {$fiveBase} + {/if} }, hAxis: { direction: -1, format: 'd/H:mm', - minorGridlines: { count: 0 }, - title: 'Day/Hour:Minute', + {if $jsonVersion > 1} + title: 'Day/Hour:Minute (Scroll to zoom, Drag to pan)', + {else} + title: 'Day/Hour:Minute', + {/if} viewWindow: { - min: 'Date('+(endD-7200000).toString()+')', + min: 'Date('+(endD-7050000).toString()+')', max: 'Date('+(endD+150000).toString()+')' - } + }, + ticks: [ +{foreach from=$fiveGraphData key=key item=value} + new {$value.label}, +{/foreach} + ] } }; @@ -91,14 +103,22 @@ maxZoomOut: 10.0 }, vAxis: { - format: '##.## {$hourlyLargestPrefix}' + format: '###.### {$hourlyLargestPrefix}' + {if $graph_type == 'log'} + ,scaleType: 'log', + baseline: {$hourlyBase} + {/if} }, hAxis: { - title: 'Day/Hour', + {if $jsonVersion > 1} + title: 'Day/Hour (Scroll to zoom, Drag to pan)', + {else} + title: 'Day/Hour', + {/if} format: 'd/H', direction: -1, viewWindow: { - min: 'Date('+(endD-86400000).toString()+')', + min: 'Date('+(endD-84600000).toString()+')', max: 'Date('+(endD+1800000).toString()+')' }, ticks: [ @@ -149,16 +169,29 @@ maxZoomOut: 10.0 }, vAxis: { - format: '##.## {$dailyLargestPrefix}' + format: '###.### {$dailyLargestPrefix}' + {if $graph_type == 'log'} + ,scaleType: 'log', + baseline: {$dailyBase} + {/if} }, hAxis: { - title: 'Day', + {if $jsonVersion > 1} + title: 'Day (Scroll to zoom, Drag to pan)', + {else} + title: 'Day', + {/if} format: 'dd/MM/YYYY', viewWindow: { - min: 'Date('+(endD-2592000000).toString()+')', + min: 'Date('+(endD-2548800000).toString()+')', max: 'Date('+(endD+43200000).toString()+')' }, - direction: -1 + direction: -1, + ticks: [ +{foreach from=$dailyGraphData key=key item=value} + new {$value.label}, +{/foreach} + ] } };