From 718ecd05a74eaf0957f2e6aa5cf6f58af34e583b Mon Sep 17 00:00:00 2001 From: Peter Eckel Date: Mon, 29 Jul 2019 13:42:40 +0200 Subject: [PATCH] Fix Icinga 2 version detection With this commit the version prefix character is treated as optional which always used to be 'r' or 'v'. But this is gone since Icinga 2 version 2.11.0 RC1. Signed-off-by: Eric Lippmann --- .../monitoring/library/Monitoring/Backend/MonitoringBackend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php index f37278337..31e6488a7 100644 --- a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php +++ b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php @@ -354,7 +354,7 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface $programVersion = $this->select()->from('programstatus', array('program_version'))->fetchOne(); } return (bool) preg_match( - '/^[vr]2\.\d+\.\d+.*$/', + '/^[vr]?2\.\d+\.\d+.*$/', $programVersion ); }