diff --git a/html/includes/graphs/device/cambium_250_modulationMode.inc.php b/html/includes/graphs/device/cambium_250_modulationMode.inc.php index 01fa4118f..ec6adab90 100644 --- a/html/includes/graphs/device/cambium_250_modulationMode.inc.php +++ b/html/includes/graphs/device/cambium_250_modulationMode.inc.php @@ -16,6 +16,7 @@ if (file_exists($rrdfilename)) { $rrd_options .= " COMMENT:'Mode Now Ave Max \\n'"; $rrd_options .= ' DEF:rxModulation='.$rrdfilename.':rxModulation:AVERAGE '; $rrd_options .= ' DEF:txModulation='.$rrdfilename.':txModulation:AVERAGE '; + $rrd_options .= " -l 0 "; $rrd_options .= " LINE2:rxModulation#0000FF:'Receive Modulation ' "; $rrd_options .= ' GPRINT:rxModulation:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:rxModulation:MIN:%0.2lf%s '; @@ -24,4 +25,4 @@ if (file_exists($rrdfilename)) { $rrd_options .= ' GPRINT:txModulation:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:txModulation:MIN:%0.2lf%s '; $rrd_options .= ' GPRINT:txModulation:MAX:%0.2lf%s\\\l '; -} +} \ No newline at end of file diff --git a/html/includes/graphs/device/cambium_250_transmitPower.inc.php b/html/includes/graphs/device/cambium_250_transmitPower.inc.php index 7206e02a9..82a8436f9 100644 --- a/html/includes/graphs/device/cambium_250_transmitPower.inc.php +++ b/html/includes/graphs/device/cambium_250_transmitPower.inc.php @@ -16,7 +16,8 @@ if (file_exists($rrdfilename)) { $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= ' DEF:transmitPower='.$rrdfilename.':transmitPower:AVERAGE '; $rrd_options .= " LINE2:transmitPower#FF0000:'Transmit Power ' "; + $rrd_options .= " -l 0 "; $rrd_options .= ' GPRINT:transmitPower:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:transmitPower:MIN:%0.2lf%s '; $rrd_options .= ' GPRINT:transmitPower:MAX:%0.2lf%s\\\l '; -} +} \ No newline at end of file diff --git a/html/includes/graphs/device/cambium_650_modulationMode.inc.php b/html/includes/graphs/device/cambium_650_modulationMode.inc.php index cb8a62da0..81a83aad1 100644 --- a/html/includes/graphs/device/cambium_650_modulationMode.inc.php +++ b/html/includes/graphs/device/cambium_650_modulationMode.inc.php @@ -16,6 +16,7 @@ if (file_exists($rrdfilename)) { $rrd_options .= " COMMENT:'Mode Now Ave Max \\n'"; $rrd_options .= ' DEF:rxModulation='.$rrdfilename.':rxModulation:AVERAGE '; $rrd_options .= ' DEF:txModulation='.$rrdfilename.':txModulation:AVERAGE '; + $rrd_options .= " -l 0 "; $rrd_options .= " LINE2:rxModulation#0000FF:'Receive Modulation ' "; $rrd_options .= ' GPRINT:rxModulation:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:rxModulation:MIN:%0.2lf%s '; @@ -24,4 +25,4 @@ if (file_exists($rrdfilename)) { $rrd_options .= ' GPRINT:txModulation:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:txModulation:MIN:%0.2lf%s '; $rrd_options .= ' GPRINT:txModulation:MAX:%0.2lf%s\\\l '; -} +} \ No newline at end of file diff --git a/html/includes/graphs/device/cambium_650_transmitPower.inc.php b/html/includes/graphs/device/cambium_650_transmitPower.inc.php index 565a75eef..46af92e3a 100644 --- a/html/includes/graphs/device/cambium_650_transmitPower.inc.php +++ b/html/includes/graphs/device/cambium_650_transmitPower.inc.php @@ -15,8 +15,9 @@ $rrdfilename = $config['rrd_dir'].'/'.$device['hostname'].'/cambium-650-transmit if (file_exists($rrdfilename)) { $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= ' DEF:transmitPower='.$rrdfilename.':transmitPower:AVERAGE '; + $rrd_options .= " -l 0 "; $rrd_options .= " LINE2:transmitPower#FF0000:'Transmit Power ' "; $rrd_options .= ' GPRINT:transmitPower:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:transmitPower:MIN:%0.2lf%s '; $rrd_options .= ' GPRINT:transmitPower:MAX:%0.2lf%s\\\l '; -} +} \ No newline at end of file diff --git a/html/includes/graphs/device/cambium_epmp_gps.inc.php b/html/includes/graphs/device/cambium_epmp_gps.inc.php index 548c5f9d7..46d27c6fc 100644 --- a/html/includes/graphs/device/cambium_epmp_gps.inc.php +++ b/html/includes/graphs/device/cambium_epmp_gps.inc.php @@ -14,7 +14,7 @@ if (file_exists($rrdfilename)) { $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= ' DEF:numTracked='.$rrdfilename.':numTracked:AVERAGE '; $rrd_options .= ' DEF:numVisible='.$rrdfilename.':numVisible:AVERAGE '; - $rrd_options .= " LINE2:numTracked#FF0000:'GPS Number Tracked ' "; + $rrd_options .= " AREA:numTracked#00B200:'GPS Number Tracked ' "; $rrd_options .= ' GPRINT:numTracked:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:numTracked:MIN:%0.2lf%s '; $rrd_options .= ' GPRINT:numTracked:MAX:%0.2lf%s\\\l '; @@ -22,4 +22,4 @@ if (file_exists($rrdfilename)) { $rrd_options .= ' GPRINT:numVisible:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:numVisible:MIN:%0.2lf%s '; $rrd_options .= ' GPRINT:numVisible:MAX:%0.2lf%s\\\l '; -} +} \ No newline at end of file diff --git a/html/includes/graphs/device/cambium_epmp_gpsSync.inc.php b/html/includes/graphs/device/cambium_epmp_gpsSync.inc.php index cf08b8b13..a6f3f3421 100644 --- a/html/includes/graphs/device/cambium_epmp_gpsSync.inc.php +++ b/html/includes/graphs/device/cambium_epmp_gpsSync.inc.php @@ -13,7 +13,8 @@ $rrdfilename = $config['rrd_dir'].'/'.$device['hostname'].'/cambium-epmp-gpsSync if (file_exists($rrdfilename)) { $rrd_options .= " COMMENT:'1 - GPS Sync Up 2 - GPS Sync Down 3 - CMM Sync \\n'"; $rrd_options .= ' DEF:gpsSync='.$rrdfilename.':gpsSync:AVERAGE '; + $rrd_options .= " -l 1 "; + $rrd_options .= " -u 3 "; $rrd_options .= " LINE2:gpsSync#666699:'GPS Sync Status ' "; $rrd_options .= ' GPRINT:gpsSync:LAST:%0.2lf%s '; - } \ No newline at end of file diff --git a/html/includes/graphs/device/cambium_epmp_registeredSM.inc.php b/html/includes/graphs/device/cambium_epmp_registeredSM.inc.php index 7ee964ee5..fd12c5129 100644 --- a/html/includes/graphs/device/cambium_epmp_registeredSM.inc.php +++ b/html/includes/graphs/device/cambium_epmp_registeredSM.inc.php @@ -15,7 +15,8 @@ if (file_exists($rrdfilename)) { $rrd_options .= " COMMENT:'Value Now Ave Max \\n'"; $rrd_options .= ' DEF:regSM='.$rrdfilename.':regSM:AVERAGE '; $rrd_options .= " LINE2:regSM#73b0c2:'Registered SM ' "; + $rrd_options .= " -l 0 "; $rrd_options .= ' GPRINT:regSM:LAST:%0.2lf%s '; $rrd_options .= ' GPRINT:regSM:MIN:%0.2lf%s '; $rrd_options .= ' GPRINT:regSM:MAX:%0.2lf%s\\\l '; -} +} \ No newline at end of file diff --git a/html/includes/graphs/device/cambium_generic_450_linkRadioDbm.inc.php b/html/includes/graphs/device/cambium_generic_450_linkRadioDbm.inc.php deleted file mode 100644 index 1c643a71d..000000000 --- a/html/includes/graphs/device/cambium_generic_450_linkRadioDbm.inc.php +++ /dev/null @@ -1,26 +0,0 @@ - -80) { - $limit = -80; - } + $limit = -80; break; }//end switch @@ -387,7 +384,7 @@ function sensor_limit($class, $current) { break; case 'signal'; - $limit = 0; + $limit = -30; break; }//end switch diff --git a/includes/discovery/sensors/temperatures/canopy.inc.php b/includes/discovery/sensors/temperatures/canopy.inc.php index a268c52da..7acf089c7 100644 --- a/includes/discovery/sensors/temperatures/canopy.inc.php +++ b/includes/discovery/sensors/temperatures/canopy.inc.php @@ -15,7 +15,6 @@ if ($device['os'] == 'canopy') { list(,$current) = explode(' ', $oids); $index = $oid; $descr = 'System Temp'; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', -30, null, null, 50, $current); } - -} +} \ No newline at end of file