From 985e1a44025930aecc171daa4e958a50b56dbfb9 Mon Sep 17 00:00:00 2001 From: Paul Heinrichs Date: Thu, 24 Mar 2016 10:34:56 -0400 Subject: [PATCH] Split Cambium/Canopy Detection and Polling --- .../canopy_generic_450_linkRadioDbm.inc.php | 26 ++ .../canopy_generic_450_masterSSR.inc.php | 21 ++ .../canopy_generic_450_powerlevel.inc.php | 21 ++ .../device/canopy_generic_450_ptpSNR.inc.php | 26 ++ .../device/canopy_generic_450_slaveHV.inc.php | 26 ++ .../canopy_generic_450_slaveSNR.inc.php | 26 ++ .../canopy_generic_450_slaveSSR.inc.php | 21 ++ .../device/canopy_generic_crcErrors.inc.php | 22 ++ .../device/canopy_generic_errorCount.inc.php | 26 ++ .../graphs/device/canopy_generic_freq.inc.php | 18 ++ .../device/canopy_generic_gpsStats.inc.php | 26 ++ .../device/canopy_generic_jitter.inc.php | 21 ++ .../device/canopy_generic_radioDbm.inc.php | 36 +++ .../device/canopy_generic_regCount.inc.php | 26 ++ .../graphs/device/canopy_generic_rssi.inc.php | 21 ++ .../device/canopy_generic_signalHV.inc.php | 31 ++ .../device/canopy_generic_snrHV.inc.php | 26 ++ .../canopy_generic_whispGPSStats.inc.php | 18 ++ includes/definitions.inc.php | 109 ++++--- includes/discovery/os/cambium.inc.php | 6 - includes/discovery/os/canopy.inc.php | 19 ++ .../discovery/sensors/signal/cambium.inc.php | 22 -- .../discovery/sensors/signal/canopy.inc.php | 48 +++ .../sensors/temperatures/canopy.inc.php | 21 ++ includes/polling/functions.inc.php | 4 +- includes/polling/os/cambium.inc.php | 63 ---- includes/polling/os/canopy.inc.php | 76 +++++ includes/polling/signal/cambium.inc.php | 18 -- includes/polling/signal/canopy.inc.php | 32 ++ includes/polling/temperatures/canopy.inc.php | 3 + .../polling/wireless/canopy-generic.inc.php | 297 ++++++++++++++++++ 31 files changed, 994 insertions(+), 162 deletions(-) create mode 100644 html/includes/graphs/device/canopy_generic_450_linkRadioDbm.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_450_masterSSR.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_450_powerlevel.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_450_ptpSNR.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_450_slaveHV.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_450_slaveSNR.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_450_slaveSSR.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_crcErrors.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_errorCount.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_freq.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_gpsStats.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_jitter.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_radioDbm.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_regCount.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_rssi.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_signalHV.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_snrHV.inc.php create mode 100644 html/includes/graphs/device/canopy_generic_whispGPSStats.inc.php create mode 100644 includes/discovery/os/canopy.inc.php create mode 100644 includes/discovery/sensors/signal/canopy.inc.php create mode 100644 includes/discovery/sensors/temperatures/canopy.inc.php create mode 100644 includes/polling/os/canopy.inc.php create mode 100644 includes/polling/signal/canopy.inc.php create mode 100644 includes/polling/temperatures/canopy.inc.php create mode 100644 includes/polling/wireless/canopy-generic.inc.php diff --git a/html/includes/graphs/device/canopy_generic_450_linkRadioDbm.inc.php b/html/includes/graphs/device/canopy_generic_450_linkRadioDbm.inc.php new file mode 100644 index 0000000000..da19365f41 --- /dev/null +++ b/html/includes/graphs/device/canopy_generic_450_linkRadioDbm.inc.php @@ -0,0 +1,26 @@ + $fecInErrorsCount, + 'fecOutErrorsCount' => $fecOutErrorsCount, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_errorCount'] = TRUE; + unset($rrd_filename,$fecInErrorsCount,$fecOutErrorsCount); + } + + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-crcErrors.rrd"; + $crcErrors = snmp_get($device, "fecCRCError.0", "-Ovqn", "WHISP-BOX-MIBV2-MIB"); + if (is_numeric($crcErrors)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:crcErrors:GAUGE:600:0:100000".$config['rrd_rra']); + } + $fields = array( + 'crcErrors' => $crcErrors, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_crcErrors'] = TRUE; + } + + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-signalHV.rrd"; + $vertical = str_replace('"',"",snmp_get($device, ".1.3.6.1.4.1.161.19.3.2.2.117.0", "-Ovqn", "")); + $horizontal = str_replace('"',"",snmp_get($device, ".1.3.6.1.4.1.161.19.3.2.2.118.0", "-Ovqn", "")); + $combined = snmp_get($device, "1.3.6.1.4.1.161.19.3.2.2.21.0", "-Ovqn", ""); + if (is_numeric($vertical) && is_numeric($horizontal) && is_numeric($combined)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:vertical:GAUGE:600:-150:0 DS:horizontal:GAUGE:600:-150:0 DS:combined:GAUGE:600:-150:0".$config['rrd_rra']); + } + $fields = array( + 'vertical' => floatval($vertical), + 'horizontal' => floatval($horizontal), + 'combined' => $combined, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_signalHV'] = TRUE; + unset($rrd_filename,$vertical,$horizontal,$combined); + } + + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-rssi.rrd"; + $rssi = snmp_get($device, "1.3.6.1.4.1.161.19.3.2.2.2.0", "-Ovqn", ""); + if (is_numeric($rssi)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:rssi:GAUGE:600:0:5000".$config['rrd_rra']); + } + $fields = array( + 'rssi' => $rssi, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_rssi'] = TRUE; + unset($rrd_filename,$rssi); + } + + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-jitter.rrd"; + $jitter = snmp_get($device, "jitter.0", "-Ovqn", "WHISP-SM-MIB"); + if (is_numeric($jitter)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:jitter:GAUGE:600:0:20".$config['rrd_rra']); + } + $fields = array( + 'jitter' => $jitter, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_jitter'] = TRUE; + unset($rrd_filename,$jitter); + } + + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-slaveHV.rrd"; + $horizontal = str_replace('"',"",snmp_get($device, "radioDbmHorizontal.0", "-Ovqn", "WHISP-SM-MIB")); + $vertical = str_replace('"',"",snmp_get($device, "radioDbmVertical.0", "-Ovqn", "WHISP-SM-MIB")); + if (is_numeric($horizontal) && is_numeric($vertical)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:horizontal:GAUGE:600:-100:100 DS:vertical:GAUGE:600:-100:100".$config['rrd_rra']); + } + $fields = array( + 'horizontal' => $horizontal, + 'vertical' => $vertical, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_450_slaveHV'] = TRUE; + unset($rrd_filename,$horizontal,$vertical); + } + + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-slaveSSR.rrd"; + $ssr = str_replace('"',"",snmp_get($device, "signalStrengthRatio.0", "-Ovqn", "WHISP-SM-MIB")); + if (is_numeric($ssr)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:ssr:GAUGE:600:-150:150".$config['rrd_rra']); + } + $fields = array( + 'ssr' => $ssr, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_450_slaveSSR'] = TRUE; + unset($rrd_filename,$ssr); + } + + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-slaveSNR.rrd"; + $horizontal = str_replace('"',"",snmp_get($device, "signalToNoiseRatioSMHorizontal.0", "-Ovqn", "WHISP-SM-MIB")); + $vertical = str_replace('"',"",snmp_get($device, "signalToNoiseRatioSMVertical.0", "-Ovqn", "WHISP-SM-MIB")); + if (is_numeric($horizontal) && is_numeric($vertical)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:horizontal:GAUGE:600:0:100 DS:vertical:GAUGE:600:0:100".$config['rrd_rra']); + } + $fields = array( + 'horizontal' => $horizontal, + 'vertical' => $vertical, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_450_slaveSNR'] = TRUE; + unset($rrd_filename,$horizontal,$vertical); + } +} + +if (strstr($hardware, 'AP') || strstr($hardware, 'Master') || strstr($hardware, 'CMM')) { + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-whispGPSStats.rrd"; + $gpsStatus = snmp_get($device, "whispGPSStats.0", "-Ovqn", "WHISP-APS-MIB"); + if ($gpsStatus == 'generatingSync') { + $gpsStatus = 3; + } + else if ($gpsStatus == 'gpsLostSync') { + $gpsStatus = 2; + } + else if ($gpsStatus == 'gpsSynchronized') { + $gpsStatus = 1; + } + if (is_numeric($gpsStatus)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:whispGPSStats:GAUGE:600:0:4".$config['rrd_rra']); + } + $fields = array( + 'whispGPSStats' => $gpsStatus, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_whispGPSStats'] = TRUE; + unset($rrd_filename,$gpsStatus); + } + + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-gpsStats.rrd"; + $visible = str_replace('"',"",snmp_get($device, ".1.3.6.1.4.1.161.19.3.4.4.7.0", "-Ovqn", "")); + $tracked = str_replace('"',"",snmp_get($device, ".1.3.6.1.4.1.161.19.3.4.4.8.0", "-Ovqn", "")); + if (is_numeric($visible) && is_numeric($tracked)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:visible:GAUGE:600:0:1000 DS:tracked:GAUGE:600:0:1000".$config['rrd_rra']); + } + $fields = array( + 'visible' => floatval($visible), + 'tracked' => floatval($tracked), + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_gpsStats'] = TRUE; + 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"; + $horizontal = str_replace('"',"",snmp_get($device, "linkRadioDbmHorizontal.2", "-Ovqn", "WHISP-APS-MIB")); + $vertical = str_replace('"',"",snmp_get($device, "linkRadioDbmVertical.2", "-Ovqn", "WHISP-APS-MIB")); + if (is_numeric($horizontal) && is_numeric($vertical)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:horizontal:GAUGE:600:-100:0 DS:vertical:GAUGE:600:-100:0".$config['rrd_rra']); + } + $fields = array( + 'horizontal' => $horizontal, + 'vertical' => $vertical, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_450_linkRadioDbm'] = TRUE; + unset($rrd_filename,$horizontal,$horizontal); + } + + $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")); + if (is_numeric($horizontal) && is_numeric($vertical)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:horizontal:GAUGE:600:0:100 DS:vertical:GAUGE:600:0:100".$config['rrd_rra']); + } + $fields = array( + 'horizontal' => $horizontal, + 'vertical' => $vertical, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_450_ptpSNR'] = TRUE; + unset($rrd_filename,$horizontal,$horizontal); + } + + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-masterSSR.rrd"; + $ssr = str_replace('"',"",snmp_get($device, "linkSignalStrengthRatio.2", "-Ovqn", "WHISP-APS-MIB")); + if (is_numeric($ssr)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:ssr:GAUGE:600:-150:150".$config['rrd_rra']); + } + $fields = array( + 'ssr' => $ssr, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_450_masterSSR'] = TRUE; + unset($rrd_filename,$ssr); + } + + if (strstr($hardware, 'PTP 230')) { + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-radioDbm.rrd"; + $dbmRadio = str_replace('"',"",snmp_get($device, "radioDbmInt.0", "-Ovqn", "WHISP-SM-MIB")); + $minRadio = str_replace('"',"",snmp_get($device, "minRadioDbm.0", "-Ovqn", "WHISP-SM-MIB")); + $maxRadio = str_replace('"',"",snmp_get($device, "maxRadioDbm.0", "-Ovqn", "WHISP-SM-MIB")); + $avgRadio = str_replace('"',"",snmp_get($device, "radioDbmAvg.0", "-Ovqn", "WHISP-SM-MIB")); + + if (is_numeric($dbmRadio) && is_numeric($minRadio) && is_numeric($maxRadio) && is_numeric($avgRadio)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:dbm:GAUGE:600:-100:0 DS:min:GAUGE:600:-100:0 DS:max:GAUGE:600:-100:0 DS:avg:GAUGE:600:-100:0".$config['rrd_rra']); + } + $fields = array( + 'dbm' => $dbmRadio, + 'min' => $minRadio, + 'max' => $maxRadio, + 'avg' => $avgRadio, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_radioDbm'] = TRUE; + unset($rrd_filename,$dbmRadio,$minRadio,$maxRadio,$avgRadio); + } + } +} + +//AP Equipment +if (strstr($version, 'AP')) { + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-regCount.rrd"; + $registered = str_replace('"',"",snmp_get($device, "regCount.0", "-Ovqn", "WHISP-APS-MIB")); + $failed = str_replace('"',"",snmp_get($device, "regFailureCount.0", "-Ovqn", "WHISP-APS-MIB")); + if (is_numeric($registered) && is_numeric($failed)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:regCount:GAUGE:600:0:15000 DS:failed:GAUGE:600:0:15000".$config['rrd_rra']); + } + $fields = array( + 'regCount' => $registered, + 'failed' => $failed, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_regCount'] = TRUE; + unset($rrd_filename,$registered,$failed); + } + + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-freq.rrd"; + $freq = str_replace('"',"",snmp_get($device, "currentRadioFreqCarrier.0", "-Ovqn", "WHISP-APS-MIB")); + if (is_numeric($freq)) { + if (!is_file($rrd_filename)) { + rrdtool_create($rrd_filename, " --step 300 DS:freq:GAUGE:600:0:100000".$config['rrd_rra']); + } + if ($freq > 99999) { + $freq = $freq / 100000; + } + else { + $freq = $freq / 10000; + } + $fields = array( + 'freq' => $freq, + ); + rrdtool_update($rrd_filename, $fields); + $graphs['canopy_generic_freq'] = TRUE; + unset($rrd_filename,$freq); + } +} \ No newline at end of file