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

Change Units on Noise Floor (#11790)

Browse Source 
* Change Units on Noise Floor

I may be wrong, but I think this should just be dBm (i.e. integrated over the carrier bandwidth). The numbers look much too high to me to be on a per Hz basis.

If I am correct here, this should also be updated in the web interface.

Thanks!

* Update php, correct units for Wireless noise-floor

* Wireless Frequency, don't format_si, to avoid kMHz units

* Update Wireless noise-floor units, in RRD plots
This commit is contained in:
arrmo
2020-06-10 03:41:36 -05:00
committed by GitHub
parent 8fb8fd95e7
commit ba1302805f
9 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Developing/os/Wireless-Sensors.md
View File

@@ -19,7 +19,7 @@ with the values we expect to see the data in:
| errors | count | WirelessErrorsDiscovery | The total bits of errored packets or bits, etc | | errors | count | WirelessErrorsDiscovery | The total bits of errored packets or bits, etc |
| frequency | MHz | WirelessFrequencyDiscovery | The frequency of the radio in MHz, channels can be converted | | frequency | MHz | WirelessFrequencyDiscovery | The frequency of the radio in MHz, channels can be converted |
| mse | dB | WirelessMseDiscovery | The Mean Square Error | | mse | dB | WirelessMseDiscovery | The Mean Square Error |
| noise-floor | dBm/Hz | WirelessNoiseFloorDiscovery | The amount of noise received by the radio | | noise-floor | dBm | WirelessNoiseFloorDiscovery | The amount of noise received by the radio |
| power | dBm | WirelessPowerDiscovery | The power of transmit or receive, including signal level | | power | dBm | WirelessPowerDiscovery | The power of transmit or receive, including signal level |
| quality | % | WirelessQualityDiscovery | The % of quality of the link, 100% = perfect link | | quality | % | WirelessQualityDiscovery | The % of quality of the link, 100% = perfect link |
| rate | bps | WirelessRateDiscovery | The negotiated rate of the connection (not data transfer) | | rate | bps | WirelessRateDiscovery | The negotiated rate of the connection (not data transfer) |

3
includes/html/functions.inc.php
View File

@@ -1551,6 +1551,9 @@ function get_sensor_label_color($sensor, $type = 'sensors')
$sensor['sensor_current'] = formatUptime($sensor['sensor_current'] * 60, 'short'); $sensor['sensor_current'] = formatUptime($sensor['sensor_current'] * 60, 'short');
return "<span class='label $label_style'>".trim($sensor['sensor_current'])."</span>"; return "<span class='label $label_style'>".trim($sensor['sensor_current'])."</span>";
} }
if ($sensor['sensor_class'] == 'frequency' && $sensor['sensor_type'] == 'openwrt') {
return "<span class='label $label_style'>".trim($sensor['sensor_current'])." ".$unit."</span>";
}
return "<span class='label $label_style'>".trim(format_si($sensor['sensor_current']).$unit)."</span>"; return "<span class='label $label_style'>".trim(format_si($sensor['sensor_current']).$unit)."</span>";
} }

2
includes/html/graphs/device/wireless_noise-floor.inc.php
View File

@@ -5,6 +5,6 @@ $scale_max = '0';
$class = 'noise-floor'; $class = 'noise-floor';
$unit = ''; $unit = '';
$unit_long = 'dBm/Hz'; $unit_long = 'dBm';
require 'includes/html/graphs/device/wireless-sensor.inc.php'; require 'includes/html/graphs/device/wireless-sensor.inc.php';

2
includes/html/graphs/wireless/noise-floor.inc.php
View File

@@ -3,6 +3,6 @@ $scale_min = '-175';
$scale_max = '0'; $scale_max = '0';
$unit_long = 'Noise Floor (dBm/Hz)'; $unit_long = 'Noise Floor (dBm/Hz)';
$unit = 'dBm/Hz'; $unit = 'dBm';
include 'wireless-sensor.inc.php'; include 'wireless-sensor.inc.php';

2
resources/lang/de/wireless.php
View File

@@ -64,7 +64,7 @@ return [
'noise-floor' => [ 'noise-floor' => [
'short' => 'Grundrauschen', 'short' => 'Grundrauschen',
'long' => 'Grundrauschen', 'long' => 'Grundrauschen',
'unit' => 'dBm/Hz', 'unit' => 'dBm',
], ],
'power' => [ 'power' => [
'short' => 'Signalstärke', 'short' => 'Signalstärke',

2
resources/lang/en/wireless.php
View File

@@ -65,7 +65,7 @@ return [
'noise-floor' => [ 'noise-floor' => [
'short' => 'Noise Floor', 'short' => 'Noise Floor',
'long' => 'Noise Floor', 'long' => 'Noise Floor',
'unit' => 'dBm/Hz', 'unit' => 'dBm',
], ],
'power' => [ 'power' => [
'short' => 'Power/Signal', 'short' => 'Power/Signal',

2
resources/lang/fr/wireless.php
View File

@@ -64,7 +64,7 @@ return [
'noise-floor' => [ 'noise-floor' => [
'short' => 'Bruit de fond', 'short' => 'Bruit de fond',
'long' => 'Bruit de fond', 'long' => 'Bruit de fond',
'unit' => 'dBm/Hz', 'unit' => 'dBm',
], ],
'power' => [ 'power' => [
'short' => 'Puissance/Signal', 'short' => 'Puissance/Signal',

2
resources/lang/uk/wireless.php
View File

@@ -64,7 +64,7 @@ return [
'noise-floor' => [ 'noise-floor' => [
'short' => 'Рівень шуму', 'short' => 'Рівень шуму',
'long' => 'Рівень шуму', 'long' => 'Рівень шуму',
'unit' => 'dBm/Hz', 'unit' => 'dBm',
], ],
'power' => [ 'power' => [
'short' => 'Сила сигналу', 'short' => 'Сила сигналу',

2
resources/lang/zh-TW/wireless.php
View File

@@ -64,7 +64,7 @@ return [
'noise-floor' => [ 'noise-floor' => [
'short' => '背景雜訊', 'short' => '背景雜訊',
'long' => '背景雜訊', 'long' => '背景雜訊',
'unit' => 'dBm/Hz', 'unit' => 'dBm',
], ],
'power' => [ 'power' => [
'short' => '電力/訊號', 'short' => '電力/訊號',