diff --git a/config.php b/config.php index e9d4718..4d1e6cd 100644 --- a/config.php +++ b/config.php @@ -23,6 +23,9 @@ // 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; diff --git a/index.php b/index.php index 0eca23b..dd50adc 100644 --- a/index.php +++ b/index.php @@ -77,6 +77,13 @@ function printTableStats($path, $type, $interface, $label) // Assume they mean the first interface $thisInterface = reset($interface_list); } + +if (isset($vnstat_config)) { + $vnstat_cmd = $vnstat_bin_dir.' --config '.$vnstat_config; +} else { + $vnstat_cmd = $vnstat_bin_dir; +} + ?> @@ -86,39 +93,161 @@ function printTableStats($path, $type, $interface, $label) - + - - + + + +

Network Traffic ()

@@ -221,46 +420,61 @@ function drawMonthlyChart()
-
-
+ 1) { echo " +
+
+
+ "; } ?> + +
id="hourlyGraph"> +
-
+
-
+
-
- + 1) { echo " +
"; + printTableStats($vnstat_cmd, "five", $thisInterface, 'Time'); + echo "
"; } ?> + +
id="hourly"> +
- +
- +
- +
diff --git a/vnstat.php b/vnstat.php index 849ecbb..6b1825b 100644 --- a/vnstat.php +++ b/vnstat.php @@ -17,28 +17,35 @@ * along with this program. If not, see . */ -// $wSuf (without suffix MB, GB, etc) -function kbytesToString($kb, $wSuf = false, $byte_notation = null) +$logk = log(1024); +$terraB = pow(1024,4); +$version = 1; + +function getMagnitude($bytes) { - $units = ['TB', 'GB', 'MB', 'KB']; - $scale = 1024 * 1024 * 1024 * 1024; - $ui = 0; + global $logk; - $custom_size = isset($byte_notation) && in_array($byte_notation, $units); + $ui = floor(round(log($bytes)/$logk,3)); + if ($ui < 0) { $ui = 0; } + if ($ui > 4) { $ui = 4; } - while ((($kb < $scale) && ($scale > 1)) || $custom_size) { + return $ui; +} - if ($custom_size && $units[$ui] == $byte_notation) { - break; - } - $ui++; - $scale = $scale / 1024; +// $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.2f", ($kb / $scale)); + return sprintf("%0.6f", ($bytes / pow(1024, $ui))); } else { - return sprintf("%0.2f %s", ($kb / $scale), $units[$ui]); + return sprintf("%0.2f %s", ($bytes / pow(1024, $ui)), $units[$ui]); } } @@ -69,22 +76,51 @@ function getLargestValue($array) }); } -function getLargestPrefix($kb) +function getBaseValue($array, $magnitude) { - $units = ['TB', 'GB', 'MB', 'KB']; - $scale = 1024 * 1024 * 1024; - $ui = 0; + 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); - while ((($kb < $scale) && ($scale > 1))) { - $ui++; - $scale = $scale / 1024; + if ($sml >= $terraB) { + $sml = 1; } - return $units[$ui]; + $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) +{ + $units = ['B', 'K', 'M', 'G', 'T']; + + return $units[getMagnitude($bytes)]; } function getVnstatData($path, $type, $interface) { + global $version; + $vnstat_information = []; // Create an empty array for use later $vnstatJSON = popen("$path --json -i $interface", "r"); @@ -103,6 +139,8 @@ function getVnstatData($path, $type, $interface) $vnstatDecoded = json_decode($vnstatDecoded, true); + $fiveGraph = []; + $five = []; $hourlyGraph = []; $hourly = []; $dailyGraph = []; @@ -111,32 +149,63 @@ function getVnstatData($path, $type, $interface) $monthly = []; $top10 = []; + if( isset( $vnstatDecoded['jsonversion'] )){ + $version = $vnstatDecoded['jsonversion']; + } + + $s=''; + if( $version == 1 ){ + $s = 's'; + } + $i = 0; - foreach ($vnstatDecoded['interfaces'][0]['traffic']['top'] as $top) { + 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'] = kbytesToString($top['rx']); - $top10[$i]['tx'] = kbytesToString($top['tx']); + $top10[$i]['rx'] = bytesToString($top['rx']); + $top10[$i]['tx'] = bytesToString($top['tx']); $top10[$i]['totalraw'] = ($top['rx'] + $top['tx']); - $top10[$i]['total'] = kbytesToString($top['rx'] + $top['tx']); + $top10[$i]['total'] = bytesToString($top['rx'] + $top['tx']); } } + if( $version > 1 ){ $i = 0; - foreach ($vnstatDecoded['interfaces'][0]['traffic']['day'] as $day) { + 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'] = kbytesToString($day['rx']); - $daily[$i]['tx'] = kbytesToString($day['tx']); + $daily[$i]['rx'] = bytesToString($day['rx']); + $daily[$i]['tx'] = bytesToString($day['tx']); $daily[$i]['totalraw'] = ($day['rx'] + $day['tx']); - $daily[$i]['total'] = kbytesToString($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'] = 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']); @@ -145,37 +214,43 @@ function getVnstatData($path, $type, $interface) } $i = 0; - foreach ($vnstatDecoded['interfaces'][0]['traffic']['hour'] as $hour) { + foreach ($vnstatDecoded['interfaces'][0]['traffic']['hour'.$s] as $hour) { if (is_array($hour)) { ++$i; - $hourly[$i]['label'] = date("ga", mktime($hour['id'], 0, 0, $hour['date']['month'], $hour['date']['day'], $hour['date']['year'])); - $hourly[$i]['rx'] = kbytesToString($hour['rx']); - $hourly[$i]['tx'] = kbytesToString($hour['tx']); + 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'] = kbytesToString($hour['rx'] + $hour['tx']); - $hourly[$i]['time'] = mktime($hour['id'], 0, 0, $hour['date']['month'], $hour['date']['day'], $hour['date']['year']); + $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'] = date("ga", mktime($hour['id'], 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($hour['id'], 0, 0, $hour['date']['month'], $hour['date']['day'], $hour['date']['year']); + $hourlyGraph[$i]['time'] = mktime($h, 0, 0, $hour['date']['month'], $hour['date']['day'], $hour['date']['year']); } } - asort($vnstatDecoded['interfaces'][0]['traffic']['month']); + asort($vnstatDecoded['interfaces'][0]['traffic']['month'.$s]); $i = 0; - foreach ($vnstatDecoded['interfaces'][0]['traffic']['month'] as $month) { + 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'] = kbytesToString($month['rx']); - $monthly[$i]['tx'] = kbytesToString($month['tx']); + $monthly[$i]['rx'] = bytesToString($month['rx']); + $monthly[$i]['tx'] = bytesToString($month['tx']); $monthly[$i]['totalraw'] = ($month['rx'] + $month['tx']); - $monthly[$i]['total'] = kbytesToString($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)); @@ -194,6 +269,8 @@ function getVnstatData($path, $type, $interface) } }; + usort($five, $sorting_function); + usort($fiveGraph, $sorting_function); usort($hourly, $sorting_function); usort($hourlyGraph, $sorting_function); usort($daily, $sorting_function); @@ -211,6 +288,10 @@ function getVnstatData($path, $type, $interface) }); switch ($type) { + case "fiveGraph": + return $fiveGraph; + case "five": + return $five; case "hourlyGraph": return $hourlyGraph; case "hourly": @@ -220,7 +301,7 @@ function getVnstatData($path, $type, $interface) case "daily": return $daily; case "monthlyGraph": - return $monthlyGraph; + return array_slice($monthlyGraph, 0, 12, true); case "monthly": return $monthly; case "top10":