From 1541e8d7ae3cc9060949a1454444b54eca771d15 Mon Sep 17 00:00:00 2001 From: Jack Greyhat Date: Fri, 22 Jan 2021 10:43:05 +0100 Subject: [PATCH] add month/year --- librenms-speedtest.sh | 128 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/librenms-speedtest.sh b/librenms-speedtest.sh index 1fd0567..cdad79f 100644 --- a/librenms-speedtest.sh +++ b/librenms-speedtest.sh @@ -94,6 +94,56 @@ SpeedtestResultDir=/opt/librenms-speedtest/tmp --font LEGEND:8:DejaVuSansMono \ --font AXIS:7:DejaVuSansMono > /dev/null 2>&1 + # Create the Latency PNG of the last month + rrdtool graph $PNGImagesDir/speedtest-latency-month.png -J -a PNG --start "-1month" \ + --title="Last Month" \ + --vertical-label "ms" \ + DEF:P=$RRDGraphsDir/speedtest-latency.rrd:LATENCY:AVERAGE \ + DEF:PMIN=$RRDGraphsDir/speedtest-latency.rrd:LATENCY:MIN \ + DEF:PMAX=$RRDGraphsDir/speedtest-latency.rrd:LATENCY:MAX \ + VDEF:Pavg=P,AVERAGE \ + LINE1:Pavg#cc3300:"Avg \n" \ + LINE2:P#3d61ab:"Last latency (ms)\n" \ + GPRINT:Pavg:"Avg latency %2.1lf ms\n" \ + -h 300 -w 650 -y1:2 \ + -c BACK#EEEEEE00 \ + -c SHADEA#EEEEEE00 \ + -c SHADEB#EEEEEE00 \ + -c CANVAS#FFFFFF00 \ + -c GRID#a5a5a5 \ + -c MGRID#FF9999 \ + -c FRAME#5e5e5e \ + -c ARROW#5e5e5e \ + -R normal \ + -c FONT#000000 \ + --font LEGEND:8:DejaVuSansMono \ + --font AXIS:7:DejaVuSansMono > /dev/null 2>&1 + + # Create the Latency PNG of the last year + rrdtool graph $PNGImagesDir/speedtest-latency-year.png -J -a PNG --start "-1year" \ + --title="Last Year" \ + --vertical-label "ms" \ + DEF:P=$RRDGraphsDir/speedtest-latency.rrd:LATENCY:AVERAGE \ + DEF:PMIN=$RRDGraphsDir/speedtest-latency.rrd:LATENCY:MIN \ + DEF:PMAX=$RRDGraphsDir/speedtest-latency.rrd:LATENCY:MAX \ + VDEF:Pavg=P,AVERAGE \ + LINE1:Pavg#cc3300:"Avg \n" \ + LINE2:P#3d61ab:"Last latency (ms)\n" \ + GPRINT:Pavg:"Avg latency %2.1lf ms\n" \ + -h 300 -w 650 -y1:2 \ + -c BACK#EEEEEE00 \ + -c SHADEA#EEEEEE00 \ + -c SHADEB#EEEEEE00 \ + -c CANVAS#FFFFFF00 \ + -c GRID#a5a5a5 \ + -c MGRID#FF9999 \ + -c FRAME#5e5e5e \ + -c ARROW#5e5e5e \ + -R normal \ + -c FONT#000000 \ + --font LEGEND:8:DejaVuSansMono \ + --font AXIS:7:DejaVuSansMono > /dev/null 2>&1 + # Create the Bandwidth PNG of the last day rrdtool graph $PNGImagesDir/speedtest-bandwidth-day.png -J -a PNG --start "-1day" \ --title="Last Day" \ @@ -172,6 +222,84 @@ SpeedtestResultDir=/opt/librenms-speedtest/tmp --font LEGEND:8:DejaVuSansMono \ --font AXIS:7:DejaVuSansMono > /dev/null 2>&1 + # Create the Bandwidth PNG of the last month + rrdtool graph $PNGImagesDir/speedtest-bandwidth-month.png -J -a PNG --start "-1month" \ + --title="Last Month" \ + --vertical-label "Mbit/s" \ + DEF:D=$RRDGraphsDir/speedtest-bandwidth.rrd:DOWN:AVERAGE \ + DEF:DMIN=$RRDGraphsDir/speedtest-bandwidth.rrd:DOWN:MIN \ + DEF:DMAX=$RRDGraphsDir/speedtest-bandwidth.rrd:DOWN:MAX \ + DEF:U=$RRDGraphsDir/speedtest-bandwidth.rrd:UP:AVERAGE \ + DEF:UMIN=$RRDGraphsDir/speedtest-bandwidth.rrd:UP:MIN \ + DEF:UMAX=$RRDGraphsDir/speedtest-bandwidth.rrd:UP:MAX \ + CDEF:Y0=U,0,* \ + CDEF:NegU=U,-1,* \ + VDEF:Yavg=Y0,AVERAGE \ + VDEF:Davg=D,AVERAGE \ + VDEF:Uavg=NegU,AVERAGE \ + VDEF:Uavg2=U,AVERAGE \ + AREA:D#61ab3d:"Download" \ + AREA:NegU#3d61ab:"Upload" \ + LINE1:Uavg#cc1100: \ + LINE1:Davg#cc3300:"Avg\n" \ + LINE1:Yavg#111111: \ + GPRINT:D:LAST:"Last download bandwidth\: %2.1lf Mb/s\n" \ + GPRINT:U:LAST:"Last upload bandwidth\: %2.1lf Mb/s\n" \ + GPRINT:Davg:"Avg download bandwidth %2.1lf Mb/s\n" \ + GPRINT:Uavg2:"Avg upload bandwidth %2.1lf Mb/s" \ + -h 300 -w 650 \ + -c BACK#EEEEEE00 \ + -c SHADEA#EEEEEE00 \ + -c SHADEB#EEEEEE00 \ + -c CANVAS#FFFFFF00 \ + -c GRID#a5a5a5 \ + -c MGRID#FF9999 \ + -c FRAME#5e5e5e \ + -c ARROW#5e5e5e \ + -R normal \ + -c FONT#000000 \ + --font LEGEND:8:DejaVuSansMono \ + --font AXIS:7:DejaVuSansMono > /dev/null 2>&1 + + # Create the Bandwidth PNG of the last year + rrdtool graph $PNGImagesDir/speedtest-bandwidth-year.png -J -a PNG --start "-1year" \ + --title="Last Year" \ + --vertical-label "Mbit/s" \ + DEF:D=$RRDGraphsDir/speedtest-bandwidth.rrd:DOWN:AVERAGE \ + DEF:DMIN=$RRDGraphsDir/speedtest-bandwidth.rrd:DOWN:MIN \ + DEF:DMAX=$RRDGraphsDir/speedtest-bandwidth.rrd:DOWN:MAX \ + DEF:U=$RRDGraphsDir/speedtest-bandwidth.rrd:UP:AVERAGE \ + DEF:UMIN=$RRDGraphsDir/speedtest-bandwidth.rrd:UP:MIN \ + DEF:UMAX=$RRDGraphsDir/speedtest-bandwidth.rrd:UP:MAX \ + CDEF:Y0=U,0,* \ + CDEF:NegU=U,-1,* \ + VDEF:Yavg=Y0,AVERAGE \ + VDEF:Davg=D,AVERAGE \ + VDEF:Uavg=NegU,AVERAGE \ + VDEF:Uavg2=U,AVERAGE \ + AREA:D#61ab3d:"Download" \ + AREA:NegU#3d61ab:"Upload" \ + LINE1:Uavg#cc1100: \ + LINE1:Davg#cc3300:"Avg\n" \ + LINE1:Yavg#111111: \ + GPRINT:D:LAST:"Last download bandwidth\: %2.1lf Mb/s\n" \ + GPRINT:U:LAST:"Last upload bandwidth\: %2.1lf Mb/s\n" \ + GPRINT:Davg:"Avg download bandwidth %2.1lf Mb/s\n" \ + GPRINT:Uavg2:"Avg upload bandwidth %2.1lf Mb/s" \ + -h 300 -w 650 \ + -c BACK#EEEEEE00 \ + -c SHADEA#EEEEEE00 \ + -c SHADEB#EEEEEE00 \ + -c CANVAS#FFFFFF00 \ + -c GRID#a5a5a5 \ + -c MGRID#FF9999 \ + -c FRAME#5e5e5e \ + -c ARROW#5e5e5e \ + -R normal \ + -c FONT#000000 \ + --font LEGEND:8:DejaVuSansMono \ + --font AXIS:7:DejaVuSansMono > /dev/null 2>&1 + # Move PNGs to the LibreNMS plugin location cp $PNGImagesDir/*.png /opt/librenms/html/plugins/Speedtest/image ;;