Index: includes/definitions/os.inc.php
===================================================================
--- includes/definitions/os.inc.php	(revision 5881)
+++ includes/definitions/os.inc.php	(working copy)
@@ -1053,6 +1053,18 @@
 $config['os'][$os]['sysObjectID'][]     = ".1.3.6.1.4.1.32050";
 $config['os'][$os]['mibs'][]            = "PACKETFLUX-MIB";
 
+// Cambium Canopy
+$os = "canopy";
+$config['os'][$os]['text']              = "Cambium Canopy";
+$config['os'][$os]['type']              = "wireless";
+$config['os'][$os]['icon']              = "cambium";
+$config['os'][$os]['sysObjectID'][]     = ".1.3.6.1.4.1.161.19.250.256";
+$config['os'][$os]['mibs'][]            = "CANOPY-MIB";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Traffic";
+$config['os'][$os]['over'][1]['graph']  = "device_wifi_clients";
+$config['os'][$os]['over'][1]['text']   = "Wireless Clients";
+
 // Proxim
 
 $os = "proxim";
Index: includes/discovery/os/canopy.inc.php
===================================================================
--- includes/discovery/os/canopy.inc.php	(revision 0)
+++ includes/discovery/os/canopy.inc.php	(working copy)
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package    observium
+ * @subpackage discovery
+ * @copyright  (C) 2006-2014 Adam Armstrong
+ *
+ */
+
+if (!$os)
+{
+  if (strstr($sysDescr, "CANOPY")) { $os = "canopy"; }
+}
+
+// EOF
+<?php
+
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package    observium
+ * @subpackage discovery
+ * @copyright  (C) 2006-2014 Adam Armstrong
+ *
+ */
+
+if (!$os)
+{
+  if (strstr($sysDescr, "CANOPY")) { $os = "canopy"; }
+}
+
+// EOF
Index: includes/polling/os/canopy.inc.php
===================================================================
--- includes/polling/os/canopy.inc.php	(revision 0)
+++ includes/polling/os/canopy.inc.php	(working copy)
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package    observium
+ * @subpackage poller
+ * @copyright  (C) 2006-2014 Adam Armstrong
+ *
+ */
+
+$version = trim(snmp_get($device, "1.3.6.1.4.1.161.19.3.3.1.1.0", "-OQv"),'"');
+$version = preg_replace("/^CANOPY /", "", $version);
+
+$platform = trim(snmp_get($device, "platformVer.0", "-OQv", 'WHISP-BOX-MIBV2-MIB', mib_dirs('cambium')), '"');
+$hardware = trim(snmp_get($device, "boxDeviceType.0", "-OQv", 'WHISP-BOX-MIBV2-MIB', mib_dirs('cambium')), '"');
+$hardware = "$hardware (P$platform)";
+
+// EOF
Index: includes/polling/wifi/canopy-mib.inc.php
===================================================================
--- includes/polling/wifi/canopy-mib.inc.php	(revision 0)
+++ includes/polling/wifi/canopy-mib.inc.php	(working copy)
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package    observium
+ * @subpackage poller
+ * @copyright  (C) 2006-2014 Adam Armstrong
+ *
+ */
+
+echo(" CANOPY-MIB ");
+
+if (preg_match("/AP/", $version, $regexp_result)) {
+	$wificlients1 = snmp_get($device, "regCount.0", "-Ovq", "WHISP-APS-MIB", mib_dirs('cambium'));
+}
+
+// EOF