Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: remove sentinel variable

Browse Source 
fix: metrics are disabled by default
This commit is contained in:
Andras Bacsai 2024-06-18 13:01:23 +02:00
parent 768c917a0e
commit 83983bbb32
5 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Kernel.php
View File

@ -61,7 +61,7 @@ private function pull_images($schedule)
{
$servers = $this->all_servers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
foreach ($servers as $server) {
if (config('coolify.is_sentinel_enabled')) {
if ($server->is_metrics_enabled) {
$schedule->job(new PullSentinelImageJob($server))->everyFiveMinutes()->onOneServer();
}
$schedule->job(new PullHelperImageJob($server))->everyFiveMinutes()->onOneServer();

1
app/Jobs/PullSentinelImageJob.php
View File

@ -50,7 +50,6 @@ public function handle(): void
}
if (version_compare($local_version, $version, '<')) {
StartSentinel::run($this->server, $version, true);
return;
}
ray('Sentinel image is up to date');

8
app/Jobs/ServerStatusJob.php
View File

@ -41,19 +41,19 @@ public function uniqueId(): int
public function handle()
{
if (! $this->server->isServerReady($this->tries)) {
if (!$this->server->isServerReady($this->tries)) {
throw new \RuntimeException('Server is not ready.');
}
try {
if ($this->server->isFunctional()) {
$this->cleanup(notify: false);
$this->remove_unnecessary_coolify_yaml();
if (config('coolify.is_sentinel_enabled')) {
if ($this->server->is_metrics_enabled) {
$this->server->checkSentinel();
}
}
} catch (\Throwable $e) {
send_internal_notification('ServerStatusJob failed with: '.$e->getMessage());
send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
ray($e->getMessage());
return handleError($e);
@ -103,7 +103,7 @@ private function remove_unnecessary_coolify_yaml()
{
// This will remote the coolify.yaml file from the server as it is not needed on cloud servers
if (isCloud() && $this->server->id !== 0) {
$file = $this->server->proxyPath().'/dynamic/coolify.yaml';
$file = $this->server->proxyPath() . '/dynamic/coolify.yaml';
return instant_remote_process([
"rm -f $file",

1
config/coolify.php
View File

@ -14,5 +14,4 @@
'helper_image' => env('HELPER_IMAGE', 'ghcr.io/coollabsio/coolify-helper:latest'),
'is_horizon_enabled' => env('HORIZON_ENABLED', true),
'is_scheduler_enabled' => env('SCHEDULER_ENABLED', true),
'is_sentinel_enabled' => env('SENTINEL_ENABLED', false),
];

31
database/migrations/2024_06_18_105947_disable_server_metrics_by_default.php Normal file
View File

@ -0,0 +1,31 @@
<?php
use App\Models\Server;
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('is_metrics_enabled')->default(false)->change();
});
Server::where('is_metrics_enabled', true)->update(['is_metrics_enabled' => false]);
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->boolean('is_metrics_enabled')->default(true)->change();
});
Server::where('is_metrics_enabled', false)->update(['is_metrics_enabled' => true]);
}
};