patch

Author: lbr38

www/controllers/Layout/Chart/vars/hosts-count-chart.vars.inc.php

@@ -1,11 +1,16 @@
 <?php
+use \Controllers\Host\Package\Package;
+use \Controllers\Host\Package\Event;
+
 $hostController = new \Controllers\Host\Host();
 $hostListingController = new \Controllers\Host\Listing();
 $datasets = [];
 $labels = [];
 $options = [];
 $totalNotUptodate = 0;
 $totalUptodate = 0;
+$totalCompliant = 0;
+$totalNotCompliant = 0;
 
 // Getting hosts list
 $hosts = $hostListingController->get();
@@ -16,32 +21,51 @@
 // Threshold of the maximum number of available update above which the host is considered as 'not up to date' (but not critical)
 $complianceThresholdCount = $hostsSettings['compliance_threshold_count'];
 
+// Threshold of the maximum number of days since the last update above which the host is considered as 'not up to date' (but not critical)
+$complianceThresholdDays = $hostsSettings['compliance_threshold_days'];
+
 // Loop through the list of hosts to determine the number of hosts up to date and not up to date
 foreach ($hosts as $host) {
     // Open the dedicated database of the host from its ID to be able to retrieve additional information
-    $hostPackageController = new \Controllers\Host\Package\Package($host['Id']);
+    $hostPackageController = new Package($host['Id']);
+    $hostPackageEventController = new Event($host['Id']);
+
+    $upToDate = true;
 
     // Retrieve the total number of available packages
     $packagesAvailableTotal = count($hostPackageController->getAvailable());
 
-    // Retrieve the total number of installed packages
-    $packagesInstalledTotal = count($hostPackageController->getInstalled());
+    // Retrieve the date of the last package upgrade event
+    $latestUpdate = $hostPackageEventController->getLastPackageUpgradeEventDate()['Date'] ?? null;
 
-    /**
-     *  If the total number of available packages retrieved previously is > $complianceThresholdCount (threshold defined by the user) then we increment $totalNotUptodate (counts the number of hosts that are not up to date in the chartjs)
-     *  Else it's $totalUptodate that we increment.
-     */
+    // The host is not compliant if the available updates count is >= threshold
     if ($packagesAvailableTotal >= $complianceThresholdCount) {
-        $totalNotUptodate++;
-    } else {
+        $upToDate = false;
+    }
+
+    // The host is not compliant if the latest update is older than the threshold in days
+    if ($latestUpdate and strtotime($latestUpdate) < strtotime('-' . $complianceThresholdDays . ' days')) {
+        $upToDate = false;
+    }
+
+    if ($upToDate) {
         $totalUptodate++;
+    } else {
+        $totalNotUptodate++;
     }
+
+    // Calculate % compliance
+    $totalCompliant = round(($totalUptodate / ($totalUptodate + $totalNotUptodate)) * 100, 2);
+
 }
 
-$labels[] = 'Up to date';
-$labels[] = 'Need update';
+$labels[] = 'Compliant';
+$labels[] = 'Not compliant';
 $datasets[0]['data'][] = $totalUptodate;
 $datasets[0]['data'][] = $totalNotUptodate;
 $datasets[0]['colors'] = ['#24d794', '#F32F63'];
+$options['title']['text'] = $totalCompliant . '% compliant';
+$options['title']['align'] = 'left';
+$options['title']['fontSize'] = 12;
 
-unset($hostController, $hostListingController, $hostPackageController, $hosts, $hostsSettings, $totalUptodate, $totalNotUptodate, $complianceThresholdCount, $packagesAvailableTotal, $packagesInstalledTotal);
+unset($hostController, $hostListingController, $hostPackageController, $hosts, $hostsSettings, $totalUptodate, $totalNotUptodate, $complianceThresholdCount, $packagesAvailableTotal);

www/public/resources/js/classes/EChart.js

@@ -536,7 +536,7 @@ class EChart
                     type: 'pie',
                     roseType: 'radius',
                     radius: [innerRadius, outerRadius], // Configurable radius values
-                    center: ['50%', '50%'],
+                    center: this.chartOptions?.title?.text ? ['50%', '57%'] : ['50%', '50%'],
                     itemStyle: {
                         borderRadius: 2
                     },
@@ -1004,6 +1004,9 @@ class EChart
         if (this.chartOptions.title?.text) {
             options.title.text = this.chartOptions.title.text;
             options.title.left = this.chartOptions.title.align || 'left';
+            if (this.chartOptions.title.fontSize !== undefined) {
+                options.title.textStyle.fontSize = this.chartOptions.title.fontSize;
+            }
         }
 
         // Y-axis features