nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge $popgraph and $popdescr into $config['os'] as overgraph and overtext

Browse Source 
merge ifalias/ifdescr/ifname/ifindex decision making about port names into $config['os']


git-svn-id: http://www.observium.org/svn/observer/trunk@1265 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-06-25 13:04:03 +00:00
parent 19ccf99d8f
commit 9542635761
6 changed files with 119 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/snmp.inc.php
+7 -7
View File
@@ -19,7 +19,7 @@ function snmp_get ($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
function snmp_walk($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
{
global $debug; global $config; global $runtime_stats;
if ($device['snmpver'] == 'v1' || in_array($device['os'],$config['nobulkwalk']))
if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
{
$snmpcommand = $config['snmpwalk'];
}
@@ -43,7 +43,7 @@ function snmp_walk($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
function snmp_cache_cip($oid, $device, $array, $mib = 0)
{
global $config;
if ($device['snmpver'] == 'v1' || in_array($device['os'],$config['nobulkwalk']))
if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
{
$snmpcommand = $config['snmpwalk'];
}
@@ -80,7 +80,7 @@ function snmp_cache_cip($oid, $device, $array, $mib = 0)
function snmp_cache_ifIndex($device) {
global $config;
if ($device['snmpver'] == 'v1' || in_array($device['os'],$config['nobulkwalk']))
if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
{
$snmpcommand = $config['snmpwalk'];
}
@@ -173,7 +173,7 @@ function snmpwalk_cache_triple_oid($device, $oid, $array, $mib = NULL, $mibdir =
function snmpwalk_cache_twopart_oid($oid, $device, $array, $mib = 0) {
global $config;
if ($device['snmpver'] == 'v1' || in_array($device['os'],$config['nobulkwalk']))
if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
{
$snmpcommand = $config['snmpwalk'];
}
@@ -199,7 +199,7 @@ function snmpwalk_cache_twopart_oid($oid, $device, $array, $mib = 0) {
function snmpwalk_cache_threepart_oid($oid, $device, $array, $mib = 0) {
global $config, $debug;
if ($device['snmpver'] == 'v1' || in_array($device['os'],$config['nobulkwalk']))
if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
{
$snmpcommand = $config['snmpwalk'];
}
@@ -226,7 +226,7 @@ function snmpwalk_cache_threepart_oid($oid, $device, $array, $mib = 0) {
function snmp_cache_slotport_oid($oid, $device, $array, $mib = 0) {
global $config;
if ($device['snmpver'] == 'v1' || in_array($device['os'],$config['nobulkwalk']))
if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
{
$snmpcommand = $config['snmpwalk'];
}
@@ -255,7 +255,7 @@ function snmp_cache_slotport_oid($oid, $device, $array, $mib = 0) {
function snmp_cache_oid($oid, $device, $array, $mib = 0) {
global $config;
if ($device['snmpver'] == 'v1' || in_array($device['os'],$config['nobulkwalk']))
if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
{
$snmpcommand = $config['snmpwalk'];
}