diff --git a/check_speedtest.py b/check_speedtest.py index b6c9a50..335c3d3 100755 --- a/check_speedtest.py +++ b/check_speedtest.py @@ -34,8 +34,8 @@ def main(): warnings.simplefilter("ignore", category=RuntimeWarning) speedtest_results = cloudflareclass.cloudflare(printit=False).runalltests() - out_str = f"upload: {speedtest_results['90th_percentile_upload_speed']['value']} Mbps, download: {speedtest_results['90th_percentile_download_speed']['value']} Mbps, latency: {speedtest_results['latency_ms']['value']} ms, Jitter: {speedtest_results['Jitter_ms']['value']} ms" - perf_data = f"'upload'={speedtest_results['90th_percentile_upload_speed']['value'] * 1e+6}B;{args.warn_up * 1e+6};{args.critical_up * 1e+6};0; 'download'={speedtest_results['90th_percentile_download_speed']['value'] * 1e+6}B;{args.warn_down * 1e+6};{args.critical_down * 1e+6};0; 'latency_ms'={speedtest_results['latency_ms']['value']}ms;{args.warn_latency};{args.critical_latency};0; 'Jitter_ms'={speedtest_results['Jitter_ms']['value']}ms;;;0;" + out_str = f"upload: {speedtest_results['90th_percentile_upload_speed']['value']} Mbps, download: {speedtest_results['90th_percentile_download_speed']['value']} Mbps, latency: {speedtest_results['latency_ms']['value']} ms, jitter: {speedtest_results['Jitter_ms']['value']} ms" + perf_data = f"'upload'={speedtest_results['90th_percentile_upload_speed']['value'] * 1e+6}B;{args.warn_up * 1e+6};{args.critical_up * 1e+6};0; 'download'={speedtest_results['90th_percentile_download_speed']['value'] * 1e+6}B;{args.warn_down * 1e+6};{args.critical_down * 1e+6};0; 'latency_ms'={speedtest_results['latency_ms']['value']}ms;{args.warn_latency};{args.critical_latency};0; 'jitter_ms'={speedtest_results['Jitter_ms']['value']}ms;;;0;" exit_code = nagios.OK diff --git a/install.sh b/install.sh index 88a0c4a..acb4d38 100755 --- a/install.sh +++ b/install.sh @@ -11,8 +11,17 @@ ln_existing() { ln -s "$src" "$dest" } +if [[ $UID != 0 ]]; then + echo "Please run this script with sudo:" + echo "sudo $0 $*" + exit 1 +fi + + apt update apt install -y python3-venv git sysstat bc smartmontools curl recode python3-pip +curl https://bootstrap.pypa.io/get-pip.py | python3 +# sudo synogear install pip install -U pip wheel setuptools pip install psutil check_systemd