diff --git a/app/Listeners/Discord/SendSpeedtestCompletedNotification.php b/app/Listeners/Discord/SendSpeedtestCompletedNotification.php index bca6ba2ac..5200886e2 100644 --- a/app/Listeners/Discord/SendSpeedtestCompletedNotification.php +++ b/app/Listeners/Discord/SendSpeedtestCompletedNotification.php @@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void 'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2), 'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2), 'packetLoss' => $event->result->packet_loss, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(), ]; diff --git a/app/Listeners/Discord/SendSpeedtestThresholdNotification.php b/app/Listeners/Discord/SendSpeedtestThresholdNotification.php index fc7ad9446..4fad0a5eb 100644 --- a/app/Listeners/Discord/SendSpeedtestThresholdNotification.php +++ b/app/Listeners/Discord/SendSpeedtestThresholdNotification.php @@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void 'serverId' => $event->result->server_id, 'isp' => $event->result->isp, 'metrics' => $failed, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(), ]; diff --git a/app/Listeners/Gotify/SendSpeedtestCompletedNotification.php b/app/Listeners/Gotify/SendSpeedtestCompletedNotification.php index 05b93d976..8265426c9 100644 --- a/app/Listeners/Gotify/SendSpeedtestCompletedNotification.php +++ b/app/Listeners/Gotify/SendSpeedtestCompletedNotification.php @@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void 'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2), 'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2), 'packetLoss' => $event->result->packet_loss, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(), ]; diff --git a/app/Listeners/Gotify/SendSpeedtestThresholdNotification.php b/app/Listeners/Gotify/SendSpeedtestThresholdNotification.php index 1ca0b14bf..8da2daedf 100644 --- a/app/Listeners/Gotify/SendSpeedtestThresholdNotification.php +++ b/app/Listeners/Gotify/SendSpeedtestThresholdNotification.php @@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void 'serverId' => $event->result->server_id, 'isp' => $event->result->isp, 'metrics' => $failed, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(), ]; diff --git a/app/Listeners/HealthCheck/SendSpeedtestCompletedNotification.php b/app/Listeners/HealthCheck/SendSpeedtestCompletedNotification.php index a7936c815..3d127f59b 100644 --- a/app/Listeners/HealthCheck/SendSpeedtestCompletedNotification.php +++ b/app/Listeners/HealthCheck/SendSpeedtestCompletedNotification.php @@ -41,6 +41,7 @@ public function handle(SpeedtestCompleted $event): void 'download' => $event->result->downloadBits, 'upload' => $event->result->uploadBits, 'packetLoss' => $event->result->packet_loss, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ]) ->doNotSign() diff --git a/app/Listeners/HealthCheck/SendSpeedtestThresholdNotification.php b/app/Listeners/HealthCheck/SendSpeedtestThresholdNotification.php index 76bb3833d..11db9fec1 100644 --- a/app/Listeners/HealthCheck/SendSpeedtestThresholdNotification.php +++ b/app/Listeners/HealthCheck/SendSpeedtestThresholdNotification.php @@ -68,6 +68,7 @@ public function handle(SpeedtestCompleted $event): void 'site_name' => config('app.name'), 'isp' => $event->result->isp, 'metrics' => $failed, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ]) ->doNotSign() diff --git a/app/Listeners/Ntfy/SendSpeedtestCompletedNotification.php b/app/Listeners/Ntfy/SendSpeedtestCompletedNotification.php index 585db1654..f63cdcd13 100644 --- a/app/Listeners/Ntfy/SendSpeedtestCompletedNotification.php +++ b/app/Listeners/Ntfy/SendSpeedtestCompletedNotification.php @@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void 'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2), 'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2), 'packetLoss' => $event->result->packet_loss, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(); diff --git a/app/Listeners/Ntfy/SendSpeedtestThresholdNotification.php b/app/Listeners/Ntfy/SendSpeedtestThresholdNotification.php index 62263f1b6..2ca1a93e1 100644 --- a/app/Listeners/Ntfy/SendSpeedtestThresholdNotification.php +++ b/app/Listeners/Ntfy/SendSpeedtestThresholdNotification.php @@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void 'serverId' => $event->result->server_id, 'isp' => $event->result->isp, 'metrics' => $failed, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(); diff --git a/app/Listeners/Pushover/SendSpeedtestCompletedNotification.php b/app/Listeners/Pushover/SendSpeedtestCompletedNotification.php index 606fdf8d8..465c98f9d 100644 --- a/app/Listeners/Pushover/SendSpeedtestCompletedNotification.php +++ b/app/Listeners/Pushover/SendSpeedtestCompletedNotification.php @@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void 'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2), 'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2), 'packetLoss' => $event->result->packet_loss, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(), ]; diff --git a/app/Listeners/Pushover/SendSpeedtestThresholdNotification.php b/app/Listeners/Pushover/SendSpeedtestThresholdNotification.php index a13179d08..7643702f8 100644 --- a/app/Listeners/Pushover/SendSpeedtestThresholdNotification.php +++ b/app/Listeners/Pushover/SendSpeedtestThresholdNotification.php @@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void 'serverId' => $event->result->server_id, 'isp' => $event->result->isp, 'metrics' => $failed, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(), ]; diff --git a/app/Listeners/Slack/SendSpeedtestCompletedNotification.php b/app/Listeners/Slack/SendSpeedtestCompletedNotification.php index d56362759..791aaad33 100644 --- a/app/Listeners/Slack/SendSpeedtestCompletedNotification.php +++ b/app/Listeners/Slack/SendSpeedtestCompletedNotification.php @@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void 'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2), 'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2), 'packetLoss' => $event->result->packet_loss, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(), ]; diff --git a/app/Listeners/Slack/SendSpeedtestThresholdNotification.php b/app/Listeners/Slack/SendSpeedtestThresholdNotification.php index b3eb7924e..debeb76cf 100644 --- a/app/Listeners/Slack/SendSpeedtestThresholdNotification.php +++ b/app/Listeners/Slack/SendSpeedtestThresholdNotification.php @@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void 'serverId' => $event->result->server_id, 'isp' => $event->result->isp, 'metrics' => $failed, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(), ]; diff --git a/app/Listeners/Telegram/SendSpeedtestCompletedNotification.php b/app/Listeners/Telegram/SendSpeedtestCompletedNotification.php index be407f3c2..93e69fbb4 100644 --- a/app/Listeners/Telegram/SendSpeedtestCompletedNotification.php +++ b/app/Listeners/Telegram/SendSpeedtestCompletedNotification.php @@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void 'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2), 'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2), 'packetLoss' => is_numeric($event->result->packet_loss) ? round($event->result->packet_loss, 2) : 'n/a', + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(); diff --git a/app/Listeners/Telegram/SendSpeedtestThresholdNotification.php b/app/Listeners/Telegram/SendSpeedtestThresholdNotification.php index d906cc593..6ae2375b2 100644 --- a/app/Listeners/Telegram/SendSpeedtestThresholdNotification.php +++ b/app/Listeners/Telegram/SendSpeedtestThresholdNotification.php @@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void 'serverId' => $event->result->server_id, 'isp' => $event->result->isp, 'metrics' => $failed, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ])->render(); diff --git a/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php b/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php index 88560ce20..3956d2bed 100644 --- a/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php +++ b/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php @@ -41,6 +41,7 @@ public function handle(SpeedtestCompleted $event): void 'download' => $event->result->downloadBits, 'upload' => $event->result->uploadBits, 'packetLoss' => $event->result->packet_loss, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ]) ->doNotSign() diff --git a/app/Listeners/Webhook/SendSpeedtestThresholdNotification.php b/app/Listeners/Webhook/SendSpeedtestThresholdNotification.php index aac1866a7..8bf45d768 100644 --- a/app/Listeners/Webhook/SendSpeedtestThresholdNotification.php +++ b/app/Listeners/Webhook/SendSpeedtestThresholdNotification.php @@ -68,6 +68,7 @@ public function handle(SpeedtestCompleted $event): void 'site_name' => config('app.name'), 'isp' => $event->result->isp, 'metrics' => $failed, + 'speedtest_url' => $event->result->result_url, 'url' => url('/admin/results'), ]) ->doNotSign() diff --git a/app/Mail/SpeedtestCompletedMail.php b/app/Mail/SpeedtestCompletedMail.php index f8480f1bb..c6d43bfc3 100644 --- a/app/Mail/SpeedtestCompletedMail.php +++ b/app/Mail/SpeedtestCompletedMail.php @@ -52,6 +52,7 @@ public function content(): Content 'download' => Number::toBitRate(bits: $this->result->download_bits, precision: 2), 'upload' => Number::toBitRate(bits: $this->result->upload_bits, precision: 2), 'packetLoss' => is_numeric($this->result->packet_loss) ? $this->result->packet_loss : 'n/a', + 'speedtest_url' => $this->result->result_url, 'url' => url('/admin/results'), ], ); diff --git a/app/Mail/SpeedtestThresholdMail.php b/app/Mail/SpeedtestThresholdMail.php index 46202f28f..038709e90 100644 --- a/app/Mail/SpeedtestThresholdMail.php +++ b/app/Mail/SpeedtestThresholdMail.php @@ -48,6 +48,7 @@ public function content(): Content 'serverName' => $this->result->server_name, 'serverId' => $this->result->server_id, 'isp' => $this->result->isp, + 'speedtest_url' => $this->result->result_url, 'url' => url('/admin/results'), 'metrics' => $this->metrics, ], diff --git a/resources/views/discord/speedtest-completed.blade.php b/resources/views/discord/speedtest-completed.blade.php index dda7a8782..023fa9464 100644 --- a/resources/views/discord/speedtest-completed.blade.php +++ b/resources/views/discord/speedtest-completed.blade.php @@ -9,4 +9,5 @@ - **Download:** {{ $download }} - **Upload:** {{ $upload }} - **Packet Loss:** {{ $packetLoss }} **%** +- **Ookla Speedtest:** {{ $speedtest_url }} - **URL:** {{ $url }} diff --git a/resources/views/discord/speedtest-threshold.blade.php b/resources/views/discord/speedtest-threshold.blade.php index 2cb708643..dc38dd40c 100644 --- a/resources/views/discord/speedtest-threshold.blade.php +++ b/resources/views/discord/speedtest-threshold.blade.php @@ -5,4 +5,5 @@ @foreach ($metrics as $item) - **{{ $item['name'] }}** {{ $item['threshold'] }}: {{ $item['value'] }} @endforeach +- **Ookla Speedtest:** {{ $speedtest_url }} - **URL:** {{ $url }} diff --git a/resources/views/emails/speedtest-completed.blade.php b/resources/views/emails/speedtest-completed.blade.php index b8ce7d1d4..a9f3c1ac8 100644 --- a/resources/views/emails/speedtest-completed.blade.php +++ b/resources/views/emails/speedtest-completed.blade.php @@ -12,7 +12,8 @@ | Ping | {{ $ping }} | | Download | {{ $download }} | | Upload | {{ $upload }} | -| Packet Loss | {{ $packetLoss }}**%** | +| Packet Loss | {{ $packetLoss }} **%** | + @@ -20,6 +21,10 @@ View Results + +View Results on Ookla + + Thanks,
{{ config('app.name') }} diff --git a/resources/views/emails/speedtest-threshold.blade.php b/resources/views/emails/speedtest-threshold.blade.php index 18879fd8a..373e33f47 100644 --- a/resources/views/emails/speedtest-threshold.blade.php +++ b/resources/views/emails/speedtest-threshold.blade.php @@ -15,6 +15,10 @@ View Results + +View Results on Ookla + + Thanks,
{{ config('app.name') }} diff --git a/resources/views/gotify/speedtest-completed.blade.php b/resources/views/gotify/speedtest-completed.blade.php index 2bd6a8581..c0a677edc 100644 --- a/resources/views/gotify/speedtest-completed.blade.php +++ b/resources/views/gotify/speedtest-completed.blade.php @@ -9,4 +9,5 @@ - Download: {{ $download }} - Upload: {{ $upload }} - Packet Loss: {{ $packetLoss }} % +- **Ookla Speedtest:** {{ $speedtest_url }} - URL: {{ $url }} diff --git a/resources/views/gotify/speedtest-threshold.blade.php b/resources/views/gotify/speedtest-threshold.blade.php index 3bc1830ab..f290c8e80 100644 --- a/resources/views/gotify/speedtest-threshold.blade.php +++ b/resources/views/gotify/speedtest-threshold.blade.php @@ -5,4 +5,5 @@ @foreach ($metrics as $item) - {{ $item['name'] }} {{ $item['threshold'] }}: {{ $item['value'] }} @endforeach +- **Ookla Speedtest:** {{ $speedtest_url }} - URL: {{ $url }} diff --git a/resources/views/ntfy/speedtest-completed.blade.php b/resources/views/ntfy/speedtest-completed.blade.php index d51c75ce0..5976b28d4 100644 --- a/resources/views/ntfy/speedtest-completed.blade.php +++ b/resources/views/ntfy/speedtest-completed.blade.php @@ -9,4 +9,5 @@ Download: {{ $download }} Upload: {{ $upload }} Packet Loss: {{ $packetLoss }} % +Ookla Speedtest: {{ $speedtest_url }} URL: {{ $url }} diff --git a/resources/views/ntfy/speedtest-threshold.blade.php b/resources/views/ntfy/speedtest-threshold.blade.php index a84ee245e..3fd6ca617 100644 --- a/resources/views/ntfy/speedtest-threshold.blade.php +++ b/resources/views/ntfy/speedtest-threshold.blade.php @@ -5,4 +5,5 @@ @foreach ($metrics as $item) - {{ $item['name'] }} {{ $item['threshold'] }}: {{ $item['value'] }} @endforeach +- Ookla Speedtest: {{ $speedtest_url }} - URL: {{ $url }} diff --git a/resources/views/pushover/speedtest-completed.blade.php b/resources/views/pushover/speedtest-completed.blade.php index 2bd6a8581..2a209023c 100644 --- a/resources/views/pushover/speedtest-completed.blade.php +++ b/resources/views/pushover/speedtest-completed.blade.php @@ -9,4 +9,5 @@ - Download: {{ $download }} - Upload: {{ $upload }} - Packet Loss: {{ $packetLoss }} % +- Ookla Speedtest: {{ $speedtest_url }} - URL: {{ $url }} diff --git a/resources/views/pushover/speedtest-threshold.blade.php b/resources/views/pushover/speedtest-threshold.blade.php index 3bc1830ab..4a7fe325e 100644 --- a/resources/views/pushover/speedtest-threshold.blade.php +++ b/resources/views/pushover/speedtest-threshold.blade.php @@ -5,4 +5,5 @@ @foreach ($metrics as $item) - {{ $item['name'] }} {{ $item['threshold'] }}: {{ $item['value'] }} @endforeach +- Ookla Speedtest: {{ $speedtest_url }} - URL: {{ $url }} diff --git a/resources/views/slack/speedtest-completed.blade.php b/resources/views/slack/speedtest-completed.blade.php index b10afe419..c4ec19faa 100644 --- a/resources/views/slack/speedtest-completed.blade.php +++ b/resources/views/slack/speedtest-completed.blade.php @@ -9,4 +9,5 @@ - *Download:* {{ $download }} - *Upload:* {{ $upload }} - *Packet Loss:* {{ $packetLoss }} *%* +- **Ookla Speedtest:** {{ $speedtest_url }} - *URL:* {{ $url }} diff --git a/resources/views/telegram/speedtest-completed.blade.php b/resources/views/telegram/speedtest-completed.blade.php index 75cd08663..6b1ac81f6 100644 --- a/resources/views/telegram/speedtest-completed.blade.php +++ b/resources/views/telegram/speedtest-completed.blade.php @@ -9,4 +9,5 @@ - *Download:* {{ $download }} - *Upload:* {{ $upload }} - **Packet Loss:** {{ $packetLoss }}**%** +- **Ookla Speedtest:** {{ $speedtest_url }} - **URL:** {{ $url }} diff --git a/resources/views/telegram/speedtest-threshold.blade.php b/resources/views/telegram/speedtest-threshold.blade.php index 2cb708643..dc38dd40c 100644 --- a/resources/views/telegram/speedtest-threshold.blade.php +++ b/resources/views/telegram/speedtest-threshold.blade.php @@ -5,4 +5,5 @@ @foreach ($metrics as $item) - **{{ $item['name'] }}** {{ $item['threshold'] }}: {{ $item['value'] }} @endforeach +- **Ookla Speedtest:** {{ $speedtest_url }} - **URL:** {{ $url }}