From 03c37f4442e5fc24b618bf902be68f487db7f75a Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Wed, 12 Aug 2020 14:12:35 +0100 Subject: [PATCH] Updated files to v1.8.0 --- README.md | 3 +- conf/site/README.md | 3 +- conf/site/app/Helpers/SpeedtestHelper.php | 5 +- conf/site/app/Jobs/SpeedtestJob.php | 28 +++ conf/site/changelog.json | 6 + conf/site/composer.json | 1 + conf/site/composer.lock | 203 ++++++++---------- conf/site/config/speedtest.php | 6 +- ...08_12_123941_add_healthchecks_settings.php | 47 ++++ conf/site/database/speed.db | Bin 139264 -> 0 bytes .../js/components/Graphics/HistoryGraph.js | 1 - .../js/components/Settings/Settings.js | 12 ++ 12 files changed, 197 insertions(+), 118 deletions(-) create mode 100644 conf/site/database/migrations/2020_08_12_123941_add_healthchecks_settings.php delete mode 100644 conf/site/database/speed.db diff --git a/README.md b/README.md index 8b794366..9bdbd0ca 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Speedtest Tracker -[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.7.19-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE) +[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.8.0-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE) This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses [Ookla's Speedtest cli](https://www.speedtest.net/apps/cli) to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results. @@ -14,6 +14,7 @@ Disclaimer: You will need to accept Ookla's [EULA](https://www.speedtest.net/abo - Graph of previous speedtests going back x days - Backup/restore data in JSON/CSV format - Slack/Discord/Telegram notifications +- [healthchecks.io](https://healthchecks.io) integration - Organizr integration ## Usage diff --git a/conf/site/README.md b/conf/site/README.md index 41274c45..42a242c3 100644 --- a/conf/site/README.md +++ b/conf/site/README.md @@ -1,6 +1,6 @@ # Speedtest Tracker -[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.7.19-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE) +[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.8.0-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE) This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses the [Ookla's speedtest cli](https://www.speedtest.net/apps/cli) package to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results. @@ -14,6 +14,7 @@ Disclaimer: You will need to accept Ookla's EULA and privacy agreements in order - Graph of previous speedtests going back x days - Backup/restore data in JSON/CSV format - Slack/Discord/Telegram notifications +- [healthchecks.io](https://healthchecks.io) integration - Organizr integration ## Installation & Setup diff --git a/conf/site/app/Helpers/SpeedtestHelper.php b/conf/site/app/Helpers/SpeedtestHelper.php index 4abf88a4..26516fa6 100644 --- a/conf/site/app/Helpers/SpeedtestHelper.php +++ b/conf/site/app/Helpers/SpeedtestHelper.php @@ -5,6 +5,7 @@ namespace App\Helpers; use App\Speedtest; use Carbon\Carbon; use Exception; +use Henrywhitaker3\Healthchecks\Healthchecks; use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; @@ -51,7 +52,7 @@ class SpeedtestHelper { $test = false; } - if(!$test) { + if($test == false) { Speedtest::create([ 'ping' => 0, 'upload' => 0, @@ -59,9 +60,7 @@ class SpeedtestHelper { 'failed' => true, 'scheduled' => $scheduled, ]); - } - if($test == false) { return false; } diff --git a/conf/site/app/Jobs/SpeedtestJob.php b/conf/site/app/Jobs/SpeedtestJob.php index 8ed0e1bf..0f718b8d 100644 --- a/conf/site/app/Jobs/SpeedtestJob.php +++ b/conf/site/app/Jobs/SpeedtestJob.php @@ -4,7 +4,10 @@ namespace App\Jobs; use App\Events\SpeedtestCompleteEvent; use App\Events\SpeedtestFailedEvent; +use App\Helpers\SettingsHelper; use App\Helpers\SpeedtestHelper; +use Exception; +use Henrywhitaker3\Healthchecks\Healthchecks; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; @@ -35,11 +38,36 @@ class SpeedtestJob implements ShouldQueue */ public function handle() { + $healthchecksEnabled = (bool)SettingsHelper::get('healthchecks_enabled')->value; + $healthchecksUuid = SettingsHelper::get('healthchecks_uuid')->value; + + if($healthchecksEnabled === true) { + try { + $hc = new Healthchecks($healthchecksUuid); + $hc->start(); + } catch(Exception $e) { + Log::error($e->getMessage()); + } + } $output = SpeedtestHelper::output(); $speedtest = SpeedtestHelper::runSpeedtest($output, $this->scheduled); if($speedtest == false) { + if(isset($hc)) { + try { + $hc->fail(); + } catch(Exception $e) { + // + } + } event(new SpeedtestFailedEvent()); } else { + if(isset($hc)) { + try { + $hc->success(); + } catch(Exception $e) { + // + } + } event(new SpeedtestCompleteEvent($speedtest)); } return $speedtest; diff --git a/conf/site/changelog.json b/conf/site/changelog.json index f2a9dc9b..5dead0ac 100644 --- a/conf/site/changelog.json +++ b/conf/site/changelog.json @@ -1,4 +1,10 @@ { + "1.8.0": [ + { + "description": "Added healthchecks.io integration.", + "link": "" + } + ], "1.7.19": [ { "description": "Updated dependencies.", diff --git a/conf/site/composer.json b/conf/site/composer.json index c3720bd3..0a766b06 100644 --- a/conf/site/composer.json +++ b/conf/site/composer.json @@ -14,6 +14,7 @@ "fideloper/proxy": "^4.2", "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0", + "henrywhitaker3/healthchecks-io": "^1.0", "laravel-notification-channels/telegram": "^0.4.0", "laravel/framework": "^7.0", "laravel/slack-notification-channel": "^2.0", diff --git a/conf/site/composer.lock b/conf/site/composer.lock index c5f4f5be..11884a6d 100644 --- a/conf/site/composer.lock +++ b/conf/site/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "eee4cd81905b1464677cd0295e867901", + "content-hash": "837c814b9f3c208c35d3e28d611623fa", "packages": [ { "name": "asm89/stack-cors", @@ -102,12 +102,6 @@ "brick", "math" ], - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/brick/math", - "type": "tidelift" - } - ], "time": "2020-04-15T15:59:35+00:00" }, { @@ -498,20 +492,6 @@ "uppercase", "words" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", - "type": "tidelift" - } - ], "time": "2020-05-29T15:13:26+00:00" }, { @@ -574,20 +554,6 @@ "parser", "php" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -824,12 +790,6 @@ "crossdomain", "laravel" ], - "funding": [ - { - "url": "https://github.com/barryvdh", - "type": "github" - } - ], "time": "2020-05-31T07:30:16+00:00" }, { @@ -1035,6 +995,57 @@ ], "time": "2019-07-01T23:21:34+00:00" }, + { + "name": "henrywhitaker3/healthchecks-io", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/henrywhitaker3/PHP-healthchecks.io.git", + "reference": "c9dc8bed2f537e6043ec84c0e95182c15f5b990b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/henrywhitaker3/PHP-healthchecks.io/zipball/c9dc8bed2f537e6043ec84c0e95182c15f5b990b", + "reference": "c9dc8bed2f537e6043ec84c0e95182c15f5b990b", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "rakit/validation": "^1.3", + "ramsey/uuid": "^4.1" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.37", + "phpunit/phpunit": "^8.5", + "vlucas/phpdotenv": "^5.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Henrywhitaker3\\Healthchecks\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Henry Whitaker", + "email": "henrywhitaker3@outlook.com", + "homepage": "https://github.com/henrywhitaker3" + } + ], + "description": "A simple PHP healthchecks.io wrapper", + "homepage": "https://github.com/henrywhitaker3/PHP-healthchecks.io", + "keywords": [ + "api", + "healthchecks", + "healthchecks.io", + "wrapper" + ], + "time": "2020-08-12T11:56:35+00:00" + }, { "name": "laravel-notification-channels/telegram", "version": "0.4.1", @@ -2548,6 +2559,48 @@ ], "time": "2020-05-03T19:32:03+00:00" }, + { + "name": "rakit/validation", + "version": "v1.3.2", + "source": { + "type": "git", + "url": "https://github.com/rakit/validation.git", + "reference": "126306ccabeadec24b6fa310605c71be67dee188" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rakit/validation/zipball/126306ccabeadec24b6fa310605c71be67dee188", + "reference": "126306ccabeadec24b6fa310605c71be67dee188", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=7.0" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^6.5", + "squizlabs/php_codesniffer": "^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Rakit\\Validation\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Muhammad Syifa", + "email": "emsifa@gmail.com" + } + ], + "description": "PHP Laravel like standalone validation library", + "time": "2020-08-09T01:18:04+00:00" + }, { "name": "ralouphie/getallheaders", "version": "3.0.3", @@ -4119,20 +4172,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -4491,20 +4530,6 @@ "polyfill", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-02T11:55:35+00:00" }, { @@ -5202,12 +5227,6 @@ "jwt", "laravel" ], - "funding": [ - { - "url": "https://www.patreon.com/seantymon", - "type": "patreon" - } - ], "time": "2020-03-04T11:21:28+00:00" }, { @@ -5763,20 +5782,6 @@ "constructor", "instantiate" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], "time": "2020-05-29T17:27:14+00:00" }, { @@ -6367,20 +6372,6 @@ "php", "symfony" ], - "funding": [ - { - "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", - "type": "custom" - }, - { - "url": "https://github.com/nunomaduro", - "type": "github" - }, - { - "url": "https://www.patreon.com/nunomaduro", - "type": "patreon" - } - ], "time": "2020-04-04T19:56:08+00:00" }, { @@ -7257,12 +7248,6 @@ "highlight.php", "syntax" ], - "funding": [ - { - "url": "https://github.com/allejo", - "type": "github" - } - ], "time": "2020-03-02T05:59:21+00:00" }, { diff --git a/conf/site/config/speedtest.php b/conf/site/config/speedtest.php index 4d105f9c..87e86b62 100644 --- a/conf/site/config/speedtest.php +++ b/conf/site/config/speedtest.php @@ -7,7 +7,7 @@ return [ |-------------------------------------------------------------------------- */ - 'version' => '1.7.19', + 'version' => '1.8.0', /* |-------------------------------------------------------------------------- @@ -15,7 +15,7 @@ return [ |-------------------------------------------------------------------------- */ - 'install' => 'docker', + 'install' => 'manual', /* |-------------------------------------------------------------------------- @@ -23,7 +23,7 @@ return [ |-------------------------------------------------------------------------- */ - 'home' => 'HOME=/config', + 'home' => 'HOME=' . base_path() . DIRECTORY_SEPARATOR, /* |-------------------------------------------------------------------------- diff --git a/conf/site/database/migrations/2020_08_12_123941_add_healthchecks_settings.php b/conf/site/database/migrations/2020_08_12_123941_add_healthchecks_settings.php new file mode 100644 index 00000000..343d08d4 --- /dev/null +++ b/conf/site/database/migrations/2020_08_12_123941_add_healthchecks_settings.php @@ -0,0 +1,47 @@ + 'healthchecks_enabled', + 'value' => false, + 'description' => 'Enable the healthchecks.io integration for speedtests.' + ]); + } + + if(!SettingsHelper::get('healthchecks_uuid')) { + Setting::create([ + 'name' => 'healthchecks_uuid', + 'value' => '', + 'description' => '' + ]); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Setting::whereIn('name', [ + 'healthchecks_enabled', + 'healthchecks_uuid', + ])->delete(); + } +} diff --git a/conf/site/database/speed.db b/conf/site/database/speed.db deleted file mode 100644 index 14f8cce3e64c51ae51db39fc661642db1946c9bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139264 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 diff --git a/conf/site/resources/js/components/Graphics/HistoryGraph.js b/conf/site/resources/js/components/Graphics/HistoryGraph.js index da83b0b2..c0f227aa 100644 --- a/conf/site/resources/js/components/Graphics/HistoryGraph.js +++ b/conf/site/resources/js/components/Graphics/HistoryGraph.js @@ -205,7 +205,6 @@ export default class HistoryGraph extends Component { failData.datasets[1].data.push(fail); failData.labels.push(new Date(e.date).toLocaleString([], {year: '2-digit', month:'2-digit', day:'2-digit'})); }) - console.log(failData); this.setState({ failData: failData, diff --git a/conf/site/resources/js/components/Settings/Settings.js b/conf/site/resources/js/components/Settings/Settings.js index afcd5c61..785f780d 100644 --- a/conf/site/resources/js/components/Settings/Settings.js +++ b/conf/site/resources/js/components/Settings/Settings.js @@ -158,6 +158,18 @@ export default class Settings extends Component { } ]} /> + + +