diff --git a/CHANGELOG b/CHANGELOG
index 6004193b0d..76d8f85003 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,24 @@
For more granular updates check http://twitter.com/observium or
http://www.observium.org/websvn/listing.php?repname=observer
-Release 0.10.6
+Release 0.10.7 ( SVN )
+
+* Project name has changed to Observium
+* rrdcached support
+* Discovery of new device/os types :
+ Apple Airport, Axis Camera, Motorola Netopia, APC Switch PDU,
+ Extreme Extremware, Redback, ZyXEL ZyWALL, DELL DRAC,
+ Dell PowerVault, Allied Telesis, Cisco NX-OS, MGE Evolution UPS
+ HP JetDirect printers, APC STS/ATS, Mikrotic RouterOS,
+ AKCP SensorProbe3
+* Temperature detection from CISCO-ENTITY-SENSOR-MIB
+* Graphing of statistics from DISKIO-MIB
+* Ongoing unification of all sensors into one 'sensors' framework
+* Detection and polling of frequency, voltage and ampage stats
+ for many UPSes and power switching hardware
+
+
+Release 0.10.6 ( 21st June 2010 )
Changed netstats (icmp, udp, tcp, snmp, ip) stats collection
Implemented new application monitoring system
diff --git a/html/images/os/broadcom.png b/html/images/os/broadcom.png
new file mode 100644
index 0000000000..715117c126
Binary files /dev/null and b/html/images/os/broadcom.png differ
diff --git a/includes/functions.php b/includes/functions.php
index b801dd3f52..1f85f40c5f 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -207,13 +207,21 @@ function getImage($host)
$sql = "SELECT * FROM `devices` WHERE `device_id` = '$host'";
$data = mysql_fetch_array(mysql_query($sql));
$type = strtolower($data['os']);
- if (file_exists($config['html_dir'] . "/images/os/$type" . ".png")){ $image = '
';
- } elseif (file_exists($config['html_dir'] . "/images/os/$type" . ".gif")){ $image = '
'; }
- if ($type == "linux") {
- $features = strtolower(trim($data['features']));
- list($distro) = split(" ", $features);
- if (file_exists($config['html_dir'] . "/images/os/$distro" . ".png")){ $image = '
';
- } elseif (file_exists($config['html_dir'] . "/images/os/$distro" . ".gif")){ $image = '
'; }
+ if ($config['os'][$type]['icon'] && file_exists($config['html_dir'] . "/images/os/" . $config['os'][$type]['icon'] . ".png"))
+ {
+ $image = '
';
+ } elseif ($config['os'][$type]['icon'] && file_exists($config['html_dir'] . "/images/os/". $config['os'][$type]['icon'] . ".gif"))
+ {
+ $image = '
';
+ } else {
+ if (file_exists($config['html_dir'] . "/images/os/$type" . ".png")){ $image = '
';
+ } elseif (file_exists($config['html_dir'] . "/images/os/$type" . ".gif")){ $image = '
'; }
+ if ($type == "linux") {
+ $features = strtolower(trim($data['features']));
+ list($distro) = split(" ", $features);
+ if (file_exists($config['html_dir'] . "/images/os/$distro" . ".png")){ $image = '
';
+ } elseif (file_exists($config['html_dir'] . "/images/os/$distro" . ".gif")){ $image = '
'; }
+ }
}
return $image;
}
diff --git a/includes/osdiscovery/discover-bcm963.php b/includes/osdiscovery/discover-bcm963.php
new file mode 100644
index 0000000000..bf69985551
--- /dev/null
+++ b/includes/osdiscovery/discover-bcm963.php
@@ -0,0 +1,10 @@
+
diff --git a/includes/static-config.php b/includes/static-config.php
index ab144243d7..a047ff002d 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -105,6 +105,9 @@ $config['os']['powervault']['text'] = "Dell PowerVault";
$config['os']['drac']['text'] = "Dell DRAC";
+$config['os']['bcm963']['text'] = "Broadcom BCM963xxx";
+$config['os']['bcm963']['icon'] = "broadcom";
+
$config['os']['netopia']['text'] = "Motorola Netopia";
$config['os']['netopia']['type'] = "network";