added a bunch of device types to discover

git-svn-id: http://www.observium.org/svn/observer/trunk@1363 61d68cd4-352d-0410-923a-c4978735b2b8

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);
     }

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"; }
 
 }
 

includes/osdiscovery/discover-axiscam.php

@@ -0,0 +1,9 @@
+<?php
+
+if (!$os) {
+
+  if (preg_match("/AXIS.*Network Camera/", $sysDescr)) { $os = "axiscam"; }
+
+}
+
+?>

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"; }
+
+}
+
+?>

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"; }
+
 }
 
 ?>

includes/osdiscovery/discover-mgepdu.php

@@ -0,0 +1,9 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "MGE Switched PDU")) { $os = "mgepdu"; }
+
+}
+
+?>

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"; }
 
 }
 

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";