From 24f591838570071a66e2341b7fb3c595556ed2f6 Mon Sep 17 00:00:00 2001 From: Paul Heinrichs Date: Tue, 29 Mar 2016 11:50:55 -0400 Subject: [PATCH 1/3] Typo in temp canopy.inc --- includes/discovery/sensors/temperatures/canopy.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/discovery/sensors/temperatures/canopy.inc.php b/includes/discovery/sensors/temperatures/canopy.inc.php index 5a7a21233e..a268c52da6 100644 --- a/includes/discovery/sensors/temperatures/canopy.inc.php +++ b/includes/discovery/sensors/temperatures/canopy.inc.php @@ -6,11 +6,11 @@ if ($device['os'] == 'canopy') { d_echo($oids."\n"); if (!empty($oids)) { - echo 'Cambium Temperature '; + echo 'Canopy Temperature '; } $divisor = 1; - $type = 'cambium'; + $type = 'canopy'; if (!empty($oids)) { list(,$current) = explode(' ', $oids); $index = $oid; From 2e5fcdc2a744242f0823bb3230830b296e4ca5cf Mon Sep 17 00:00:00 2001 From: Paul Heinrichs Date: Tue, 29 Mar 2016 11:52:42 -0400 Subject: [PATCH 2/3] Exclude Canopy Powerlevel graph for AP --- .../polling/wireless/canopy-generic.inc.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/includes/polling/wireless/canopy-generic.inc.php b/includes/polling/wireless/canopy-generic.inc.php index bcedeb05f4..db1f0d761c 100644 --- a/includes/polling/wireless/canopy-generic.inc.php +++ b/includes/polling/wireless/canopy-generic.inc.php @@ -171,20 +171,6 @@ if (strstr($hardware, 'AP') || strstr($hardware, 'Master') || strstr($hardware, unset($rrd_filename,$visible,$tracked); } } -//PTP Equipment - $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-powerlevel.rrd"; - $lastLevel = str_replace('"',"",snmp_get($device, "lastPowerLevel.2", "-Ovqn", "WHISP-APS-MIB")); - if (is_numeric($lastLevel)) { - if (!is_file($rrd_filename)) { - rrdtool_create($rrd_filename, " --step 300 DS:last:GAUGE:600:-100:0".$config['rrd_rra']); - } - $fields = array( - 'last' => $lastLevel, - ); - rrdtool_update($rrd_filename, $fields); - $graphs['canopy_generic_450_powerlevel'] = TRUE; - unset($lastLevel); - } if (strstr($version, 'AP') == false) { $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-linkRadioDbm.rrd"; @@ -203,6 +189,20 @@ if (strstr($version, 'AP') == false) { unset($rrd_filename,$horizontal,$horizontal); } + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-powerlevel.rrd"; + $lastLevel = str_replace('"',"",snmp_get($device, "lastPowerLevel.2", "-Ovqn", "WHISP-APS-MIB")); + if (is_numeric($lastLevel)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:last:GAUGE:600:-100:0".$config['rrd_rra']); + } + $fields = array( + 'last' => $lastLevel, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_450_powerlevel'] = TRUE; + unset($lastLevel); + } + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-ptpSNR.rrd"; $horizontal = str_replace('"',"",snmp_get($device, "signalToNoiseRatioHorizontal.2", "-Ovqn", "WHISP-APS-MIB")); $vertical = str_replace('"',"",snmp_get($device, "signalToNoiseRatioVertical.2", "-Ovqn", "WHISP-APS-MIB")); From e9fc08ea28557c0ab4272a77e6cac82776973a72 Mon Sep 17 00:00:00 2001 From: Paul Heinrichs Date: Wed, 30 Mar 2016 09:41:02 -0400 Subject: [PATCH 3/3] Changing GPS tracked to green --- html/includes/graphs/device/cambium_generic_gpsStats.inc.php | 2 +- html/includes/graphs/device/canopy_generic_gpsStats.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/html/includes/graphs/device/cambium_generic_gpsStats.inc.php b/html/includes/graphs/device/cambium_generic_gpsStats.inc.php index 6872522f05..177fb67007 100644 --- a/html/includes/graphs/device/cambium_generic_gpsStats.inc.php +++ b/html/includes/graphs/device/cambium_generic_gpsStats.inc.php @@ -19,7 +19,7 @@ if (file_exists($rrdfilename)) { $rrd_options .= ' GPRINT:visible:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:visible:MIN:%0.2lf%s '; $rrd_options .= ' GPRINT:visible:MAX:%0.2lf%s\\\l '; - $rrd_options .= " LINE2:tracked#cc9900:'Tracked ' "; + $rrd_options .= " LINE2:tracked#00ff00:'Tracked ' "; $rrd_options .= ' GPRINT:tracked:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:tracked:MIN:%0.2lf%s '; $rrd_options .= ' GPRINT:tracked:MAX:%0.2lf%s\\\l '; diff --git a/html/includes/graphs/device/canopy_generic_gpsStats.inc.php b/html/includes/graphs/device/canopy_generic_gpsStats.inc.php index 93c0cd41cf..c49dcd581d 100644 --- a/html/includes/graphs/device/canopy_generic_gpsStats.inc.php +++ b/html/includes/graphs/device/canopy_generic_gpsStats.inc.php @@ -19,7 +19,7 @@ if (file_exists($rrdfilename)) { $rrd_options .= ' GPRINT:visible:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:visible:MIN:%0.2lf%s '; $rrd_options .= ' GPRINT:visible:MAX:%0.2lf%s\\\l '; - $rrd_options .= " LINE2:tracked#cc9900:'Tracked ' "; + $rrd_options .= " LINE2:tracked#00ff00:'Tracked ' "; $rrd_options .= ' GPRINT:tracked:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:tracked:MIN:%0.2lf%s '; $rrd_options .= ' GPRINT:tracked:MAX:%0.2lf%s\\\l ';