Merge pull request #1463 from coollabsio/next

v4.0.0-beta.139

README.md

@@ -10,35 +10,40 @@ No vendor lock-in, which means that all the configuration for your applications/
 
 For more information, take a look at our landing page [here](https://coolify.io).
 
-> If you are looking for previous (v3) version, it is [here](https://github.com/coollabsio/coolify/tree/v3).
+# Donations
+To stay completely free, open-source, no feature behind paywall and evolve the project, we need your help. If you like Coolify, please consider donating to help us fund the future development of the project.
+
+https://coolify.io/sponsorships
+
+Thank you so much!
 
 # Cloud
 
 If you do not want to self-host Coolify, there is a paid cloud version available: https://app.coolify.io
 
-You can easily attach your own servers, get all the automations, free email notifications, etc.
-
 For more information & pricing, take a look at our landing page [here](https://coolify.io).
 
-# Beta
+## Why should I use the Cloud version?
+The recommended way to use Coolify is to have one server for Coolify and one (or more) for the resources you are deploying. A server is around 4-5$/month.
 
-The latest version (v4) is still in beta. That does not mean it is unstable. All the features that are available are stable enough be usable in real-life. 
-
-There are hundreds of people using it for managing their client's applications, freelancers, hobbyists, businesses.
+By subscribing to the cloud version, you get the Coolify server for the same price, but with:
+- High-availability
+- Free email notifications
+- Better support
+- Less maintenance for you
 
 # Installation
 
 ```bash
 curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
 ```
+You can find the installation script source [here](./scripts/install.sh).
 
-You can find the installation script [here](./scripts/install.sh).
-
-## Support
+# Support
 
 Contact us [here](https://coolify.io/docs/contact).
 
-## Recognitions
+# Recognitions
 
 <p>
 <a href="https://news.ycombinator.com/item?id=26624341">
@@ -54,11 +59,11 @@ Contact us [here](https://coolify.io/docs/contact).
 
 <a href="https://trendshift.io/repositories/634" target="_blank"><img src="https://trendshift.io/api/badge/repositories/634" alt="coollabsio%2Fcoolify | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
-## 💰 Financial Contributors
+# 💰 Financial Contributors
 
 Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/coollabsio/contribute)]
 
-### Organizations
+## Organizations
 
 Special thanks to our biggest sponsors, [CCCareers](https://cccareers.org/) and [Appwrite](https://appwrite.io)!
 
@@ -78,10 +83,10 @@ Support this project with your organization. Your logo will show up here with a
 <a href="https://opencollective.com/coollabsio/organization/8/website"><img src="https://opencollective.com/coollabsio/organization/8/avatar.svg"></a>
 <a href="https://opencollective.com/coollabsio/organization/9/website"><img src="https://opencollective.com/coollabsio/organization/9/avatar.svg"></a>
 
-### Individuals
+## Individuals
 
 <a href="https://opencollective.com/coollabsio"><img src="https://opencollective.com/coollabsio/individuals.svg?width=890"></a>
 
-## Star History
+# Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=coollabsio/coolify&type=Date)](https://star-history.com/#coollabsio/coolify&Date)

app/Actions/Database/StartMariadb.php

@@ -69,6 +69,16 @@ class StartMariadb
                 ]
             ]
         ];
+        if ($this->database->destination->server->isDrainLogActivated()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
         if (count($this->database->ports_mappings_array) > 0) {
             $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
         }

app/Actions/Database/StartMongodb.php

@@ -76,6 +76,16 @@ class StartMongodb
                 ]
             ]
         ];
+        if ($this->database->destination->server->isDrainLogActivated()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
         if (count($this->database->ports_mappings_array) > 0) {
             $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
         }

app/Actions/Database/StartMysql.php

@@ -69,6 +69,16 @@ class StartMysql
                 ]
             ]
         ];
+        if ($this->database->destination->server->isDrainLogActivated()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
         if (count($this->database->ports_mappings_array) > 0) {
             $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
         }

app/Actions/Database/StartPostgresql.php

@@ -79,6 +79,16 @@ class StartPostgresql
                 ]
             ]
         ];
+        if ($this->database->destination->server->isDrainLogActivated()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
         if (count($this->database->ports_mappings_array) > 0) {
             $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
         }

app/Actions/Database/StartRedis.php

@@ -78,6 +78,16 @@ class StartRedis
                 ]
             ]
         ];
+        if ($this->database->destination->server->isDrainLogActivated()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
         if (count($this->database->ports_mappings_array) > 0) {
             $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
         }

app/Actions/Server/InstallLogDrain.php

@@ -0,0 +1,185 @@
+<?php
+
+namespace App\Actions\Server;
+
+use Lorisleiva\Actions\Concerns\AsAction;
+use App\Models\Server;
+
+class InstallLogDrain
+{
+    use AsAction;
+    public function handle(Server $server, string $type)
+    {
+        try {
+            if ($type === 'none') {
+                $command = [
+                    "echo 'Stopping old Fluent Bit'",
+                    "docker rm -f coolify-log-drain || true",
+                ];
+                return instant_remote_process($command, $server);
+            } else if ($type === 'newrelic') {
+                if (!$server->settings->is_logdrain_newrelic_enabled) {
+                    throw new \Exception('New Relic log drain is not enabled.');
+                }
+                $config = base64_encode("
+[SERVICE]
+    Flush     5
+    Daemon    off
+    Tag container_logs
+    Log_Level debug
+    Parsers_File  parsers.conf
+[INPUT]
+    Name              forward
+    Buffer_Chunk_Size 1M
+    Buffer_Max_Size   6M
+[FILTER]
+    Name grep
+    Match *
+    Exclude log 127.0.0.1
+[FILTER]
+    Name                modify
+    Match               *
+    Set                 server_name {$server->name}
+[OUTPUT]
+    Name nrlogs
+    Match *
+    license_key \${LICENSE_KEY}
+    # https://log-api.eu.newrelic.com/log/v1 - EU
+    # https://log-api.newrelic.com/log/v1 - US
+    base_uri \${BASE_URI}
+");
+            } else if ($type === 'highlight') {
+                if (!$server->settings->is_logdrain_highlight_enabled) {
+                    throw new \Exception('Highlight log drain is not enabled.');
+                }
+                $config = base64_encode("
+[SERVICE]
+    Flush     5
+    Daemon    off
+    Log_Level debug
+    Parsers_File  parsers.conf
+[INPUT]
+    Name              forward
+    tag               \${HIGHLIGHT_PROJECT_ID}
+    Buffer_Chunk_Size 1M
+    Buffer_Max_Size   6M
+[OUTPUT]
+    Name                forward
+    Match               *
+    Host                otel.highlight.io
+    Port                24224
+");
+            } else if ($type === 'axiom') {
+                if (!$server->settings->is_logdrain_axiom_enabled) {
+                    throw new \Exception('Axiom log drain is not enabled.');
+                }
+                $config = base64_encode("
+[SERVICE]
+    Flush     5
+    Daemon    off
+    Log_Level debug
+    Parsers_File  parsers.conf
+[INPUT]
+    Name              forward
+    Buffer_Chunk_Size 1M
+    Buffer_Max_Size   6M
+[FILTER]
+    Name grep
+    Match *
+    Exclude log 127.0.0.1
+[FILTER]
+    Name                modify
+    Match               *
+    Set                 server_name {$server->name}
+[OUTPUT]
+    Name            http
+    Match           *
+    Host            api.axiom.co
+    Port            443
+    URI             /v1/datasets/\${AXIOM_DATASET_NAME}/ingest
+    # Authorization Bearer should be an API token
+    Header Authorization Bearer \${AXIOM_API_KEY}
+    compress gzip
+    format json
+    json_date_key _time
+    json_date_format iso8601
+    tls On
+");
+            } else {
+                throw new \Exception('Unknown log drain type.');
+            }
+            $parsers = base64_encode("
+[PARSER]
+    Name        empty_line_skipper
+    Format      regex
+    Regex       /^(?!\s*$).+/
+");
+            $compose = base64_encode("
+services:
+  coolify-log-drain:
+    image: cr.fluentbit.io/fluent/fluent-bit:2.0
+    container_name: coolify-log-drain
+    command: -c /fluent-bit.conf
+    env_file:
+      - .env
+    volumes:
+      - ./fluent-bit.conf:/fluent-bit.conf
+      - ./parsers.conf:/parsers.conf
+    ports:
+      - 127.0.0.1:24224:24224
+");
+            $readme = base64_encode('# New Relic Log Drain
+This log drain is based on [Fluent Bit](https://fluentbit.io/) and New Relic Log Forwarder.
+
+Files:
+- `fluent-bit.conf` - configuration file for Fluent Bit
+- `docker-compose.yml` - docker-compose file to run Fluent Bit
+- `.env` - environment variables for Fluent Bit
+');
+            $license_key = $server->settings->logdrain_newrelic_license_key;
+            $base_uri = $server->settings->logdrain_newrelic_base_uri;
+            $base_path = config('coolify.base_config_path');
+
+            $config_path = $base_path . '/log-drains';
+            $fluent_bit_config = $config_path . '/fluent-bit.conf';
+            $parsers_config = $config_path . '/parsers.conf';
+            $compose_path = $config_path . '/docker-compose.yml';
+            $readme_path = $config_path . '/README.md';
+            $command = [
+                "echo 'Saving configuration'",
+                "mkdir -p $config_path",
+                "echo '{$parsers}' | base64 -d > $parsers_config",
+                "echo '{$config}' | base64 -d > $fluent_bit_config",
+                "echo '{$compose}' | base64 -d > $compose_path",
+                "echo '{$readme}' | base64 -d > $readme_path",
+                "test -f $config_path/.env && rm $config_path/.env",
+
+            ];
+            if ($type === 'newrelic') {
+                $add_envs_command = [
+                    "echo LICENSE_KEY=$license_key >> $config_path/.env",
+                    "echo BASE_URI=$base_uri >> $config_path/.env",
+                ];
+            } else if ($type === 'highlight') {
+                $add_envs_command = [
+                    "echo HIGHLIGHT_PROJECT_ID={$server->settings->logdrain_highlight_project_id} >> $config_path/.env",
+                ];
+            } else if ($type === 'axiom') {
+                $add_envs_command = [
+                    "echo AXIOM_DATASET_NAME={$server->settings->logdrain_axiom_dataset_name} >> $config_path/.env",
+                    "echo AXIOM_API_KEY={$server->settings->logdrain_axiom_api_key} >> $config_path/.env",
+                ];
+            }
+            $restart_command = [
+                "echo 'Stopping old Fluent Bit'",
+                "cd $config_path && docker rm -f coolify-log-drain || true",
+                "echo 'Starting Fluent Bit'",
+                "cd $config_path && docker compose up -d --remove-orphans",
+            ];
+            $command = array_merge($command, $add_envs_command, $restart_command);
+            return instant_remote_process($command, $server);
+        } catch (\Throwable $e) {
+            return handleError($e);
+        }
+    }
+}

app/Console/Commands/Init.php

@@ -3,8 +3,11 @@
 namespace App\Console\Commands;
 
 use App\Enums\ApplicationDeploymentStatus;
+use App\Jobs\CleanupHelperContainersJob;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
+use App\Models\InstanceSettings;
+use App\Models\Server;
 use App\Models\Service;
 use App\Models\ServiceApplication;
 use App\Models\ServiceDatabase;
@@ -14,6 +17,7 @@ use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
 
 class Init extends Command
@@ -23,15 +27,40 @@ class Init extends Command
 
     public function handle()
     {
-        ray()->clearAll();
+        $this->alive();
         $cleanup = $this->option('cleanup');
         if ($cleanup) {
             $this->cleanup_stucked_resources();
             $this->cleanup_ssh();
         }
         $this->cleanup_in_progress_application_deployments();
+        $this->cleanup_stucked_helper_containers();
     }
+    private function cleanup_stucked_helper_containers() {
+        $servers = Server::all();
+        foreach ($servers as $server) {
+            if ($server->isFunctional()) {
+                CleanupHelperContainersJob::dispatch($server);
+            }
+        }
 
+    }
+    private function alive()
+    {
+        $id = config('app.id');
+        $settings = InstanceSettings::get();
+        $do_not_track = data_get($settings, 'do_not_track');
+        if ($do_not_track == true) {
+            echo "Skipping alive as do_not_track is enabled\n";
+            return;
+        }
+        try {
+            echo "I am alive!\n";
+            Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id");
+        } catch (\Throwable $e) {
+            echo "Error in alive: {$e->getMessage()}\n";
+        }
+    }
     private function cleanup_ssh()
     {
         try {

app/Console/Kernel.php

@@ -2,13 +2,12 @@
 
 namespace App\Console;
 
-use App\Jobs\CheckResaleLicenseJob;
 use App\Jobs\CleanupInstanceStuffsJob;
 use App\Jobs\DatabaseBackupJob;
-use App\Jobs\DockerCleanupJob;
 use App\Jobs\InstanceAutoUpdateJob;
 use App\Jobs\ContainerStatusJob;
 use App\Jobs\PullHelperImageJob;
+use App\Jobs\ServerStatusJob;
 use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\Server;
@@ -27,7 +26,6 @@ class Kernel extends ConsoleKernel
             // Server Jobs
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
-            $this->cleanup_servers($schedule);
             $this->check_scheduled_backups($schedule);
             $this->pull_helper_image($schedule);
         } else {
@@ -40,7 +38,6 @@ class Kernel extends ConsoleKernel
             $this->instance_auto_update($schedule);
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
-            $this->cleanup_servers($schedule);
             $this->pull_helper_image($schedule);
         }
     }
@@ -51,13 +48,6 @@ class Kernel extends ConsoleKernel
             $schedule->job(new PullHelperImageJob($server))->everyTenMinutes()->onOneServer();
         }
     }
-    private function cleanup_servers($schedule)
-    {
-        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
-        foreach ($servers as $server) {
-            $schedule->job(new DockerCleanupJob($server))->everyTenMinutes()->onOneServer();
-        }
-    }
     private function check_resources($schedule)
     {
         if (isCloud()) {
@@ -66,6 +56,7 @@ class Kernel extends ConsoleKernel
             $servers = Server::all();
         }
         foreach ($servers as $server) {
+            $schedule->job(new ServerStatusJob($server))->everyTenMinutes()->onOneServer();
             $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
         }
     }

app/Http/Livewire/Boarding/Index.php

@@ -33,7 +33,7 @@ class Index extends Component
     public ?string $remoteServerUser = 'root';
     public ?Server $createdServer = null;
 
-    public Collection|array $projects = [];
+    public Collection $projects;
     public ?int $selectedExistingProject = null;
     public ?Project $createdProject = null;
 

app/Http/Livewire/Server/LogDrains.php

@@ -0,0 +1,138 @@
+<?php
+
+namespace App\Http\Livewire\Server;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class LogDrains extends Component
+{
+    public Server $server;
+    public $parameters = [];
+    protected $rules = [
+        'server.settings.is_logdrain_newrelic_enabled' => 'required|boolean',
+        'server.settings.logdrain_newrelic_license_key' => 'required|string',
+        'server.settings.logdrain_newrelic_base_uri' => 'required|string',
+        'server.settings.is_logdrain_highlight_enabled' => 'required|boolean',
+        'server.settings.logdrain_highlight_project_id' => 'required|string',
+        'server.settings.is_logdrain_axiom_enabled' => 'required|boolean',
+        'server.settings.logdrain_axiom_dataset_name' => 'required|string',
+        'server.settings.logdrain_axiom_api_key' => 'required|string',
+    ];
+    protected $validationAttributes = [
+        'server.settings.is_logdrain_newrelic_enabled' => 'New Relic log drain',
+        'server.settings.logdrain_newrelic_license_key' => 'New Relic license key',
+        'server.settings.logdrain_newrelic_base_uri' => 'New Relic base URI',
+        'server.settings.is_logdrain_highlight_enabled' => 'Highlight log drain',
+        'server.settings.logdrain_highlight_project_id' => 'Highlight project ID',
+        'server.settings.is_logdrain_axiom_enabled' => 'Axiom log drain',
+        'server.settings.logdrain_axiom_dataset_name' => 'Axiom dataset name',
+        'server.settings.logdrain_axiom_api_key' => 'Axiom API key',
+    ];
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        try {
+            $server = Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user', 'proxy'])->whereUuid(request()->server_uuid)->first();
+            if (is_null($server)) {
+                return redirect()->route('server.all');
+            }
+            $this->server = $server;
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function configureLogDrain()
+    {
+        try {
+            if ($this->server->settings->is_logdrain_newrelic_enabled) {
+                $this->server->logDrain('newrelic');
+            } else if ($this->server->settings->is_logdrain_highlight_enabled) {
+                $this->server->logDrain('highlight');
+            } else if ($this->server->settings->is_logdrain_axiom_enabled) {
+                $this->server->logDrain('axiom');
+            } else {
+                $this->server->logDrain('none');
+                $this->emit('serverRefresh');
+                $this->emit('success', 'Log drain service stopped.');
+                return;
+            }
+            $this->emit('serverRefresh');
+            $this->emit('success', 'Log drain service started successfully.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function instantSave(string $type)
+    {
+        try {
+            $ok = $this->submit($type);
+            if (!$ok) {
+                return;
+            }
+            $this->configureLogDrain();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function submit(string $type)
+    {
+        try {
+            $this->resetErrorBag();
+            if ($type === 'newrelic') {
+                $this->validate([
+                    'server.settings.is_logdrain_newrelic_enabled' => 'required|boolean',
+                    'server.settings.logdrain_newrelic_license_key' => 'required|string',
+                    'server.settings.logdrain_newrelic_base_uri' => 'required|string',
+                ]);
+                $this->server->settings->update([
+                    'is_logdrain_highlight_enabled' => false,
+                    'is_logdrain_axiom_enabled' => false,
+                ]);
+            } else if ($type === 'highlight') {
+                $this->validate([
+                    'server.settings.is_logdrain_highlight_enabled' => 'required|boolean',
+                    'server.settings.logdrain_highlight_project_id' => 'required|string',
+                ]);
+                $this->server->settings->update([
+                    'is_logdrain_newrelic_enabled' => false,
+                    'is_logdrain_axiom_enabled' => false,
+                ]);
+            } else if ($type === 'axiom') {
+                $this->validate([
+                    'server.settings.is_logdrain_axiom_enabled' => 'required|boolean',
+                    'server.settings.logdrain_axiom_dataset_name' => 'required|string',
+                    'server.settings.logdrain_axiom_api_key' => 'required|string',
+                ]);
+                $this->server->settings->update([
+                    'is_logdrain_newrelic_enabled' => false,
+                    'is_logdrain_highlight_enabled' => false,
+                ]);
+            }
+            $this->server->settings->save();
+            $this->emit('success', 'Settings saved successfully.');
+            return true;
+        } catch (\Throwable $e) {
+            if ($type === 'newrelic') {
+                $this->server->settings->update([
+                    'is_logdrain_newrelic_enabled' => false,
+                ]);
+            } else if ($type === 'highlight') {
+                $this->server->settings->update([
+                    'is_logdrain_highlight_enabled' => false,
+                ]);
+            } else if ($type === 'axiom') {
+                $this->server->settings->update([
+                    'is_logdrain_axiom_enabled' => false,
+                ]);
+            }
+            handleError($e, $this);
+            return false;
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.log-drains');
+    }
+}

app/Http/Livewire/Team/Storage/Create.php

@@ -64,21 +64,10 @@ class Create extends Component
             }
             $this->storage->team_id = currentTeam()->id;
             $this->storage->testConnection();
-            $this->storage->is_usable = true;
             $this->storage->save();
             return redirect()->route('team.storages.show', $this->storage->uuid);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
-
-    private function test_s3_connection()
-    {
-        try {
-            $this->storage->testConnection();
-            return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
 }

app/Http/Livewire/Team/Storage/Form.php

@@ -32,7 +32,7 @@ class Form extends Component
     public function test_s3_connection()
     {
         try {
-            $this->storage->testConnection();
+            $this->storage->testConnection(shouldSave: true);
             return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -53,10 +53,7 @@ class Form extends Component
     {
         $this->validate();
         try {
-            $this->storage->testConnection();
-            $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
-            $this->storage->save();
-            $this->emit('success', 'Storage settings saved.');
+            $this->test_s3_connection();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Jobs/ApplicationDeploymentJob.php

@@ -33,6 +33,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ExecuteRemoteCommand;
 
+    public $timeout = 3600;
+
     public static int $batch_counter = 0;
 
     private int $application_deployment_queue_id;
@@ -73,6 +75,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private ?string $buildTarget = null;
     private $log_model;
     private Collection $saved_outputs;
+    private ?string $full_healthcheck_url = null;
 
     private string $serverUser = 'root';
     private string $serverUserHomeDir = '/root';
@@ -192,7 +195,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->customRepository = $this->application->git_repository;
         }
         try {
-            if ($this->restart_only) {
+            if ($this->restart_only && $this->application->build_pack !== 'dockerimage') {
                 $this->just_restart();
             } else if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
@@ -490,8 +493,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->execute_remote_command(
                 [
                     "echo 'Waiting for healthcheck to pass on the new version of your application.'"
-                ],
+                ]
             );
+            if ($this->full_healthcheck_url) {
+                $this->execute_remote_command(
+                    [
+                        "echo 'Healthcheck URL (inside the container): {$this->full_healthcheck_url}'"
+                    ]
+                );
+            }
             while ($counter < $this->application->health_check_retries) {
                 $this->execute_remote_command(
                     [
@@ -854,6 +864,16 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ]
         ];
+        if ($this->server->isDrainLogActivated()) {
+            $docker_compose['services'][$this->container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
         if ($this->application->isHealthcheckDisabled()) {
             data_forget($docker_compose, 'services.' . $this->container_name . '.healthcheck');
         }
@@ -951,10 +971,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $health_check_port = $this->application->health_check_port;
         }
         if ($this->application->health_check_path) {
+            $this->full_healthcheck_url = "{$this->application->health_check_method}: {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path}";
             $generated_healthchecks_commands = [
                 "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path} > /dev/null"
             ];
         } else {
+            $this->full_healthcheck_url = "{$this->application->health_check_method}: {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/";
             $generated_healthchecks_commands = [
                 "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/"
             ];
@@ -1000,6 +1022,10 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 listen  [::]:80;
                 server_name  localhost;
 
+                // real_ip_header    X-Forwarded-For;
+                // proxy_set_header        X-Real-IP       \$remote_addr;
+                // proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for;
+
                 location / {
                     root   /usr/share/nginx/html;
                     index  index.html;
@@ -1089,21 +1115,19 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
     private function start_by_compose_file()
     {
-        if (
-            !$this->application->dockerfile &&
-            (
-                $this->application->build_pack === 'dockerimage' ||
-                $this->application->build_pack === 'dockerfile')
-        ) {
+        if ($this->application->build_pack === 'dockerimage') {
             $this->execute_remote_command(
                 ["echo -n 'Pulling latest images from the registry.'"],
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir}"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
+                ["echo -n 'Starting application (could take a while).'"],
+                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
+            );
+        } else {
+            $this->execute_remote_command(
+                ["echo -n 'Starting application (could take a while).'"],
+                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
             );
         }
-        $this->execute_remote_command(
-            ["echo -n 'Starting application (could take a while).'"],
-            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
-        );
     }
 
     private function generate_build_env_variables()

app/Jobs/CleanupHelperContainersJob.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CleanupHelperContainersJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(public Server $server)
+    {
+    }
+
+    public function handle(): void
+    {
+        try {
+            ray('Cleaning up helper containers on ' . $this->server->name);
+            $containers = instant_remote_process(['docker container ps --filter "ancestor=ghcr.io/coollabsio/coolify-helper:next" --filter "ancestor=ghcr.io/coollabsio/coolify-helper:latest" --format \'{{json .}}\''], $this->server, false);
+            $containers = format_docker_command_output_to_json($containers);
+            if ($containers->count() > 0) {
+                foreach ($containers as $container) {
+                    $containerId = data_get($container,'ID');
+                    ray('Removing container ' . $containerId);
+                    instant_remote_process(['docker container rm -f ' . $containerId], $this->server, false);
+                }
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('CleanupHelperContainersJob failed with error: ' . $e->getMessage());
+            ray($e->getMessage());
+        }
+    }
+}

app/Jobs/ContainerStatusJob.php

@@ -8,8 +8,6 @@ use App\Models\ApplicationPreview;
 use App\Models\Server;
 use App\Notifications\Container\ContainerRestarted;
 use App\Notifications\Container\ContainerStopped;
-use App\Notifications\Server\Revived;
-use App\Notifications\Server\Unreachable;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -41,76 +39,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
     {
         // ray("checking server status for {$this->server->id}");
         try {
-            // ray()->clearAll();
-            $serverUptimeCheckNumber = $this->server->unreachable_count;
-            $serverUptimeCheckNumberMax = 3;
-
-            // ray('checking # ' . $serverUptimeCheckNumber);
-            if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
-                if ($this->server->unreachable_email_sent === false) {
-                    ray('Server unreachable, sending notification...');
-                    $this->server->team->notify(new Unreachable($this->server));
-                    $this->server->update(['unreachable_email_sent' => true]);
-                }
-                $this->server->settings()->update([
-                    'is_reachable' => false,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => 0,
-                ]);
-                // Update all applications, databases and services to exited
-                foreach ($this->server->applications() as $application) {
-                    $application->update(['status' => 'exited']);
-                }
-                foreach ($this->server->databases() as $database) {
-                    $database->update(['status' => 'exited']);
-                }
-                foreach ($this->server->services() as $service) {
-                    $apps = $service->applications()->get();
-                    $dbs = $service->databases()->get();
-                    foreach ($apps as $app) {
-                        $app->update(['status' => 'exited']);
-                    }
-                    foreach ($dbs as $db) {
-                        $db->update(['status' => 'exited']);
-                    }
-                }
-                return;
-            }
-            $result = $this->server->validateConnection();
-            if ($result) {
-                $this->server->settings()->update([
-                    'is_reachable' => true,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => 0,
-                ]);
-            } else {
-                $serverUptimeCheckNumber++;
-                $this->server->settings()->update([
-                    'is_reachable' => false,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => $serverUptimeCheckNumber,
-                ]);
-                return;
-            }
-
-            if (data_get($this->server, 'unreachable_email_sent') === true) {
-                ray('Server is reachable again, sending notification...');
-                $this->server->team->notify(new Revived($this->server));
-                $this->server->update(['unreachable_email_sent' => false]);
-            }
-            if (
-                data_get($this->server, 'settings.is_reachable') === false ||
-                data_get($this->server, 'settings.is_usable') === false
-            ) {
-                $this->server->settings()->update([
-                    'is_reachable' => true,
-                    'is_usable' => true
-                ]);
-            }
-            // $this->server->validateDockerEngine(true);
+            $this->server->checkServerRediness();
             $containers = instant_remote_process(["docker container ls -q"], $this->server);
             if (!$containers) {
                 return;

app/Jobs/DatabaseBackupJob.php

@@ -434,7 +434,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             // $region = $this->s3->region;
             $bucket = $this->s3->bucket;
             $endpoint = $this->s3->endpoint;
-            $this->s3->testConnection();
+            $this->s3->testConnection(shouldSave: true);
             if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
                 $network = $this->database->service->destination->network;
             } else {

app/Jobs/DockerCleanupJob.php

@@ -3,6 +3,7 @@
 namespace App\Jobs;
 
 use App\Models\Server;
+use App\Notifications\Server\HighDiskUsage;
 use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
@@ -18,45 +19,35 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $timeout = 300;
-    public ?string $dockerRootFilesystem = null;
     public ?int $usageBefore = null;
 
-    public function middleware(): array
-    {
-        return [(new WithoutOverlapping($this->server->uuid))];
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->server->uuid;
-    }
     public function __construct(public Server $server)
     {
     }
     public function handle(): void
     {
-        $isInprogress = false;
-        $this->server->applications()->each(function ($application) use (&$isInprogress) {
-            if ($application->isDeploymentInprogress()) {
-                $isInprogress = true;
-                return;
-            }
-        });
-        if ($isInprogress) {
-            throw new Exception('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping...');
-        }
         try {
+            $isInprogress = false;
+            $this->server->applications()->each(function ($application) use (&$isInprogress) {
+                if ($application->isDeploymentInprogress()) {
+                    $isInprogress = true;
+                    return;
+                }
+            });
+            if ($isInprogress) {
+                throw new Exception('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping...');
+            }
             if (!$this->server->isFunctional()) {
                 return;
             }
-            $this->dockerRootFilesystem = "/";
-            $this->usageBefore = $this->getFilesystemUsage();
+            $this->usageBefore = $this->server->getDiskUsage();
+            ray('Usage before: ' . $this->usageBefore);
             if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) {
                 ray('Cleaning up ' . $this->server->name);
-                instant_remote_process(['docker image prune -af'], $this->server);
-                instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $this->server);
-                instant_remote_process(['docker builder prune -af'], $this->server);
-                $usageAfter = $this->getFilesystemUsage();
+                instant_remote_process(['docker image prune -af'], $this->server, false);
+                instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $this->server, false);
+                instant_remote_process(['docker builder prune -af'], $this->server, false);
+                $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);
@@ -74,9 +65,4 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
             throw $e;
         }
     }
-
-    private function getFilesystemUsage()
-    {
-        return instant_remote_process(["df '{$this->dockerRootFilesystem}'| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $this->server, false);
-    }
 }

app/Jobs/ServerStatusJob.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Server;
+use App\Notifications\Server\HighDiskUsage;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public ?int $disk_usage = null;
+    public function __construct(public Server $server)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->server->id;
+    }
+
+    public function handle(): void
+    {
+        ray("checking server status for {$this->server->id}");
+        try {
+            $this->server->checkServerRediness();
+            $this->cleanup(notify: false);
+        } catch (\Throwable $e) {
+            send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            handleError($e);
+        }
+    }
+    public function cleanup(bool $notify = false): void
+    {
+        $this->disk_usage = $this->server->getDiskUsage();
+        if ($this->disk_usage >= $this->server->settings->cleanup_after_percentage) {
+            if ($notify) {
+                if ($this->server->high_disk_usage_notification_sent) {
+                    ray('high disk usage notification already sent');
+                    return;
+                } else {
+                    $this->server->high_disk_usage_notification_sent = true;
+                    $this->server->save();
+                    $this->server->team->notify(new HighDiskUsage($this->server, $this->disk_usage, $this->server->settings->cleanup_after_percentage));
+                }
+            } else {
+                DockerCleanupJob::dispatchSync($this->server);
+                $this->cleanup(notify: true);
+            }
+        } else {
+            $this->server->high_disk_usage_notification_sent = false;
+            $this->server->save();
+        }
+    }
+}

app/Models/S3Storage.php

@@ -36,14 +36,13 @@ class S3Storage extends BaseModel
         return "{$this->endpoint}/{$this->bucket}";
     }
 
-    public function testConnection()
+    public function testConnection(bool $shouldSave = false)
     {
         try {
             set_s3_target($this);
             Storage::disk('custom-s3')->files();
             $this->unusable_email_sent = false;
             $this->is_usable = true;
-            return;
         } catch (\Throwable $e) {
             $this->is_usable = false;
             if ($this->unusable_email_sent === false && is_transactional_emails_active()) {
@@ -65,7 +64,9 @@ class S3Storage extends BaseModel
 
             throw $e;
         } finally {
-            $this->save();
+            if ($shouldSave) {
+                $this->save();
+            }
         }
     }
 }

app/Models/Server.php

@@ -2,10 +2,15 @@
 
 namespace App\Models;
 
+use App\Actions\Server\InstallLogDrain;
+use App\Actions\Server\InstallNewRelic;
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
+use App\Notifications\Server\Revived;
+use App\Notifications\Server\Unreachable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Support\Sleep;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
 use Illuminate\Support\Str;
@@ -56,6 +61,8 @@ class Server extends BaseModel
 
     public $casts = [
         'proxy' => SchemalessAttributes::class,
+        'logdrain_axiom_api_key' => 'encrypted',
+        'logdrain_newrelic_license_key' => 'encrypted',
     ];
     protected $schemalessAttributes = [
         'proxy',
@@ -109,11 +116,88 @@ class Server extends BaseModel
         return $this->proxy->modelScope();
     }
 
+    public function isLocalhost()
+    {
+        return $this->ip === 'host.docker.internal' || $this->id === 0;
+    }
+    public function checkServerRediness()
+    {
+        $serverUptimeCheckNumber = $this->unreachable_count;
+        $serverUptimeCheckNumberMax = 5;
+
+        $currentTime = now()->timestamp;
+        $runtime5Minutes = 1 * 60;
+        // Run for 1 minutes max and check every 5 seconds
+        while ($currentTime + $runtime5Minutes > now()->timestamp) {
+            if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
+                if ($this->unreachable_notification_sent === false) {
+                    ray('Server unreachable, sending notification...');
+                    $this->team->notify(new Unreachable($this));
+                    $this->update(['unreachable_notification_sent' => true]);
+                }
+                $this->settings()->update([
+                    'is_reachable' => false,
+                ]);
+                $this->update([
+                    'unreachable_count' => 0,
+                ]);
+                foreach ($this->applications() as $application) {
+                    $application->update(['status' => 'exited']);
+                }
+                foreach ($this->databases() as $database) {
+                    $database->update(['status' => 'exited']);
+                }
+                foreach ($this->services() as $service) {
+                    $apps = $service->applications()->get();
+                    $dbs = $service->databases()->get();
+                    foreach ($apps as $app) {
+                        $app->update(['status' => 'exited']);
+                    }
+                    foreach ($dbs as $db) {
+                        $db->update(['status' => 'exited']);
+                    }
+                }
+                throw new \Exception('Server is not reachable.');
+            }
+            $result = $this->validateConnection();
+            ray('validateConnection: ' . $result);
+            if (!$result) {
+                $serverUptimeCheckNumber++;
+                $this->update([
+                    'unreachable_count' => $serverUptimeCheckNumber,
+                ]);
+                Sleep::for(5)->seconds();
+                return;
+            }
+            $this->update([
+                'unreachable_count' => 0,
+            ]);
+            if (data_get($this, 'unreachable_notification_sent') === true) {
+                ray('Server is reachable again, sending notification...');
+                $this->team->notify(new Revived($this));
+                $this->update(['unreachable_notification_sent' => false]);
+            }
+            if (
+                data_get($this, 'settings.is_reachable') === false ||
+                data_get($this, 'settings.is_usable') === false
+            ) {
+                $this->settings()->update([
+                    'is_reachable' => true,
+                    'is_usable' => true
+                ]);
+            }
+            break;
+        }
+    }
+    public function getDiskUsage()
+    {
+        return instant_remote_process(["df /| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $this, false);
+    }
     public function hasDefinedResources()
     {
-        $applications = $this->applications()->count() === 0;
-        $databases = $this->databases()->count() === 0;
-        $services = $this->services()->count() === 0;
+        $applications = $this->applications()->count() > 0;
+        $databases = $this->databases()->count() > 0;
+        $services = $this->services()->count() > 0;
         if ($applications || $databases || $services) {
             return true;
         }
@@ -148,7 +232,7 @@ class Server extends BaseModel
                 if (isDev()) {
                     return '127.0.0.1';
                 }
-                if ($this->ip === 'host.docker.internal') {
+                if ($this->isLocalhost()) {
                     return base_ip();
                 }
                 return $this->ip;
@@ -216,10 +300,17 @@ class Server extends BaseModel
         // }
         return true;
     }
+    public function logDrain($type)
+    {
+        InstallLogDrain::run($this, $type);
+    }
     public function isFunctional()
     {
         return $this->settings->is_reachable && $this->settings->is_usable;
     }
+    public function isDrainLogActivated() {
+        return $this->settings->is_logdrain_newrelic_enabled || $this->settings->is_logdrain_highlight_enabled || $this->settings->is_logdrain_axiom_enabled;
+    }
     public function validateConnection()
     {
         $uptime = instant_remote_process(['uptime'], $this, false);

app/Models/Service.php

@@ -797,6 +797,16 @@ class Service extends BaseModel
                         $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($this->uuid, $fqdns, true));
                     }
                 }
+                if ($this->server->isDrainLogActivated()) {
+                    data_set($service, 'logging', [
+                        'driver' => 'fluentd',
+                        'options' => [
+                            'fluentd-address' => "tcp://127.0.0.1:24224",
+                            'fluentd-async' => "true",
+                            'fluentd-sub-second-precision' => "true",
+                        ]
+                    ]);
+                }
                 data_set($service, 'labels', $serviceLabels->toArray());
                 data_forget($service, 'is_database');
                 data_set($service, 'restart', RESTART_MODE);

app/Models/ServiceDatabase.php

@@ -36,7 +36,7 @@ class ServiceDatabase extends BaseModel
     {
         $port = $this->public_port;
         $realIp = $this->service->server->ip;
-        if ($realIp === 'host.docker.internal' || isDev()) {
+        if ($this->service->server->isLocalhost() || isDev()) {
             $realIp = base_ip();
         }
         $url = "{$realIp}:{$port}";

app/Notifications/Server/HighDiskUsage.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Notifications\Server;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use App\Notifications\Channels\DiscordChannel;
+use App\Notifications\Channels\EmailChannel;
+use App\Notifications\Channels\TelegramChannel;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class HighDiskUsage extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $tries = 1;
+    public function __construct(public Server $server, public int $disk_usage, public int $cleanup_after_percentage)
+    {
+    }
+
+    public function via(object $notifiable): array
+    {
+        $channels = [];
+        $isEmailEnabled = isEmailEnabled($notifiable);
+        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
+        $isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
+
+        if ($isDiscordEnabled) {
+            $channels[] = DiscordChannel::class;
+        }
+        if ($isEmailEnabled) {
+            $channels[] = EmailChannel::class;
+        }
+        if ($isTelegramEnabled) {
+            $channels[] = TelegramChannel::class;
+        }
+        return $channels;
+    }
+
+    public function toMail(): MailMessage
+    {
+        $mail = new MailMessage();
+        $mail->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}' high disk usage detected!\nDisk usage: {$this->disk_usage}%. Threshold: {$this->cleanup_after_percentage}%.\nPlease cleanup your disk to prevent data-loss.\nHere are some tips: https://coolify.io/docs/automated-cleanup.";
+        return $message;
+    }
+    public function toTelegram(): array
+    {
+        return [
+            "message" => "Coolify: Server '{$this->server->name}' high disk usage detected!\nDisk usage: {$this->disk_usage}%. Threshold: {$this->cleanup_after_percentage}%.\nPlease cleanup your disk to prevent data-loss.\nHere are some tips: https://coolify.io/docs/automated-cleanup."
+        ];
+    }
+}

app/Notifications/Server/Revived.php

@@ -18,7 +18,7 @@ class Revived extends Notification implements ShouldQueue
     public $tries = 1;
     public function __construct(public Server $server)
     {
-        if ($this->server->unreachable_email_sent === false) {
+        if ($this->server->unreachable_notification_sent === false) {
             return;
         }
     }

bootstrap/helpers/docker.php

@@ -10,7 +10,6 @@ use Visus\Cuid2\Cuid2;
 
 function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null): Collection
 {
-    ray($id, $pullRequestId);
     $containers = collect([]);
     $containers = instant_remote_process(["docker ps -a --filter='label=coolify.applicationId={$id}' --format '{{json .}}' "], $server);
     $containers = format_docker_command_output_to_json($containers);
@@ -26,7 +25,6 @@ function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pul
         return null;
     });
     $containers = $containers->filter();
-    ray($containers);
     return $containers;
 }
 

bootstrap/helpers/remoteProcess.php

@@ -191,7 +191,7 @@ function refresh_server_connection(?PrivateKey $private_key = null)
 //         if (!$uptime) {
 //             $server->settings->is_reachable = false;
 //             $server->team->notify(new Unreachable($server));
-//             $server->unreachable_email_sent = true;
+//             $server->unreachable_notification_sent = true;
 //             $server->save();
 //             return [
 //                 "uptime" => null,
@@ -213,9 +213,9 @@ function refresh_server_connection(?PrivateKey $private_key = null)
 //             $server->settings->is_usable = false;
 //         } else {
 //             $server->settings->is_usable = true;
-//             if (data_get($server, 'unreachable_email_sent') === true) {
+//             if (data_get($server, 'unreachable_notification_sent') === true) {
 //                 $server->team->notify(new Revived($server));
-//                 $server->unreachable_email_sent = false;
+//                 $server->unreachable_notification_sent = false;
 //                 $server->save();
 //             }
 //         }

bootstrap/helpers/shared.php

@@ -511,7 +511,7 @@ function generateDeployWebhook($resource)
     return $url;
 }
 function generateGitManualWebhook($resource, $type) {
-    if ($resource->source_id !== 0) {
+    if ($resource->source_id !== 0 && !is_null($resource->source_id)) {
         return null;
     }
     if ($resource->getMorphClass() === 'App\Models\Application') {

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // 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.132',
+    'release' => '4.0.0-beta.139',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.132';
+return '4.0.0-beta.139';

database/migrations/2023_11_16_101819_add_high_disk_usage_notification.php

@@ -0,0 +1,30 @@
+<?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('servers', function (Blueprint $table) {
+            $table->boolean('high_disk_usage_notification_sent')->default(false);
+            $table->renameColumn('unreachable_email_sent', 'unreachable_notification_sent');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropColumn('high_disk_usage_notification_sent');
+            $table->renameColumn('unreachable_notification_sent', 'unreachable_email_sent');
+        });
+    }
+};

database/migrations/2023_11_16_220647_add_log_drains.php

@@ -0,0 +1,47 @@
+<?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->boolean('is_logdrain_newrelic_enabled')->default(false);
+            $table->string('logdrain_newrelic_license_key')->nullable();
+            $table->string('logdrain_newrelic_base_uri')->nullable();
+
+            $table->boolean('is_logdrain_highlight_enabled')->default(false);
+            $table->string('logdrain_highlight_project_id')->nullable();
+
+            $table->boolean('is_logdrain_axiom_enabled')->default(false);
+            $table->string('logdrain_axiom_dataset_name')->nullable();
+            $table->string('logdrain_axiom_api_key')->nullable();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->dropColumn('is_logdrain_newrelic_enabled');
+            $table->dropColumn('logdrain_newrelic_license_key');
+            $table->dropColumn('logdrain_newrelic_base_uri');
+
+            $table->dropColumn('is_logdrain_highlight_enabled');
+            $table->dropColumn('logdrain_highlight_project_id');
+
+            $table->dropColumn('is_logdrain_axiom_enabled');
+            $table->dropColumn('logdrain_axiom_dataset_name');
+            $table->dropColumn('logdrain_axiom_api_key');
+        });
+    }
+};

resources/views/components/server/navbar.blade.php

@@ -32,6 +32,12 @@
             ]) }}">
             <button>Destinations</button>
         </a>
+        <a class="{{ request()->routeIs('server.log-drains') ? 'text-white' : '' }}"
+            href="{{ route('server.log-drains', [
+                'server_uuid' => data_get($parameters, 'server_uuid'),
+            ]) }}">
+            <button>Log Drains</button>
+        </a>
         <div class="flex-1"></div>
         <livewire:server.proxy.deploy :server="$server" />
     </nav>

resources/views/emails/high-disk-usage.blade.php

@@ -0,0 +1,9 @@
+<x-emails.layout>
+
+Your server ({{ $name }}) has high disk usage ({{ $disk_usage }}% used). Threshold is {{ $threshold }}%.
+
+Please cleanup your disk to prevent data-loss. Here are some [tips](https://coolify.io/docs/automated-cleanup).
+
+(You can change the threshold in the Server Settings menu.)
+
+</x-emails.layout>

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

@@ -49,11 +49,13 @@
                     <x-forms.input type="number" id="server.port" label="Port" required />
                 </div>
             </div>
-            <div class="w-64">
-                <x-forms.checkbox instantSave
-                    helper="If you are using Cloudflare Tunnels, enable this. It will proxy all ssh requests to your server through Cloudflare.<span class='text-warning'>Coolify does not install/setup Cloudflare (cloudflared) on your server.</span>"
-                    id="server.settings.is_cloudflare_tunnel" label="Cloudflare Tunnel" />
-            </div>
+            @if (!$server->isLocalhost())
+                <div class="w-64">
+                    <x-forms.checkbox instantSave
+                        helper="If you are using Cloudflare Tunnels, enable this. It will proxy all ssh requests to your server through Cloudflare.<span class='text-warning'>Coolify does not install/setup Cloudflare (cloudflared) on your server.</span>"
+                        id="server.settings.is_cloudflare_tunnel" label="Cloudflare Tunnel" />
+                </div>
+            @endif
         </div>
 
         @if ($server->isFunctional())

resources/views/livewire/server/log-drains.blade.php

@@ -0,0 +1,66 @@
+<div>
+    <x-server.navbar :server="$server" :parameters="$parameters" />
+    <h2>Log Drains</h2>
+    <div class="pb-4">Sends resource logs to external services.</div>
+    <div class="flex flex-col gap-4 pt-4">
+        <div class="p-4 border border-coolgray-500">
+            <form wire:submit.prevent='submit("newrelic")' class="flex flex-col">
+                <h3>New Relic</h3>
+                <div class="w-32">
+                    <x-forms.checkbox instantSave='instantSave("newrelic")'
+                        id="server.settings.is_logdrain_newrelic_enabled" label="Enabled" />
+                </div>
+                <div class="flex flex-col gap-4">
+                    <div class="flex flex-col w-full gap-2 xl:flex-row">
+                        <x-forms.input type="password" required id="server.settings.logdrain_newrelic_license_key"
+                            label="License Key" />
+                        <x-forms.input required id="server.settings.logdrain_newrelic_base_uri"
+                            placeholder="https://log-api.eu.newrelic.com/log/v1" label="Endpoint (EU / US)" />
+                    </div>
+                </div>
+                <div class="flex justify-end gap-4 pt-6">
+                    <x-forms.button type="submit">
+                        Save
+                    </x-forms.button>
+                </div>
+            </form>
+            {{-- <h3>Highlight.io</h3>
+            <div class="w-32">
+                <x-forms.checkbox instantSave='instantSave("highlight")'
+                    id="server.settings.is_logdrain_highlight_enabled" label="Enabled" />
+            </div>
+            <form wire:submit.prevent='submit("highlight")' class="flex flex-col">
+                <div class="flex flex-col gap-4">
+                    <div class="flex flex-col w-full gap-2 xl:flex-row">
+                        <x-forms.input type="password" required id="server.settings.logdrain_highlight_project_id"
+                            label="Project Id" />
+                    </div>
+                </div>
+                <div class="flex justify-end gap-4 pt-6">
+                    <x-forms.button type="submit">
+                        Save
+                    </x-forms.button>
+                </div>
+            </form> --}}
+            <h3>Axiom</h3>
+            <div class="w-32">
+                <x-forms.checkbox instantSave='instantSave("axiom")' id="server.settings.is_logdrain_axiom_enabled"
+                    label="Enabled" />
+            </div>
+            <form wire:submit.prevent='submit("axiom")' class="flex flex-col">
+                <div class="flex flex-col gap-4">
+                    <div class="flex flex-col w-full gap-2 xl:flex-row">
+                        <x-forms.input type="password" required id="server.settings.logdrain_axiom_api_key"
+                            label="API Key" />
+                        <x-forms.input required id="server.settings.logdrain_axiom_dataset_name" label="Dataset Name" />
+                    </div>
+                </div>
+                <div class="flex justify-end gap-4 pt-6">
+                    <x-forms.button type="submit">
+                        Save
+                    </x-forms.button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>

resources/views/livewire/team/storage/create.blade.php

@@ -1,6 +1,6 @@
 <div>
     <h1>Create a new S3 Storage</h1>
-    <div class="subtitle ">S3 Storage used to save backups / files</div>
+    <div class="subtitle">S3 Storage used to save backups / files</div>
     <form class="flex flex-col gap-2" wire:submit.prevent='submit'>
         <div class="flex gap-2">
             <x-forms.input label="Name" id="name" />

routes/web.php

@@ -16,6 +16,7 @@ use App\Http\Livewire\Security\ApiTokens;
 use App\Http\Livewire\Server\All;
 use App\Http\Livewire\Server\Create;
 use App\Http\Livewire\Server\Destination\Show as DestinationShow;
+use App\Http\Livewire\Server\LogDrains;
 use App\Http\Livewire\Server\PrivateKey\Show as PrivateKeyShow;
 use App\Http\Livewire\Server\Proxy\Show as ProxyShow;
 use App\Http\Livewire\Server\Proxy\Logs as ProxyLogs;
@@ -130,6 +131,7 @@ Route::middleware(['auth'])->group(function () {
     Route::get('/server/{server_uuid}/proxy/logs', ProxyLogs::class)->name('server.proxy.logs');
     Route::get('/server/{server_uuid}/private-key', PrivateKeyShow::class)->name('server.private-key');
     Route::get('/server/{server_uuid}/destinations', DestinationShow::class)->name('server.destinations');
+    Route::get('/server/{server_uuid}/log-drains', LogDrains::class)->name('server.log-drains');
 });
 
 

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.132"
+            "version": "4.0.0-beta.139"
         }
     }
 }