From b9168ab2d0ad45ff80b4e729bcad8a63a1802e11 Mon Sep 17 00:00:00 2001 From: Jack Greyhat Date: Thu, 28 Jan 2021 10:37:41 +0100 Subject: [PATCH] finalizing code --- Speedtest.inc.php | 9 ++++----- librenms-speedtest.sh | 8 +++++--- ookla-logo.png => logos/ookla-logo.png | Bin speedtest-logo.png => logos/speedtest-logo.png | Bin 4 files changed, 9 insertions(+), 8 deletions(-) rename ookla-logo.png => logos/ookla-logo.png (100%) rename speedtest-logo.png => logos/speedtest-logo.png (100%) diff --git a/Speedtest.inc.php b/Speedtest.inc.php index d0cd674..7227934 100644 --- a/Speedtest.inc.php +++ b/Speedtest.inc.php @@ -3,18 +3,17 @@
- +
- antnetscaler02.icl-ltd.com
- POP (default) + Last used Speedtest server:
+
- +
-
diff --git a/librenms-speedtest.sh b/librenms-speedtest.sh index 28baac5..c24c417 100644 --- a/librenms-speedtest.sh +++ b/librenms-speedtest.sh @@ -37,14 +37,16 @@ SpeedtestResultDir=$SpeedtestPluginDir/tmp speedtest --accept-license --accept-gdpr -p no > $SpeedtestResultDir/speedtest-results 2>/dev/null # Get the Latency - Latency=$(cat $SpeedtestResultDir/speedtest-results | grep Latency | sed -r 's/\s+//g'| cut -d":" -f2 | cut -d"m" -f1) + Latency=$(cat $SpeedtestResultDir/speedtest-results | grep Latency | sed 's/.*Latency:\s*\([0-9]*.[0-9]*\).*/\1/') # Get the Download speed - DownloadSpeed=$(cat $SpeedtestResultDir/speedtest-results | grep Download | sed -r 's/\s+//g'| cut -d":" -f2 | cut -d"M" -f1) + DownloadSpeed=$(cat $SpeedtestResultDir/speedtest-results | grep Download | sed 's/.*Download:\s*\([0-9]*.[0-9]*\).*/\1/') # Get the Upload speed - UploadSpeed=$(cat $SpeedtestResultDir/speedtest-results | grep Upload | sed -r 's/\s+//g'| cut -d":" -f2 | cut -d"M" -f1) + UploadSpeed=$(cat $SpeedtestResultDir/speedtest-results | grep Upload | sed 's/.*Upload:\s*\([0-9]*.[0-9]*\).*/\1/') + # Get the server that was used, dump it into a file + cat $SpeedtestResultDir/speedtest-results | grep Server | sed 's/.*Server:\s*\(.*\)/\1/' > $SpeedtestResultDir/speedtest-server # Update the RRD graphs rrdtool update $RRDGraphsDir/speedtest-latency.rrd $DATE:$Latency rrdtool update $RRDGraphsDir/speedtest-bandwidth.rrd $DATE:$DownloadSpeed:$UploadSpeed diff --git a/ookla-logo.png b/logos/ookla-logo.png similarity index 100% rename from ookla-logo.png rename to logos/ookla-logo.png diff --git a/speedtest-logo.png b/logos/speedtest-logo.png similarity index 100% rename from speedtest-logo.png rename to logos/speedtest-logo.png