From b08d38f3397851d7e9fb450014ac64f2a40b0e9d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 12 Jul 2024 14:54:54 +0200
Subject: [PATCH 1/2] refactor: Update version numbers to 4.0.0-beta.312

---
 config/sentry.php  | 2 +-
 config/version.php | 2 +-
 versions.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index f08d73156..09cd71fc3 100644
--- a/config/sentry.php
+++ b/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.311',
+    'release' => '4.0.0-beta.312',
     // 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 7f08a2b47..db7527f17 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.311';
+return '4.0.0-beta.312';
diff --git a/versions.json b/versions.json
index ca1c6fb50..4cc8314de 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.311"
+            "version": "4.0.0-beta.312"
         }
     }
 }

From a85066c644830587fa93da7e5d4d8aa756aeb8b0 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 12 Jul 2024 15:05:12 +0200
Subject: [PATCH 2/2] fix: disable sentinel until a few bugs are fixed

---
 app/Console/Commands/Init.php                  | 11 +++++++++++
 resources/views/livewire/server/form.blade.php | 14 ++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php
index 7949b2457..4a276cfc4 100644
--- a/app/Console/Commands/Init.php
+++ b/app/Console/Commands/Init.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Actions\Server\StopSentinel;
 use App\Enums\ApplicationDeploymentStatus;
 use App\Jobs\CleanupHelperContainersJob;
 use App\Models\ApplicationDeploymentQueue;
@@ -23,6 +24,16 @@ class Init extends Command
     {
         $this->alive();
         get_public_ips();
+        if (version_compare('4.0.0-beta.312', config('version'), '<=')) {
+            $servers = Server::all();
+            foreach ($servers as $server) {
+                $server->settings->update(['is_metrics_enabled' => false]);
+                if ($server->isFunctional()) {
+                    StopSentinel::dispatch($server);
+                }
+            }
+        }
+
         $full_cleanup = $this->option('full-cleanup');
         $cleanup_deployments = $this->option('cleanup-deployments');
 
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index d8144e931..5cba620dd 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -146,15 +146,13 @@
             </div>
             <div class="flex items-center gap-2 pt-4 pb-2">
                 <h3>Sentinel</h3>
-                @if ($server->isSentinelEnabled())
-                    <x-forms.button wire:click='restartSentinel'>Restart</x-forms.button>
-                @endif
+                {{-- @if ($server->isSentinelEnabled()) --}}
+                {{-- <x-forms.button wire:click='restartSentinel'>Restart</x-forms.button> --}}
+                {{-- @endif --}}
             </div>
-            <div class="w-64">
+            <div>Metrics are disabled until a few bugs are fixed.</div>
+            {{-- <div class="w-64">
                 <x-forms.checkbox instantSave id="server.settings.is_metrics_enabled" label="Enable Metrics" />
-                {{-- <x-forms.checkbox instantSave id="server.settings.is_server_api_enabled" label="Enable Server API"
-                    helper="You need to open port 12172 on your firewall. This API will be used to gather data from your server, which makes Coolify a lot faster than relying on SSH connections." />
-                <x-forms.button wire:click='checkPortForServerApi'>Check Port for Server API</x-forms.button> --}}
             </div>
             <div class="pt-4">
                 <div class="flex flex-wrap gap-2 sm:flex-nowrap">
@@ -166,7 +164,7 @@
                     <x-forms.input id="server.settings.metrics_history_days" label="Metrics history (days)" required
                         helper="How many days should the metrics data should be reserved." />
                 </div>
-            </div>
+            </div>  --}}
         @endif
     </form>
 </div>