From b991efa9a66680c5f1fdaefbd8abeec9d3797226 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Fri, 2 Jul 2010 16:11:59 +0000
Subject: [PATCH] add jetdirect support, fix automatic type assignment

git-svn-id: http://www.observium.org/svn/observer/trunk@1283 61d68cd4-352d-0410-923a-c4978735b2b8
---
 discovery.php                    |   2 +-
 html/images/os/jetdirect.png     | Bin 0 -> 1634 bytes
 includes/discovery/toner.inc.php |   6 +++---
 includes/static-config.php       |   7 +++++++
 4 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100755 html/images/os/jetdirect.png

diff --git a/discovery.php b/discovery.php
index 411960042..cc06b081f 100755
--- a/discovery.php
+++ b/discovery.php
@@ -131,7 +131,7 @@ while ($device = mysql_fetch_array($device_query))
   include("includes/discovery/ucd-diskio.inc.php");
   include("includes/discovery/services.inc.php");
 
-  if ($device['type'] == "unknown")
+  if ($device['type'] == "unknown" || $device['type'] == "")
   {
     if ($config['os'][$device['os']]['type'])
     {
diff --git a/html/images/os/jetdirect.png b/html/images/os/jetdirect.png
new file mode 100755
index 0000000000000000000000000000000000000000..600dc4e55ecdab395985ed0b94e0d2e46cab3ac3
GIT binary patch
literal 1634
zcmd^8`9IqS0R58LP)ZR;k4?36ANf>Et?ML_h`5g^Mdv6rN2z11tGd=pv?CFTG>Op0
zHKk}>ElN=uM0IsjXNfDWh$NDj{vCUtcYNLt@5h(n>Wos9KPnFZfFjxs;eL?XUnL7V
za0CPU?jXJig*m|h;CZ*D40h?DYsDkI<2|CU#U}>Fh5)eO=%5g7^!32d5ciP4;F~e;
zLw*JTX^yKS2C3;l&~hXgcvB6%DQ12YQy;2^Jwel+VCGBZ@r7!3IeQ|pIywhzcR)NC
zouiH>D8jQf?Q@h7IDt@P=6kTBs-bd5XI4yosUuU1kSjFHKzep@m(gX4sx4j>g+K0;
zYv4uU3q(hdI0ZP4R?SjD;>2Q!sx5A7XLpvpej)hDCYOIUpfH8pdONS}LMY=07t+$&
zHhXm|x4eh&4-+0<3=e0V_Q><PRrynJfx#tm@9-DTn-x}93!)#s#Fuo<vNynXgh$0)
zS&Yu7bsyt!ul-W0HP8f)gp%-#y1LGhsE4%?*gE&bXKsm=N=UqGLd9uJ-kaVrWaQHy
zG34aD7Lizdub`u{c}VXPrL?i{tUs-=rk7g9+T7-GHn}HUh$oy$2Hq51PqIbO6J%7$
zefnEtZ}Kt6Ts0KlJ)s=pN89BK+gYF2H@6$RCw2v**4{BxR4Hp@fmqhz5??+rIyXGE
z{NnB49GkPm**a{4d(l4D#+p__;5NCtroI$xVY@1dU>9AghQeJ8Epmt{z4T|Lz86&k
zojbF@(f4|6;zNzV)+Z60Zj+jsgYzH9+4^1-WMq+5aG^3HJGY#vjKtAvSiQpw(6GXw
zJGGoG9$z3-fMvJzj7DYF2c%WcFKsBo@kbC@C*6pyzdut(;8hUWD#+|#LK$nDJL9vf
zU^Jm`gl!o__fM@#d)%_a6L==o3{A2%(75Hb&Ay>I`x~WViG=ig0F1(!`O)&L`?TGN
zCO$NXUp_RvSS%J#EpARPaGH9iblmeAI)_~27(2UyH$CHAo`780C;Q9acF|?+A7)0U
zmv(lAM;!<fiR9D7LRH)7rwKNXzo&~KxAo6_?@T=9K{oNFg<)Tv3n<vy;V0mm$7fe)
z)xB0%^J_cDbupyy2QP9f`W9E#eUnN@rk1jb+k?`cudH*!GU^pzSpwl6t%^B0w~|xV
ztzwH;vBhaQ5cc=?`Mc6ze<X}|clJ1_|4#s)1CXZxK#Ge-z%YM|1@X}UL_tob=wCvf
zc7T2TSoP~HXKOz3xZ-?K>YZ1?*UY=C#HoOVBr(E2nLG2)aC`R1eXMx;a(gyYHpC}i
z)HuEY)%o!0lzZlvK*M>>ypswp$I9r|dWZJl#zPPG537N~z%oWaO#?i27MFe~Fv^^g
zEb|N}6D~~xxo)hsEuNczt}&5J>qbz`j676V4g-K4@fsfutb`u^W)+jm3->&`b*nDY
zlrRAW?%>K-DVYOXNqb~V1ShRoPtmP)Pg;N96@9kfCa&vxTc0lam{khvi_IBWfQ~Cn
zoL)a>Qj+{xqs1bkXr-T?9BC&{)dRpu$}L>PIa?zmqWOcw@qW5k+D@KtDHfI83OZaO
z;H8JA*IX2-L;K^?D}Z~TZq?P;N7gH>lwa$)JN*^Qp^rgtBqA%byc6Nl=S#t+lKA&!
zrhaase3-t+fN-#%-ZcoDRe;DeN$9DS4Z`gbUz>NNE;;KIEMr>?wV1ijw7MaSdTH1s
zWzI7OVa?Czs6k#{`7XoZ#@*Pzeybh)FcKNWzH4jwx_A#yw|0t{gEE_LY8D6?TFlNA
zNNTH6LJaaUuKm`d>!BlZG1WFQ!-)_KhnX8JBZVG<ph|2qP5m3<%CkVS9UbR8cute=
fA;z)l&{Qda|LuC&JAX^k!3zL1(iu?+4@mzHFXzHC

literal 0
HcmV?d00001

diff --git a/includes/discovery/toner.inc.php b/includes/discovery/toner.inc.php
index 1e9bb3092..a9832959e 100644
--- a/includes/discovery/toner.inc.php
+++ b/includes/discovery/toner.inc.php
@@ -13,11 +13,11 @@ $valid_toner = array();
 
 echo("Toner : ");
 
-if ($device['os'] == "dell-laser") 
+if ($device['os'] == "dell-laser" || $device['os'] == "jetdirect") 
 {
   $oids = trim(snmp_walk($device, "SNMPv2-SMI::mib-2.43.12.1.1.2.1 ", "-OsqnU"));
   if ($debug) { echo($oids."\n"); }
-  if ($oids) echo("Dell ");
+  if ($oids) echo("Jetdirect ");
   foreach(explode("\n", $oids) as $data) 
   {
     $data = trim($data);
@@ -35,7 +35,7 @@ if ($device['os'] == "dell-laser")
         $current       = snmp_get($device, $toner_oid, "-Oqv");
         $capacity      = snmp_get($device, $capacity_oid, "-Oqv");
         $current       = $current / $capacity * 100;
-        $type          = "dell-laser";
+        $type          = "jetdirect";
         echo discover_toner($valid_toner,$device, $toner_oid, $index, $type, $descr, $capacity, $current);
       }
     }
diff --git a/includes/static-config.php b/includes/static-config.php
index cf5b05ede..af6feaa81 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -150,6 +150,13 @@ $config['os']['dell-laser']['overtext']    = "Toner";
 $config['os']['dell-laser']['ifname']	   = 1;
 $config['os']['dell-laser']['type']        = "printer";
 
+$config['os']['jetdirect']['group'] 	   = "printer";
+$config['os']['jetdirect']['text']  	   = "HP Printer";
+$config['os']['jetdirect']['overgraph'][]  = "device_toner";
+$config['os']['jetdirect']['overtext']     = "Toner";
+$config['os']['jetdirect']['ifname']	   = 1;
+$config['os']['jetdirect']['type']         = "printer";
+
 $config['os']['3com']['text']             = "3Com";
 $config['os']['3com']['overgraph'][]      = "";
 $config['os']['3com']['overtext']         = "";