mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3306 from pheinrichs/issue-3305

Browse Source 
Minor Cambium fixes
This commit is contained in:
Neil Lathwood
2016-03-31 11:53:17 +01:00
parent c43970edff 49a1418534
commit 56e6d7facc
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/graphs/device/cambium_generic_gpsStats.inc.php
View File

@ -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 ';

2
html/includes/graphs/device/canopy_generic_gpsStats.inc.php
View File

@ -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 ';

4
includes/discovery/sensors/temperatures/canopy.inc.php
View File

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

28
includes/polling/wireless/canopy-generic.inc.php
View File

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