diff --git a/app/Jobs/DockerCleanupJob.php b/app/Jobs/DockerCleanupJob.php index 69c445801..01f085d93 100644 --- a/app/Jobs/DockerCleanupJob.php +++ b/app/Jobs/DockerCleanupJob.php @@ -4,6 +4,7 @@ use App\Actions\Server\CleanupDocker; use App\Models\Server; +use App\Notifications\Server\DockerCleanup; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeEncrypted; use Illuminate\Contracts\Queue\ShouldQueue; @@ -47,8 +48,9 @@ public function handle(): void CleanupDocker::run($this->server); $usageAfter = $this->server->getDiskUsage(); if ($usageAfter < $this->usageBefore) { - ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name); - send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name); + $this->server->team?->notify(new DockerCleanup($this->server, 'Saved ' . ($this->usageBefore - $usageAfter) . '% disk space.')); + // ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name); + // send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name); Log::info('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name); } else { Log::info('DockerCleanupJob failed to save disk space on ' . $this->server->name); diff --git a/app/Notifications/Server/DockerCleanup.php b/app/Notifications/Server/DockerCleanup.php new file mode 100644 index 000000000..754287fa1 --- /dev/null +++ b/app/Notifications/Server/DockerCleanup.php @@ -0,0 +1,63 @@ +subject("Coolify: Server ({$this->server->name}) high disk usage detected!"); + // $mail->view('emails.high-disk-usage', [ + // 'name' => $this->server->name, + // 'disk_usage' => $this->disk_usage, + // 'threshold' => $this->cleanup_after_percentage, + // ]); + // return $mail; + // } + + public function toDiscord(): string + { + $message = "Coolify: Server '{$this->server->name}' cleanup job done!\n\n{$this->message}"; + return $message; + } + public function toTelegram(): array + { + return [ + "message" => "Coolify: Server '{$this->server->name}' cleanup job done!\n\n{$this->message}" + ]; + } +} diff --git a/config/sentry.php b/config/sentry.php index 1b96a2a02..438c45246 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.231', + 'release' => '4.0.0-beta.232', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index 53d87bbd5..2ff41e455 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@