From 67b9345005cbfd73b20434ed77e9ffad51c77529 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Sat, 17 Jul 2010 17:26:47 +0000
Subject: [PATCH] more hardware detection - discovering the internets :)

git-svn-id: http://www.observium.org/svn/observer/trunk@1382 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/css/styles.css                           |   2 +-
 html/images/os/{dell-laser.png => dell.png}   | Bin
 html/images/os/konica.png                     | Bin 0 -> 2504 bytes
 html/images/os/kyocera.png                    | Bin 0 -> 567 bytes
 html/images/os/powerconnect.png               | Bin 1777 -> 0 bytes
 html/images/os/powervault.png                 | Bin 1777 -> 0 bytes
 html/images/os/ricoh.png                      | Bin 0 -> 964 bytes
 html/images/os/{zywall.png => zyxel.png}      | Bin
 includes/discovery/toner.inc.php              |   4 +-
 includes/osdiscovery/discover-dlink.inc.php   |  10 ----
 includes/osdiscovery/discover-dlinkap.php     |  20 ++++++++
 includes/osdiscovery/discover-ies.php         |  10 ++++
 includes/osdiscovery/discover-konica.php      |   9 ++++
 includes/osdiscovery/discover-kyocera.php     |   9 ++++
 .../osdiscovery/discover-powerconnect.php     |   6 +--
 includes/osdiscovery/discover-prestige.php    |  10 ++++
 includes/osdiscovery/discover-procurve.php    |   2 +-
 includes/osdiscovery/discover-ricoh.php       |   9 ++++
 includes/osdiscovery/discover-speedtouch.php  |   1 +
 includes/polling/device-windows.inc.php       |   3 +-
 includes/static-config.php                    |  48 ++++++++++++++++--
 21 files changed, 121 insertions(+), 22 deletions(-)
 rename html/images/os/{dell-laser.png => dell.png} (100%)
 create mode 100644 html/images/os/konica.png
 create mode 100644 html/images/os/kyocera.png
 delete mode 100644 html/images/os/powerconnect.png
 delete mode 100644 html/images/os/powervault.png
 create mode 100644 html/images/os/ricoh.png
 rename html/images/os/{zywall.png => zyxel.png} (100%)
 create mode 100644 includes/osdiscovery/discover-dlinkap.php
 create mode 100644 includes/osdiscovery/discover-ies.php
 create mode 100644 includes/osdiscovery/discover-konica.php
 create mode 100644 includes/osdiscovery/discover-kyocera.php
 create mode 100644 includes/osdiscovery/discover-prestige.php
 create mode 100644 includes/osdiscovery/discover-ricoh.php

diff --git a/html/css/styles.css b/html/css/styles.css
index 31ab5cf53..c7d3a4391 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -331,7 +331,7 @@ a.list-device-ignored-up {
 }
 
 a.list-device-disabled {
-	color: #888888;
+	color: #999999;
 }
 
 .footer-text {
diff --git a/html/images/os/dell-laser.png b/html/images/os/dell.png
similarity index 100%
rename from html/images/os/dell-laser.png
rename to html/images/os/dell.png
diff --git a/html/images/os/konica.png b/html/images/os/konica.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bfd0479f7589bf9448fff98c28837e496742b99
GIT binary patch
literal 2504
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
S{$$Sp0000<MNUMnLSTYQUaGzT

literal 0
HcmV?d00001

diff --git a/html/images/os/kyocera.png b/html/images/os/kyocera.png
new file mode 100644
index 0000000000000000000000000000000000000000..34fc59820f2c6b8a689ba6338ae517d6e71b11e3
GIT binary patch
literal 567
zcmV-70?7S|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2igY^
z7dsKsBV<_s00Fm2L_t(o!^PLVPQp+a#_{K+EmgFzXyU-gWVi?%O&m<%9-Q?Cyawaq
zz~W*TCuPTY55z@x2f|<zOdHzQfk=RIdcG=lgB<w(`h5;DGs@T|6m%U>2*8t#br84r
zIUWH(W!v%ft@597Yk+Os3Q$Je7*JLm0Nmvd5!HvXAEZcM=I-pYXdHnKd5%;EWI(5A
zFav`GbmxOUzJb>xj)vl+RBJk`e{XjR7#NHZ^{Vh<0DHTj=T8bwY)?T&C*ER?m%cVe
zBsu^=+!(<~`?pBmlmL>rHiD7%Z!o>MX3nGl#kewJQ(Oqpj7t%s_(p(XT!<)&=Kz-R
z6$FDjvUm<K!|cH_zCgHe&tqg^Q9K9m;NDLt=-Sp9X@82@)egKT+1;^z4R{VHv_bqH
zb{~|f+#Q?l0%L^WoEIWQ&jD?O<bo3-ik^hZ2$ic{gpj=pqzJ|M3SvUFrq0_?h|r8L
z5LKiN-T6QcVHmfX6M7CP%#d`;isz<e4&t_aPFQ7tjxSLkeNm%e_2arK05Vycy%YHd
z2p$PIGudnFrCEzP9wX{8FxbkR@GlWoOS3W%){9eH#1D42G!(V$CPM%K002ovPDHLk
FV1mw0>w5qI

literal 0
HcmV?d00001

diff --git a/html/images/os/powerconnect.png b/html/images/os/powerconnect.png
deleted file mode 100644
index 9fffd8c50c1252944ecf02bd4a75e65200f6708c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1777
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
TlzL0z00000NkvXXu0mjf`gv4w

diff --git a/html/images/os/powervault.png b/html/images/os/powervault.png
deleted file mode 100644
index 9fffd8c50c1252944ecf02bd4a75e65200f6708c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1777
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
TlzL0z00000NkvXXu0mjf`gv4w

diff --git a/html/images/os/ricoh.png b/html/images/os/ricoh.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb84bb36a07e82beee83b93b3c4a4b586fe14821
GIT binary patch
literal 964
zcmV;#13UbQP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RV2M`x0C~Hx%3;+NFR!KxbR7l6Q
zR!dJ4Q4~J&pq;s;v~)^J0*Fcw2@iuY7;$BMCN4}|i3`JumBxh&6BoL0V~k7VPcU7%
z@Ubu^ipHQZL?Q$q38*|O0cT3fbnZ;2Gjm-O>~v;YJB^&o;^y2l_q*r&&N;ahAp~~P
zShs6^^t$?E+2IUby%ZlkW67F0eoOtajCce9q*Vy^?`t?Vj7A2000btdo0paxPW=6N
zrCq5-z&EeNFJJHkpxrJKLM+AEKgTWrY;W-_#U(@quHD6xv$X<j8)f?{87T%tbc`Q9
z^9xX;_@o%AOwCxb<_n;@IWue8#C1^g&pb*PMj}p!xtgk|(h=1I0w<2tTBa@y%aWiJ
z%u<})X%H>fyFWa3&M!qCmVP?HuZs4gr3U)f;e%}Q4%-&@n*nj~lV3;~S8oRltC*I~
z((?Eix_CA=(Cx{7Eg};;%WO2v@u5<~8y1<H$BU^dr`Jf)7Tt`{q>l_4q*UzDiMKFz
zL%g4?4}iE!h(0=Ghh!-(qGRSk(nyK*Wk4Jygbwy)1IXTJEXA1%OPM!QbyHN9M6jom
z>Dpyy2>>EGwjRH#55P$gBQzBb^w^TyN}}P@H&fcITV%>hhB8C*OB+*j|Dn;!WhhNO
zx`5%yYaakMmYq7gWFP>9r8ws0dry|=S~{SD45a{rXpLXKda~p(DvU&25(RtHYO2CU
zLUtLH$!W)5nyT<qpW(D~rc&-_i;)sdE$_TYG|UK1#kE<m$a>nN7`VXSm}&r(%q&<;
zgYTm7ph&!*1R+{nhldB&X1*l`dvrz4&;2ypTH<}(nbmbNI}fo)w7*+gSj<b=VsQJ3
z5%=Kp$RN{ss<3w#08o=3aq?bJh%l-S0O{owP7si$n{6$5DT_26ViA)MFsa{ZMUHi}
zHy`SAQ^b0{i;4^D{7Jqe0RW)t0Kf?XLOdWIMMHThi@89M4*&q_Yy&xm!j1kK4XYRc
zXf9Z)6G=)huRuDh(`DDfat>qF-z*}nLg>&S{pbamou{_jC#IR4AV4f)q_arVHA!Mr
zol$j2XEjN}a?X3sxHS-;zeC|hCJ~cA%m({*Yq}ZR(_v)f&5aBI2t8faW^QA34FHOM
mU6Hq@Nbf#(nNd6aeE$PdGiNcLK^I;C0000<MNUMnLSTXdOrin+

literal 0
HcmV?d00001

diff --git a/html/images/os/zywall.png b/html/images/os/zyxel.png
similarity index 100%
rename from html/images/os/zywall.png
rename to html/images/os/zyxel.png
diff --git a/includes/discovery/toner.inc.php b/includes/discovery/toner.inc.php
index 2835b609f..eb4d22665 100644
--- a/includes/discovery/toner.inc.php
+++ b/includes/discovery/toner.inc.php
@@ -5,8 +5,8 @@ if ($config['enable_printers'])
   $valid_toner = array();
   
   echo("Toner : ");
-  
-  if ($device['os'] == "dell-laser" || $device['os'] == "jetdirect") 
+
+  if ($device['os_group'] == 'printer') 
   {
     $oids = trim(snmp_walk($device, "SNMPv2-SMI::mib-2.43.12.1.1.2.1 ", "-OsqnU"));
     if ($debug) { echo($oids."\n"); }
diff --git a/includes/osdiscovery/discover-dlink.inc.php b/includes/osdiscovery/discover-dlink.inc.php
index 08427e8a6..e69de29bb 100644
--- a/includes/osdiscovery/discover-dlink.inc.php
+++ b/includes/osdiscovery/discover-dlink.inc.php
@@ -1,10 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strpos($sysDescr, "DES-") !== FALSE) { $os = "dlink"; }
-
-}
-
-
-?>
diff --git a/includes/osdiscovery/discover-dlinkap.php b/includes/osdiscovery/discover-dlinkap.php
new file mode 100644
index 000000000..3443bfe52
--- /dev/null
+++ b/includes/osdiscovery/discover-dlinkap.php
@@ -0,0 +1,20 @@
+<?php
+
+if (!$os) {
+
+  if (preg_match("/D-Link .* AP/", $sysDescr)) { $os = "dlinkap"; }
+  else if (preg_match("/D-Link Access Point/", $sysDescr)) { $os = "dlinkap"; }
+
+}
+
+?>
+<?php
+
+if (!$os) {
+
+  if (preg_match("/D-Link .* AP/", $sysDescr)) { $os = "dlinkap"; }
+  else if (preg_match("/D-Link Access Point/", $sysDescr)) { $os = "dlinkap"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-ies.php b/includes/osdiscovery/discover-ies.php
new file mode 100644
index 000000000..a5e9b08f0
--- /dev/null
+++ b/includes/osdiscovery/discover-ies.php
@@ -0,0 +1,10 @@
+<?php
+
+if(!$os) {
+
+  if(strpos($sysDescr, "ZyXEL IES-") !== FALSE) { $os = "ies"; }
+
+}
+
+
+?>
diff --git a/includes/osdiscovery/discover-konica.php b/includes/osdiscovery/discover-konica.php
new file mode 100644
index 000000000..3091a0790
--- /dev/null
+++ b/includes/osdiscovery/discover-konica.php
@@ -0,0 +1,9 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "KONICA MINOLTA magicolor")) { $os = "konica"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-kyocera.php b/includes/osdiscovery/discover-kyocera.php
new file mode 100644
index 000000000..de9d85333
--- /dev/null
+++ b/includes/osdiscovery/discover-kyocera.php
@@ -0,0 +1,9 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "KYOCERA ")) { $os = "kyocera"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-powerconnect.php b/includes/osdiscovery/discover-powerconnect.php
index e396dd457..e6abb416b 100755
--- a/includes/osdiscovery/discover-powerconnect.php
+++ b/includes/osdiscovery/discover-powerconnect.php
@@ -2,9 +2,9 @@
 
 if (!$os) 
 {
-  if (strstr($sysDescr, "Neyland 24T")) { $os = "powerconnect"; }
-  if (stristr($sysDescr, "PowerConnect ")) { $os = "powerconnect"; }
-  if (preg_match("/Dell.*Gigabit\ Ethernet/i",$sysDescr)) { $os = "powerconnect"; } 
+  if (strstr($sysDescr, "Neyland 24T")) { $os = "powerconnect"; } /* Powerconnect 5324 */
+  else if (stristr($sysDescr, "PowerConnect ")) { $os = "powerconnect"; }
+  else if (preg_match("/Dell.*Gigabit\ Ethernet/i",$sysDescr)) { $os = "powerconnect"; } 
 }
 
 ?>
diff --git a/includes/osdiscovery/discover-prestige.php b/includes/osdiscovery/discover-prestige.php
new file mode 100644
index 000000000..14c5108f8
--- /dev/null
+++ b/includes/osdiscovery/discover-prestige.php
@@ -0,0 +1,10 @@
+<?php
+
+if (!$os) {
+
+  if (preg_match("/^Prestige \d/", $sysDescr)) { $os = "prestige"; }
+  else if (preg_match("/^P-.*-/", $sysDescr)) { $os = "prestige"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-procurve.php b/includes/osdiscovery/discover-procurve.php
index d72de9fc9..e763a0e71 100755
--- a/includes/osdiscovery/discover-procurve.php
+++ b/includes/osdiscovery/discover-procurve.php
@@ -2,7 +2,7 @@
 
 if(!$os) {
 
-  if(strstr($sysDescr, "ProCurve")) { $os = "procurve"; }
+  if(stristr($sysDescr, "ProCurve")) { $os = "procurve"; }
 
 }
 
diff --git a/includes/osdiscovery/discover-ricoh.php b/includes/osdiscovery/discover-ricoh.php
new file mode 100644
index 000000000..47df745ec
--- /dev/null
+++ b/includes/osdiscovery/discover-ricoh.php
@@ -0,0 +1,9 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "RICOH Aficio")) { $os = "ricoh"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-speedtouch.php b/includes/osdiscovery/discover-speedtouch.php
index c87250de0..443a17dd7 100755
--- a/includes/osdiscovery/discover-speedtouch.php
+++ b/includes/osdiscovery/discover-speedtouch.php
@@ -4,6 +4,7 @@ if(!$os) {
 
   if(strpos($sysDescr, "TG585v7") !== FALSE) { $os = "speedtouch"; }
   else if(strpos($sysDescr, "SpeedTouch 5") !== FALSE) { $os = "speedtouch"; }
+  else if (preg_match("/^ST\d/", $sysDescr)) { $os = "speedtouch"; }
 
 }
 
diff --git a/includes/polling/device-windows.inc.php b/includes/polling/device-windows.inc.php
index 6b83d967c..b234d6f93 100755
--- a/includes/polling/device-windows.inc.php
+++ b/includes/polling/device-windows.inc.php
@@ -4,6 +4,7 @@
 
    if(strstr($sysDescr, "x86")) { $hardware = "Generic x86"; }
    if(strstr($sysDescr, "AMD64")) { $hardware = "Generic x64"; }
+   if(strstr($sysDescr, "Intel64")) { $hardware = "Generic x64"; }
 
    if(strstr($sysDescr, "Build Number: 1381")) { $version = "NT 4.0"; }
    if(strstr($sysDescr, "Build 2195"))         { $version = "2000 (NT 5.0)"; }
@@ -12,7 +13,7 @@
    if(strstr($sysDescr, "Build 6000"))         { $version = "Vista (NT 6.0)"; }
    if(strstr($sysDescr, "Build 6001"))         { $version = "Vista SP1 / 2008 (NT 6.0)"; }
    if(strstr($sysDescr, "Build 6001"))         { $version = "Vista SP2 / 2008 SP2 (NT 6.0)"; }
-   if(strstr($sysDescr, "Build 6001"))         { $version = "7 / 2008 R2 (NT 6.1)"; }
+   if(strstr($sysDescr, "Build 7600"))         { $version = "7 / 2008 R2 (NT 6.1)"; }
 
    if(strstr($sysDescr, "Uniprocessor Free")) { $features = "Uniprocessor"; }
    if(strstr($sysDescr, "Multiprocessor Free")) { $features = "Multiprocessor"; }
diff --git a/includes/static-config.php b/includes/static-config.php
index a047ff002..3b3b4fb95 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -100,10 +100,13 @@ $config['os']['extremeware']['ifname']  = 1;
 $config['os']['powerconnect']['text']   = "Dell PowerConnect";
 $config['os']['powerconnect']['ifname'] = 1;
 $config['os']['powerconnect']['type']   = "network";
+$config['os']['powerconnect']['icon']   = "dell";
 
 $config['os']['powervault']['text']     = "Dell PowerVault";
+$config['os']['powervault']['icon']     = "dell";
 
 $config['os']['drac']['text']           = "Dell DRAC";
+$config['os']['drac']['icon']           = "dell";
 
 $config['os']['bcm963']['text']		= "Broadcom BCM963xxx";
 $config['os']['bcm963']['icon']		= "broadcom";
@@ -111,6 +114,14 @@ $config['os']['bcm963']['icon']		= "broadcom";
 $config['os']['netopia']['text']        = "Motorola Netopia";
 $config['os']['netopia']['type']        = "network";
 
+$config['os']['dlink']['text']          = "D-Link Switch";
+$config['os']['dlink']['type']          = "network";
+$config['os']['dlink']['icon']          = "dlink";
+
+$config['os']['dlinkap']['text']        = "D-Link Access Point";
+$config['os']['dlinkap']['type']        = "network";
+$config['os']['dlink']['icon']          = "dlink";
+
 $config['os']['axiscam']['text']        = "AXIS Network Camera";
 
 $config['os']['axisdocserver']['text']  = "AXIS Network Document Server";
@@ -135,6 +146,15 @@ $config['os']['zywall']['text']     	= "ZyXEL ZyWALL";
 $config['os']['zywall']['type']     	= "firewall";
 $config['os']['zywall']['overgraph'][]  = "device_bits";
 $config['os']['zywall']['overtext']     = "Traffic";
+$config['os']['zywall']['icon']         = "zyxel";
+
+$config['os']['prestige']['text']     	= "ZyXEL Prestige";
+$config['os']['prestige']['type']     	= "network";
+$config['os']['prestige']['icon']       = "zyxel";
+
+$config['os']['ies']['text']     	= "ZyXEL IES DSLAM";
+$config['os']['ies']['type']     	= "network";
+$config['os']['ies']['icon']            = "zyxel";
 
 $config['os']['allied']['text']         = "AlliedWare";
 $config['os']['allied']['type']         = "network";
@@ -193,10 +213,30 @@ $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']         = "";
-$config['os']['3com']['type']             = "network";
+$config['os']['ricoh']['group'] 	   = "printer";
+$config['os']['ricoh']['text']  	   = "Ricoh Printer";
+$config['os']['ricoh']['overgraph'][]      = "device_toner";
+$config['os']['ricoh']['overtext']         = "Toner";
+$config['os']['ricoh']['type']             = "printer";
+
+$config['os']['konica']['group'] 	   = "printer";
+$config['os']['konica']['text']  	   = "Konica-Minolta Printer";
+$config['os']['konica']['overgraph'][]     = "device_toner";
+$config['os']['konica']['overtext']        = "Toner";
+$config['os']['konica']['ifname']	   = 1;
+$config['os']['konica']['type']            = "printer";
+
+$config['os']['kyocera']['group'] 	   = "printer";
+$config['os']['kyocera']['text']  	   = "Kyocera Mita Printer";
+$config['os']['kyocera']['overgraph'][]    = "device_toner";
+$config['os']['kyocera']['overtext']       = "Toner";
+$config['os']['kyocera']['ifname']	   = 1;
+$config['os']['kyocera']['type']           = "printer";
+
+$config['os']['3com']['text']              = "3Com";
+$config['os']['3com']['overgraph'][]       = "";
+$config['os']['3com']['overtext']          = "";
+$config['os']['3com']['type']              = "network";
 
 if(!$config['graph_colours']['greens']) {
   $config['graph_colours']['greens']  = array('B6D14B','91B13C','6D912D','48721E','24520F','003300');