Merge branch 'release/1.0.1'

Author: sanderpotjer

README.md

@@ -6,7 +6,7 @@ This plugin provides a [Oh Dear](https://ohdear.app) Application Health checker
 
 ## 🚦 Health Checks Overview
 
-This plugin performs the following health checks and provides a JSON feed on yourwebsite.com/application-health.json for Oh Dear. The response is cached for 10 minutes. 
+This plugin performs the following health checks and provides a JSON feed on yourwebsite.com/application-health.json for Oh Dear. The response is cached for 5 minutes. 
 
 ### ✅ Updates
 Checks if updates are available for Craft CMS and installed plugins.

src/controllers/HealthController.php

@@ -19,7 +19,7 @@ class HealthController extends Controller
 {
     protected array|int|bool $allowAnonymous = true;
     private const CACHE_KEY = 'ohdear-health-check-json';
-    private const CACHE_DURATION = 600;
+    private const CACHE_DURATION = 300;
 
     public function actionCheck(): Response
     {

src/services/HealthCheckService.php

@@ -49,36 +49,89 @@ private function addUpdateCheck(CheckResults $checkResults): void
         $meta = [];
         $updateCount = 0;
         $updateNames = [];
+        $criticalUpdates = [];
+        $oldestUpdateDate = null;
+        $now = new DateTime();
 
         if ($updates->cms->getHasReleases()) {
-            $meta['Craft CMS'] = sprintf('%s => %s', Craft::$app->version, $updates->cms->getLatest()->version);
+            $oldest = null;
+            foreach ($updates->cms->releases as $release) {
+                if ($oldest === null || $release->date < $oldest) {
+                    $oldest = $release->date;
+                }
+            }
+
+            $latest = $updates->cms->getLatest();
+            $ageDays = $oldest ? $now->diff($oldest)->days : 'unknown';
+            $meta['Craft CMS'] = sprintf('%s => %s (oldest update %s days ago)', Craft::$app->version, $latest->version, $ageDays);
             $updateNames[] = 'Craft CMS';
             $updateCount++;
+
+            if ($updates->cms->getHasCritical()) {
+                $criticalUpdates[] = 'Craft CMS';
+            }
+
+            if ($oldest && ($oldestUpdateDate === null || $oldest < $oldestUpdateDate)) {
+                $oldestUpdateDate = $oldest;
+            }
         }
 
         foreach ($updates->plugins as $pluginHandle => $pluginUpdate) {
             if ($pluginUpdate->getHasReleases()) {
                 try {
                     $pluginInfo = Craft::$app->getPlugins()->getPluginInfo($pluginHandle);
                     if ($pluginInfo['isInstalled']) {
-                        $meta[$pluginInfo['name']] = sprintf('%s => %s', $pluginInfo['version'], $pluginUpdate->getLatest()->version);
+                        $oldest = null;
+                        foreach ($pluginUpdate->releases as $release) {
+                            if ($oldest === null || $release->date < $oldest) {
+                                $oldest = $release->date;
+                            }
+                        }
+
+                        $latest = $pluginUpdate->getLatest();
+                        $ageDays = $oldest ? $now->diff($oldest)->days : 'unknown';
+                        $meta[$pluginInfo['name']] = sprintf('%s => %s (oldest update %s days ago)', $pluginInfo['version'], $latest->version, $ageDays);
                         $updateNames[] = $pluginInfo['name'];
                         $updateCount++;
+
+                        if ($pluginUpdate->getHasCritical()) {
+                            $criticalUpdates[] = $pluginInfo['name'];
+                        }
+
+                        if ($oldest && ($oldestUpdateDate === null || $oldest < $oldestUpdateDate)) {
+                            $oldestUpdateDate = $oldest;
+                        }
                     }
                 } catch (\craft\errors\InvalidPluginException $e) {
                     continue;
                 }
             }
         }
 
-        $status = $updateCount === 0 ? CheckResult::STATUS_OK : CheckResult::STATUS_WARNING;
-        $message = $updateCount === 0 ? 'Plugins and CMS are up to date' : implode(', ', $updateNames) . ' have updates available';
+        $status = CheckResult::STATUS_OK;
+        $message = $updateCount === 0
+            ? 'Plugins and CMS are up to date'
+            : implode(', ', $updateNames) . ' have updates available';
+
+        $shortSummary = "{$updateCount} updates";
+
+        if (!empty($criticalUpdates)) {
+            $status = CheckResult::STATUS_WARNING;
+            $message = '🚨 ' . $message . ' (critical updates: ' . implode(', ', $criticalUpdates) . ')';
+            $shortSummary = "🚨 {$updateCount} updates (critical)";
+        } elseif ($oldestUpdateDate !== null) {
+            $diff = $now->diff($oldestUpdateDate);
+            if ($diff->days > 30) {
+                $status = CheckResult::STATUS_WARNING;
+                $message .= ' (oldest update is over 30 days old)';
+            }
+        }
 
         $checkResults->addCheckResult(new CheckResult(
             name: 'Updates',
             label: 'Available Updates',
             notificationMessage: $message,
-            shortSummary: "{$updateCount} updates",
+            shortSummary: $shortSummary,
             status: $status,
             meta: $meta
         ));