opensourcemirror
/
LibreNMS
mirror of https://github.com/librenms/librenms.git
1
0
Fork 0
Code Releases Activity

Global Settings - SNMP Timeout (#12579) 

* Global Settings - SNMP Timeout

* omit snmp timeout if it is 1

* add retries field

* filter default retries too

* fix typo

Co-authored-by: Tony Murray <murraytony@gmail.com>
This commit is contained in:
SourceDoctor 2021-03-05 03:18:26 +01:00 committed by GitHub
parent 0e05fa31bf
commit 09d30ce75d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
html/mix-manifest.json
View File

@ -3,9 +3,9 @@
"/js/manifest.js": "/js/manifest.js?id=411da0f32dfa6d682e04",
"/css/app.css": "/css/app.css?id=996b9e3da0c3ab98067e",
"/js/vendor.js": "/js/vendor.js?id=54e44dd06cb8f6a3e6fe",
"/js/lang/de.js": "/js/lang/de.js?id=d57e11c0b49446e43d32",
"/js/lang/en.js": "/js/lang/en.js?id=abb57dae3941488e07e9",
"/js/lang/fr.js": "/js/lang/fr.js?id=5c985dc7ace8c7f28baf",
"/js/lang/de.js": "/js/lang/de.js?id=db973f6aaff0cda764c6",
"/js/lang/en.js": "/js/lang/en.js?id=db41698ef6dc5a662096",
"/js/lang/fr.js": "/js/lang/fr.js?id=acd514ce666ebf45ef7b",
"/js/lang/it.js": "/js/lang/it.js?id=b28a63928155eeb4e2a1",
"/js/lang/ru.js": "/js/lang/ru.js?id=f6b7c078755312a0907c",
"/js/lang/uk.js": "/js/lang/uk.js?id=c19a5dcee4724579cb41",

8
includes/snmp.inc.php
View File

@ -163,10 +163,14 @@ function gen_snmp_cmd($cmd, $device, $oids, $options = null, $mib = null, $mibdi
array_push($cmd, '-m', $mib);
}
array_push($cmd, '-M', mibdir($mibdir, $device));
if ($timeout = prep_snmp_setting($device, 'timeout')) {
$timeout = prep_snmp_setting($device, 'timeout');
if ($timeout && $timeout !== 1) {
array_push($cmd, '-t', $timeout);
}
if ($retries = prep_snmp_setting($device, 'retries')) {
$retries = prep_snmp_setting($device, 'retries');
if ($retries && $retries !== 5) {
array_push($cmd, '-r', $retries);
}

14
misc/config_definitions.json
View File

@ -4985,6 +4985,20 @@
"type": "integer",
"default": 0
},
"snmp.timeout": {
"group": "poller",
"section": "snmp",
"order": 5,
"type": "integer",
"default": 1
},
"snmp.retries": {
"group": "poller",
"section": "snmp",
"order": 6,
"type": "integer",
"default": 5
},
"snmp.port": {
"group": "poller",
"section": "snmp",

8
resources/lang/en/settings.php
View File

@ -1227,6 +1227,14 @@ return [
'description' => 'Port',
'help' => 'Set the tcp/udp port to be used for SNMP',
],
'timeout' => [
'description' => 'Timeout',
'help' => 'SNMP Timeout in seconds',
],
'retries' => [
'description' => 'Retries',
'help' => 'how many times to retry the query',
],
'v3' => [
'description' => 'SNMP v3 Authentication (priority)',
'help' => 'Set up v3 authentication variables and order them as you want them to be tried',