diff --git a/LibreNMS/Validations/Rrd/CheckRrdVersion.php b/LibreNMS/Validations/Rrd/CheckRrdVersion.php index 53d001241a..85be0474d0 100644 --- a/LibreNMS/Validations/Rrd/CheckRrdVersion.php +++ b/LibreNMS/Validations/Rrd/CheckRrdVersion.php @@ -30,6 +30,7 @@ use Illuminate\Support\Str; use LibreNMS\Config; use LibreNMS\Interfaces\Validation; use LibreNMS\Interfaces\ValidationFixer; +use LibreNMS\Util\Version; use LibreNMS\ValidationResult; use Storage; @@ -38,13 +39,15 @@ class CheckRrdVersion implements Validation, ValidationFixer public function validate(): ValidationResult { // Check that rrdtool config version is what we see - $rrd_version = '0.1'; //Version::get()->rrdtool(); - if (version_compare(Config::get('rrdtool_version'), '1.5.5', '<') - && version_compare(Config::get('rrdtool_version'), $rrd_version, '>') + $rrd_version = Version::get()->rrdtool(); + $config_version = Config::get('rrdtool_version'); + + if (version_compare($config_version, '1.5.5', '<') + && version_compare($config_version, $rrd_version, '>') ) { return ValidationResult::fail( - trans('validation.validations.rrd.CheckRrdVersion.fail'), - trans('validation.validations.rrd.CheckRrdVersion.fix', ['version' => Config::get('rrdtool_version')]) + trans('validation.validations.rrd.CheckRrdVersion.fail', ['config_version' => $config_version, 'installed_version' => $rrd_version]), + trans('validation.validations.rrd.CheckRrdVersion.fix', ['version' => $config_version]) )->setFixer(__CLASS__, is_writable(base_path('config.php'))); } diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index d614648b24..dc1274842e 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -174,7 +174,7 @@ return [ 'validations' => [ 'rrd' => [ 'CheckRrdVersion' => [ - 'fail' => 'The rrdtool version you have specified is newer than what is installed.', + 'fail' => 'The rrdtool version you have specified is newer than what is installed. Config: :config_version Installed :installed_version', 'fix' => 'Either comment out or delete $config[\'rrdtool_version\'] = \':version\'; from your config.php file', 'ok' => 'rrdtool version ok', ],