From a723db6084d08a3c8890a95144c6c32cd27abc4c Mon Sep 17 00:00:00 2001 From: TimZ99 Date: Thu, 9 Jan 2020 22:24:21 +0100 Subject: [PATCH] Added ssl expiration to warning state --- .../Server/Controller/AbstractServerController.php | 11 ++++++++++- src/psm/Module/Server/Controller/StatusController.php | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/psm/Module/Server/Controller/AbstractServerController.php b/src/psm/Module/Server/Controller/AbstractServerController.php index 1a1c210e..90f6e629 100644 --- a/src/psm/Module/Server/Controller/AbstractServerController.php +++ b/src/psm/Module/Server/Controller/AbstractServerController.php @@ -120,7 +120,16 @@ abstract class AbstractServerController extends AbstractController } $server['last_check'] = psm_timespan($server['last_check']); - if ($server['status'] == 'on' && $server['warning_threshold_counter'] > 0) { + if ( + ( + $server['status'] == 'on' && + $server['warning_threshold_counter'] > 0 + ) || ( + $server['status'] == 'on' && + $server['ssl_cert_expired_time'] !== null && + $server['ssl_cert_expiry_days'] > 0 + ) + ) { $server['status'] = 'warning'; } diff --git a/src/psm/Module/Server/Controller/StatusController.php b/src/psm/Module/Server/Controller/StatusController.php index efe840f3..d4ee083d 100644 --- a/src/psm/Module/Server/Controller/StatusController.php +++ b/src/psm/Module/Server/Controller/StatusController.php @@ -100,6 +100,8 @@ class StatusController extends AbstractServerController $layout_data['servers_offline'][] = $server; } elseif ($server['warning_threshold_counter'] > 0) { $layout_data['servers_warning'][] = $server; + } elseif ($server['ssl_cert_expired_time'] !== null && $server['ssl_cert_expiry_days'] > 0) { + $layout_data['servers_warning'][] = $server; } else { $layout_data['servers_online'][] = $server; }