From eb1c9f2763dcc1c54b312d8b02a10911e0feb441 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Thu, 15 Jul 2010 23:17:25 +0000
Subject: [PATCH] added a bunch of device types to discover

git-svn-id: http://www.observium.org/svn/observer/trunk@1363 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/images/os/axiscam.png                   | Bin 0 -> 2138 bytes
 html/images/os/drac.png                      | Bin 0 -> 1777 bytes
 html/images/os/mgepdu.png                    | Bin 0 -> 1119 bytes
 includes/functions.php                       |   2 +-
 includes/osdiscovery/discover-apc.php        |   1 +
 includes/osdiscovery/discover-axiscam.php    |   9 +++++++++
 includes/osdiscovery/discover-drac.php       |   9 +++++++++
 includes/osdiscovery/discover-jetdirect.php  |   3 ++-
 includes/osdiscovery/discover-mgepdu.php     |   9 +++++++++
 includes/osdiscovery/discover-speedtouch.php |   1 +
 includes/static-config.php                   |  12 ++++++++++--
 11 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 html/images/os/axiscam.png
 create mode 100644 html/images/os/drac.png
 create mode 100644 html/images/os/mgepdu.png
 create mode 100644 includes/osdiscovery/discover-axiscam.php
 create mode 100644 includes/osdiscovery/discover-drac.php
 create mode 100644 includes/osdiscovery/discover-mgepdu.php

diff --git a/html/images/os/axiscam.png b/html/images/os/axiscam.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba70a171638db91236ccc16b134dcd4b93fc980
GIT binary patch
literal 2138
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
QaR2}S07*qoM6N<$f>k5<{{R30

literal 0
HcmV?d00001

diff --git a/html/images/os/drac.png b/html/images/os/drac.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fffd8c50c1252944ecf02bd4a75e65200f6708c
GIT binary patch
literal 1777
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
TlzL0z00000NkvXXu0mjf`gv4w

literal 0
HcmV?d00001

diff --git a/html/images/os/mgepdu.png b/html/images/os/mgepdu.png
new file mode 100644
index 0000000000000000000000000000000000000000..670303fb09eb2a36e51c76281c487f2cd7796259
GIT binary patch
literal 1119
zcmV-l1fctgP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igV-
z4=D+$O5k4r00ZAiL_t(o!|j$`Xk1kg$A5D__TJsi=BrJ#wb7blO>G3Vnp9t;pfnGy
zf{=bvpH!%b;HwClK8VkKkRphA5EYBk;s-@-Nf4wZ6q=R<p^`KvByO6t?xy>Z&E7jc
z<ZRj8<jE5AU=AF(cg}xi{%6k2Fruog<+51gwN7B2z&ZivUX(A3xKY_I)rA$oQLMo^
z0HYG?Xd>8q9skoOH8%+`E&jF`awH%)w?Rt-QG2r@J08J#4RjMgh?6ehe-2!(#$A*8
zh8FV2z}c!$R7g(ae$^&&5mmJSnpo&a5T0lyI9gG32@WMFo~R|<8Fl`bB%evZ8HX?r
z)=5QrU4pbv@%|{bmGVPA!Mh%z?O+Y~$Y6@XY*i$bEWAFCJCnuvwwrEy0yg|j>~s+?
zQ^wn`s#NbgIQ<#ik5RRvXUnn4C-S(1MVu~$ghH(P-0Bf=z>+fI_llHGajqjyYP*62
zglC|<vHC{C(p=-9+XLM102Pqx9gRRpId2g-z#9c(@6X}AJtdnHOR7LX6rBpN`aSY*
z7Rhh5;HnEZLo`)waE`!Iz`^zuR6$i*{9EF8r6sX@dG@KLi*Cj($|Hg`cAKekv<$r%
z#3$ir;9v?lki+T)X$&D&ZLU*ivkI4l{LwxUA7F|J@d-YtW&U_H3N}s>)GJW#^)>jU
zM)Rj1Q!Onapje(Fsgt|r#{$AW+bWN5*1|+UxFy6|R;pR-_bjZor*J-;6X)dy+{1!2
zmtj1LokvO_@fhw~8SxI~#C~T+;?E;Ji_uqACM40BBy4Kb;t#(`T?4?g?9I$@_CSD+
z+^3~WQNwBR+T+M^o6rLY(D6C!FSls%y29NdV?-M3n#mk?vD-pqUeJa-&M)WL_f5Bc
z9mqWoB=WG2ju!v5dX#{OIDn(7MG>h7N~)SSX9?510#(gP&z{BS8AzrW9nCR3++a#O
zUBRkqc8UG=_8I^k8p@%n0@%QFz#U*3Xa!yX&H~$j0ad+W2pj|c0LFk9&36{)06qg=
zHGX~sUIBgrHX54=WAi28BJjJKPAI?*U?1=RunBO1o4`)s@u~~NfIUC~cp3<Sz~CMP
z(&oPw*lqAWa1huJctD*YY+*uF7Lf};CvXFp0L~jHSAo$g0z<$gFbA9hMt~IXE08fa
zO9HpeZ3P$vJ~ENM1zZ90R1&q)5`lPii!@P)%Hn_(kvV`DZNWz0T|vIYrmXc??wI6y
z6gXl+yV|QBxB&F2YFO!VO+Xhgv&zmFfEM6Spuc(|ngqTur6{XRA_ZKlB;nm05E1*o
le0x<5R_ui9WBLD%z(4pH<-4hW?aKfF002ovPDHLkV1fwK^|1f|

literal 0
HcmV?d00001

diff --git a/includes/functions.php b/includes/functions.php
index aaba84555..18d90d720 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -105,7 +105,7 @@ function getHostOS($device)
   $dir_handle = @opendir($config['install_dir'] . "/includes/osdiscovery") or die("Unable to open $path");
   while ($file = readdir($dir_handle))
   {
-    if ( preg_match("/^discover-([a-z0-9\-]*).php/", $file) )
+    if ( preg_match("/^discover-([a-z0-9\-]*).php$/", $file) )
     {
       include($config['install_dir'] . "/includes/osdiscovery/" . $file);
     }
diff --git a/includes/osdiscovery/discover-apc.php b/includes/osdiscovery/discover-apc.php
index f59e213bc..aee6b3eb1 100644
--- a/includes/osdiscovery/discover-apc.php
+++ b/includes/osdiscovery/discover-apc.php
@@ -4,6 +4,7 @@ if(!$os) {
 
   if(strstr($sysDescr, "APC Web/SNMP Management Card")) { $os = "apc"; }
   else if(strstr($sysDescr, "APC Switched Rack PDU")) { $os = "apc"; }
+  else if(strstr($sysDescr, "APC MasterSwitch PDU")) { $os = "apc"; }
 
 }
 
diff --git a/includes/osdiscovery/discover-axiscam.php b/includes/osdiscovery/discover-axiscam.php
new file mode 100644
index 000000000..b366fb9e9
--- /dev/null
+++ b/includes/osdiscovery/discover-axiscam.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os) {
+
+  if (preg_match("/AXIS.*Network Camera/", $sysDescr)) { $os = "axiscam"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-drac.php b/includes/osdiscovery/discover-drac.php
new file mode 100644
index 000000000..82e24cf0f
--- /dev/null
+++ b/includes/osdiscovery/discover-drac.php
@@ -0,0 +1,9 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "Dell Out-of-band SNMP Agent for Remote Access Controller")) { $os = "drac"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-jetdirect.php b/includes/osdiscovery/discover-jetdirect.php
index bd3470697..26b167552 100644
--- a/includes/osdiscovery/discover-jetdirect.php
+++ b/includes/osdiscovery/discover-jetdirect.php
@@ -3,7 +3,8 @@
 if(!$os) {
 
   if(strstr($sysDescr, "JETDIRECT")) { $os = "jetdirect"; }
-  else if(strstr($sysDescr, "HP ETHERNET MULTI-ENVIRONMENT,")) { $os = "jetdirect"; }
+  else if(strstr($sysDescr, "HP ETHERNET MULTI-ENVIRONMENT")) { $os = "jetdirect"; }
+
 }
 
 ?>
diff --git a/includes/osdiscovery/discover-mgepdu.php b/includes/osdiscovery/discover-mgepdu.php
new file mode 100644
index 000000000..3a464e577
--- /dev/null
+++ b/includes/osdiscovery/discover-mgepdu.php
@@ -0,0 +1,9 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "MGE Switched PDU")) { $os = "mgepdu"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-speedtouch.php b/includes/osdiscovery/discover-speedtouch.php
index a1060aa71..c87250de0 100755
--- a/includes/osdiscovery/discover-speedtouch.php
+++ b/includes/osdiscovery/discover-speedtouch.php
@@ -3,6 +3,7 @@
 if(!$os) {
 
   if(strpos($sysDescr, "TG585v7") !== FALSE) { $os = "speedtouch"; }
+  else if(strpos($sysDescr, "SpeedTouch 5") !== FALSE) { $os = "speedtouch"; }
 
 }
 
diff --git a/includes/static-config.php b/includes/static-config.php
index 72d4e5bcc..f2faba7f8 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -101,9 +101,14 @@ $config['os']['powerconnect']['text']   = "Dell PowerConnect";
 $config['os']['powerconnect']['ifname'] = 1;
 $config['os']['powerconnect']['type']   = "network";
 
-$config['os']['powervault']['text']   = "Dell PowerVault";
+$config['os']['powervault']['text']     = "Dell PowerVault";
 
-$config['os']['gamatronicups']['text']   = "Gamatronic UPS Stack";
+$config['os']['drac']['text']           = "Dell DRAC";
+
+$config['os']['axiscam']['text']        = "AXIS Network Camera";
+
+$config['os']['gamatronicups']['text']  = "Gamatronic UPS Stack";
+$config['os']['gamatronicups']['type']  = "power";
 
 $config['os']['airport']['type'] 	= "network";
 $config['os']['airport']['text']  	= "Apple AirPort";
@@ -132,6 +137,9 @@ $config['os']['mgeups']['overgraph'][]	= "device_current";
 $config['os']['mgeups']['overtext']	= "Current";
 $config['os']['mgeups']['type']		= "power";
 
+$config['os']['mgepdu']['text']         = "MGE PDU";
+$config['os']['mgepdu']['type']		= "power";
+
 $config['os']['apc']['text']            = "APC Management Module";
 $config['os']['apc']['overgraph'][]	= "device_current";
 $config['os']['apc']['overtext']	= "Current";