mirror of
https://github.com/openwrt/luci.git
synced 2025-12-21 14:54:36 +04:00
Formatting fixes
This commit is contained in:
Thomas Aldrian
committed by
Paul Donald
Paul Donald
parent
668b13f238
commit
8c9e377820
@@ -3,171 +3,399 @@
|
||||
'use strict';
|
||||
|
||||
return L.Class.extend({
|
||||
title: _('DSL'),
|
||||
title: _("DSL"),
|
||||
|
||||
rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
|
||||
rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
|
||||
var g = [];
|
||||
var dtypes = graph.dataTypes(host, plugin, plugin_instance);
|
||||
|
||||
const d_snr = {
|
||||
title: _("DSL Signal"),
|
||||
vlabel: "dB",
|
||||
data: {
|
||||
types: ["snr"],
|
||||
options: {
|
||||
snr_latn_up: {
|
||||
title: _("Line Attenuation Up (LATN)"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
},
|
||||
snr_latn_down: {
|
||||
title: _("Line Attenuation Down (LATN)"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
},
|
||||
snr_satn_up: {
|
||||
title: _("Signal Attenuation Up (SATN)"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
},
|
||||
snr_satn_down: {
|
||||
title: _("Signal Attenuation Down (SATN)"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
},
|
||||
snr_snr_up: {
|
||||
title: _("Noise Margin Up (SNR)"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
},
|
||||
snr_snr_down: {
|
||||
title: _("Noise Margin Down (SNR)"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
},
|
||||
}
|
||||
}
|
||||
};
|
||||
const d_uptime = {
|
||||
title: _("DSL Line Uptime"),
|
||||
title: _("%H: Line uptime on %pi"),
|
||||
vlabel: "seconds",
|
||||
number_format: "%8.0lf s",
|
||||
alt_autoscale_max: true,
|
||||
y_min: 0,
|
||||
data: {
|
||||
types: ["uptime"],
|
||||
options: {
|
||||
uptime: {
|
||||
title: _("Uptime"),
|
||||
noarea: true
|
||||
noarea: true,
|
||||
noavg: true
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
const d_flags = {
|
||||
title: _("DSL Flags"),
|
||||
|
||||
const d_snr = {
|
||||
title: _("%H: SNR on %pi"),
|
||||
vlabel: "dB",
|
||||
number_format: "%5.1lf dB",
|
||||
data: {
|
||||
types: ["snr"],
|
||||
instances: {
|
||||
bool: [
|
||||
"bitswap_up",
|
||||
"bitswap_down",
|
||||
"vector_up",
|
||||
"vector_down"
|
||||
]
|
||||
snr: ["snr_down", "snr_up"]
|
||||
},
|
||||
options: {
|
||||
bool_bitswap_up: {
|
||||
title: _("Bitswap Up"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
snr_snr_down: {
|
||||
title: _("SNR Margin Down"),
|
||||
weight: 1
|
||||
},
|
||||
snr_snr_up: {
|
||||
title: _("SNR Margin Up"),
|
||||
flip: true,
|
||||
weight: 2
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const d_atn = {
|
||||
title: _("%H: Attenuation on %pi"),
|
||||
vlabel: "dB",
|
||||
number_format: "%5.1lf dB",
|
||||
data: {
|
||||
types: ["gauge"],
|
||||
instances: {
|
||||
snr: ["latn_down", "satn_down", "latn_up", "satn_up"]
|
||||
},
|
||||
options: {
|
||||
gauge_latn_down: {
|
||||
title: _("Line Attenuation Down"),
|
||||
noarea: true,
|
||||
overlay: true,
|
||||
weight: 1
|
||||
},
|
||||
gauge_satn_down: {
|
||||
title: _("Signal Attenuation Down"),
|
||||
flip: false,
|
||||
noarea: true,
|
||||
overlay: true,
|
||||
weight: 1
|
||||
},
|
||||
gauge_latn_up: {
|
||||
title: _("Line Attenuation Up"),
|
||||
flip: true,
|
||||
noarea: true,
|
||||
overlay: true,
|
||||
weight: 2
|
||||
},
|
||||
gauge_satn_up: {
|
||||
title: _("Signal Attenuation Up"),
|
||||
flip: true,
|
||||
noarea: true,
|
||||
overlay: true,
|
||||
weight: 2
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const d_flags = {
|
||||
title: _("%H: Line flags on %pi"),
|
||||
data: {
|
||||
types: ["bool"],
|
||||
instances: {
|
||||
bool: ["bitswap_down", "vector_down", "bitswap_up", "vector_up"]
|
||||
},
|
||||
options: {
|
||||
bool_bitswap_down: {
|
||||
title: _("Bitswap Down"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
},
|
||||
bool_vector_up: {
|
||||
title: _("Vectoring Up"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
overlay: true,
|
||||
weight: 1
|
||||
},
|
||||
bool_vector_down: {
|
||||
title: _("Vectoring Down"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
overlay: true,
|
||||
weight: 1
|
||||
},
|
||||
}
|
||||
}
|
||||
};
|
||||
const d_bitrate = {
|
||||
title: _("Bitrate"),
|
||||
vlabel: "b/s",
|
||||
data: {
|
||||
instances: {
|
||||
bitrate: [
|
||||
"attndr_up",
|
||||
"attndr_down",
|
||||
"data_rate_up",
|
||||
"data_rate_down"
|
||||
]
|
||||
},
|
||||
options: {
|
||||
bitrate_attndr_up: {
|
||||
title: _("Max. Attainable Data Rate (ATTNDR) Up"),
|
||||
bool_bitswap_up: {
|
||||
title: _("Bitswap Up"),
|
||||
flip: true,
|
||||
noarea: true,
|
||||
overlay: true
|
||||
overlay: true,
|
||||
weight: 2
|
||||
},
|
||||
bitrate_attndr_down: {
|
||||
title: _("Max. Attainable Data Rate (ATTNDR) Down"),
|
||||
bool_vector_up: {
|
||||
title: _("Vectoring Up"),
|
||||
flip: true,
|
||||
noarea: true,
|
||||
overlay: true
|
||||
},
|
||||
bitrate_data_rate_up: {
|
||||
title: _("Data Rate Up"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
},
|
||||
bitrate_data_rate_down: {
|
||||
title: _("Data Rate Down"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
overlay: true,
|
||||
weight: 2
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
const d_count = {
|
||||
title: _("Errors"),
|
||||
vlabel: "count",
|
||||
|
||||
const d_bitrate = {
|
||||
title: _("%H: Data rate on %pi"),
|
||||
vlabel: "b/s",
|
||||
number_format: "%5.1lf%sb/s",
|
||||
data: {
|
||||
types: ["bitrate"],
|
||||
instances: {
|
||||
bitrate: [
|
||||
"data_rate_down",
|
||||
"attndr_down",
|
||||
"data_rate_up",
|
||||
"attndr_up"
|
||||
]
|
||||
},
|
||||
options: {
|
||||
bitrate_data_rate_down: {
|
||||
title: _("Data Rate Down"),
|
||||
noarea: false,
|
||||
overlay: true,
|
||||
weight: 1
|
||||
},
|
||||
bitrate_attndr_down: {
|
||||
title: _("Attainable Data Rate Down"),
|
||||
noarea: true,
|
||||
overlay: true,
|
||||
weight: 1
|
||||
},
|
||||
bitrate_data_rate_up: {
|
||||
title: _("Data Rate Up"),
|
||||
flip: true,
|
||||
noarea: false,
|
||||
overlay: true,
|
||||
weight: 2
|
||||
},
|
||||
bitrate_attndr_up: {
|
||||
title: _("Attainable Data Rate Up"),
|
||||
flip: true,
|
||||
noarea: true,
|
||||
overlay: true,
|
||||
weight: 2
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const d_errors = {
|
||||
title: _("%H: Errored seconds on %pi"),
|
||||
number_format: "%8.0lf",
|
||||
totals_format: "%5.0lf%s",
|
||||
vlabel: "seconds",
|
||||
data: {
|
||||
types: ["errors"],
|
||||
instances: {
|
||||
errors: [
|
||||
"es_near",
|
||||
"ses_near",
|
||||
"loss_near",
|
||||
"uas_near",
|
||||
"es_far",
|
||||
"ses_far",
|
||||
"loss_far",
|
||||
"uas_far"
|
||||
]
|
||||
},
|
||||
options: {
|
||||
errors_rx_corrupted_far: {
|
||||
title: _("Rx Corrupted Far"),
|
||||
errors_es_near: {
|
||||
title: _("Near Errored seconds"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
overlay: true
|
||||
total: true,
|
||||
weight: 1
|
||||
},
|
||||
errors_ses_near: {
|
||||
title: _("Near Severely Errored Seconds"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true,
|
||||
weight: 1
|
||||
},
|
||||
errors_loss_near: {
|
||||
title: _("Near Loss of Signal Seconds"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true,
|
||||
weight: 1
|
||||
},
|
||||
errors_uas_near: {
|
||||
title: _("Near Unavailable Seconds"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true,
|
||||
weight: 1
|
||||
},
|
||||
errors_es_far: {
|
||||
title: _("Far Errored Seconds"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
flip: true,
|
||||
total: true,
|
||||
weight: 2
|
||||
},
|
||||
errors_ses_far: {
|
||||
title: _("Far Severely Errored Seconds"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
flip: true,
|
||||
total: true,
|
||||
weight: 2
|
||||
},
|
||||
errors_loss_far: {
|
||||
title: _("Far Loss of Signal Seconds"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
flip: true,
|
||||
total: true,
|
||||
weight: 2
|
||||
},
|
||||
errors_uas_far: {
|
||||
title: _("Far Unavailable Seconds"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
flip: true,
|
||||
total: true,
|
||||
weight: 2
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const d_retx = {
|
||||
title: _("%H: RETX Errors %pi"),
|
||||
vlabel: "count",
|
||||
number_format: "%8.0lf",
|
||||
totals_format: "%5.0lf%s",
|
||||
data: {
|
||||
types: ["errors"],
|
||||
instances: {
|
||||
errors: [
|
||||
"rx_corrupted_near",
|
||||
"rx_uncorrected_protected_near",
|
||||
"rx_retransmitted_near",
|
||||
"rx_corrected_near",
|
||||
"tx_retransmitted_near",
|
||||
"rx_corrupted_far",
|
||||
"rx_uncorrected_protected_far",
|
||||
"rx_retransmitted_far",
|
||||
"rx_corrected_far",
|
||||
"tx_retransmitted_far"
|
||||
]
|
||||
},
|
||||
options: {
|
||||
errors_rx_corrupted_near: {
|
||||
title: _("Rx Corrupted Near"),
|
||||
title: _("RX Corrupted Near"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
overlay: true
|
||||
total: true,
|
||||
weight: 1
|
||||
},
|
||||
errors_rx_retransmitted_far: {
|
||||
title: _("Rx Retransmitted Far"),
|
||||
errors_rx_uncorrected_protected_near: {
|
||||
title: _("RX Uncorrected Protected Near"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
overlay: true
|
||||
},
|
||||
errors_tx_retransmitted_far: {
|
||||
title: _("Tx Retransmitted Far"),
|
||||
noarea: true,
|
||||
overlay: true
|
||||
total: true,
|
||||
weight: 1
|
||||
},
|
||||
errors_rx_retransmitted_near: {
|
||||
title: _("Rx Retransmitted Near"),
|
||||
title: _("RX Retransmitted Near"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
overlay: true
|
||||
total: true,
|
||||
weight: 1
|
||||
},
|
||||
errors_rx_corrected_near: {
|
||||
title: _("RX Corrected Near"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true,
|
||||
weight: 1
|
||||
},
|
||||
errors_tx_retransmitted_near: {
|
||||
title: _("Tx Retransmitted Near"),
|
||||
title: _("TX Retransmitted Near"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
overlay: true
|
||||
total: true,
|
||||
weight: 2
|
||||
},
|
||||
errors_rx_corrupted_far: {
|
||||
title: _("RX Corrupted Far"),
|
||||
flip: true,
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true,
|
||||
weight: 3
|
||||
},
|
||||
errors_rx_uncorrected_protected_far: {
|
||||
title: _("RX Uncorrected Protected Far"),
|
||||
flip: true,
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true,
|
||||
weight: 3
|
||||
},
|
||||
errors_rx_retransmitted_far: {
|
||||
title: _("RX Retransmitted Far"),
|
||||
flip: true,
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true,
|
||||
weight: 3
|
||||
},
|
||||
errors_rx_corrected_far: {
|
||||
title: _("RX Corrected Far"),
|
||||
flip: true,
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true,
|
||||
weight: 3
|
||||
},
|
||||
errors_tx_retransmitted_far: {
|
||||
title: _("TX Retransmitted Far"),
|
||||
flip: true,
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true,
|
||||
weight: 4
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const d_crc = {
|
||||
title: _("%H: CRC Errors on %pi"),
|
||||
vlabel: "errors",
|
||||
number_format: "%8.0lf",
|
||||
totals_format: "%5.0lf%s",
|
||||
data: {
|
||||
types: ["errors"],
|
||||
instances: {
|
||||
errors: ["crc_p_near", "crcp_p_near", "crc_p_far", "crcp_p_far"]
|
||||
},
|
||||
options: {
|
||||
errors_crc_p_near: {
|
||||
title: _("Near CRC Errors"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true
|
||||
},
|
||||
errors_crcp_p_near: {
|
||||
title: _("Near Pre-emptive CRC Errors"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true
|
||||
},
|
||||
errors_crc_p_far: {
|
||||
title: _("Far CRC Errors"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true,
|
||||
flip: true
|
||||
},
|
||||
errors_crcp_p_far: {
|
||||
title: _("Far Pre-emptive CRC Errors"),
|
||||
overlay: true,
|
||||
noarea: true,
|
||||
total: true,
|
||||
flip: true
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -175,6 +403,9 @@ return L.Class.extend({
|
||||
if (dtypes.includes("snr")) {
|
||||
g.push(d_snr);
|
||||
}
|
||||
if (dtypes.includes("gauge")) {
|
||||
g.push(d_atn);
|
||||
}
|
||||
if (dtypes.includes("uptime")) {
|
||||
g.push(d_uptime);
|
||||
}
|
||||
@@ -184,8 +415,28 @@ return L.Class.extend({
|
||||
if (dtypes.includes("bitrate")) {
|
||||
g.push(d_bitrate);
|
||||
}
|
||||
if (dtypes.includes("count")) {
|
||||
g.push(d_count);
|
||||
if (dtypes.includes("errors")) {
|
||||
var dinsts = graph.dataInstances(host, plugin, plugin_instance, "errors");
|
||||
var e = 0,
|
||||
c = 0,
|
||||
r = 0;
|
||||
for (var i = 0; i < dinsts.length; i++) {
|
||||
if (
|
||||
!e &&
|
||||
(dinsts[i].indexOf("es") > -1 ||
|
||||
dinsts[i].indexOf("loss") > -1 ||
|
||||
dinsts[i].indexOf("uas") > -1)
|
||||
) {
|
||||
e = g.push(d_errors);
|
||||
} else if (!c && dinsts[i].indexOf("crc") > -1) {
|
||||
c = g.push(d_crc);
|
||||
} else if (
|
||||
!r &&
|
||||
(dinsts[i].indexOf("rx_") == 0 || dinsts[i].indexOf("tx_") == 0)
|
||||
) {
|
||||
r = g.push(d_retx);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return g;
|
||||
|
||||
Reference in New Issue
Block a user