From 9797be367736cb284b43148e67741ff6b8a54440 Mon Sep 17 00:00:00 2001 From: PipoCanaja <38363551+PipoCanaja@users.noreply.github.com> Date: Thu, 29 Oct 2020 02:08:29 +0100 Subject: [PATCH] Update DSL stats even if port is down (#12262) * Update DSL stats even if port is down * Correct swapped Upload/download on graphs * Display attainable line speed in the ADSL page * Correct SNR graph * Rewrite labels to avoid misunderstanding * last swap I hope --- includes/html/graphs/port/adsl_attainable.inc.php | 8 ++++---- includes/html/graphs/port/adsl_attenuation.inc.php | 8 ++++---- includes/html/graphs/port/adsl_power.inc.php | 8 ++++---- includes/html/graphs/port/adsl_snr.inc.php | 8 ++++---- includes/html/graphs/port/adsl_speed.inc.php | 4 ++-- includes/html/pages/device/port/adsl.inc.php | 7 ++++++- includes/html/print-interface.inc.php | 4 ++-- includes/polling/ports.inc.php | 3 ++- 8 files changed, 28 insertions(+), 22 deletions(-) diff --git a/includes/html/graphs/port/adsl_attainable.inc.php b/includes/html/graphs/port/adsl_attainable.inc.php index 6b3427df98..c0ba86625a 100644 --- a/includes/html/graphs/port/adsl_attainable.inc.php +++ b/includes/html/graphs/port/adsl_attainable.inc.php @@ -3,12 +3,12 @@ $rrd_filename = get_port_rrdfile_path($device['hostname'], $port['port_id'], 'adsl'); $rrd_list[0]['filename'] = $rrd_filename; -$rrd_list[0]['descr'] = 'Downstream'; -$rrd_list[0]['ds'] = 'AtucCurrAttainableR'; +$rrd_list[0]['descr'] = 'Central to CPE'; +$rrd_list[0]['ds'] = 'AturCurrAttainableR'; $rrd_list[1]['filename'] = $rrd_filename; -$rrd_list[1]['descr'] = 'Upstream'; -$rrd_list[1]['ds'] = 'AturCurrAttainableR'; +$rrd_list[1]['descr'] = 'CPE to Central'; +$rrd_list[1]['ds'] = 'AtucCurrAttainableR'; $unit_text = 'Bits/sec'; diff --git a/includes/html/graphs/port/adsl_attenuation.inc.php b/includes/html/graphs/port/adsl_attenuation.inc.php index 2e50e1cfc0..7297b6b0a1 100644 --- a/includes/html/graphs/port/adsl_attenuation.inc.php +++ b/includes/html/graphs/port/adsl_attenuation.inc.php @@ -3,12 +3,12 @@ $rrd_filename = get_port_rrdfile_path($device['hostname'], $port['port_id'], 'adsl'); $rrd_list[0]['filename'] = $rrd_filename; -$rrd_list[0]['descr'] = 'Downstream'; -$rrd_list[0]['ds'] = 'AtucCurrAtn'; +$rrd_list[0]['descr'] = 'Central to CPE'; +$rrd_list[0]['ds'] = 'AturCurrAtn'; $rrd_list[1]['filename'] = $rrd_filename; -$rrd_list[1]['descr'] = 'Upstream'; -$rrd_list[1]['ds'] = 'AturCurrAtn'; +$rrd_list[1]['descr'] = 'CPE to Central'; +$rrd_list[1]['ds'] = 'AtucCurrAtn'; $unit_text = 'dB'; diff --git a/includes/html/graphs/port/adsl_power.inc.php b/includes/html/graphs/port/adsl_power.inc.php index d1e7f20a4a..2d3c562e13 100644 --- a/includes/html/graphs/port/adsl_power.inc.php +++ b/includes/html/graphs/port/adsl_power.inc.php @@ -3,12 +3,12 @@ $rrd_filename = get_port_rrdfile_path($device['hostname'], $port['port_id'], 'adsl'); $rrd_list[0]['filename'] = $rrd_filename; -$rrd_list[0]['descr'] = 'Downstream'; -$rrd_list[0]['ds'] = 'AtucCurrOutputPwr'; +$rrd_list[0]['descr'] = 'Central'; +$rrd_list[0]['ds'] = 'AturCurrOutputPwr'; $rrd_list[1]['filename'] = $rrd_filename; -$rrd_list[1]['descr'] = 'Upstream'; -$rrd_list[1]['ds'] = 'AturCurrOutputPwr'; +$rrd_list[1]['descr'] = 'CPE'; +$rrd_list[1]['ds'] = 'AtucCurrOutputPwr'; $unit_text = 'dBm'; diff --git a/includes/html/graphs/port/adsl_snr.inc.php b/includes/html/graphs/port/adsl_snr.inc.php index ac78f8e962..ed4a038f58 100644 --- a/includes/html/graphs/port/adsl_snr.inc.php +++ b/includes/html/graphs/port/adsl_snr.inc.php @@ -3,12 +3,12 @@ $rrd_filename = get_port_rrdfile_path($device['hostname'], $port['port_id'], 'adsl'); $rrd_list[0]['filename'] = $rrd_filename; -$rrd_list[0]['descr'] = 'Downstream'; -$rrd_list[0]['ds'] = 'AtucCurrSnrMgn'; +$rrd_list[0]['descr'] = 'Central to CPE'; +$rrd_list[0]['ds'] = 'AturCurrSnrMgn'; $rrd_list[1]['filename'] = $rrd_filename; -$rrd_list[1]['descr'] = 'Upstream'; -$rrd_list[1]['ds'] = 'AturCurrSnrMgn'; +$rrd_list[1]['descr'] = 'CPE to Central'; +$rrd_list[1]['ds'] = 'AtucCurrSnrMgn'; $unit_text = 'dB'; diff --git a/includes/html/graphs/port/adsl_speed.inc.php b/includes/html/graphs/port/adsl_speed.inc.php index 58b14f5fb4..1a8e818416 100644 --- a/includes/html/graphs/port/adsl_speed.inc.php +++ b/includes/html/graphs/port/adsl_speed.inc.php @@ -3,11 +3,11 @@ $rrd_filename = get_port_rrdfile_path($device['hostname'], $port['port_id'], 'adsl'); $rrd_list[0]['filename'] = $rrd_filename; -$rrd_list[0]['descr'] = 'Downstream'; +$rrd_list[0]['descr'] = 'Central to CPE'; $rrd_list[0]['ds'] = 'AtucChanCurrTxRate'; $rrd_list[1]['filename'] = $rrd_filename; -$rrd_list[1]['descr'] = 'Upstream'; +$rrd_list[1]['descr'] = 'CPE to Central'; $rrd_list[1]['ds'] = 'AturChanCurrTxRate'; $unit_text = 'Bits/sec'; diff --git a/includes/html/pages/device/port/adsl.inc.php b/includes/html/pages/device/port/adsl.inc.php index 64f8b85f84..868688a538 100644 --- a/includes/html/pages/device/port/adsl.inc.php +++ b/includes/html/pages/device/port/adsl.inc.php @@ -2,11 +2,16 @@ if (file_exists(get_port_rrdfile_path($device['hostname'], $port['port_id'], 'adsl'))) { $iid = $id; - echo '
ADSL Line Speed
'; + echo '
ADSL Current Line Speed
'; $graph_type = 'port_adsl_speed'; include 'includes/html/print-interface-graphs.inc.php'; + echo '
ADSL Attainable Speed
'; + $graph_type = 'port_adsl_attainable'; + + include 'includes/html/print-interface-graphs.inc.php'; + echo '
ADSL Line Attenuation
'; $graph_type = 'port_adsl_attenuation'; diff --git a/includes/html/print-interface.inc.php b/includes/html/print-interface.inc.php index 2799d38ba2..f6941bbca0 100644 --- a/includes/html/print-interface.inc.php +++ b/includes/html/print-interface.inc.php @@ -146,9 +146,9 @@ if ($port_adsl['adslLineCoding']) { // adslAtucCurrAttainableRate is UploadMaxRate echo 'Max:' . formatRates($port_adsl['adslAturCurrAttainableRate']) . '/' . formatRates($port_adsl['adslAtucCurrAttainableRate']); echo ""; - echo 'Atten:' . $port_adsl['adslAtucCurrAtn'] . 'dB/' . $port_adsl['adslAturCurrAtn'] . 'dB'; + echo 'Atten:' . $port_adsl['adslAturCurrAtn'] . 'dB/' . $port_adsl['adslAtucCurrAtn'] . 'dB'; echo '
'; - echo 'SNR:' . $port_adsl['adslAtucCurrSnrMgn'] . 'dB/' . $port_adsl['adslAturCurrSnrMgn'] . 'dB'; + echo 'SNR:' . $port_adsl['adslAturCurrSnrMgn'] . 'dB/' . $port_adsl['adslAtucCurrSnrMgn'] . 'dB'; } else { echo ""; if ($port['ifType'] && $port['ifType'] != '') { diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index fc8f726021..5d60e4c4a1 100644 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -734,8 +734,9 @@ foreach ($ports as $port) { if (! empty($port['skipped'])) { // We don't care about statistics for skipped selective polling ports d_echo("$port_id skipped because selective polling ports is set."); - } elseif ($port['ifOperStatus'] == 'down' && $port['ifOperStatus_prev'] == 'down' && $this_port['ifOperStatus'] == 'down' && $this_port['ifLastChange'] == $port['ifLastChange']) { + } elseif ($port['ifType'] != 'adsl' && $port['ifOperStatus'] == 'down' && $port['ifOperStatus_prev'] == 'down' && $this_port['ifOperStatus'] == 'down' && $this_port['ifLastChange'] == $port['ifLastChange']) { // We don't care about statistics for down ports on which states did not change since last polling + // We still take into account 'adsl' ports that may update speed/noise even if the interface is status down d_echo("$port_id skipped because port is still down since last polling."); } else { // End parse ifAlias