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

Added support for RIEDO data concentrator (#11237)

Browse Source 
* Riedo E3Meter DataConcentrator

* Riedo E3Meter DataConcentrator Image

* logos

* name

* Freq + Power

* Power

* Tests + standalone riedo mib

* tests
This commit is contained in:
PipoCanaja
2020-04-10 13:24:49 +02:00
committed by GitHub
parent ad1c7d0e19
commit 3fb46710a6
10 changed files with 10992 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
LibreNMS/Device/YamlDiscovery.php
View File

@@ -155,6 +155,10 @@ class YamlDiscovery
*/
public static function getValueFromData($name, $index, $discovery_data, $pre_cache, $default = null)
{
//create the sub-index values in order to try to match them with precache
foreach (explode('.', $index) as $pos => $sindex) {
$subindex[$pos] = $sindex;
}
if (isset($discovery_data[$name])) {
$name = $discovery_data[$name];
}
@@ -167,12 +171,14 @@ class YamlDiscovery
if (is_array($pre_cache[$name])) {
if (isset($pre_cache[$name][$index][$name])) {
return $pre_cache[$name][$index][$name];
} elseif (isset($pre_cache[$index][$name])) {
return $pre_cache[$index][$name];
} elseif (isset($pre_cache[$index][$name])) { //probably makes no sense here
return $pre_cache[$index][$name]; //same
} elseif (isset($pre_cache[$name][$index])) {
return $pre_cache[$name][$index];
} elseif (count($pre_cache[$name]) === 1) {
return current($pre_cache[$name]);
} elseif (isset($pre_cache[$name][$subindex[0]][$name])) {
return $pre_cache[$name][$subindex[0]][$name];
}
} else {
return $pre_cache[$name];