Implement phase 2 monitor check logging ingestion

rathorevaibhav · rathorevaibhav · commit 92ec41624c85 · 2026-02-14T15:41:51.000+05:30
diff --git a/app/Console/Commands/CheckDomainExpiration.php b/app/Console/Commands/CheckDomainExpiration.php
@@ -30,9 +30,9 @@ public function handle(DomainService $domainService): void
         $hasNotifications = false;
 
         foreach ($monitors as $monitor) {
-            $notificationMessageConfirmation = $domainService->verifyDomainExpiration($monitor);
+            $result = $domainService->verifyDomainExpiration($monitor);
 
-            if ($notificationMessageConfirmation) {
+            if ($result['notified']) {
                 $hasNotifications = true;
             }
         }
diff --git a/app/Listeners/LogCertificateCheckFailed.php b/app/Listeners/LogCertificateCheckFailed.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Services\MonitorCheckLogService;
+use Carbon\Carbon;
+use Spatie\UptimeMonitor\Events\CertificateCheckFailed;
+
+class LogCertificateCheckFailed
+{
+    public function __construct(protected MonitorCheckLogService $monitorCheckLogService)
+    {
+    }
+
+    public function handle(CertificateCheckFailed $event): void
+    {
+        $monitor = $event->monitor;
+        if (! $monitor->certificate_check_enabled) {
+            return;
+        }
+
+        $this->monitorCheckLogService->logCheck(
+            monitor: $monitor,
+            checkType: MonitorCheckLogService::CHECK_TYPE_CERTIFICATE,
+            status: MonitorCheckLogService::STATUS_FAILED,
+            checkedAt: Carbon::now()->utc(),
+            message: 'Certificate check failed.',
+            failureReason: $event->reason,
+            metadata: [
+                'certificate_expiration_date' => optional($monitor->certificate_expiration_date)?->toDateString(),
+            ],
+        );
+    }
+}
diff --git a/app/Listeners/LogCertificateCheckSucceeded.php b/app/Listeners/LogCertificateCheckSucceeded.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Services\MonitorCheckLogService;
+use Carbon\Carbon;
+use Spatie\UptimeMonitor\Events\CertificateCheckSucceeded;
+
+class LogCertificateCheckSucceeded
+{
+    public function __construct(protected MonitorCheckLogService $monitorCheckLogService)
+    {
+    }
+
+    public function handle(CertificateCheckSucceeded $event): void
+    {
+        $monitor = $event->monitor;
+        if (! $monitor->certificate_check_enabled) {
+            return;
+        }
+
+        $this->monitorCheckLogService->logCheck(
+            monitor: $monitor,
+            checkType: MonitorCheckLogService::CHECK_TYPE_CERTIFICATE,
+            status: MonitorCheckLogService::STATUS_SUCCESS,
+            checkedAt: Carbon::now()->utc(),
+            message: 'Certificate check succeeded.',
+            metadata: [
+                'issuer' => $monitor->certificate_issuer,
+                'certificate_expiration_date' => optional($monitor->certificate_expiration_date)?->toDateString(),
+            ],
+        );
+    }
+}
diff --git a/app/Models/Monitor.php b/app/Models/Monitor.php
@@ -2,9 +2,12 @@
 
 namespace App\Models;
 
+use App\Services\MonitorCheckLogService;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Psr\Http\Message\ResponseInterface;
+use Spatie\UptimeMonitor\Models\Enums\UptimeStatus;
 use Spatie\UptimeMonitor\Models\Monitor as SpatieMonitor;
 
 class Monitor extends SpatieMonitor
@@ -24,6 +27,57 @@ public function scopeDomainCheckEnabled(Builder $query): Collection
             ->get();
     }
 
+    public function uptimeRequestSucceeded(ResponseInterface $response): void
+    {
+        parent::uptimeRequestSucceeded($response);
+
+        if (! $this->uptime_check_enabled) {
+            return;
+        }
+
+        $updatedMonitor = $this->fresh();
+        if (! $updatedMonitor) {
+            return;
+        }
+
+        $status = $this->mapUptimeStatusToCheckStatus($updatedMonitor->uptime_status);
+        $failureReason = $status === MonitorCheckLogService::STATUS_FAILED
+            ? $updatedMonitor->uptime_check_failure_reason
+            : null;
+
+        app(MonitorCheckLogService::class)->logCheck(
+            monitor: $updatedMonitor,
+            checkType: MonitorCheckLogService::CHECK_TYPE_UPTIME,
+            status: $status,
+            checkedAt: $updatedMonitor->uptime_last_check_date,
+            message: $status === MonitorCheckLogService::STATUS_SUCCESS ? 'Uptime check succeeded.' : 'Uptime check failed.',
+            failureReason: $failureReason,
+        );
+    }
+
+    public function uptimeRequestFailed(string $reason): void
+    {
+        parent::uptimeRequestFailed($reason);
+
+        if (! $this->uptime_check_enabled) {
+            return;
+        }
+
+        $updatedMonitor = $this->fresh();
+        if (! $updatedMonitor) {
+            return;
+        }
+
+        app(MonitorCheckLogService::class)->logCheck(
+            monitor: $updatedMonitor,
+            checkType: MonitorCheckLogService::CHECK_TYPE_UPTIME,
+            status: MonitorCheckLogService::STATUS_FAILED,
+            checkedAt: $updatedMonitor->uptime_last_check_date,
+            message: 'Uptime check failed.',
+            failureReason: $reason,
+        );
+    }
+
     public function group()
     {
         return $this->belongsTo(Group::class);
@@ -38,4 +92,13 @@ public function dailyCheckMetrics(): HasMany
     {
         return $this->hasMany(MonitorDailyCheckMetric::class);
     }
+
+    protected function mapUptimeStatusToCheckStatus(string $uptimeStatus): string
+    {
+        return match ($uptimeStatus) {
+            UptimeStatus::UP => MonitorCheckLogService::STATUS_SUCCESS,
+            UptimeStatus::DOWN => MonitorCheckLogService::STATUS_FAILED,
+            default => MonitorCheckLogService::STATUS_UNKNOWN,
+        };
+    }
 }
diff --git a/app/Models/MonitorCheckLog.php b/app/Models/MonitorCheckLog.php
@@ -13,6 +13,7 @@ class MonitorCheckLog extends Model
 
     protected $fillable = [
         'monitor_id',
+        'idempotency_key',
         'check_type',
         'status',
         'checked_at',
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -2,7 +2,14 @@
 
 namespace App\Providers;
 
+use App\Listeners\LogCertificateCheckFailed;
+use App\Listeners\LogCertificateCheckSucceeded;
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\ServiceProvider;
+use Spatie\UptimeMonitor\Events\CertificateCheckFailed;
+use Spatie\UptimeMonitor\Events\CertificateCheckSucceeded;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -23,9 +30,8 @@ public function register()
      */
     public function boot()
     {
-        \Illuminate\Support\Facades\Event::listen(
-            \Illuminate\Auth\Events\Registered::class,
-            \Illuminate\Auth\Listeners\SendEmailVerificationNotification::class
-        );
+        Event::listen(Registered::class, SendEmailVerificationNotification::class);
+        Event::listen(CertificateCheckSucceeded::class, LogCertificateCheckSucceeded::class);
+        Event::listen(CertificateCheckFailed::class, LogCertificateCheckFailed::class);
     }
 }
diff --git a/app/Services/DomainService.php b/app/Services/DomainService.php
@@ -34,40 +34,98 @@ public static function addDomainExpiration(Monitor $monitor): bool
         return false;
     }
 
-    public function verifyDomainExpiration(Monitor $monitor): bool
+    public function verifyDomainExpiration(Monitor $monitor): array
     {
+        if (! $monitor->domain_check_enabled) {
+            return [
+                'status' => MonitorCheckLogService::STATUS_UNKNOWN,
+                'notified' => false,
+                'reason' => 'Domain check is disabled for this monitor.',
+                'days_until_expiration' => null,
+                'expiration_date' => null,
+            ];
+        }
+
+        $checkedAt = Carbon::now()->utc();
         $domainInfo = $this->getDomainExpirationDate($monitor->url);
 
         if (empty($domainInfo)) {
-            return false;
+            app(MonitorCheckLogService::class)->logCheck(
+                monitor: $monitor,
+                checkType: MonitorCheckLogService::CHECK_TYPE_DOMAIN,
+                status: MonitorCheckLogService::STATUS_FAILED,
+                checkedAt: $checkedAt,
+                message: 'Domain expiration lookup failed.',
+                failureReason: 'Unable to determine domain expiration date.',
+            );
+
+            return [
+                'status' => MonitorCheckLogService::STATUS_FAILED,
+                'notified' => false,
+                'reason' => 'Unable to determine domain expiration date.',
+                'days_until_expiration' => null,
+                'expiration_date' => null,
+            ];
         }
 
         $expirationDate = Carbon::parse($domainInfo['expirationDate']);
         if (! $monitor->domain_expires_at || ! $monitor->domain_expires_at->equalTo($expirationDate)) {
             $this->updateDomainExpiration($monitor, $domainInfo['expirationDate']);
         }
 
-        return $this->checkAndNotifyExpiration($monitor);
+        $daysUntilExpiration = Carbon::now()->startOfDay()->diffInDays($expirationDate->copy()->startOfDay(), false);
+        $notifications = $this->checkAndNotifyExpiration($monitor, $daysUntilExpiration);
+
+        $status = match (true) {
+            $daysUntilExpiration < 0 => MonitorCheckLogService::STATUS_FAILED,
+            $daysUntilExpiration <= 30 => MonitorCheckLogService::STATUS_WARNING,
+            default => MonitorCheckLogService::STATUS_SUCCESS,
+        };
+
+        $message = match (true) {
+            $daysUntilExpiration < 0 => 'Domain has expired.',
+            $daysUntilExpiration === 0 => 'Domain expires today.',
+            default => "Domain expires in {$daysUntilExpiration} day(s).",
+        };
+
+        app(MonitorCheckLogService::class)->logCheck(
+            monitor: $monitor,
+            checkType: MonitorCheckLogService::CHECK_TYPE_DOMAIN,
+            status: $status,
+            checkedAt: $checkedAt,
+            message: $message,
+            metadata: [
+                'days_until_expiration' => $daysUntilExpiration,
+                'expiration_date' => optional($monitor->domain_expires_at)->toDateString(),
+                'notifications_sent' => count($notifications),
+            ],
+        );
+
+        return [
+            'status' => $status,
+            'notified' => ! empty($notifications),
+            'reason' => null,
+            'days_until_expiration' => $daysUntilExpiration,
+            'expiration_date' => optional($monitor->domain_expires_at)->toDateString(),
+        ];
     }
 
-    protected function checkAndNotifyExpiration(Monitor $monitor): bool
+    protected function checkAndNotifyExpiration(Monitor $monitor, int $daysUntilExpiration): array
     {
         $expirationDate = $monitor->domain_expires_at;
 
         if (! $expirationDate) {
-            return false;
+            return [];
         }
 
-        $daysUntilExpiration = Carbon::now()->diffInDays($expirationDate);
-
         $domainCheckTimePeriods = config('domain-expiration.domain_check_time_period');
 
         $notifications = [];
 
         foreach ($domainCheckTimePeriods as $warningType => $details) {
             $daysThreshold = $details['days'];
 
-            if ($daysUntilExpiration === $daysThreshold) {
+            if ($daysUntilExpiration >= 0 && $daysUntilExpiration === $daysThreshold) {
                 $notifications[] = [
                     'days' => $daysThreshold,
                     'message' => "Domain expires in $daysThreshold ".($daysThreshold === 1 ? 'day' : 'days').'!',
@@ -77,7 +135,7 @@ protected function checkAndNotifyExpiration(Monitor $monitor): bool
         }
 
         if (empty($notifications)) {
-            return false;
+            return [];
         }
 
         $notifiable = new Notifiable;
@@ -87,7 +145,7 @@ protected function checkAndNotifyExpiration(Monitor $monitor): bool
             $notifiable->notify($notificationInstance);
         }
 
-        return true;
+        return $notifications;
     }
 
     protected function getDomainExpirationDate(string $url): array
diff --git a/app/Services/MonitorCheckLogService.php b/app/Services/MonitorCheckLogService.php
diff --git a/database/migrations/2026_02_14_101500_add_idempotency_key_to_monitor_check_logs_table.php b/database/migrations/2026_02_14_101500_add_idempotency_key_to_monitor_check_logs_table.php

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ public function handle(DomainService $domainService): void`
`30`	`30`	`$hasNotifications = false;`
`31`	`31`
`32`	`32`	`foreach ($monitors as $monitor) {`
`33`		`- $notificationMessageConfirmation = $domainService->verifyDomainExpiration($monitor);`
	`33`	`+ $result = $domainService->verifyDomainExpiration($monitor);`
`34`	`34`
`35`		`- if ($notificationMessageConfirmation) {`
	`35`	`+ if ($result['notified']) {`
`36`	`36`	`$hasNotifications = true;`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace App\Providers;`
`4`	`4`
	`5`	`+use App\Listeners\LogCertificateCheckFailed;`
	`6`	`+use App\Listeners\LogCertificateCheckSucceeded;`
	`7`	`+use Illuminate\Auth\Events\Registered;`
	`8`	`+use Illuminate\Auth\Listeners\SendEmailVerificationNotification;`
	`9`	`+use Illuminate\Support\Facades\Event;`
`5`	`10`	`use Illuminate\Support\ServiceProvider;`
	`11`	`+use Spatie\UptimeMonitor\Events\CertificateCheckFailed;`
	`12`	`+use Spatie\UptimeMonitor\Events\CertificateCheckSucceeded;`
`6`	`13`
`7`	`14`	`class AppServiceProvider extends ServiceProvider`
`8`	`15`	`{`
`@@ -23,9 +30,8 @@ public function register()`
`23`	`30`	`*/`
`24`	`31`	`public function boot()`
`25`	`32`	`{`
`26`		`- \Illuminate\Support\Facades\Event::listen(`
`27`		`- \Illuminate\Auth\Events\Registered::class,`
`28`		`- \Illuminate\Auth\Listeners\SendEmailVerificationNotification::class`
`29`		`- );`
	`33`	`+ Event::listen(Registered::class, SendEmailVerificationNotification::class);`
	`34`	`+ Event::listen(CertificateCheckSucceeded::class, LogCertificateCheckSucceeded::class);`
	`35`	`+ Event::listen(CertificateCheckFailed::class, LogCertificateCheckFailed::class);`
`30`	`36`	`}`
`31`	`37`	`}`