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

Add group to sensor 1st discovery + template syntax {{ $xxx }} (#9667)

Browse Source 
* add group to sensor initial discovery and use dynamic_discovery_get_value template syntax on them

* spaces

* switching to YamlDiscovery::replaceValues

* testdata from ibmc

* testdata from nxos

* testdata from omnitron-iconverter

* testdata from vrp

* adapt discovery_schema to accept variables

* remove pattern

* Update discovery_schema.json
This commit is contained in:
PipoCanaja
2019-01-16 03:56:30 +01:00
committed by Tony Murray
parent d33d87931e
commit 8e80121c33
11 changed files with 385 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
includes/discovery/functions.inc.php
View File

@@ -266,6 +266,7 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr,
'entPhysicalIndex' => $entPhysicalIndex,
'entPhysicalIndex_measured' => $entPhysicalIndex_measured,
'user_func' => $user_func,
'group' => $group,
);
foreach ($insert as $key => $val_check) {
@@ -992,17 +993,10 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache)
$oid = str_replace('{{ $index }}', $index, $data['num_oid']);
// process the description
$descr = dynamic_discovery_get_value('descr', $index, $data, $pre_cache);
if (is_null($descr)) {
$descr = str_replace('{{ $index }}', $index, $data['descr']);
preg_match_all('/{{ \$([a-zA-Z0-9.]+) }}/', $descr, $matches);
foreach ($matches[1] as $tmp_var) {
$replace = dynamic_discovery_get_value($tmp_var, $index, $data, $pre_cache, null);
if (!is_null($replace)) {
$descr = str_replace("{{ \$$tmp_var }}", $replace, $descr);
}
}
}
$descr = YamlDiscovery::replaceValues('descr', $index, null, $data, $pre_cache);
// process the group
$group = YamlDiscovery::replaceValues('group', $index, null, $data, $pre_cache);
$divisor = $data['divisor'] ?: ($sensor_options['divisor'] ?: 1);
$multiplier = $data['multiplier'] ?: ($sensor_options['multiplier'] ?: 1);
@@ -1038,7 +1032,7 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache)
}
$uindex = str_replace('{{ $index }}', $index, isset($data['index']) ? $data['index'] : $index);
discover_sensor($valid['sensor'], $sensor_type, $device, $oid, $uindex, $sensor_name, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_function, isset($data['group']) ? $data['group'] : null);
discover_sensor($valid['sensor'], $sensor_type, $device, $oid, $uindex, $sensor_name, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_function, $group);
if ($sensor_type === 'state') {
create_sensor_to_state_index($device, $sensor_name, $uindex);