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

Exclude some modules when collecting all modules (#8124)

Browse Source
This commit is contained in:
Tony Murray
2018-01-25 15:07:10 -06:00
committed by Neil Lathwood
parent 37c3c5c88f
commit f1a2e8d3b4
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
LibreNMS/Util/ModuleTestHelper.php
View File

@@ -43,6 +43,13 @@ class ModuleTestHelper
private $discovery_output;
private $poller_output;
// Definitions
// ignore these when dumping all modules
private $exclude_from_all = ['arp-table'];
private $module_deps = [
'arp-table' => ['ports', 'arp-table'],
];
/**
* ModuleTester constructor.
@@ -264,10 +271,6 @@ class ModuleTestHelper
*/
private function resolveModuleDependencies($modules)
{
$module_deps = array(
'arp-table' => array('ports', 'arp-table'),
);
// generate a full list of modules
$full_list = array();
foreach ($modules as $module) {
@@ -276,8 +279,8 @@ class ModuleTestHelper
continue;
}
if (isset($module_deps[$module])) {
$full_list = array_merge($full_list, $module_deps[$module]);
if (isset($this->module_deps[$module])) {
$full_list = array_merge($full_list, $this->module_deps[$module]);
} else {
$full_list[] = $module;
}
@@ -564,8 +567,16 @@ class ModuleTestHelper
public function dumpDb($device_id, $key = null)
{
$data = array();
$module_dump_info = $this->getTableData();
foreach ($this->getTableData() as $module => $module_tables) {
// don't dump some modules by default unless they are manually listed
if (empty($this->modules)) {
foreach ($this->exclude_from_all as $module) {
unset($module_dump_info[$module]);
}
}
foreach ($module_dump_info as $module => $module_tables) {
foreach ($module_tables as $table => $info) {
// check for custom where
$where = isset($info['custom_where']) ? $info['custom_where'] : "WHERE `device_id`=?";