dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: disable sentinel for now

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-24 11:10:02 +02:00
parent f9bf2e3eaf
commit 70aa61c59e
3 changed files with 62 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap/helpers/shared.php
View File

@@ -362,6 +362,10 @@ function isCloud(): bool
return ! config('coolify.self_hosted'); return ! config('coolify.self_hosted');
} }
function isExperimentalEnabled(): bool
{
return false;
}
function translate_cron_expression($expression_to_validate): string function translate_cron_expression($expression_to_validate): string
{ {
if (isset(VALID_CRON_STRINGS[$expression_to_validate])) { if (isset(VALID_CRON_STRINGS[$expression_to_validate])) {

104
resources/views/livewire/server/form.blade.php
View File

@@ -159,59 +159,67 @@
</div> </div>
</div> </div>
@if (!$server->isSwarm() && !$server->isBuildServer()) @if (!$server->isSwarm() && !$server->isBuildServer())
<div class="flex gap-2 items-center pt-4 pb-2"> @if (isExperimentalEnabled())
<h3>Sentinel</h3> <div class="flex gap-2 items-center pt-4 pb-2">
@if ($server->isSentinelEnabled()) <h3>Sentinel</h3>
<div class="flex gap-2 items-center"
wire:poll.{{ $server->settings->sentinel_push_interval_seconds }}s="checkSyncStatus">
@if ($server->isSentinelLive())
<x-status.running status="In sync" noLoading title="{{ $server->sentinel_updated_at }}" />
<x-forms.button wire:click='restartSentinel'>Restart</x-forms.button>
@else
<x-status.stopped status="Out of sync" noLoading
title="{{ $server->sentinel_updated_at }}" />
<x-forms.button wire:click='restartSentinel'>Sync</x-forms.button>
@endif
</div>
@endif
</div>
<div class="flex flex-col gap-2">
<div class="w-64">
<x-forms.checkbox wire:model.live="server.settings.is_sentinel_enabled" label="Enable Sentinel" />
@if ($server->isSentinelEnabled()) @if ($server->isSentinelEnabled())
<x-forms.checkbox instantSave id="server.settings.is_metrics_enabled" <div class="flex gap-2 items-center"
label="Enable Metrics" /> wire:poll.{{ $server->settings->sentinel_push_interval_seconds }}s="checkSyncStatus">
@else @if ($server->isSentinelLive())
<x-forms.checkbox instantSave disabled id="server.settings.is_metrics_enabled" <x-status.running status="In sync" noLoading
label="Enable Metrics" /> title="{{ $server->sentinel_updated_at }}" />
<x-forms.button wire:click='restartSentinel'>Restart</x-forms.button>
@else
<x-status.stopped status="Out of sync" noLoading
title="{{ $server->sentinel_updated_at }}" />
<x-forms.button wire:click='restartSentinel'>Sync</x-forms.button>
@endif
</div>
@endif @endif
</div> </div>
@if ($server->isSentinelEnabled()) @else
<div class="flex flex-wrap gap-2 sm:flex-nowrap items-end"> <h3>Sentinel</h3>
<x-forms.input type="password" id="server.settings.sentinel_token" label="Sentinel token" <div>Sentinel is not available in this version (soon).</div>
required helper="Token for Sentinel." /> @endif
<x-forms.button wire:click="regenerateSentinelToken">Regenerate</x-forms.button> @if (isExperimentalEnabled())
<div class="flex flex-col gap-2">
<div class="w-64">
<x-forms.checkbox wire:model.live="server.settings.is_sentinel_enabled"
label="Enable Sentinel" />
@if ($server->isSentinelEnabled())
<x-forms.checkbox instantSave id="server.settings.is_metrics_enabled"
label="Enable Metrics" />
@else
<x-forms.checkbox instantSave disabled id="server.settings.is_metrics_enabled"
label="Enable Metrics" />
@endif
</div> </div>
@if ($server->isSentinelEnabled())
<x-forms.input id="server.settings.sentinel_custom_url" required label="Coolify URL" <div class="flex flex-wrap gap-2 sm:flex-nowrap items-end">
helper="URL to your Coolify instance. If it is empty that means you do not have a FQDN set for your Coolify instance." /> <x-forms.input type="password" id="server.settings.sentinel_token" label="Sentinel token"
required helper="Token for Sentinel." />
<div class="flex flex-col gap-2"> <x-forms.button wire:click="regenerateSentinelToken">Regenerate</x-forms.button>
<div class="flex flex-wrap gap-2 sm:flex-nowrap">
<x-forms.input id="server.settings.sentinel_metrics_refresh_rate_seconds"
label="Metrics rate (seconds)" required
helper="The interval for gathering metrics. Lower means more disk space will be used." />
<x-forms.input id="server.settings.sentinel_metrics_history_days"
label="Metrics history (days)" required
helper="How many days should the metrics data should be reserved." />
<x-forms.input id="server.settings.sentinel_push_interval_seconds"
label="Push interval (seconds)" required
helper="How many seconds should the metrics data should be pushed to the collector." />
</div> </div>
</div>
@endif
</div>
@endif
<x-forms.input id="server.settings.sentinel_custom_url" required label="Coolify URL"
helper="URL to your Coolify instance. If it is empty that means you do not have a FQDN set for your Coolify instance." />
<div class="flex flex-col gap-2">
<div class="flex flex-wrap gap-2 sm:flex-nowrap">
<x-forms.input id="server.settings.sentinel_metrics_refresh_rate_seconds"
label="Metrics rate (seconds)" required
helper="The interval for gathering metrics. Lower means more disk space will be used." />
<x-forms.input id="server.settings.sentinel_metrics_history_days"
label="Metrics history (days)" required
helper="How many days should the metrics data should be reserved." />
<x-forms.input id="server.settings.sentinel_push_interval_seconds"
label="Push interval (seconds)" required
helper="How many seconds should the metrics data should be pushed to the collector." />
</div>
</div>
@endif
</div>
@endif
@endif
</form> </form>
</div> </div>

4
resources/views/livewire/server/show.blade.php
View File

@@ -28,8 +28,8 @@
<a class="menu-item" :class="activeTab === 'log-drains' && 'menu-item-active'" <a class="menu-item" :class="activeTab === 'log-drains' && 'menu-item-active'"
@click.prevent="activeTab = 'log-drains'; window.location.hash = 'log-drains'" href="#">Log @click.prevent="activeTab = 'log-drains'; window.location.hash = 'log-drains'" href="#">Log
Drains</a> Drains</a>
<a class="menu-item" :class="activeTab === 'metrics' && 'menu-item-active'" {{-- <a class="menu-item" :class="activeTab === 'metrics' && 'menu-item-active'"
@click.prevent="activeTab = 'metrics'; window.location.hash = 'metrics'" href="#">Metrics</a> @click.prevent="activeTab = 'metrics'; window.location.hash = 'metrics'" href="#">Metrics</a> --}}
@endif @endif
@if (!$server->isLocalhost()) @if (!$server->isLocalhost())
<a class="menu-item" :class="activeTab === 'danger' && 'menu-item-active'" <a class="menu-item" :class="activeTab === 'danger' && 'menu-item-active'"