mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
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:
76
app/Console/Commands/DevicePoll.php
Normal file
76
app/Console/Commands/DevicePoll.php
Normal file
@@ -0,0 +1,76 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Console\LnmsCommand;
|
||||
use App\Polling\Measure\MeasurementManager;
|
||||
use Illuminate\Database\QueryException;
|
||||
use LibreNMS\Config;
|
||||
use LibreNMS\Poller;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Input\InputOption;
|
||||
|
||||
class DevicePoll extends LnmsCommand
|
||||
{
|
||||
protected $name = 'device:poll';
|
||||
|
||||
/**
|
||||
* Create a new command instance.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
$this->addArgument('device spec', InputArgument::REQUIRED);
|
||||
$this->addOption('modules', 'm', InputOption::VALUE_REQUIRED);
|
||||
$this->addOption('no-data', 'x', InputOption::VALUE_NONE);
|
||||
}
|
||||
|
||||
public function handle(MeasurementManager $measurements): int
|
||||
{
|
||||
$this->configureOutputOptions();
|
||||
|
||||
if ($this->option('no-data')) {
|
||||
Config::set('rrd.enable', false);
|
||||
Config::set('influxdb.enable', false);
|
||||
Config::set('prometheus.enable', false);
|
||||
Config::set('graphite.enable', false);
|
||||
}
|
||||
|
||||
try {
|
||||
$poller = app(Poller::class, ['device_spec' => $this->argument('device spec'), 'module_override' => explode(',', $this->option('modules'))]);
|
||||
$polled = $poller->poll();
|
||||
|
||||
if ($polled > 0) {
|
||||
if (! $this->output->isQuiet()) {
|
||||
if ($polled > 1) {
|
||||
$this->output->newLine();
|
||||
$this->line(sprintf('Polled %d devices in %0.3fs', $polled, $measurements->getCategory('device')->getSummary('poll')->getDuration()));
|
||||
}
|
||||
$this->output->newLine();
|
||||
$measurements->printStats();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
} catch (QueryException $e) {
|
||||
if ($e->getCode() == 2002) {
|
||||
$this->error(trans('commands.device:poll.errors.db_connect'));
|
||||
|
||||
return 1;
|
||||
} elseif ($e->getCode() == 1045) {
|
||||
// auth failed, don't need to include the query
|
||||
$this->error(trans('commands.device:poll.errors.db_auth', ['error' => $e->getPrevious()->getMessage()]));
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
$this->error($e->getMessage());
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 1; // failed to poll
|
||||
}
|
||||
}
|
@@ -27,6 +27,7 @@ namespace App\Console;
|
||||
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use LibreNMS\Util\Debug;
|
||||
use Symfony\Component\Console\Exception\InvalidArgumentException;
|
||||
use Validator;
|
||||
|
||||
@@ -45,7 +46,7 @@ abstract class LnmsCommand extends Command
|
||||
$this->setDescription(__('commands.' . $this->getName() . '.description'));
|
||||
}
|
||||
|
||||
public function isHidden()
|
||||
public function isHidden(): bool
|
||||
{
|
||||
$env = $this->getLaravel() ? $this->getLaravel()->environment() : getenv('APP_ENV');
|
||||
|
||||
@@ -125,4 +126,15 @@ abstract class LnmsCommand extends Command
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
protected function configureOutputOptions(): void
|
||||
{
|
||||
\Log::setDefaultDriver($this->getOutput()->isQuiet() ? 'stack' : 'console');
|
||||
if (($verbosity = $this->getOutput()->getVerbosity()) >= 128) {
|
||||
Debug::set();
|
||||
if ($verbosity >= 256) {
|
||||
Debug::setVerbose();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user