vnstat 2.7: Adjusted 'traffic.cgi' to display 5-minute graphs

Message ID 20210522132556.3382-1-matthias.fischer@ipfire.org
State Accepted
Commit 26a97847513a9b8f3182bd0685d6de2e62fa3a9f
Headers
Series vnstat 2.7: Adjusted 'traffic.cgi' to display 5-minute graphs |

Commit Message

Matthias Fischer May 22, 2021, 1:25 p.m. UTC
  Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 html/cgi-bin/traffic.cgi | 4 ++++
 1 file changed, 4 insertions(+)
  

Comments

Peter Müller May 22, 2021, 4:35 p.m. UTC | #1
Looks good to me, thank you. :-)

Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
>  html/cgi-bin/traffic.cgi | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi
> index cafccf73f..4846cfdf9 100644
> --- a/html/cgi-bin/traffic.cgi
> +++ b/html/cgi-bin/traffic.cgi
> @@ -86,7 +86,10 @@ sub display_vnstat
>  	if ( $testdata =~ 'enough') {
>  		print"No data for $device !<br>";
>  	} else {
> +	    # Summary
>  	    system("/usr/bin/vnstati -c 1 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png");
> +	    # 5-minute graphs
> +	    system("/usr/bin/vnstati -c 1 -5 -i $device -o /srv/web/ipfire/html/graphs/vnstat-5-$device.png");
>  	    # Hour graph
>  	    system("/usr/bin/vnstati -c 1 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png");
>  	    # Day graph
> @@ -100,6 +103,7 @@ sub display_vnstat
>  print <<END
>  <table>
>  <tr><td><img src="/graphs/vnstat-s-$device.png"></td></tr>
> +<tr><td><img src="/graphs/vnstat-5-$device.png"></td></tr>
>  <tr><td><img src="/graphs/vnstat-h-$device.png"></td></tr>
>  <tr><td><img src="/graphs/vnstat-d-$device.png"></td></tr>
>  <tr><td><img src="/graphs/vnstat-m-$device.png"></td></tr>
>
  

Patch

diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi
index cafccf73f..4846cfdf9 100644
--- a/html/cgi-bin/traffic.cgi
+++ b/html/cgi-bin/traffic.cgi
@@ -86,7 +86,10 @@  sub display_vnstat
 	if ( $testdata =~ 'enough') {
 		print"No data for $device !<br>";
 	} else {
+	    # Summary
 	    system("/usr/bin/vnstati -c 1 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png");
+	    # 5-minute graphs
+	    system("/usr/bin/vnstati -c 1 -5 -i $device -o /srv/web/ipfire/html/graphs/vnstat-5-$device.png");
 	    # Hour graph
 	    system("/usr/bin/vnstati -c 1 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png");
 	    # Day graph
@@ -100,6 +103,7 @@  sub display_vnstat
 print <<END
 <table>
 <tr><td><img src="/graphs/vnstat-s-$device.png"></td></tr>
+<tr><td><img src="/graphs/vnstat-5-$device.png"></td></tr>
 <tr><td><img src="/graphs/vnstat-h-$device.png"></td></tr>
 <tr><td><img src="/graphs/vnstat-d-$device.png"></td></tr>
 <tr><td><img src="/graphs/vnstat-m-$device.png"></td></tr>