From 125c6245884fd090d2641c7f2414eb97f50d8831 Mon Sep 17 00:00:00 2001 From: Codex Agent Date: Tue, 18 Nov 2025 16:45:56 +0100 Subject: [PATCH] admin widget zu dokploy geswitched --- .env.example | 10 +- app/Filament/Blog/Resources/PostResource.php | 30 ++- .../Pages/ManageCoolifyActionLogs.php | 16 -- .../InfrastructureActionLogResource.php} | 12 +- .../Pages/ManageInfrastructureActionLogs.php | 16 ++ .../SuperAdmin/Pages/CoolifyDeployments.php | 127 ---------- .../SuperAdmin/Pages/DokployDeployments.php | 129 ++++++++++ .../Widgets/CoolifyPlatformHealth.php | 62 ----- .../Widgets/DokployPlatformHealth.php | 91 +++++++ ...ionLog.php => InfrastructureActionLog.php} | 2 +- .../Filament/SuperAdminPanelProvider.php | 8 +- app/Services/Coolify/CoolifyClient.php | 138 ----------- app/Services/Dokploy/DokployClient.php | 222 ++++++++++++++++++ config/coolify.php | 11 - config/dokploy.php | 11 + ...61628_rename_coolify_action_logs_table.php | 28 +++ docs/deployment/coolify.md | 93 -------- docs/deployment/docker.md | 2 +- docs/deployment/dokploy.md | 122 ++++++++++ docs/queue-supervisor/README.md | 14 +- ...lade.php => dokploy-deployments.blade.php} | 26 +- ....php => dokploy-platform-health.blade.php} | 35 +-- 22 files changed, 693 insertions(+), 512 deletions(-) delete mode 100644 app/Filament/Resources/CoolifyActionLogs/Pages/ManageCoolifyActionLogs.php rename app/Filament/Resources/{CoolifyActionLogs/CoolifyActionLogResource.php => InfrastructureActionLogs/InfrastructureActionLogResource.php} (82%) create mode 100644 app/Filament/Resources/InfrastructureActionLogs/Pages/ManageInfrastructureActionLogs.php delete mode 100644 app/Filament/SuperAdmin/Pages/CoolifyDeployments.php create mode 100644 app/Filament/SuperAdmin/Pages/DokployDeployments.php delete mode 100644 app/Filament/Widgets/CoolifyPlatformHealth.php create mode 100644 app/Filament/Widgets/DokployPlatformHealth.php rename app/Models/{CoolifyActionLog.php => InfrastructureActionLog.php} (90%) delete mode 100644 app/Services/Coolify/CoolifyClient.php create mode 100644 app/Services/Dokploy/DokployClient.php delete mode 100644 config/coolify.php create mode 100644 config/dokploy.php create mode 100644 database/migrations/2025_11_18_161628_rename_coolify_action_logs_table.php delete mode 100644 docs/deployment/coolify.md create mode 100644 docs/deployment/dokploy.md rename resources/views/filament/super-admin/pages/{coolify-deployments.blade.php => dokploy-deployments.blade.php} (77%) rename resources/views/filament/widgets/{coolify-platform-health.blade.php => dokploy-platform-health.blade.php} (57%) diff --git a/.env.example b/.env.example index cc46678..30f760f 100644 --- a/.env.example +++ b/.env.example @@ -132,11 +132,11 @@ PHOTOBOOTH_IMPORT_ROOT=/var/www/storage/app/photobooth PHOTOBOOTH_IMPORT_MAX_FILES=50 PHOTOBOOTH_ALLOWED_EXTENSIONS=jpg,jpeg,png,webp -COOLIFY_API_BASE_URL= -COOLIFY_API_TOKEN= -COOLIFY_WEB_URL= -COOLIFY_API_TIMEOUT=5 -COOLIFY_SERVICE_IDS={"app":"svc_app","queue":"svc_queue","scheduler":"svc_scheduler","ftp":"svc_ftp","control":"svc_control"} +DOKPLOY_API_BASE_URL= +DOKPLOY_API_KEY= +DOKPLOY_WEB_URL= +DOKPLOY_API_TIMEOUT=10 +DOKPLOY_APPLICATION_IDS={"app":"app_xxx","queue":"app_queue","scheduler":"app_scheduler","ftp":"app_ftp"} GUEST_ACHIEVEMENT_MILESTONES=10,25,50 diff --git a/app/Filament/Blog/Resources/PostResource.php b/app/Filament/Blog/Resources/PostResource.php index fc2da4d..8da428c 100644 --- a/app/Filament/Blog/Resources/PostResource.php +++ b/app/Filament/Blog/Resources/PostResource.php @@ -112,14 +112,16 @@ class PostResource extends Resource ->columnSpanFull(), ]) ->columns(2), - ]), - TextInput::make('slug') - ->label('Slug') - ->required() - ->unique(BlogPost::class, 'slug', ignoreRecord: true) - ->maxLength(255), + ]) + ->columnSpanFull(), Section::make('Bild und Kategorie') ->schema([ + TextInput::make('slug') + ->label('Slug') + ->required() + ->unique(BlogPost::class, 'slug', ignoreRecord: true) + ->maxLength(255) + ->columnSpanFull(), FileUpload::make('featured_image') ->label('Featured Image') ->image() @@ -194,6 +196,8 @@ class PostResource extends Resource ->label('Titel (DE)') ->getStateUsing(fn ($record) => $record->getTranslation('title', 'de')) ->searchable() + ->limit(50) + ->url(fn ($record) => static::getUrl('edit', ['record' => $record])) ->sortable(), TextColumn::make('category_label') ->label('Kategorie') @@ -225,10 +229,10 @@ class PostResource extends Resource ->trueIcon('heroicon-o-check-circle') ->falseIcon('heroicon-o-x-circle'), TextColumn::make('published_at') - ->label('Veröffentlicht am') - ->dateTime() - ->sortable() - ->toggleable(isToggledHiddenByDefault: true), + ->label('Veröffentlichungsdatum') + ->icon('heroicon-o-calendar') + ->dateTime('d.m.Y H:i') + ->sortable(), TextColumn::make('created_at') ->label('Erstellt am') ->dateTime() @@ -240,9 +244,9 @@ class PostResource extends Resource ->label('Veröffentlicht'), ]) ->actions([ - ViewAction::make(), - EditAction::make(), - DeleteAction::make(), + DeleteAction::make() + ->icon('heroicon-o-trash') + ->label(''), ]) ->bulkActions([ BulkActionGroup::make([ diff --git a/app/Filament/Resources/CoolifyActionLogs/Pages/ManageCoolifyActionLogs.php b/app/Filament/Resources/CoolifyActionLogs/Pages/ManageCoolifyActionLogs.php deleted file mode 100644 index d5c07a2..0000000 --- a/app/Filament/Resources/CoolifyActionLogs/Pages/ManageCoolifyActionLogs.php +++ /dev/null @@ -1,16 +0,0 @@ - ManageCoolifyActionLogs::route('/'), + 'index' => ManageInfrastructureActionLogs::route('/'), ]; } } diff --git a/app/Filament/Resources/InfrastructureActionLogs/Pages/ManageInfrastructureActionLogs.php b/app/Filament/Resources/InfrastructureActionLogs/Pages/ManageInfrastructureActionLogs.php new file mode 100644 index 0000000..442f65c --- /dev/null +++ b/app/Filament/Resources/InfrastructureActionLogs/Pages/ManageInfrastructureActionLogs.php @@ -0,0 +1,16 @@ +coolifyWebUrl = config('coolify.web_url'); - $this->refreshServices($client); - $this->refreshLogs(); - } - - public function restart(string $serviceId): void - { - $this->performAction($serviceId, 'restart'); - } - - public function redeploy(string $serviceId): void - { - $this->performAction($serviceId, 'redeploy'); - } - - protected function performAction(string $serviceId, string $action): void - { - $client = app(CoolifyClient::class); - - if (! $this->isKnownService($serviceId)) { - Notification::make() - ->danger() - ->title('Unknown service') - ->body("The service ID {$serviceId} is not configured.") - ->send(); - - return; - } - - try { - $action === 'restart' - ? $client->restartService($serviceId, auth()->user()) - : $client->redeployService($serviceId, auth()->user()); - - Notification::make() - ->success() - ->title(ucfirst($action).' requested') - ->body("Coolify accepted the {$action} action for {$serviceId}.") - ->send(); - } catch (\Throwable $exception) { - Notification::make() - ->danger() - ->title('Coolify request failed') - ->body($exception->getMessage()) - ->send(); - } - - $this->refreshServices($client); - $this->refreshLogs(); - } - - protected function refreshServices(CoolifyClient $client): void - { - $serviceMap = config('coolify.services', []); - $results = []; - - foreach ($serviceMap as $label => $id) { - try { - $status = $client->serviceStatus($id); - $results[] = [ - 'label' => ucfirst($label), - 'service_id' => $id, - 'status' => Arr::get($status, 'data.status', 'unknown'), - ]; - } catch (\Throwable $e) { - $results[] = [ - 'label' => ucfirst($label), - 'service_id' => $id, - 'status' => 'error', - ]; - } - } - - $this->services = $results; - } - - protected function refreshLogs(): void - { - $this->recentLogs = CoolifyActionLog::query() - ->with('user') - ->latest() - ->limit(5) - ->get() - ->map(fn ($log) => [ - 'created_at' => $log->created_at->diffForHumans(), - 'user' => $log->user?->name ?? 'System', - 'service_id' => $log->service_id, - 'action' => $log->action, - 'status_code' => $log->status_code, - ]) - ->toArray(); - } - - protected function isKnownService(string $serviceId): bool - { - return in_array($serviceId, array_values(config('coolify.services', [])), true); - } -} diff --git a/app/Filament/SuperAdmin/Pages/DokployDeployments.php b/app/Filament/SuperAdmin/Pages/DokployDeployments.php new file mode 100644 index 0000000..1d6c89a --- /dev/null +++ b/app/Filament/SuperAdmin/Pages/DokployDeployments.php @@ -0,0 +1,129 @@ +dokployWebUrl = config('dokploy.web_url'); + $this->refreshApplications($client); + $this->refreshLogs(); + } + + public function reload(string $applicationId): void + { + $this->performAction($applicationId, 'reload'); + } + + public function redeploy(string $applicationId): void + { + $this->performAction($applicationId, 'redeploy'); + } + + protected function performAction(string $applicationId, string $action): void + { + $client = app(DokployClient::class); + + if (! $this->isKnownApplication($applicationId)) { + Notification::make() + ->danger() + ->title('Unknown service') + ->body("The application ID {$applicationId} is not configured.") + ->send(); + + return; + } + + try { + $action === 'reload' + ? $client->reloadApplication($applicationId, auth()->user()) + : $client->redeployApplication($applicationId, auth()->user()); + + Notification::make() + ->success() + ->title(ucfirst($action).' requested') + ->body("Dokploy accepted the {$action} action for {$applicationId}.") + ->send(); + } catch (\Throwable $exception) { + Notification::make() + ->danger() + ->title('Dokploy request failed') + ->body($exception->getMessage()) + ->send(); + } + + $this->refreshApplications($client); + $this->refreshLogs(); + } + + protected function refreshApplications(DokployClient $client): void + { + $applicationMap = config('dokploy.applications', []); + $results = []; + + foreach ($applicationMap as $label => $id) { + try { + $status = $client->applicationStatus($id); + $application = Arr::get($status, 'application', []); + + $results[] = [ + 'label' => ucfirst($label), + 'application_id' => $id, + 'status' => Arr::get($application, 'applicationStatus', 'unknown'), + ]; + } catch (\Throwable $e) { + $results[] = [ + 'label' => ucfirst($label), + 'application_id' => $id, + 'status' => 'error', + ]; + } + } + + $this->applications = $results; + } + + protected function refreshLogs(): void + { + $this->recentLogs = InfrastructureActionLog::query() + ->with('user') + ->latest() + ->limit(5) + ->get() + ->map(fn ($log) => [ + 'created_at' => $log->created_at->diffForHumans(), + 'user' => $log->user?->name ?? 'System', + 'service_id' => $log->service_id, + 'action' => $log->action, + 'status_code' => $log->status_code, + ]) + ->toArray(); + } + + protected function isKnownApplication(string $applicationId): bool + { + return in_array($applicationId, array_values(config('dokploy.applications', [])), true); + } +} diff --git a/app/Filament/Widgets/CoolifyPlatformHealth.php b/app/Filament/Widgets/CoolifyPlatformHealth.php deleted file mode 100644 index fc8fa6f..0000000 --- a/app/Filament/Widgets/CoolifyPlatformHealth.php +++ /dev/null @@ -1,62 +0,0 @@ - $this->loadServices(), - ]; - } - - protected function loadServices(): array - { - $client = app(CoolifyClient::class); - $serviceMap = config('coolify.services', []); - $results = []; - - foreach ($serviceMap as $label => $serviceId) { - try { - $status = $client->serviceStatus($serviceId); - $results[] = [ - 'label' => ucfirst($label), - 'service_id' => $serviceId, - 'status' => Arr::get($status, 'data.status', 'unknown'), - 'cpu' => Arr::get($status, 'data.metrics.cpu_percent'), - 'memory' => Arr::get($status, 'data.metrics.memory_percent'), - 'last_deploy' => Arr::get($status, 'data.last_deployment.finished_at'), - ]; - } catch (\Throwable $exception) { - $results[] = [ - 'label' => ucfirst($label), - 'service_id' => $serviceId, - 'status' => 'unreachable', - 'error' => $exception->getMessage(), - ]; - } - } - - if (empty($results)) { - return [ - [ - 'label' => 'Coolify', - 'service_id' => '-', - 'status' => 'unconfigured', - 'error' => 'Set COOLIFY_SERVICE_IDS in .env to enable monitoring.', - ], - ]; - } - - return $results; - } -} diff --git a/app/Filament/Widgets/DokployPlatformHealth.php b/app/Filament/Widgets/DokployPlatformHealth.php new file mode 100644 index 0000000..06ec3ac --- /dev/null +++ b/app/Filament/Widgets/DokployPlatformHealth.php @@ -0,0 +1,91 @@ + $this->loadApplications(), + ]; + } + + protected function loadApplications(): array + { + $client = app(DokployClient::class); + $applicationMap = config('dokploy.applications', []); + $results = []; + + foreach ($applicationMap as $label => $applicationId) { + try { + $status = $client->applicationStatus($applicationId); + $deployments = $client->recentDeployments($applicationId, 1); + $application = Arr::get($status, 'application', []); + $monitoring = Arr::get($status, 'monitoring', []); + + $results[] = [ + 'label' => ucfirst($label), + 'application_id' => $applicationId, + 'app_name' => Arr::get($application, 'appName') ?? Arr::get($application, 'name'), + 'status' => Arr::get($application, 'applicationStatus', 'unknown'), + 'cpu' => $this->extractMetric($monitoring, [ + 'metrics.cpuPercent', + 'metrics.cpu_percent', + 'cpuPercent', + 'cpu_percent', + ]), + 'memory' => $this->extractMetric($monitoring, [ + 'metrics.memoryPercent', + 'metrics.memory_percent', + 'memoryPercent', + 'memory_percent', + ]), + 'last_deploy' => Arr::get($deployments, '0.createdAt') + ?? Arr::get($deployments, '0.created_at') + ?? Arr::get($application, 'updatedAt') + ?? Arr::get($application, 'lastDeploymentAt'), + ]; + } catch (\Throwable $exception) { + $results[] = [ + 'label' => ucfirst($label), + 'application_id' => $applicationId, + 'status' => 'unreachable', + 'error' => $exception->getMessage(), + ]; + } + } + + if (empty($results)) { + return [ + [ + 'label' => 'Dokploy', + 'application_id' => '-', + 'status' => 'unconfigured', + 'error' => 'Set DOKPLOY_APPLICATION_IDS in .env to enable monitoring.', + ], + ]; + } + + return $results; + } + + protected function extractMetric(array $source, array $candidates): mixed + { + foreach ($candidates as $key) { + if (Arr::has($source, $key)) { + return Arr::get($source, $key); + } + } + + return null; + } +} diff --git a/app/Models/CoolifyActionLog.php b/app/Models/InfrastructureActionLog.php similarity index 90% rename from app/Models/CoolifyActionLog.php rename to app/Models/InfrastructureActionLog.php index 3f727b9..bd0fc57 100644 --- a/app/Models/CoolifyActionLog.php +++ b/app/Models/InfrastructureActionLog.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; -class CoolifyActionLog extends Model +class InfrastructureActionLog extends Model { use HasFactory; diff --git a/app/Providers/Filament/SuperAdminPanelProvider.php b/app/Providers/Filament/SuperAdminPanelProvider.php index 9701475..5e23bd3 100644 --- a/app/Providers/Filament/SuperAdminPanelProvider.php +++ b/app/Providers/Filament/SuperAdminPanelProvider.php @@ -4,10 +4,10 @@ namespace App\Providers\Filament; use App\Filament\Blog\Resources\CategoryResource; use App\Filament\Blog\Resources\PostResource; -use App\Filament\Resources\CoolifyActionLogs\CoolifyActionLogResource; +use App\Filament\Resources\InfrastructureActionLogs\InfrastructureActionLogResource; use App\Filament\Resources\LegalPageResource; -use App\Filament\Widgets\CoolifyPlatformHealth; use App\Filament\Widgets\CreditAlertsWidget; +use App\Filament\Widgets\DokployPlatformHealth; use App\Filament\Widgets\PlatformStatsWidget; use App\Filament\Widgets\RevenueTrendWidget; use App\Filament\Widgets\TopTenantsByRevenue; @@ -61,7 +61,7 @@ class SuperAdminPanelProvider extends PanelProvider TopTenantsByRevenue::class, TopTenantsByUploads::class, \App\Filament\Widgets\StorageCapacityWidget::class, - CoolifyPlatformHealth::class, + DokployPlatformHealth::class, ]) ->middleware([ EncryptCookies::class, @@ -87,7 +87,7 @@ class SuperAdminPanelProvider extends PanelProvider PostResource::class, CategoryResource::class, LegalPageResource::class, - CoolifyActionLogResource::class, + InfrastructureActionLogResource::class, ]) ->authGuard('web'); diff --git a/app/Services/Coolify/CoolifyClient.php b/app/Services/Coolify/CoolifyClient.php deleted file mode 100644 index 12dd6db..0000000 --- a/app/Services/Coolify/CoolifyClient.php +++ /dev/null @@ -1,138 +0,0 @@ -cached("coolify.service.$serviceId", fn () => $this->get("/services/{$serviceId}"), 30); - } - - public function recentDeployments(string $serviceId, int $limit = 5): array - { - return $this->cached("coolify.deployments.$serviceId", function () use ($serviceId, $limit) { - $response = $this->get("/services/{$serviceId}/deployments?per_page={$limit}"); - - return Arr::get($response, 'data', []); - }, 60); - } - - public function restartService(string $serviceId, ?Authenticatable $actor = null): array - { - return $this->dispatchAction($serviceId, 'restart', function () use ($serviceId) { - return $this->post("/services/{$serviceId}/actions/restart"); - }, $actor); - } - - public function redeployService(string $serviceId, ?Authenticatable $actor = null): array - { - return $this->dispatchAction($serviceId, 'redeploy', function () use ($serviceId) { - return $this->post("/services/{$serviceId}/actions/redeploy"); - }, $actor); - } - - protected function cached(string $key, callable $callback, int $seconds): mixed - { - return Cache::remember($key, now()->addSeconds($seconds), $callback); - } - - protected function get(string $path): array - { - $response = $this->request()->get($path); - - if ($response->failed()) { - $this->logFailure('GET', $path, $response); - throw new RequestException($response); - } - - return $response->json() ?? []; - } - - protected function post(string $path, array $payload = []): array - { - $response = $this->request()->post($path, $payload); - - if ($response->failed()) { - $this->logFailure('POST', $path, $response); - throw new RequestException($response); - } - - return $response->json() ?? []; - } - - protected function request(): PendingRequest - { - $baseUrl = config('coolify.api.base_url'); - $token = config('coolify.api.token'); - $timeout = config('coolify.api.timeout', 5); - - if (! $baseUrl || ! $token) { - throw new \RuntimeException('Coolify API is not configured.'); - } - - return $this->http - ->baseUrl($baseUrl) - ->timeout($timeout) - ->acceptJson() - ->withToken($token); - } - - protected function logFailure(string $method, string $path, \Illuminate\Http\Client\Response $response): void - { - Log::error('[Coolify] API request failed', [ - 'method' => $method, - 'path' => $path, - 'status' => $response->status(), - 'body' => $response->body(), - ]); - } - - protected function dispatchAction(string $serviceId, string $action, callable $callback, ?Authenticatable $actor = null): array - { - $payload = []; - - try { - $response = $callback(); - } catch (\Throwable $exception) { - $this->logAction($serviceId, $action, $payload, [ - 'error' => $exception->getMessage(), - ], null, $actor); - - throw $exception; - } - - $this->logAction($serviceId, $action, $payload, $response, $response['status'] ?? null, $actor); - - return $response; - } - - protected function logAction( - string $serviceId, - string $action, - array $payload, - array $response, - ?int $status, - ?Authenticatable $actor = null, - ): void { - CoolifyActionLog::create([ - 'user_id' => $actor?->getAuthIdentifier() ?? auth()->id(), - 'service_id' => $serviceId, - 'action' => $action, - 'payload' => $payload, - 'response' => $response, - 'status_code' => $status, - ]); - } -} -use App\Models\CoolifyActionLog; -use Illuminate\Contracts\Auth\Authenticatable; diff --git a/app/Services/Dokploy/DokployClient.php b/app/Services/Dokploy/DokployClient.php new file mode 100644 index 0000000..dcdf657 --- /dev/null +++ b/app/Services/Dokploy/DokployClient.php @@ -0,0 +1,222 @@ +cached($this->applicationCacheKey($applicationId), function () use ($applicationId) { + $application = $this->get('/application.one', [ + 'applicationId' => $applicationId, + ]); + + $appName = Arr::get($application, 'appName') ?? Arr::get($application, 'name'); + $monitoring = []; + + if ($appName) { + $monitoring = $this->optionalGet('/application.readAppMonitoring', [ + 'appName' => $appName, + ]); + } + + return [ + 'application' => $application, + 'monitoring' => $monitoring, + 'appName' => $appName, + ]; + }, 30); + } + + public function recentDeployments(string $applicationId, int $limit = 5): array + { + return $this->cached($this->deploymentCacheKey($applicationId), function () use ($applicationId, $limit) { + $deployments = $this->get('/deployment.all', [ + 'applicationId' => $applicationId, + ]); + + if (! is_array($deployments)) { + return []; + } + + return array_slice($deployments, 0, $limit); + }, 60); + } + + public function reloadApplication(string $applicationId, ?Authenticatable $actor = null): array + { + $status = $this->applicationStatus($applicationId); + $appName = Arr::get($status, 'appName'); + + if (! $appName) { + throw new \RuntimeException('Dokploy application name is required to reload the service.'); + } + + return $this->dispatchAction( + $applicationId, + 'reload', + [ + 'applicationId' => $applicationId, + 'appName' => $appName, + ], + fn (array $payload) => $this->post('/application.reload', $payload), + $actor, + ); + } + + public function redeployApplication(string $applicationId, ?Authenticatable $actor = null): array + { + return $this->dispatchAction( + $applicationId, + 'redeploy', + [ + 'applicationId' => $applicationId, + ], + fn (array $payload) => $this->post('/application.redeploy', $payload), + $actor, + ); + } + + protected function cached(string $key, callable $callback, int $seconds): mixed + { + return Cache::remember($key, now()->addSeconds($seconds), $callback); + } + + protected function optionalGet(string $path, array $query = []): array + { + try { + return $this->get($path, $query); + } catch (\Throwable $exception) { + Log::warning('[Dokploy] Optional GET failed', [ + 'path' => $path, + 'message' => $exception->getMessage(), + ]); + + return []; + } + } + + protected function get(string $path, array $query = []): array + { + $response = $this->request()->get($this->normalizePath($path), $query); + + if ($response->failed()) { + $this->logFailure('GET', $path, $response); + throw new RequestException($response); + } + + return $response->json() ?? []; + } + + protected function post(string $path, array $payload = []): Response + { + $response = $this->request()->post($this->normalizePath($path), $payload); + + if ($response->failed()) { + $this->logFailure('POST', $path, $response); + throw new RequestException($response); + } + + return $response; + } + + protected function request(): PendingRequest + { + $baseUrl = config('dokploy.api.base_url'); + $token = config('dokploy.api.token'); + $timeout = config('dokploy.api.timeout', 10); + + if (! $baseUrl || ! $token) { + throw new \RuntimeException('Dokploy API is not configured.'); + } + + return $this->http + ->baseUrl($baseUrl) + ->timeout($timeout) + ->acceptJson() + ->withHeaders([ + 'x-api-key' => $token, + ]); + } + + protected function normalizePath(string $path): string + { + return '/'.ltrim($path, '/'); + } + + protected function logFailure(string $method, string $path, Response $response): void + { + Log::error('[Dokploy] API request failed', [ + 'method' => $method, + 'path' => $path, + 'status' => $response->status(), + 'body' => $response->body(), + ]); + } + + protected function dispatchAction( + string $applicationId, + string $action, + array $payload, + callable $callback, + ?Authenticatable $actor = null, + ): array { + try { + $response = $callback($payload); + $body = $response->json() ?? []; + $status = $response->status(); + } catch (\Throwable $exception) { + $this->logAction($applicationId, $action, $payload, [ + 'error' => $exception->getMessage(), + ], null, $actor); + + throw $exception; + } + + $this->logAction($applicationId, $action, $payload, $body, $status, $actor); + Cache::forget($this->applicationCacheKey($applicationId)); + Cache::forget($this->deploymentCacheKey($applicationId)); + + return $body; + } + + protected function logAction( + string $applicationId, + string $action, + array $payload, + array $response, + ?int $status, + ?Authenticatable $actor = null, + ): void { + InfrastructureActionLog::create([ + 'user_id' => $actor?->getAuthIdentifier() ?? auth()->id(), + 'service_id' => $applicationId, + 'action' => $action, + 'payload' => $payload, + 'response' => $response, + 'status_code' => $status, + ]); + } + + protected function applicationCacheKey(string $applicationId): string + { + return "dokploy.application.{$applicationId}"; + } + + protected function deploymentCacheKey(string $applicationId): string + { + return "dokploy.deployments.{$applicationId}"; + } +} diff --git a/config/coolify.php b/config/coolify.php deleted file mode 100644 index 4b1d188..0000000 --- a/config/coolify.php +++ /dev/null @@ -1,11 +0,0 @@ - [ - 'base_url' => env('COOLIFY_API_BASE_URL'), - 'token' => env('COOLIFY_API_TOKEN'), - 'timeout' => (int) env('COOLIFY_API_TIMEOUT', 5), - ], - 'web_url' => env('COOLIFY_WEB_URL'), - 'services' => json_decode(env('COOLIFY_SERVICE_IDS', '{}'), true) ?? [], -]; diff --git a/config/dokploy.php b/config/dokploy.php new file mode 100644 index 0000000..fd980d2 --- /dev/null +++ b/config/dokploy.php @@ -0,0 +1,11 @@ + [ + 'base_url' => rtrim(env('DOKPLOY_API_BASE_URL', ''), '/'), + 'token' => env('DOKPLOY_API_KEY'), + 'timeout' => (int) env('DOKPLOY_API_TIMEOUT', 10), + ], + 'web_url' => env('DOKPLOY_WEB_URL'), + 'applications' => json_decode(env('DOKPLOY_APPLICATION_IDS', '{}'), true) ?? [], +]; diff --git a/database/migrations/2025_11_18_161628_rename_coolify_action_logs_table.php b/database/migrations/2025_11_18_161628_rename_coolify_action_logs_table.php new file mode 100644 index 0000000..755e30a --- /dev/null +++ b/database/migrations/2025_11_18_161628_rename_coolify_action_logs_table.php @@ -0,0 +1,28 @@ + **Coolify users:** see `docs/deployment/coolify.md` for service definitions, secrets, and how to wire the same containers (web, queue, scheduler, vsftpd) inside Coolify. That document builds on the base Docker instructions below. +> **Dokploy users:** see `docs/deployment/dokploy.md` for service definitions, secrets, and how to wire the same containers (web, queue, scheduler, vsftpd) inside Dokploy. That document builds on the base Docker instructions below. ## 1. Prerequisites diff --git a/docs/deployment/dokploy.md b/docs/deployment/dokploy.md new file mode 100644 index 0000000..ad079c7 --- /dev/null +++ b/docs/deployment/dokploy.md @@ -0,0 +1,122 @@ +# Dokploy Deployment Guide + +Dokploy is our self-hosted PaaS for orchestrating the Fotospiel stack (Laravel app, scheduler, queue workers, Horizon, and the Photobooth FTP pipeline). This guide explains how to provision the services in Dokploy and how to wire the SuperAdmin observability widgets that now talk to the Dokploy API. + +## 1. Services to provision + +| Service | Notes | +|---------|-------| +| **Laravel App** | Build from this repository. Expose port 8080 (or Dokploy HTTP service). Attach the production `.env`. Health check `/up`. | +| **Scheduler** | Clone the app container; command `php artisan schedule:work`. | +| **Queue workers** | Use `docs/queue-supervisor/queue-worker.sh` scripts (default, media-storage, media-security). Deploy each as a dedicated Dokploy application or Docker service. | +| **Horizon (optional)** | Run `docs/queue-supervisor/horizon.sh` for dashboard + metrics. | +| **Redis / Database** | Use managed offerings or self-host in Dokploy. Configure network access for the app + workers. | +| **vsftpd container** | Expose port 2121 and mount the shared Photobooth volume. | +| **Photobooth Control Service** | Lightweight API (Go/Node/Laravel Octane) that can be redeployed together with vsftpd for ingest controls. | + +### Volumes + +Create persistent volumes inside Dokploy and mount them across the services: + +- `storage-app` – Laravel `storage`, uploads, compiled views. +- `photobooth` – shared by vsftpd, the control service, and Laravel for ingest. +- Database / Redis volumes if you self-manage those containers. + +## 2. Environment & secrets + +Every Dokploy application should include the regular Laravel secrets (see `.env.example`). Important blocks: + +- `APP_KEY`, `APP_URL`, `DB_*`, `CACHE_DRIVER`, `QUEUE_CONNECTION`, `MAIL_*`. +- Photobooth integration (`PHOTOBOOTH_CONTROL_*`, `PHOTOBOOTH_FTP_*`, `PHOTOBOOTH_IMPORT_*`). +- AWS / S3 credentials if the tenant media is stored remotely. + +### Dokploy integration variables + +Add the infrastructure observability variables to the Laravel app environment: + +``` +DOKPLOY_API_BASE_URL=https://dokploy.example.com/api +DOKPLOY_API_KEY=pat_xxxxxxxxxxxxxxxxx +DOKPLOY_WEB_URL=https://dokploy.example.com +DOKPLOY_APPLICATION_IDS={"app":"app_123","queue":"app_456","scheduler":"app_789","ftp":"app_abc"} +DOKPLOY_API_TIMEOUT=10 +``` + +- `DOKPLOY_APPLICATION_IDS` is a JSON object mapping human labels to Dokploy `applicationId` values. Those IDs drive the SuperAdmin widget buttons. +- The API key needs permission to read the project, query deployments, and trigger `application.redeploy` / `application.reload`. + +## 3. Project & server setup + +1. **Register the Docker host** in Dokploy (`Servers → Add Server`). Install the Dokploy agent on the target VM. +2. **Create a Project** (e.g., `fotospiel-prod`) to group all services. +3. **Attach repositories** using Dokploy Git providers (GitHub / Gitea / GitLab / Bitbucket) or Docker images. Fotospiel uses the source build (Dockerfile at repo root). +4. **Networking** – keep all services on the same internal network so they can talk to Redis/DB. Expose the public HTTP service only for the Laravel app (behind Traefik/Let’s Encrypt). + +## 4. Deploy applications + +Follow these steps for each component: + +1. **Laravel HTTP app** + - Build from the repo. + - `Dockerfile` already exposes port `8080`. + - Set branch (e.g. `main`) for automatic deployments. + - Add health check `/up`. + - Mount `storage-app` and `photobooth` volumes. + +2. **Scheduler** + - Duplicate the image. + - Override command: `php artisan schedule:work`. + - Disable HTTP exposure. + +3. **Queue workers** + - Duplicate the image. + - Commands: + - `docs/queue-supervisor/queue-worker.sh default` + - `docs/queue-supervisor/queue-worker.sh media-storage` + - `docs/queue-supervisor/queue-worker.sh media-security` + - Optionally create a dedicated container for Horizon using `docs/queue-supervisor/horizon.sh`. + +4. **vsftpd + Photobooth control** + - Deploy the ftp image (see `docker-compose` setup) or reuse Dokploy’s Docker Compose support. + - Mount `photobooth` volume read-write. + +5. **Database/Redis** + - Dokploy can provision standard MySQL/Postgres/Redis apps. Configure credentials to match `.env`. + +6. **Apply migrations** + - Use Dokploy one-off command to run `php artisan migrate --force` on first deploy. + - Seed storage targets if required: `php artisan db:seed --class=MediaStorageTargetSeeder --force`. + +## 5. SuperAdmin observability (Dokploy API) + +The SuperAdmin dashboard now uses the Dokploy API to fetch health data and trigger actions: + +1. **Config file** – `config/dokploy.php` reads the environment variables above. +2. **Client** – `App\Services\Dokploy\DokployClient` wraps key endpoints: + - `GET /application.one?applicationId=...` → status + metadata. + - `GET /application.readAppMonitoring?appName=...` → CPU & memory metrics. + - `GET /deployment.all?applicationId=...` → latest deployments for history. + - `POST /application.reload` (requires `applicationId` + `appName`). + - `POST /application.redeploy` (redeploy latest commit). +3. **Widgets / pages** – `DokployPlatformHealth` widget displays the mapped applications, and the `DokployDeployments` page exposes reload/redeploy buttons plus a log table (`InfrastructureActionLog`). +4. **Auditing** – all actions persist to `infrastructure_action_logs` with user, payload, response, and status code. + +Only SuperAdmins should have access to these widgets. If you rotate the API key, update the `.env` and deploy the app to refresh the cache. + +## 6. Monitoring & alerts + +- Dokploy already produces container metrics and deployment logs. Surface the most important ones (CPU, memory, last deployment) through the widget using the monitoring endpoint. +- Configure Dokploy webhooks (Deploy succeeded/failed, health alerts) to call a Laravel route that records incidents in `photobooth_metadata` or sends notifications. +- Use Dokploy’s Slack/email integrations for infrastructure-level alerts. Application-specific alerts (e.g., ingest failures) still live inside Laravel notifications. + +## 7. Production readiness checklist + +1. All applications deployed in Dokploy with health checks and attached volumes. +2. `photobooth` volume mounted for Laravel + vsftpd + control service. +3. Database/Redis backups scheduled (Dokploy snapshot or external tooling). +4. `.env` contains the Dokploy API credentials and application ID mapping. +5. Scheduler, workers, and Horizon logging visible in Dokploy. +6. SuperAdmin widgets show green health states and allow reload/redeploy actions. +7. Webhooks/alerts configured for failed deployments or unhealthy containers. + +With this setup the Fotospiel team can manage deployments, restarts, and metrics centrally through Dokploy while Laravel’s scheduler and workers continue to run within the same infrastructure. diff --git a/docs/queue-supervisor/README.md b/docs/queue-supervisor/README.md index 92398ea..5a142db 100644 --- a/docs/queue-supervisor/README.md +++ b/docs/queue-supervisor/README.md @@ -118,14 +118,14 @@ When deploying new code: 3. Recreate worker/horizon containers: `docker compose up -d --force-recreate queue-worker media-storage-worker horizon`. 4. Tail logs to confirm workers boot cleanly and start consuming jobs. -### 8. Running inside Coolify +### 8. Running inside Dokploy -If you host Fotospiel on Coolify: +If you host Fotospiel on Dokploy: -- Create separate Coolify “services” for each worker type using the same image and command snippets above (`queue-worker.sh default`, `media-storage`, etc.). +- Create separate Dokploy applications for each worker type using the same image and command snippets above (`queue-worker.sh default`, `media-storage`, etc.). - Attach the same environment variables and storage volumes defined for the main app. -- Use Coolify’s “One-off command” feature to run migrations or `queue:retry`. -- Expose the Horizon service through Coolify’s HTTP proxy (or keep it internal and access via SSH tunnel). -- Enable health checks so Coolify restarts workers automatically if they exit unexpectedly. +- Use Dokploy’s one-off command feature to run migrations or `queue:retry`. +- Expose the Horizon service through the Dokploy HTTP proxy (or keep it internal and access via SSH tunnel). +- Enable health checks so Dokploy restarts workers automatically if they exit unexpectedly. -These services can be observed and restarted from Coolify’s dashboard; the upcoming SuperAdmin integration will surface the same metrics/actions through a dedicated Filament widget. +These services can be observed, redeployed, or reloaded from Dokploy’s dashboard and from the SuperAdmin integration powered by the Dokploy API. diff --git a/resources/views/filament/super-admin/pages/coolify-deployments.blade.php b/resources/views/filament/super-admin/pages/dokploy-deployments.blade.php similarity index 77% rename from resources/views/filament/super-admin/pages/coolify-deployments.blade.php rename to resources/views/filament/super-admin/pages/dokploy-deployments.blade.php index 568edce..78a8788 100644 --- a/resources/views/filament/super-admin/pages/coolify-deployments.blade.php +++ b/resources/views/filament/super-admin/pages/dokploy-deployments.blade.php @@ -1,29 +1,29 @@
- +
- @foreach($services as $service) + @foreach($applications as $application)
-

{{ $service['label'] }}

-

{{ $service['service_id'] }}

+

{{ $application['label'] }}

+

{{ $application['application_id'] }}

- {{ ucfirst($service['status'] ?? 'unknown') }} + {{ ucfirst($application['status'] ?? 'unknown') }}
- - Restart + + Reload - + Redeploy - @if($coolifyWebUrl) - - Open in Coolify + @if($dokployWebUrl) + + Open in Dokploy @endif
@@ -39,7 +39,7 @@ When User - Service + Application Action Status @@ -61,7 +61,7 @@
- + View full log → diff --git a/resources/views/filament/widgets/coolify-platform-health.blade.php b/resources/views/filament/widgets/dokploy-platform-health.blade.php similarity index 57% rename from resources/views/filament/widgets/coolify-platform-health.blade.php rename to resources/views/filament/widgets/dokploy-platform-health.blade.php index a19d41c..d044fe4 100644 --- a/resources/views/filament/widgets/coolify-platform-health.blade.php +++ b/resources/views/filament/widgets/dokploy-platform-health.blade.php @@ -1,47 +1,52 @@ - +
- @forelse($services as $service) + @forelse($applications as $application)
-

{{ $service['label'] }}

-

{{ $service['service_id'] }}

+

{{ $application['label'] }}

+

{{ $application['app_name'] ?? $application['application_id'] }}

+

{{ $application['application_id'] }}

$service['status'] === 'running', - 'bg-amber-100 text-amber-800' => $service['status'] === 'deploying', - 'bg-rose-100 text-rose-800' => $service['status'] === 'unreachable' || $service['status'] === 'error', - 'bg-slate-100 text-slate-600' => ! in_array($service['status'], ['running', 'deploying', 'unreachable', 'error']), + 'bg-emerald-100 text-emerald-800' => $application['status'] === 'running', + 'bg-amber-100 text-amber-800' => in_array($application['status'], ['deploying', 'idle']), + 'bg-rose-100 text-rose-800' => in_array($application['status'], ['unreachable', 'error']), + 'bg-slate-100 text-slate-600' => ! in_array($application['status'], ['running', 'deploying', 'idle', 'unreachable', 'error']), ])> - {{ ucfirst($service['status']) }} + {{ ucfirst($application['status']) }}
- @if(isset($service['error'])) -

{{ $service['error'] }}

+ @if(isset($application['error'])) +

{{ $application['error'] }}

@else
CPU
-
{{ $service['cpu'] ?? '—' }}%
+
+ {{ isset($application['cpu']) ? $application['cpu'].'%' : '—' }} +
Memory
-
{{ $service['memory'] ?? '—' }}%
+
+ {{ isset($application['memory']) ? $application['memory'].'%' : '—' }} +
Last Deploy
- {{ $service['last_deploy'] ? \Illuminate\Support\Carbon::parse($service['last_deploy'])->diffForHumans() : '—' }} + {{ $application['last_deploy'] ? \Illuminate\Support\Carbon::parse($application['last_deploy'])->diffForHumans() : '—' }}
@endif
@empty -

No Coolify services configured.

+

No Dokploy applications configured.

@endforelse