Merge pull request #4610 from peaklabs-dev/fix-docker-cleanup-notifications

Fix: Docker Cleanup schedule

app/Console/Kernel.php

@@ -133,14 +133,14 @@ class Kernel extends ConsoleKernel
 
         foreach ($servers as $server) {
             $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
+            if (validate_timezone($serverTimezone) === false) {
+                $serverTimezone = config('app.timezone');
+            }
 
             // Sentinel check
             $lastSentinelUpdate = $server->sentinel_updated_at;
             if (Carbon::parse($lastSentinelUpdate)->isBefore(now()->subSeconds($server->waitBeforeDoingSshCheck()))) {
                 // Check container status every minute if Sentinel does not activated
-                if (validate_timezone($serverTimezone) === false) {
-                    $serverTimezone = config('app.timezone');
-                }
                 if (isCloud()) {
                     $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyFiveMinutes()->onOneServer();
                 } else {
@@ -148,14 +148,10 @@ class Kernel extends ConsoleKernel
                 }
                 // $this->scheduleInstance->job(new \App\Jobs\ServerCheckNewJob($server))->everyFiveMinutes()->onOneServer();
 
-                // Check storage usage every 10 minutes if Sentinel does not activated
+                $this->scheduleInstance->job(new ServerStorageCheckJob($server))->cron($server->settings->server_disk_usage_check_frequency)->timezone($serverTimezone)->onOneServer();
-                $this->scheduleInstance->job(new ServerStorageCheckJob($server))->everyTenMinutes()->onOneServer();
             }
-            if ($server->settings->force_docker_cleanup) {
+
             $this->scheduleInstance->job(new DockerCleanupJob($server))->cron($server->settings->docker_cleanup_frequency)->timezone($serverTimezone)->onOneServer();
-            } else {
-                $this->scheduleInstance->job(new DockerCleanupJob($server))->everyTenMinutes()->timezone($serverTimezone)->onOneServer();
-            }
 
             // Cleanup multiplexed connections every hour
             // $this->scheduleInstance->job(new ServerCleanupMux($server))->hourly()->onOneServer();

app/Livewire/Server/Advanced.php

@@ -13,14 +13,11 @@ class Advanced extends Component
 
     public array $parameters = [];
 
-    #[Validate(['integer', 'min:1'])]
+    #[Validate(['string'])]
-    public int $concurrentBuilds = 1;
+    public string $serverDiskUsageCheckFrequency = '0 23 * * *';
 
-    #[Validate(['integer', 'min:1'])]
+    #[Validate(['integer', 'min:1', 'max:99'])]
-    public int $dynamicTimeout = 1;
+    public int $serverDiskUsageNotificationThreshold = 50;
-
-    #[Validate('boolean')]
-    public bool $forceDockerCleanup = false;
 
     #[Validate(['string', 'required'])]
     public string $dockerCleanupFrequency = '*/10 * * * *';
@@ -28,8 +25,8 @@ class Advanced extends Component
     #[Validate(['integer', 'min:1', 'max:99'])]
     public int $dockerCleanupThreshold = 10;
 
-    #[Validate(['integer', 'min:1', 'max:99'])]
+    #[Validate('boolean')]
-    public int $serverDiskUsageNotificationThreshold = 50;
+    public bool $forceDockerCleanup = false;
 
     #[Validate('boolean')]
     public bool $deleteUnusedVolumes = false;
@@ -37,6 +34,12 @@ class Advanced extends Component
     #[Validate('boolean')]
     public bool $deleteUnusedNetworks = false;
 
+    #[Validate(['integer', 'min:1'])]
+    public int $concurrentBuilds = 1;
+
+    #[Validate(['integer', 'min:1'])]
+    public int $dynamicTimeout = 1;
+
     public function mount(string $server_uuid)
     {
         try {
@@ -60,6 +63,7 @@ class Advanced extends Component
             $this->server->settings->server_disk_usage_notification_threshold = $this->serverDiskUsageNotificationThreshold;
             $this->server->settings->delete_unused_volumes = $this->deleteUnusedVolumes;
             $this->server->settings->delete_unused_networks = $this->deleteUnusedNetworks;
+            $this->server->settings->server_disk_usage_check_frequency = $this->serverDiskUsageCheckFrequency;
             $this->server->settings->save();
         } else {
             $this->concurrentBuilds = $this->server->settings->concurrent_builds;
@@ -70,6 +74,7 @@ class Advanced extends Component
             $this->serverDiskUsageNotificationThreshold = $this->server->settings->server_disk_usage_notification_threshold;
             $this->deleteUnusedVolumes = $this->server->settings->delete_unused_volumes;
             $this->deleteUnusedNetworks = $this->server->settings->delete_unused_networks;
+            $this->serverDiskUsageCheckFrequency = $this->server->settings->server_disk_usage_check_frequency;
         }
     }
 
@@ -100,6 +105,10 @@ class Advanced extends Component
                 $this->dockerCleanupFrequency = $this->server->settings->getOriginal('docker_cleanup_frequency');
                 throw new \Exception('Invalid Cron / Human expression for Docker Cleanup Frequency.');
             }
+            if (! validate_cron_expression($this->serverDiskUsageCheckFrequency)) {
+                $this->serverDiskUsageCheckFrequency = $this->server->settings->getOriginal('server_disk_usage_check_frequency');
+                throw new \Exception('Invalid Cron / Human expression for Disk Usage Check Frequency.');
+            }
             $this->syncData(true);
             $this->dispatch('success', 'Server updated.');
         } catch (\Throwable $e) {

database/migrations/2024_12_17_140637_add_server_disk_usage_check_frequency_to_server_settings_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->string('server_disk_usage_check_frequency')->default('0 23 * * *');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->dropColumn('server_disk_usage_check_frequency');
+        });
+    }
+};

resources/views/livewire/server/advanced.blade.php

@@ -10,6 +10,26 @@
                 <div class="flex items-center gap-2">
                     <h2>Advanced</h2>
                     <x-forms.button type="submit">Save</x-forms.button>
+                </div>
+                <div class="mt-3 mb-4">Advanced configuration for your server.</div>
+            </div>
+
+            <h3>Disk Usage</h3>
+            <div class="flex flex-col gap-6">
+                <div class="flex flex-col">
+                    <div class="flex flex-wrap gap-2 sm:flex-nowrap pt-4">
+                        <x-forms.input placeholder="0 23 * * *" id="serverDiskUsageCheckFrequency"
+                            label="Disk usage check frequency" required
+                            helper="Cron expression for disk usage check frequency.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at 11:00 PM." />
+                        <x-forms.input id="serverDiskUsageNotificationThreshold"
+                            label="Server disk usage notification threshold (%)" required
+                            helper="If the server disk usage exceeds this threshold, Coolify will send a notification to the team members." />
+                    </div>
+                </div>
+
+                <div class="flex flex-col gap-2">
+                    <div class="flex gap-4">
+                        <h3>Docker Cleanup</h3>
                         <x-modal-confirmation title="Confirm Docker Cleanup?" buttonTitle="Trigger Manual Cleanup"
                             isHighlightedButton submitAction="manualCleanup" :actions="[
                                 'Permanently deletes all stopped containers managed by Coolify (as containers are non-persistent, no data will be lost)',
@@ -21,27 +41,11 @@
                             ]" :confirmWithText="false"
                             :confirmWithPassword="false" step2ButtonText="Trigger Docker Cleanup" />
                     </div>
-                <div>Advanced configuration for your server.</div>
-            </div>
-
-            <div class="flex flex-col gap-4">
-                <div class="flex flex-col">
-                    <div class="flex flex-wrap gap-2 sm:flex-nowrap pt-4">
-                        <x-forms.input id="serverDiskUsageNotificationThreshold"
-                            label="Server disk usage notification threshold (%)" required
-                            helper="If the server disk usage exceeds this threshold, Coolify will send a notification to the team members." />
-                    </div>
-                </div>
-                <div class="flex flex-col gap-2">
-                    <div class="flex items-center gap-2">
-                        <h3>Docker Cleanup</h3>
-                    </div>
                     <div class="flex flex-wrap items-center gap-4">
-                        @if ($forceDockerCleanup)
                         <x-forms.input placeholder="*/10 * * * *" id="dockerCleanupFrequency"
                             label="Docker cleanup frequency" required
                             helper="Cron expression for Docker Cleanup.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at midnight." />
-                        @else
+                        @if (!$forceDockerCleanup)
                         <x-forms.input id="dockerCleanupThreshold" label="Docker cleanup threshold (%)" required
                             helper="The Docker cleanup tasks will run when the disk usage exceeds this threshold." />
                         @endif