Poller rewrite (Try 2) (#13525)

* core WIP

* try to finish up

* trim space too
and a couple of cleanups

* update test data

* put escapes back

* another net-snmp difference

* correct copy paste error

* WIP

* Use new code YAY

* a tiny bit more

* Kind of working

* Handle manual modules correctly

* convert core to modern module

* Only save metrics if modules is not overridden

* correct module exists check

* database error handling

* debug handling

* restore bad changes

* Introduce Actions
 RunAlertRulesAction
 UpdateDeviceGroupsAction

* tweaks to output

* Fix some issues in outside code

* Style fixes

* fixes to module status checks

* typehints!

* Use logger only and DI

* OS module not named correctly

* Work on quiet output a bit more

* generically don't change output when disabling debug if the driver is already stack

* Fix missing $device variable for legacy os polling
Fix missing dbFacile functions when no legacy modules polled in RunAlertRulesAction

* restore legacy os module shim

* use the new poller code for tests

* PollingDevice event

* Fix some issues and enable/disable error reporting around legacy modules

* typehints

* fully update baseline

* Use Process for version commands so we don't leak debug output.

* don't detect rrdtool version in ci every time

* style fixes

* Warning fixes

* more fixes

* re-update baseline

* remove diff noise

* fix up alerts

* Catch exceptions in device ip lookup

* Revert accidental snmp.inc.php poller target change
(should have been ?: not ??)
This commit is contained in:
Tony Murray
2021-11-17 19:23:55 -06:00
committed by GitHub
parent 7893b8bebe
commit c79b187d72
48 changed files with 1187 additions and 305 deletions

View File

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