From f116bed66745617ca16f347ac0b41981b08052a8 Mon Sep 17 00:00:00 2001 From: Herbert Wolverson Date: Tue, 2 Jul 2024 13:15:23 -0500 Subject: [PATCH] Pass through UI2 to be consistent on up/down --- .../src/dashlets/endpoints_by_country.js | 8 +- .../js_build/src/dashlets/ether_protocols.js | 24 ++-- .../js_build/src/dashlets/ip_protocols.js | 4 +- .../src/dashlets/shaped_unshaped_dash.js | 4 +- .../src/dashlets/top10_downloaders.js | 8 +- .../js_build/src/dashlets/top10flows_bytes.js | 12 +- .../js_build/src/dashlets/top10flows_rate.js | 12 +- .../js_build/src/dashlets/top_tree_summary.js | 4 +- .../src/dashlets/worst10_downloaders.js | 8 +- .../src/dashlets/worst10_retransmits.js | 8 +- .../js_build/src/graphs/bits_gauge.js | 121 +++++++++--------- .../js_build/src/graphs/rtt_histo_3d.js | 3 +- 12 files changed, 108 insertions(+), 108 deletions(-) diff --git a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/endpoints_by_country.js b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/endpoints_by_country.js index aa6d1dd9..49660207 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/endpoints_by_country.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/endpoints_by_country.js @@ -50,19 +50,19 @@ export class Top10EndpointsByCountry extends BaseDashlet { row.appendChild(country); let dld = document.createElement("td"); - dld.innerText = scaleNumber(r[1][0]); + dld.innerText = scaleNumber(r[1].down); row.appendChild(dld); let dlu = document.createElement("td"); - dlu.innerText = scaleNumber(r[1][1]); + dlu.innerText = scaleNumber(r[1].up); row.appendChild(dlu); let rttd = document.createElement("td"); - rttd.innerText = scaleNanos(r[2][0]); + rttd.innerText = scaleNanos(r[2].down); row.appendChild(rttd); let rttu = document.createElement("td"); - rttu.innerText = scaleNanos(r[2][1]); + rttu.innerText = scaleNanos(r[2].up); row.appendChild(rttu); t.appendChild(row); diff --git a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/ether_protocols.js b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/ether_protocols.js index ae31a298..0f8daaf5 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/ether_protocols.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/ether_protocols.js @@ -46,22 +46,22 @@ export class EtherProtocols extends BaseDashlet { let tbody = document.createElement("tbody"); let row = document.createElement("tr"); row.appendChild(simpleRow("IPv4")); - row.appendChild(simpleRow(scaleNumber(msg.data.v4_bytes[0]))); - row.appendChild(simpleRow(scaleNumber(msg.data.v4_bytes[1]))); - row.appendChild(simpleRow(scaleNumber(msg.data.v4_packets[0]))); - row.appendChild(simpleRow(scaleNumber(msg.data.v4_packets[1]))); - row.appendChild(simpleRow(scaleNanos(msg.data.v4_rtt[0]))); - row.appendChild(simpleRow(scaleNanos(msg.data.v4_rtt[1]))); + row.appendChild(simpleRow(scaleNumber(msg.data.v4_bytes.down))); + row.appendChild(simpleRow(scaleNumber(msg.data.v4_bytes.up))); + row.appendChild(simpleRow(scaleNumber(msg.data.v4_packets.down))); + row.appendChild(simpleRow(scaleNumber(msg.data.v4_packets.up))); + row.appendChild(simpleRow(scaleNanos(msg.data.v4_rtt.down))); + row.appendChild(simpleRow(scaleNanos(msg.data.v4_rtt.up))); t.appendChild(row); row = document.createElement("tr"); row.appendChild(simpleRow("IPv6")); - row.appendChild(simpleRow(scaleNumber(msg.data.v6_bytes[0]))); - row.appendChild(simpleRow(scaleNumber(msg.data.v6_bytes[1]))); - row.appendChild(simpleRow(scaleNumber(msg.data.v6_packets[0]))); - row.appendChild(simpleRow(scaleNumber(msg.data.v6_packets[1]))); - row.appendChild(simpleRow(scaleNanos(msg.data.v6_rtt[0]))); - row.appendChild(simpleRow(scaleNanos(msg.data.v6_rtt[1]))); + row.appendChild(simpleRow(scaleNumber(msg.data.v6_bytes.down))); + row.appendChild(simpleRow(scaleNumber(msg.data.v6_bytes.up))); + row.appendChild(simpleRow(scaleNumber(msg.data.v6_packets.down))); + row.appendChild(simpleRow(scaleNumber(msg.data.v6_packets.up))); + row.appendChild(simpleRow(scaleNanos(msg.data.v6_rtt.down))); + row.appendChild(simpleRow(scaleNanos(msg.data.v6_rtt.up))); t.appendChild(row); t.appendChild(tbody); diff --git a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/ip_protocols.js b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/ip_protocols.js index c0a315a6..c8a46aaf 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/ip_protocols.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/ip_protocols.js @@ -45,8 +45,8 @@ export class IpProtocols extends BaseDashlet { let row = document.createElement("tr"); row.appendChild(simpleRow(r[0])); - row.appendChild(simpleRow(scaleNumber(r[1][0]))); - row.appendChild(simpleRow(scaleNumber(r[1][1]))); + row.appendChild(simpleRow(scaleNumber(r[1].down))); + row.appendChild(simpleRow(scaleNumber(r[1].up))); t.appendChild(row); }); diff --git a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/shaped_unshaped_dash.js b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/shaped_unshaped_dash.js index e37d5ca9..5cb1ac54 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/shaped_unshaped_dash.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/shaped_unshaped_dash.js @@ -23,8 +23,8 @@ export class ShapedUnshapedDash extends BaseDashlet{ onMessage(msg) { if (msg.event === "Throughput") { - let shaped = msg.data.shaped_bps[0] + msg.data.shaped_bps[1]; - let unshaped = msg.data.bps[0] + msg.data.bps[1]; + let shaped = msg.data.shaped_bps.down + msg.data.shaped_bps.up; + let unshaped = msg.data.bps.down + msg.data.bps.up; this.graph.update(shaped, unshaped); } } diff --git a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10_downloaders.js b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10_downloaders.js index 7960f102..7efacfc4 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10_downloaders.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10_downloaders.js @@ -57,11 +57,11 @@ export class Top10Downloaders extends BaseDashlet { row.append(ip); let dl = document.createElement("td"); - dl.innerText = scaleNumber(r.bits_per_second[0]); + dl.innerText = scaleNumber(r.bits_per_second.down); row.append(dl); let ul = document.createElement("td"); - ul.innerText = scaleNumber(r.bits_per_second[1]); + ul.innerText = scaleNumber(r.bits_per_second.up); row.append(ul); let rtt = document.createElement("td"); @@ -69,11 +69,11 @@ export class Top10Downloaders extends BaseDashlet { row.append(rtt); let tcp_xmit = document.createElement("td"); - tcp_xmit.innerText = r.tcp_retransmits[0] + " / " + r.tcp_retransmits[1]; + tcp_xmit.innerText = r.tcp_retransmits.down + " / " + r.tcp_retransmits.up; row.append(tcp_xmit); let shaped = document.createElement("td"); - shaped.innerText = r.plan[0] + " / " + r.plan[1]; + shaped.innerText = r.plan.down + " / " + r.plan.up; row.append(shaped); t.appendChild(row); diff --git a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10flows_bytes.js b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10flows_bytes.js index ef63c24d..4e13d7f5 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10flows_bytes.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10flows_bytes.js @@ -64,27 +64,27 @@ export class Top10FlowsBytes extends BaseDashlet { row.appendChild(remoteIp); let dl = document.createElement("td"); - dl.innerText = scaleNumber(r.rate_estimate_bps[0]); + dl.innerText = scaleNumber(r.rate_estimate_bps.down); row.appendChild(dl); let ul = document.createElement("td"); - ul.innerText = scaleNumber(r.rate_estimate_bps[1]); + ul.innerText = scaleNumber(r.rate_estimate_bps.up); row.appendChild(ul); let total = document.createElement("td"); - total.innerText = scaleNumber(r.bytes_sent[0]) + " / " + scaleNumber(r.bytes_sent[1]); + total.innerText = scaleNumber(r.bytes_sent.down) + " / " + scaleNumber(r.bytes_sent.up); row.appendChild(total); let rttD = document.createElement("td"); - rttD.innerText = scaleNanos(r.rtt_nanos[0]); + rttD.innerText = scaleNanos(r.rtt_nanos.down); row.appendChild(rttD); let rttU = document.createElement("td"); - rttU.innerText = scaleNanos(r.rtt_nanos[1]); + rttU.innerText = scaleNanos(r.rtt_nanos.up); row.appendChild(rttU); let tcp = document.createElement("td"); - tcp.innerText = r.tcp_retransmits[0] + " / " + r.tcp_retransmits[1]; + tcp.innerText = r.tcp_retransmits.down + " / " + r.tcp_retransmits.up; row.appendChild(tcp); let asn = document.createElement("td"); diff --git a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10flows_rate.js b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10flows_rate.js index 2ef341bd..70b9d1ae 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10flows_rate.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top10flows_rate.js @@ -64,27 +64,27 @@ export class Top10FlowsRate extends BaseDashlet { row.appendChild(remoteIp); let dl = document.createElement("td"); - dl.innerText = scaleNumber(r.rate_estimate_bps[0]); + dl.innerText = scaleNumber(r.rate_estimate_bps.down); row.appendChild(dl); let ul = document.createElement("td"); - ul.innerText = scaleNumber(r.rate_estimate_bps[1]); + ul.innerText = scaleNumber(r.rate_estimate_bps.up); row.appendChild(ul); let total = document.createElement("td"); - total.innerText = scaleNumber(r.bytes_sent[0]) + " / " + scaleNumber(r.bytes_sent[1]); + total.innerText = scaleNumber(r.bytes_sent.down) + " / " + scaleNumber(r.bytes_sent.up); row.appendChild(total); let rttD = document.createElement("td"); - rttD.innerText = scaleNanos(r.rtt_nanos[0]); + rttD.innerText = scaleNanos(r.rtt_nanos.down); row.appendChild(rttD); let rttU = document.createElement("td"); - rttU.innerText = scaleNanos(r.rtt_nanos[1]); + rttU.innerText = scaleNanos(r.rtt_nanos.up); row.appendChild(rttU); let tcp = document.createElement("td"); - tcp.innerText = r.tcp_retransmits[0] + " / " + r.tcp_retransmits[1]; + tcp.innerText = r.tcp_retransmits.down + " / " + r.tcp_retransmits.up; row.appendChild(tcp); let asn = document.createElement("td"); diff --git a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top_tree_summary.js b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top_tree_summary.js index 44ca51c9..e8fcebd6 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top_tree_summary.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/top_tree_summary.js @@ -43,8 +43,8 @@ export class TopTreeSummary extends BaseDashlet { msg.data.forEach((r) => { let row = document.createElement("tr"); row.appendChild(simpleRow(r[1].name)); - row.appendChild(simpleRow(scaleNumber(r[1].current_throughput[0]))); - row.appendChild(simpleRow(scaleNumber(r[1].current_throughput[1]))); + row.appendChild(simpleRow(scaleNumber(r[1].current_throughput.down))); + row.appendChild(simpleRow(scaleNumber(r[1].current_throughput.up))); t.appendChild(row); }); diff --git a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/worst10_downloaders.js b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/worst10_downloaders.js index 962a2855..25034e02 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/worst10_downloaders.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/worst10_downloaders.js @@ -57,11 +57,11 @@ export class Worst10Downloaders extends BaseDashlet { row.append(ip); let dl = document.createElement("td"); - dl.innerText = scaleNumber(r.bits_per_second[0]); + dl.innerText = scaleNumber(r.bits_per_second.down); row.append(dl); let ul = document.createElement("td"); - ul.innerText = scaleNumber(r.bits_per_second[1]); + ul.innerText = scaleNumber(r.bits_per_second.up); row.append(ul); let rtt = document.createElement("td"); @@ -69,11 +69,11 @@ export class Worst10Downloaders extends BaseDashlet { row.append(rtt); let tcp_xmit = document.createElement("td"); - tcp_xmit.innerText = r.tcp_retransmits[0] + " / " + r.tcp_retransmits[1]; + tcp_xmit.innerText = r.tcp_retransmits.down + " / " + r.tcp_retransmits.up; row.append(tcp_xmit); let shaped = document.createElement("td"); - shaped.innerText = r.plan[0] + " / " + r.plan[1]; + shaped.innerText = r.plan.down + " / " + r.plan.up; row.append(shaped); t.appendChild(row); diff --git a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/worst10_retransmits.js b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/worst10_retransmits.js index c985882d..858d291b 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/dashlets/worst10_retransmits.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/dashlets/worst10_retransmits.js @@ -57,11 +57,11 @@ export class Worst10Retransmits extends BaseDashlet { row.append(ip); let dl = document.createElement("td"); - dl.innerText = scaleNumber(r.bits_per_second[0]); + dl.innerText = scaleNumber(r.bits_per_second.down); row.append(dl); let ul = document.createElement("td"); - ul.innerText = scaleNumber(r.bits_per_second[1]); + ul.innerText = scaleNumber(r.bits_per_second.up); row.append(ul); let rtt = document.createElement("td"); @@ -69,11 +69,11 @@ export class Worst10Retransmits extends BaseDashlet { row.append(rtt); let tcp_xmit = document.createElement("td"); - tcp_xmit.innerText = r.tcp_retransmits[0] + " / " + r.tcp_retransmits[1]; + tcp_xmit.innerText = r.tcp_retransmits.down + " / " + r.tcp_retransmits.up; row.append(tcp_xmit); let shaped = document.createElement("td"); - shaped.innerText = r.plan[0] + " / " + r.plan[1]; + shaped.innerText = r.plan.down + " / " + r.plan.up; row.append(shaped); t.appendChild(row); diff --git a/src/rust/lqosd/src/node_manager/js_build/src/graphs/bits_gauge.js b/src/rust/lqosd/src/node_manager/js_build/src/graphs/bits_gauge.js index e30c49da..5ea02559 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/graphs/bits_gauge.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/graphs/bits_gauge.js @@ -6,6 +6,66 @@ export class BitsPerSecondGauge extends DashboardGraph { super(id); this.option = { series: [ + { + type: 'gauge', + axisLine: { + lineStyle: { + width: 10, + color: [ + [0.5, 'green'], + [0.8, 'orange'], + [1, '#fd666d'] + ] + } + }, + pointer: { + icon: 'path://M2.9,0.7L2.9,0.7c1.4,0,2.6,1.2,2.6,2.6v115c0,1.4-1.2,2.6-2.6,2.6l0,0c-1.4,0-2.6-1.2-2.6-2.6V3.3C0.3,1.9,1.4,0.7,2.9,0.7z', + itemStyle: { + color: 'red' + }, + width: 4, + }, + axisTick: { + distance: -10, + length: 8, + lineStyle: { + color: '#fff', + width: 2 + } + }, + splitLine: { + distance: -15, + length: 15, + lineStyle: { + color: '#999', + width: 4 + } + }, + axisLabel: { + color: 'inherit', + distance: 16, + fontSize: 10, + formatter: (value) => { return scaleNumber(value, 1); } + }, + detail: { + valueAnimation: true, + formatter: (value) => { return scaleNumber(value); }, + color: 'inherit', + fontSize: 12, + }, + title: { + fontSize: 14, + color: 'red', + }, + data: [ + { + name: "DOWN", + value: 0, + title: { offsetCenter: ['40%', '75%'] }, + detail: { offsetCenter: ['40%', '95%'] }, + } + ] + }, { type: 'gauge', axisLine: { @@ -66,67 +126,6 @@ export class BitsPerSecondGauge extends DashboardGraph { }, ] }, - - { - type: 'gauge', - axisLine: { - lineStyle: { - width: 10, - color: [ - [0.5, 'green'], - [0.8, 'orange'], - [1, '#fd666d'] - ] - } - }, - pointer: { - icon: 'path://M2.9,0.7L2.9,0.7c1.4,0,2.6,1.2,2.6,2.6v115c0,1.4-1.2,2.6-2.6,2.6l0,0c-1.4,0-2.6-1.2-2.6-2.6V3.3C0.3,1.9,1.4,0.7,2.9,0.7z', - itemStyle: { - color: 'red' - }, - width: 4, - }, - axisTick: { - distance: -10, - length: 8, - lineStyle: { - color: '#fff', - width: 2 - } - }, - splitLine: { - distance: -15, - length: 15, - lineStyle: { - color: '#999', - width: 4 - } - }, - axisLabel: { - color: 'inherit', - distance: 16, - fontSize: 10, - formatter: (value) => { return scaleNumber(value, 1); } - }, - detail: { - valueAnimation: true, - formatter: (value) => { return scaleNumber(value); }, - color: 'inherit', - fontSize: 12, - }, - title: { - fontSize: 14, - color: 'red', - }, - data: [ - { - name: "DOWN", - value: 0, - title: { offsetCenter: ['40%', '75%'] }, - detail: { offsetCenter: ['40%', '95%'] }, - } - ] - } ] }; this.option && this.chart.setOption(this.option); diff --git a/src/rust/lqosd/src/node_manager/js_build/src/graphs/rtt_histo_3d.js b/src/rust/lqosd/src/node_manager/js_build/src/graphs/rtt_histo_3d.js index c5736fc1..06482256 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/graphs/rtt_histo_3d.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/graphs/rtt_histo_3d.js @@ -74,7 +74,8 @@ export class RttHistogram3D extends DashboardGraph { update(rtt) { this.chart.hideLoading(); - for (let i=0; i<20; i++) rtt[i] += 20-i; + // Uncomment this for test data + //for (let i=0; i<20; i++) rtt[i] += 20-i; this.ring.push(rtt); this.option.series[0].data = this.ring.series(); this.chart.setOption(this.option);