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

Refactor datastores to classes (#9179)

Browse Source 
* Datastores to object oriented code, using the Laravel IoC container

Change instantiation
better DI
move OpenTSDB

Small re-orgs

remove unused stuff

Fix graphs and other scripts

Use DI for all except rrd

fix up connection error handling

Add tests, fix up a "few" things
Add Config::forget()

Style fixes

Don't reference legacy code

remove accidental code paste

Add datastores phpunit groups

some tests

* rebase fixes

* some test fixes

* shorter tests

* shorter tests

* Don't except when rrdtool can't be started.

* restore tests

* fix rrd tests

* fix iterable change upstream

* fix isValidDataset

* fix invalid data bug

* fix mysql incorrect ds

* fix issue with data that is too long

* use regular data_update()

* Use log facade

* OpenTSDB mis-ordered arguments fix

* Making a singleton with different options makes different singletons.  Just use the global config settings to disable datastores.

* only filter tags for datastores that won't it don't modify the tags permanently

* Update copyrights to include original authors.

* Stats for all datastores

* Fix mysql sends different rrd / other ds names

* fix snmp last stats not initialized
remove unused function

* remove unused function and move single use function closer to its use

* InfluxDB does not need to update null or U values.
Skip write if all fields are empty

* Fix smart value checks

* fix style issues
This commit is contained in:
Tony Murray
2020-03-10 19:08:00 -05:00
committed by GitHub
parent cc53801e22
commit e5dad7a64e
51 changed files with 2523 additions and 1007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
poller.php
View File

@@ -28,6 +28,7 @@
use LibreNMS\Config;
use LibreNMS\Alert\AlertRules;
use LibreNMS\Data\Store\Datastore;
$init_modules = ['polling', 'alerts', 'laravel'];
require __DIR__ . '/includes/init.php';
@@ -117,44 +118,11 @@ EOH;
update_os_cache(true); // Force update of OS Cache
}
if (isset($options['r'])) {
Config::set('norrd', true);
}
if (isset($options['f'])) {
Config::set('noinfluxdb', true);
}
if (isset($options['p'])) {
$prometheus = false;
}
if (isset($options['g'])) {
Config::set('nographite', true);
}
if (Config::get('base_url') !== true && Config::get('influxdb.enable') === true) {
$influxdb = influxdb_connect();
} else {
$influxdb = false;
}
if (Config::get('base_url') !== true && Config::get('graphite.enable') === true) {
$graphite = fsockopen(Config::get('graphite.host'), Config::get('graphite.port'));
if ($graphite !== false) {
echo "Connection made to " . Config::get('graphite.host') . " for Graphite support\n";
} else {
echo "Connection to " . Config::get('graphite.host') . " has failed, Graphite support disabled\n";
Config::set('nographite', true);
}
} else {
$graphite = false;
}
// If we've specified modules with -m, use them
$module_override = parse_modules('poller', $options);
set_debug($debug);
rrdtool_initialize();
$datastore = Datastore::init($options);
echo "Starting polling run:\n\n";
$polled_devices = 0;
@@ -186,10 +154,6 @@ $poller_end = microtime(true);
$poller_run = ($poller_end - $poller_start);
$poller_time = substr($poller_run, 0, 5);
if ($graphite !== false) {
fclose($graphite);
}
if ($polled_devices) {
dbInsert(array(
'type' => 'poll',
@@ -209,8 +173,7 @@ if (!isset($options['q'])) {
}
logfile($string);
rrdtool_close();
Datastore::terminate();
// Remove this for testing
// print_r(get_defined_vars());