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

Allow unordered OIDs (global and per-os) (#13923)

Browse Source 
* Allow unordered OIDs (global and per-os)
Fix global no_bulk setting, was ignored before
(to fix global needed to rework Config::getCombined() a bit to allow a global prefix to be specified)
Removed invalid use of getCombined and updated tests

* fix whitespace

* update os schema
This commit is contained in:
Tony Murray
2022-04-21 21:49:26 -05:00
committed by GitHub
parent 15feac7297
commit d026e9f0cc
11 changed files with 82 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
LibreNMS/Config.php
View File

@@ -204,29 +204,32 @@ class Config
* Removes any duplicates.
* When the arrays have keys, os settings take precedence over global settings
*
* @param string $os The os name
* @param string|null $os The os name
* @param string $key period separated config variable name
* @param string $global_prefix prefix for global setting
* @param array $default optional array to return if the setting is not set
* @return array
*/
public static function getCombined($os, $key, $default = [])
public static function getCombined(?string $os, string $key, string $global_prefix = '', array $default = []): array
{
if (! self::has($key)) {
return self::getOsSetting($os, $key, $default);
}
$global_key = $global_prefix . $key;
if (! isset(self::$config['os'][$os][$key])) {
if (! Str::contains($key, '.')) {
return self::get($key, $default);
if (! Str::contains($global_key, '.')) {
return (array) self::get($global_key, $default);
}
if (! self::has("os.$os.$key")) {
return self::get($key, $default);
return (array) self::get($global_key, $default);
}
}
if (! self::has("os.$os.$key")) {
return (array) self::get($global_key, $default);
}
return array_unique(array_merge(
(array) self::get($key, $default),
(array) self::getOsSetting($os, $key, $default)
(array) self::get($global_key),
(array) self::getOsSetting($os, $key)
));
}