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

Revert "Poller command rewrite (#13414)" (#13524)

Browse Source 
This reverts commit 1752d1efd4.
This commit is contained in:
Tony Murray
2021-11-16 21:40:29 -06:00
committed by GitHub
parent 1752d1efd4
commit f8764ddcb5
49 changed files with 304 additions and 1181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
LibreNMS/Util/Version.php
View File

@@ -25,7 +25,6 @@
namespace LibreNMS\Util;
use LibreNMS\Config;
use LibreNMS\DB\Eloquent;
use Symfony\Component\Process\Process;
@@ -34,9 +33,6 @@ class Version
// Update this on release
const VERSION = '21.11.0';
/**
* @var bool
*/
protected $is_git_install = false;
public function __construct()
@@ -44,12 +40,12 @@ class Version
$this->is_git_install = Git::repoPresent() && Git::binaryExists();
}
public static function get(): Version
public static function get()
{
return new static;
}
public function local(): string
public function local()
{
if ($this->is_git_install && $version = $this->fromGit()) {
return $version;
@@ -58,7 +54,7 @@ class Version
return self::VERSION;
}
public function database(): array
public function database()
{
if (Eloquent::isConnected()) {
try {
@@ -76,52 +72,34 @@ class Version
return ['last' => 'Not Connected', 'total' => 0];
}
private function fromGit(): string
private function fromGit()
{
return rtrim(shell_exec('git describe --tags 2>/dev/null'));
}
public function gitChangelog(): string
public function gitChangelog()
{
return $this->is_git_install
? rtrim(shell_exec('git log -10'))
: '';
}
public function gitDate(): string
public function gitDate()
{
return $this->is_git_install
? rtrim(shell_exec("git show --pretty='%ct' -s HEAD"))
: '';
}
public function python(): string
public static function python()
{
$proc = new Process(['python3', '--version']);
$proc->run();
if ($proc->getExitCode() !== 0) {
return '';
return null;
}
return explode(' ', rtrim($proc->getOutput()), 2)[1] ?? '';
}
public function rrdtool(): string
{
$process = new Process([Config::get('rrdtool', 'rrdtool'), '--version']);
$process->run();
preg_match('/^RRDtool ([\w.]+) /', $process->getOutput(), $matches);
return str_replace('1.7.01.7.0', '1.7.0', $matches[1] ?? '');
}
public function netSnmp(): string
{
$process = new Process([Config::get('snmpget', 'snmpget'), '-V']);
$process->run();
preg_match('/[\w.]+$/', $process->getErrorOutput(), $matches);
return $matches[0] ?? '';
return explode(' ', rtrim($proc->getOutput()), 2)[1] ?? null;
}
}