Merge branch 'alexjustesen:main' into feat/avg-notifications

Author: svenvg93

.github/workflows/cd.yml

@@ -0,0 +1,27 @@
+name: Trigger Docker Image Build
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  trigger-docker-build:
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Generate GitHub App token
+        id: generate_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+          owner: alexjustesen
+          repositories: docker-speedtest-tracker
+
+      - name: Trigger docker-speedtest-tracker build
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ steps.generate_token.outputs.token }}
+          repository: alexjustesen/docker-speedtest-tracker
+          event-type: speedtest-tracker-release
+          client-payload: '{"tag_name": "${{ github.event.release.tag_name }}"}'

app/Filament/Pages/Settings/DataIntegration.php

@@ -7,15 +7,18 @@
 use App\Settings\DataIntegrationSettings;
 use Filament\Actions\Action;
 use Filament\Forms\Components\Checkbox;
+use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Notifications\Notification;
 use Filament\Pages\SettingsPage;
 use Filament\Schemas\Components\Actions;
 use Filament\Schemas\Components\Grid;
-use Filament\Schemas\Components\Section;
+use Filament\Schemas\Components\Tabs;
+use Filament\Schemas\Components\Tabs\Tab;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Schema;
+use Filament\Support\Icons\Heroicon;
 use Illuminate\Support\Facades\Auth;
 
 class DataIntegration extends SettingsPage
@@ -52,16 +55,14 @@ public function form(Schema $schema): Schema
     {
         return $schema
             ->components([
-                Grid::make([
-                    'default' => 1,
-                    'md' => 3,
-                ])
+                Tabs::make()
                     ->schema([
-                        Section::make(__('settings/data_integration.influxdb_v2'))
-                            ->description(__('settings/data_integration.influxdb_v2_description'))
+                        Tab::make(__('settings/data_integration.influxdb_v2'))
+                            ->icon(Heroicon::OutlinedCircleStack)
                             ->schema([
                                 Toggle::make('influxdb_v2_enabled')
                                     ->label(__('settings/data_integration.influxdb_v2_enabled'))
+                                    ->helpertext(__('settings/data_integration.influxdb_v2_description'))
                                     ->reactive()
                                     ->columnSpanFull(),
                                 Grid::make(['default' => 1, 'md' => 3])
@@ -127,7 +128,26 @@ public function form(Schema $schema): Schema
                                         ]),
                                     ]),
                             ])
-                            ->compact()
+                            ->columnSpanFull(),
+                        Tab::make(__('settings/data_integration.prometheus'))
+                            ->icon(Heroicon::OutlinedChartBar)
+                            ->schema([
+                                Toggle::make('prometheus_enabled')
+                                    ->label(__('settings/data_integration.prometheus_enabled'))
+                                    ->helperText(__('settings/data_integration.influxdb_v2_description'))
+                                    ->reactive()
+                                    ->columnSpanFull(),
+                                Grid::make(['default' => 1, 'md' => 3])
+                                    ->hidden(fn (Get $get) => $get('prometheus_enabled') !== true)
+                                    ->schema([
+                                        TagsInput::make('prometheus_allowed_ips')
+                                            ->label(__('settings/data_integration.prometheus_allowed_ips'))
+                                            ->helperText(__('settings/data_integration.prometheus_allowed_ips_helper'))
+                                            ->placeholder('192.168.1.100')
+                                            ->splitKeys(['Tab', ',', ' '])
+                                            ->columnSpanFull(),
+                                    ]),
+                            ])
                             ->columnSpanFull(),
                     ])
                     ->columnSpanFull(),

app/Http/Controllers/MetricsController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Services\PrometheusMetricsService;
+use App\Settings\DataIntegrationSettings;
+use Illuminate\Http\Response;
+
+class MetricsController extends Controller
+{
+    public function __construct(
+        protected PrometheusMetricsService $metricsService,
+        protected DataIntegrationSettings $settings
+    ) {}
+
+    public function __invoke(): Response
+    {
+        if (! $this->settings->prometheus_enabled) {
+            abort(404);
+        }
+
+        $metrics = $this->metricsService->generateMetrics();
+
+        return response($metrics, 200, [
+            'Content-Type' => 'text/plain; version=0.0.4; charset=utf-8',
+        ]);
+    }
+}

app/Http/Middleware/PrometheusAllowedIpMiddleware.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Helpers\Network;
+use App\Settings\DataIntegrationSettings;
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class PrometheusAllowedIpMiddleware
+{
+    public function __construct(
+        protected DataIntegrationSettings $settings
+    ) {}
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Closure(Request):Response  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        if (blank($this->settings->prometheus_allowed_ips)) {
+            return $next($request);
+        }
+
+        $clientIp = $request->ip();
+        $allowedIps = $this->settings->prometheus_allowed_ips;
+
+        foreach ($allowedIps as $allowedIp) {
+            if (str_contains($allowedIp, '/')) {
+                if (Network::ipInRange($clientIp, $allowedIp)) {
+                    return $next($request);
+                }
+            } elseif ($clientIp === $allowedIp) {
+                return $next($request);
+            }
+        }
+
+        abort(403);
+    }
+}

app/Listeners/ProcessSpeedtestDataIntegrations.php

@@ -6,6 +6,7 @@
 use App\Events\SpeedtestFailed;
 use App\Jobs\Influxdb\v2\WriteResult;
 use App\Settings\DataIntegrationSettings;
+use Illuminate\Support\Facades\Cache;
 
 class ProcessSpeedtestDataIntegrations
 {
@@ -24,5 +25,9 @@ public function handle(SpeedtestCompleted|SpeedtestFailed $event): void
         if ($this->settings->influxdb_v2_enabled) {
             WriteResult::dispatch($event->result);
         }
+
+        if ($this->settings->prometheus_enabled) {
+            Cache::forever('prometheus:latest_result', $event->result->id);
+        }
     }
 }