diff --git a/bandwidth.sh b/bandwidth.sh index 75a0470..0432858 100644 --- a/bandwidth.sh +++ b/bandwidth.sh @@ -1,27 +1,27 @@ -#!/bin/bash - -function writeMariaDB () -{ - echo "write data to mariadb" - mariadb-import --host server0 --user sascha -p527646 --local --fields-terminated-by=',' bandwidth speedtest.tmp -} - -function runTest () -{ - # run speedtest against named server with csv output saved in tmp file - echo "running speedtest-cli" - speedtest-cli --secure --csv > speedtest.tmp - bat speedtest.tmp - - # write output to db - writeMariaDB - - # write output to csv - echo "write data to csv" - cat speedtest.tmp >> speedtest.csv -} - -# main -echo "bandwidth V0.1 by DJh2o2" -runTest -echo "Ready!" +#!/bin/bash + +function writeMariaDB () +{ + echo "write data to mariadb" + mariadb-import --host server0 --user sascha -p527646 --local --fields-terminated-by=',' bandwidth speedtest.tmp +} + +function runTest () +{ + # run speedtest against named server with csv output saved in tmp file + echo "running speedtest-cli" + speedtest-cli --secure --csv > speedtest.tmp + bat speedtest.tmp + + # write output to db + writeMariaDB + + # write output to csv + echo "write data to csv" + cat speedtest.tmp >> speedtest.csv +} + +# main +echo "bandwidth V0.11 by DJh2o2" +runTest +echo "Ready!" diff --git a/speedtest.csv b/speedtest.csv index 6c69ff9..bf9b066 100644 --- a/speedtest.csv +++ b/speedtest.csv @@ -1,3 +1,4 @@ 35692,Clouvider Ltd,Frankfurt Am Main,2022-08-04T18:17:40.548119Z,221.19864243205473,23.564,246840561.14484474,20721710.579230364,,5.146.68.185 29320,WiTCOM,Wiesbaden,2022-08-04T18:18:39.392004Z,205.6488933950454,24.203,253694035.70635754,23220505.965713702,,5.146.68.185 29320,WiTCOM,Wiesbaden,2022-08-04T18:20:01.258429Z,205.6488933950454,18.53,200909651.15138105,9111573.772799497,,5.146.68.185 +33397,PHILUNET GmbH,Dusseldorf,2023-08-01T16:22:10.517935Z,46.06510450535998,24.788,244315565.88634723,21796852.39967929,,5.146.71.1 diff --git a/speedtest.tmp b/speedtest.tmp index a7259bb..74bb8f2 100644 --- a/speedtest.tmp +++ b/speedtest.tmp @@ -1 +1 @@ -29320,WiTCOM,Wiesbaden,2022-08-04T18:20:01.258429Z,205.6488933950454,18.53,200909651.15138105,9111573.772799497,,5.146.68.185 +33397,PHILUNET GmbH,Dusseldorf,2023-08-01T16:22:10.517935Z,46.06510450535998,24.788,244315565.88634723,21796852.39967929,,5.146.71.1