nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-02 00:32:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

only discover toner if it actually exists - HP LJ 4100 has 4 indexes but only one toner; should fix FS#46

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1341 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-07-11 14:36:30 +00:00
parent ebb41fa66b
commit 722e89f12e
1 changed files with 47 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/toner.inc.php
+4 -10
View File
@@ -2,13 +2,6 @@
if ($config['enable_printers']) if ($config['enable_printers'])
{ {
$id = $device['device_id'];
$hostname = $device['hostname'];
$community = $device['community'];
$snmpver = $device['snmpver'];
$port = $device['port'];
$valid_toner = array(); $valid_toner = array();
echo("Toner : "); echo("Toner : ");
@@ -32,6 +25,8 @@ if ($device['os'] == "dell-laser" || $device['os'] == "jetdirect")
$descr_oid = ".1.3.6.1.2.1.43.11.1.1.6.1.$index"; $descr_oid = ".1.3.6.1.2.1.43.11.1.1.6.1.$index";
$capacity_oid = ".1.3.6.1.2.1.43.11.1.1.8.1.$index"; $capacity_oid = ".1.3.6.1.2.1.43.11.1.1.8.1.$index";
$descr = trim(str_replace("\n","",str_replace('"','',snmp_get($device, $descr_oid, "-Oqv")))); $descr = trim(str_replace("\n","",str_replace('"','',snmp_get($device, $descr_oid, "-Oqv"))));
if ($descr != "")
{
$current = snmp_get($device, $toner_oid, "-Oqv"); $current = snmp_get($device, $toner_oid, "-Oqv");
$capacity = snmp_get($device, $capacity_oid, "-Oqv"); $capacity = snmp_get($device, $capacity_oid, "-Oqv");
$current = $current / $capacity * 100; $current = $current / $capacity * 100;
@@ -42,9 +37,9 @@ if ($device['os'] == "dell-laser" || $device['os'] == "jetdirect")
} }
} }
} }
}
## Delete removed toners ## Delete removed toners
if($debug) { echo("\n Checking ... \n"); print_r($valid_toner); } if($debug) { echo("\n Checking ... \n"); print_r($valid_toner); }
$sql = "SELECT * FROM toner WHERE device_id = '".$device['device_id']."'"; $sql = "SELECT * FROM toner WHERE device_id = '".$device['device_id']."'";
@@ -61,9 +56,8 @@ if ($query = mysql_query($sql))
} }
} }
unset($valid_toner); echo("\n"); unset($valid_toner); echo("\n");
} # if ($config['enable_printers']) } # if ($config['enable_printers'])
?> ?>