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

fix: docker cleanup email notifications

Browse Source
This commit is contained in:
Andras Bacsai
2024-12-11 10:50:10 +01:00
parent 1257ab6ff4
commit 6a7b283844
5 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Notifications/Server/DockerCleanupFailed.php
View File

@@ -25,8 +25,8 @@ class DockerCleanupFailed extends CustomEmailNotification
$mail = new MailMessage; $mail = new MailMessage;
$mail->subject("Coolify: [ACTION REQUIRED] Docker cleanup job failed on {$this->server->name}"); $mail->subject("Coolify: [ACTION REQUIRED] Docker cleanup job failed on {$this->server->name}");
$mail->view('emails.docker-cleanup-failed', [ $mail->view('emails.docker-cleanup-failed', [
'serverName' => $this->server->name, 'name' => $this->server->name,
'message' => $this->message, 'text' => $this->message,
]); ]);
return $mail; return $mail;

5
app/Notifications/Server/DockerCleanupSuccess.php
View File

@@ -25,14 +25,13 @@ class DockerCleanupSuccess extends CustomEmailNotification
$mail = new MailMessage; $mail = new MailMessage;
$mail->subject("Coolify: Docker cleanup job succeeded on {$this->server->name}"); $mail->subject("Coolify: Docker cleanup job succeeded on {$this->server->name}");
$mail->view('emails.docker-cleanup-success', [ $mail->view('emails.docker-cleanup-success', [
'serverName' => $this->server->name, 'name' => $this->server->name,
'message' => $this->message, 'text' => $this->message,
]); ]);
return $mail; return $mail;
} }
public function toDiscord(): DiscordMessage public function toDiscord(): DiscordMessage
{ {
return new DiscordMessage( return new DiscordMessage(

4
resources/views/emails/docker-cleanup-failed.blade.php
View File

@@ -1,8 +1,8 @@
<x-emails.layout> <x-emails.layout>
Docker Cleanup on {{ $serverName }} FAILED with the following error: Docker Cleanup on {{ $name }} FAILED with the following error:
<pre> <pre>
{{ $message }} {{ $text }}
</pre> </pre>
</x-emails.layout> </x-emails.layout>

5
resources/views/emails/docker-cleanup-success.blade.php
View File

@@ -1,8 +1,9 @@
<x-emails.layout> <x-emails.layout>
Docker Cleanup on "{{ $serverName }}" succeeded with the following message: Docker Cleanup on {{ $name }} succeeded with the following message:
<pre> <pre>
"{{ $message }}" {{ $text }}
</pre> </pre>
</x-emails.layout> </x-emails.layout>

14
resources/views/livewire/notifications/email.blade.php
View File

@@ -142,14 +142,12 @@
<div class="border dark:border-coolgray-300 p-4 rounded-lg"> <div class="border dark:border-coolgray-300 p-4 rounded-lg">
<h3 class="font-medium mb-3">Server</h3> <h3 class="font-medium mb-3">Server</h3>
<div class="flex flex-col gap-1.5 pl-1"> <div class="flex flex-col gap-1.5 pl-1">
<x-forms.checkbox instantSave="saveModel" <x-forms.checkbox instantSave="saveModel" id="dockerCleanupSuccessEmailNotifications"
helper="Send an email when Docker Cleanup is run on a server." label="Docker Cleanup Success" />
id="dockerCleanupSuccessEmailNotifications" label="Docker Cleanup Success" /> <x-forms.checkbox instantSave="saveModel" id="dockerCleanupFailureEmailNotifications"
<x-forms.checkbox instantSave="saveModel" label="Docker Cleanup Failure" />
helper="Send an email when Docker Cleanup fails on a server." <x-forms.checkbox instantSave="saveModel" id="serverDiskUsageEmailNotifications"
id="dockerCleanupFailureEmailNotifications" label="Docker Cleanup Failure" /> label="Server Disk Usage" />
<x-forms.checkbox instantSave="saveModel" helper="Send an email when server disk usage is high."
id="serverDiskUsageEmailNotifications" label="Server Disk Usage" />
<x-forms.checkbox instantSave="saveModel" id="serverReachableEmailNotifications" <x-forms.checkbox instantSave="saveModel" id="serverReachableEmailNotifications"
label="Server Reachable" /> label="Server Reachable" />
<x-forms.checkbox instantSave="saveModel" id="serverUnreachableEmailNotifications" <x-forms.checkbox instantSave="saveModel" id="serverUnreachableEmailNotifications"