mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

version and git helper improvements (#14412)

Browse Source 
* Fix up version and git helpers
Improve method names
Move all git calls into the git helper
Allow runtime and external cache of results where appropriate
Consolidate version headers for discovery, poller, and validate

* Style fixes

* improve consistency in git calls

* fix style

* don't send name inconsistently

* Improve database versions

* No need to cache Version it is not used more than once currently.
This commit is contained in:
Tony Murray
2022-10-02 00:41:56 -05:00
committed by GitHub
parent 964a67289a
commit e4451714e2
20 changed files with 441 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LibreNMS/Validations/Dependencies.php
View File

@@ -47,7 +47,7 @@ class Dependencies extends BaseValidation
}
// if git is not installed, do not assume composer is either
if (! Git::repoPresent()) {
if (! Git::make()->repoPresent()) {
$validator->ok('Installed from package; no Composer required');
return;

21
LibreNMS/Validations/Updates.php
View File

@@ -32,7 +32,6 @@ use LibreNMS\ComposerHelper;
use LibreNMS\Config;
use LibreNMS\Util\EnvHelper;
use LibreNMS\Util\Git;
use LibreNMS\Util\Version;
use LibreNMS\ValidationResult;
use LibreNMS\Validator;
use Symfony\Component\Process\Process;
@@ -47,14 +46,14 @@ class Updates extends BaseValidation
return;
}
if (! Git::repoPresent()) {
if (! Git::make()->repoPresent()) {
$validator->warn('Non-git install, updates are manual or from package');
return;
}
// if git is not available, we cannot do the other tests
if (! Git::binaryExists()) {
if (! Git::make()->binaryExists()) {
$validator->warn('Unable to locate git. This should probably be installed.');
return;
@@ -62,10 +61,9 @@ class Updates extends BaseValidation
// check if users on master update channel are up to date
if (Config::get('update_channel') == 'master') {
$local_ver = Version::get()->localCommit();
$remote_ver = Version::get()->remoteCommit();
if ($local_ver['sha'] != ($remote_ver['sha'] ?? null)) {
if (empty($local_ver['date'])) {
$git = Git::make();
if ($git->commitHash() != $git->remoteHash()) {
if (! $git->commitDate()) {
$process = new Process(['git', 'show', '--quiet', '--pretty=%H|%ct'], base_path());
$process->run();
$error = rtrim($process->getErrorOutput());
@@ -73,7 +71,7 @@ class Updates extends BaseValidation
$validator->fail('Failed to fetch version from local git: ' . $error);
} else {
try {
$commit_date = new DateTime('@' . $local_ver['date'], new DateTimeZone(date_default_timezone_get()));
$commit_date = new DateTime('@' . $git->commitDate(), new DateTimeZone(date_default_timezone_get()));
if ($commit_date->diff(new DateTime())->days > 0) {
$validator->warn(
'Your install is over 24 hours out of date, last update: ' . $commit_date->format('r'),
@@ -86,13 +84,14 @@ class Updates extends BaseValidation
}
}
if ($local_ver['branch'] != 'master') {
if ($local_ver['branch'] == 'php53') {
$branch = $git->branch();
if ($branch != 'master') {
if ($branch == 'php53') {
$validator->warn(
'You are on the PHP 5.3 support branch, this will prevent automatic updates.',
'Update to PHP 5.6.4 or newer (PHP ' . Php::PHP_RECOMMENDED_VERSION . ' recommended) to continue to receive updates.'
);
} elseif ($local_ver['branch'] == 'php56') {
} elseif ($branch == 'php56') {
$validator->warn(
'You are on the PHP 5.6/7.0 support branch, this will prevent automatic updates.',
'Update to PHP ' . Php::PHP_MIN_VERSION . ' or newer (PHP ' . Php::PHP_RECOMMENDED_VERSION . ' recommended) to continue to receive updates.'

2
LibreNMS/Validations/User.php
View File

@@ -74,7 +74,7 @@ class User extends BaseValidation
}
// if no git, then we probably have different permissions by design
if (! Git::repoPresent()) {
if (! Git::make()->repoPresent()) {
return;
}