Adding ISP value to result, export, notifications & influxdb (alexjustesen#1515)

Co-authored-by: Alex Justesen <[email protected]>

Author: svenvg93

app/Filament/Exports/ResultExporter.php

@@ -30,6 +30,12 @@ public static function getColumns(): array
                     return $record->ip_address;
                 })
                 ->enabledByDefault(false),
+            ExportColumn::make('isp')
+                ->label('ISP')
+                ->state(function (Result $record): ?string {
+                    return $record->isp;
+                })
+                ->enabledByDefault(false),
             ExportColumn::make('service'),
             ExportColumn::make('server_id')
                 ->label('Server ID')

app/Filament/Resources/ResultResource.php

@@ -99,6 +99,9 @@ public static function form(Form $form): Form
                             Forms\Components\Placeholder::make('server_id')
                                 ->label('Server ID')
                                 ->content(fn (Result $result): ?string => $result->server_id),
+                            Forms\Components\Placeholder::make('isp')
+                                ->label('ISP')
+                                ->content(fn (Result $result): ?string => $result->isp),
                             Forms\Components\Placeholder::make('server_host')
                                 ->content(fn (Result $result): ?string => $result->server_host),
                             Forms\Components\Checkbox::make('scheduled'),
@@ -138,6 +141,13 @@ public static function table(Table $table): Table
                     ->sortable(query: function (Builder $query, string $direction): Builder {
                         return $query->orderBy('data->server->id', $direction);
                     }),
+                Tables\Columns\TextColumn::make('data.isp')
+                    ->label('ISP')
+                    ->toggleable()
+                    ->toggledHiddenByDefault()
+                    ->sortable(query: function (Builder $query, string $direction): Builder {
+                        return $query->orderBy('data->isp', $direction);
+                    }),
                 Tables\Columns\TextColumn::make('data.server.name')
                     ->toggleable()
                     ->sortable(query: function (Builder $query, string $direction): Builder {

app/Listeners/Discord/SendSpeedtestCompletedNotification.php

@@ -38,6 +38,7 @@ public function handle(SpeedtestCompleted $event): void
                 'service' => Str::title($event->result->service),
                 'serverName' => $event->result->server_name,
                 'serverId' => $event->result->server_id,
+                'isp' => $event->result->isp,
                 'ping' => round($event->result->ping).' ms',
                 'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2),
                 'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2),

app/Listeners/Discord/SendSpeedtestThresholdNotification.php

@@ -67,6 +67,7 @@ public function handle(SpeedtestCompleted $event): void
                 'service' => Str::title($event->result->service),
                 'serverName' => $event->result->server_name,
                 'serverId' => $event->result->server_id,
+                'isp' => $event->result->isp,
                 'metrics' => $failed,
                 'url' => url('/admin/results'),
             ])->render(),

app/Listeners/Telegram/SendSpeedtestCompletedNotification.php

@@ -38,6 +38,7 @@ public function handle(SpeedtestCompleted $event): void
             'service' => Str::title($event->result->service),
             'serverName' => $event->result->server_name,
             'serverId' => $event->result->server_id,
+            'isp' => $event->result->isp,
             'ping' => round($event->result->ping).' ms',
             'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2),
             'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2),

app/Listeners/Telegram/SendSpeedtestThresholdNotification.php

@@ -67,6 +67,7 @@ public function handle(SpeedtestCompleted $event): void
             'service' => Str::title($event->result->service),
             'serverName' => $event->result->server_name,
             'serverId' => $event->result->server_id,
+            'isp' => $event->result->isp,
             'metrics' => $failed,
             'url' => url('/admin/results'),
         ])->render();

app/Listeners/Webhook/SendSpeedtestCompletedNotification.php

@@ -36,6 +36,7 @@ public function handle(SpeedtestCompleted $event): void
                 ->payload([
                     'result_id' => $event->result->id,
                     'site_name' => config('app.name'),
+                    'isp' => $event->result->isp,
                     'ping' => $event->result->ping,
                     'download' => $event->result->downloadBits,
                     'upload' => $event->result->uploadBits,

app/Listeners/Webhook/SendSpeedtestThresholdNotification.php

@@ -66,6 +66,7 @@ public function handle(SpeedtestCompleted $event): void
                 ->payload([
                     'result_id' => $event->result->id,
                     'site_name' => config('app.name'),
+                    'isp' => $event->result->isp,
                     'metrics' => $failed,
                     'url' => url('/admin/results'),
                 ])

app/Mail/SpeedtestCompletedMail.php

@@ -48,6 +48,7 @@ public function content(): Content
                 'service' => Str::title($this->result->service),
                 'serverName' => $this->result->server_name,
                 'serverId' => $this->result->server_id,
+                'isp' => $event->result->isp,
                 'ping' => round($this->result->ping, 2).' ms',
                 'download' => Number::toBitRate(bits: $this->result->download_bits, precision: 2),
                 'upload' => Number::toBitRate(bits: $this->result->upload_bits, precision: 2),

app/Mail/SpeedtestThresholdMail.php

@@ -48,6 +48,7 @@ public function content(): Content
                 'service' => Str::title($this->result->service),
                 'serverName' => $this->result->server_name,
                 'serverId' => $this->result->server_id,
+                'isp' => $event->result->isp,
                 'url' => url('/admin/results'),
                 'metrics' => $this->metrics,
             ],