Refactor datastores to classes (#9179)

* 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

View File

@@ -11,6 +11,8 @@
* @copyright (C) 2006 - 2012 Adam Armstrong
*/
use LibreNMS\Data\Store\Datastore;
$init_modules = array();
require __DIR__ . '/includes/init.php';
@@ -22,6 +24,7 @@ if (isset($argv[1]) && is_numeric($argv[1])) {
}
set_debug(isset($options['d']));
Datastore::init();
// Wait for schema update, as running during update can break update
if (get_db_schema() < 107) {
@@ -29,8 +32,6 @@ if (get_db_schema() < 107) {
exit(1);
}
rrdtool_initialize();
$poller_start = microtime(true);
echo "Starting Polling Session ... \n\n";
@@ -164,4 +165,4 @@ if ($poller_time > 300) {
}
echo "\nCompleted in $poller_time sec\n";
rrdtool_close();
Datastore::terminate();