From 01b200050cc34db116070d13a459e80c13c7525c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Thu, 9 Jan 2025 18:11:57 -0700 Subject: [PATCH 01/13] Update build_dpkg.sh --- src/build_dpkg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build_dpkg.sh b/src/build_dpkg.sh index 094ff4d3..0759afca 100755 --- a/src/build_dpkg.sh +++ b/src/build_dpkg.sh @@ -144,7 +144,7 @@ do cp rust/target/release/"$prog" "$LQOS_DIR"/bin done -cp -r bin/static2/* "$LQOS_DIR"/bin/static2 +cp -r /bin/static2/* "$LQOS_DIR"/bin/static2 mkdir "$LQOS_DIR"/bin/dashboards echo "{\"name\":\"default\",\"entries\":[{\"name\":\"Shaped/Unshaped Pie\",\"tag\":\"shapedUnshaped\",\"size\":2},{\"name\":\"Last 5 Minutes Throughput\",\"tag\":\"throughputRing\",\"size\":4},{\"name\":\"Total TCP Retransmits\",\"tag\":\"totalRetransmits\",\"size\":4},{\"name\":\"RAM Utilization\",\"tag\":\"ram\",\"size\":2},{\"name\":\"Throughput Packets/Second\",\"tag\":\"throughputPps\",\"size\":2},{\"name\":\"Round-Trip Time Histogram\",\"tag\":\"rttHistogram\",\"size\":2},{\"name\":\"Total Cake Stats\",\"tag\":\"totalCakeStats\",\"size\":4},{\"name\":\"Tracked Flows Counter\",\"tag\":\"trackedFlowsCount\",\"size\":2},{\"name\":\"CPU Utilization\",\"tag\":\"cpu\",\"size\":2},{\"name\":\"Network Tree Sankey\",\"tag\":\"networkTreeSankey\",\"size\":6},{\"name\":\"Network Tree Summary\",\"tag\":\"treeSummary\",\"size\":6},{\"name\":\"Top 10 Downloaders (Visual)\",\"tag\":\"top10downloadersV\",\"size\":6},{\"name\":\"Top 10 Downloaders\",\"tag\":\"top10downloaders\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time (Visual)\",\"tag\":\"worst10downloadersV\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time\",\"tag\":\"worst10downloaders\",\"size\":6},{\"name\":\"Worst 10 Retransmits (Visual)\",\"tag\":\"worst10retransmitsV\",\"size\":6},{\"name\":\"Worst 10 Retransmits\",\"tag\":\"worst10retransmits\",\"size\":6},{\"name\":\"Top 10 Flows (total bytes)\",\"tag\":\"top10flowsBytes\",\"size\":6},{\"name\":\"Top 10 Flows (rate)\",\"tag\":\"top10flowsRate\",\"size\":6},{\"name\":\"Top 10 Endpoints by Country\",\"tag\":\"top10endpointsCountry\",\"size\":6},{\"name\":\"Ether Protocols\",\"tag\":\"etherProtocols\",\"size\":6},{\"name\":\"IP Protocols\",\"tag\":\"ipProtocols\",\"size\":6},{\"name\":\"Combined Top 10 Box\",\"tag\":\"combinedTop10\",\"size\":6},{\"name\":\"Circuits At Capacity\",\"tag\":\"circuitCapacity\",\"size\":6},{\"name\":\"Tree Nodes At Capacity\",\"tag\":\"treeCapacity\",\"size\":6}]}" > "$LQOS_DIR"/bin/dashboards/default.json From bd161daa8769169149fdad8a8921258f829bc76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Thu, 9 Jan 2025 18:21:03 -0700 Subject: [PATCH 02/13] Update build_dpkg.sh --- src/build_dpkg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build_dpkg.sh b/src/build_dpkg.sh index 0759afca..094ff4d3 100755 --- a/src/build_dpkg.sh +++ b/src/build_dpkg.sh @@ -144,7 +144,7 @@ do cp rust/target/release/"$prog" "$LQOS_DIR"/bin done -cp -r /bin/static2/* "$LQOS_DIR"/bin/static2 +cp -r bin/static2/* "$LQOS_DIR"/bin/static2 mkdir "$LQOS_DIR"/bin/dashboards echo "{\"name\":\"default\",\"entries\":[{\"name\":\"Shaped/Unshaped Pie\",\"tag\":\"shapedUnshaped\",\"size\":2},{\"name\":\"Last 5 Minutes Throughput\",\"tag\":\"throughputRing\",\"size\":4},{\"name\":\"Total TCP Retransmits\",\"tag\":\"totalRetransmits\",\"size\":4},{\"name\":\"RAM Utilization\",\"tag\":\"ram\",\"size\":2},{\"name\":\"Throughput Packets/Second\",\"tag\":\"throughputPps\",\"size\":2},{\"name\":\"Round-Trip Time Histogram\",\"tag\":\"rttHistogram\",\"size\":2},{\"name\":\"Total Cake Stats\",\"tag\":\"totalCakeStats\",\"size\":4},{\"name\":\"Tracked Flows Counter\",\"tag\":\"trackedFlowsCount\",\"size\":2},{\"name\":\"CPU Utilization\",\"tag\":\"cpu\",\"size\":2},{\"name\":\"Network Tree Sankey\",\"tag\":\"networkTreeSankey\",\"size\":6},{\"name\":\"Network Tree Summary\",\"tag\":\"treeSummary\",\"size\":6},{\"name\":\"Top 10 Downloaders (Visual)\",\"tag\":\"top10downloadersV\",\"size\":6},{\"name\":\"Top 10 Downloaders\",\"tag\":\"top10downloaders\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time (Visual)\",\"tag\":\"worst10downloadersV\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time\",\"tag\":\"worst10downloaders\",\"size\":6},{\"name\":\"Worst 10 Retransmits (Visual)\",\"tag\":\"worst10retransmitsV\",\"size\":6},{\"name\":\"Worst 10 Retransmits\",\"tag\":\"worst10retransmits\",\"size\":6},{\"name\":\"Top 10 Flows (total bytes)\",\"tag\":\"top10flowsBytes\",\"size\":6},{\"name\":\"Top 10 Flows (rate)\",\"tag\":\"top10flowsRate\",\"size\":6},{\"name\":\"Top 10 Endpoints by Country\",\"tag\":\"top10endpointsCountry\",\"size\":6},{\"name\":\"Ether Protocols\",\"tag\":\"etherProtocols\",\"size\":6},{\"name\":\"IP Protocols\",\"tag\":\"ipProtocols\",\"size\":6},{\"name\":\"Combined Top 10 Box\",\"tag\":\"combinedTop10\",\"size\":6},{\"name\":\"Circuits At Capacity\",\"tag\":\"circuitCapacity\",\"size\":6},{\"name\":\"Tree Nodes At Capacity\",\"tag\":\"treeCapacity\",\"size\":6}]}" > "$LQOS_DIR"/bin/dashboards/default.json From 2404c6dcdd596ec3b8357918f09f8e5d35f9f45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Thu, 9 Jan 2025 18:22:15 -0700 Subject: [PATCH 03/13] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 12b0cc6b..9564796a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -10,7 +10,7 @@ jobs: runs-on: [ lq_run ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set Version ENV run: pushd src; echo "::set-env name=VERSION::$(cat VERSION_STRING)" env: From e99c6530d77a5376363d381dc1eb0f41e26d5bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Thu, 9 Jan 2025 18:58:06 -0700 Subject: [PATCH 04/13] Update rust.yml --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 9564796a..ea879fce 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -27,6 +27,8 @@ jobs: run: pushd src/rust; cargo test --verbose --all; popd - name: Build .deb file run: pushd src; ./build_dpkg.sh --nostamp; popd + with: + path: src - name: Archive .deb file uses: actions/upload-artifact@v4 with: From 36bba7707ce3a29862c9411eb84e1217085100d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Thu, 9 Jan 2025 19:05:25 -0700 Subject: [PATCH 05/13] Update rust.yml --- .github/workflows/rust.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ea879fce..779264e1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -27,8 +27,7 @@ jobs: run: pushd src/rust; cargo test --verbose --all; popd - name: Build .deb file run: pushd src; ./build_dpkg.sh --nostamp; popd - with: - path: src + working-directory: src/ - name: Archive .deb file uses: actions/upload-artifact@v4 with: From 6a2afe75c708144af2edb271e3de3c1971f1b314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Thu, 9 Jan 2025 19:08:29 -0700 Subject: [PATCH 06/13] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 779264e1..0e71b0be 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -26,7 +26,7 @@ jobs: - name: Run tests run: pushd src/rust; cargo test --verbose --all; popd - name: Build .deb file - run: pushd src; ./build_dpkg.sh --nostamp; popd + run: ./build_dpkg.sh --nostamp working-directory: src/ - name: Archive .deb file uses: actions/upload-artifact@v4 From 1a510a8db0d05180332a10a5b113e99491614a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Thu, 9 Jan 2025 19:17:57 -0700 Subject: [PATCH 07/13] Update build_dpkg.sh --- src/build_dpkg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build_dpkg.sh b/src/build_dpkg.sh index 094ff4d3..26adaa7b 100755 --- a/src/build_dpkg.sh +++ b/src/build_dpkg.sh @@ -144,7 +144,7 @@ do cp rust/target/release/"$prog" "$LQOS_DIR"/bin done -cp -r bin/static2/* "$LQOS_DIR"/bin/static2 +cp -r bin/static2/* "$LQOS_DIR"/bin/static2/ mkdir "$LQOS_DIR"/bin/dashboards echo "{\"name\":\"default\",\"entries\":[{\"name\":\"Shaped/Unshaped Pie\",\"tag\":\"shapedUnshaped\",\"size\":2},{\"name\":\"Last 5 Minutes Throughput\",\"tag\":\"throughputRing\",\"size\":4},{\"name\":\"Total TCP Retransmits\",\"tag\":\"totalRetransmits\",\"size\":4},{\"name\":\"RAM Utilization\",\"tag\":\"ram\",\"size\":2},{\"name\":\"Throughput Packets/Second\",\"tag\":\"throughputPps\",\"size\":2},{\"name\":\"Round-Trip Time Histogram\",\"tag\":\"rttHistogram\",\"size\":2},{\"name\":\"Total Cake Stats\",\"tag\":\"totalCakeStats\",\"size\":4},{\"name\":\"Tracked Flows Counter\",\"tag\":\"trackedFlowsCount\",\"size\":2},{\"name\":\"CPU Utilization\",\"tag\":\"cpu\",\"size\":2},{\"name\":\"Network Tree Sankey\",\"tag\":\"networkTreeSankey\",\"size\":6},{\"name\":\"Network Tree Summary\",\"tag\":\"treeSummary\",\"size\":6},{\"name\":\"Top 10 Downloaders (Visual)\",\"tag\":\"top10downloadersV\",\"size\":6},{\"name\":\"Top 10 Downloaders\",\"tag\":\"top10downloaders\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time (Visual)\",\"tag\":\"worst10downloadersV\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time\",\"tag\":\"worst10downloaders\",\"size\":6},{\"name\":\"Worst 10 Retransmits (Visual)\",\"tag\":\"worst10retransmitsV\",\"size\":6},{\"name\":\"Worst 10 Retransmits\",\"tag\":\"worst10retransmits\",\"size\":6},{\"name\":\"Top 10 Flows (total bytes)\",\"tag\":\"top10flowsBytes\",\"size\":6},{\"name\":\"Top 10 Flows (rate)\",\"tag\":\"top10flowsRate\",\"size\":6},{\"name\":\"Top 10 Endpoints by Country\",\"tag\":\"top10endpointsCountry\",\"size\":6},{\"name\":\"Ether Protocols\",\"tag\":\"etherProtocols\",\"size\":6},{\"name\":\"IP Protocols\",\"tag\":\"ipProtocols\",\"size\":6},{\"name\":\"Combined Top 10 Box\",\"tag\":\"combinedTop10\",\"size\":6},{\"name\":\"Circuits At Capacity\",\"tag\":\"circuitCapacity\",\"size\":6},{\"name\":\"Tree Nodes At Capacity\",\"tag\":\"treeCapacity\",\"size\":6}]}" > "$LQOS_DIR"/bin/dashboards/default.json From b5ef8b61e3da925d2da3377c8782560b42af5eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Thu, 9 Jan 2025 21:01:58 -0700 Subject: [PATCH 08/13] Update build_dpkg.sh --- src/build_dpkg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/build_dpkg.sh b/src/build_dpkg.sh index 26adaa7b..f005c79d 100755 --- a/src/build_dpkg.sh +++ b/src/build_dpkg.sh @@ -144,6 +144,7 @@ do cp rust/target/release/"$prog" "$LQOS_DIR"/bin done +mkdir "$LQOS_DIR"/bin/static2/ cp -r bin/static2/* "$LQOS_DIR"/bin/static2/ mkdir "$LQOS_DIR"/bin/dashboards echo "{\"name\":\"default\",\"entries\":[{\"name\":\"Shaped/Unshaped Pie\",\"tag\":\"shapedUnshaped\",\"size\":2},{\"name\":\"Last 5 Minutes Throughput\",\"tag\":\"throughputRing\",\"size\":4},{\"name\":\"Total TCP Retransmits\",\"tag\":\"totalRetransmits\",\"size\":4},{\"name\":\"RAM Utilization\",\"tag\":\"ram\",\"size\":2},{\"name\":\"Throughput Packets/Second\",\"tag\":\"throughputPps\",\"size\":2},{\"name\":\"Round-Trip Time Histogram\",\"tag\":\"rttHistogram\",\"size\":2},{\"name\":\"Total Cake Stats\",\"tag\":\"totalCakeStats\",\"size\":4},{\"name\":\"Tracked Flows Counter\",\"tag\":\"trackedFlowsCount\",\"size\":2},{\"name\":\"CPU Utilization\",\"tag\":\"cpu\",\"size\":2},{\"name\":\"Network Tree Sankey\",\"tag\":\"networkTreeSankey\",\"size\":6},{\"name\":\"Network Tree Summary\",\"tag\":\"treeSummary\",\"size\":6},{\"name\":\"Top 10 Downloaders (Visual)\",\"tag\":\"top10downloadersV\",\"size\":6},{\"name\":\"Top 10 Downloaders\",\"tag\":\"top10downloaders\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time (Visual)\",\"tag\":\"worst10downloadersV\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time\",\"tag\":\"worst10downloaders\",\"size\":6},{\"name\":\"Worst 10 Retransmits (Visual)\",\"tag\":\"worst10retransmitsV\",\"size\":6},{\"name\":\"Worst 10 Retransmits\",\"tag\":\"worst10retransmits\",\"size\":6},{\"name\":\"Top 10 Flows (total bytes)\",\"tag\":\"top10flowsBytes\",\"size\":6},{\"name\":\"Top 10 Flows (rate)\",\"tag\":\"top10flowsRate\",\"size\":6},{\"name\":\"Top 10 Endpoints by Country\",\"tag\":\"top10endpointsCountry\",\"size\":6},{\"name\":\"Ether Protocols\",\"tag\":\"etherProtocols\",\"size\":6},{\"name\":\"IP Protocols\",\"tag\":\"ipProtocols\",\"size\":6},{\"name\":\"Combined Top 10 Box\",\"tag\":\"combinedTop10\",\"size\":6},{\"name\":\"Circuits At Capacity\",\"tag\":\"circuitCapacity\",\"size\":6},{\"name\":\"Tree Nodes At Capacity\",\"tag\":\"treeCapacity\",\"size\":6}]}" > "$LQOS_DIR"/bin/dashboards/default.json From 62d1dd6fbaa860ada4a35d95828c47bd9b035996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Sat, 11 Jan 2025 12:36:07 -0700 Subject: [PATCH 09/13] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0e71b0be..00426c3c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -19,7 +19,7 @@ jobs: run: | echo ${{ env.VERSION }} - name: Install dependencies - run: sudo /bin/apt-get update; sudo /bin/apt-get install --no-install-recommends python3-pip clang gcc gcc-multilib llvm libelf-dev git nano graphviz curl screen llvm pkg-config linux-tools-common linux-tools-`/bin/uname r` libbpf-dev mold + run: sudo /bin/apt-get update; sudo /bin/apt-get install --no-install-recommends python3-pip clang gcc gcc-multilib llvm libelf-dev git nano graphviz esbuild curl screen llvm pkg-config linux-tools-common linux-tools-`/bin/uname r` libbpf-dev mold if: matrix.os == 'ubuntu-latest' - name: Build run: pushd src/rust; cargo build --verbose --all; popd From b91a5898194ed7f4dfdc1d201cfd47fe07413041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Sat, 11 Jan 2025 12:42:54 -0700 Subject: [PATCH 10/13] Update build_dpkg.sh --- src/build_dpkg.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/build_dpkg.sh b/src/build_dpkg.sh index f005c79d..094ff4d3 100755 --- a/src/build_dpkg.sh +++ b/src/build_dpkg.sh @@ -144,8 +144,7 @@ do cp rust/target/release/"$prog" "$LQOS_DIR"/bin done -mkdir "$LQOS_DIR"/bin/static2/ -cp -r bin/static2/* "$LQOS_DIR"/bin/static2/ +cp -r bin/static2/* "$LQOS_DIR"/bin/static2 mkdir "$LQOS_DIR"/bin/dashboards echo "{\"name\":\"default\",\"entries\":[{\"name\":\"Shaped/Unshaped Pie\",\"tag\":\"shapedUnshaped\",\"size\":2},{\"name\":\"Last 5 Minutes Throughput\",\"tag\":\"throughputRing\",\"size\":4},{\"name\":\"Total TCP Retransmits\",\"tag\":\"totalRetransmits\",\"size\":4},{\"name\":\"RAM Utilization\",\"tag\":\"ram\",\"size\":2},{\"name\":\"Throughput Packets/Second\",\"tag\":\"throughputPps\",\"size\":2},{\"name\":\"Round-Trip Time Histogram\",\"tag\":\"rttHistogram\",\"size\":2},{\"name\":\"Total Cake Stats\",\"tag\":\"totalCakeStats\",\"size\":4},{\"name\":\"Tracked Flows Counter\",\"tag\":\"trackedFlowsCount\",\"size\":2},{\"name\":\"CPU Utilization\",\"tag\":\"cpu\",\"size\":2},{\"name\":\"Network Tree Sankey\",\"tag\":\"networkTreeSankey\",\"size\":6},{\"name\":\"Network Tree Summary\",\"tag\":\"treeSummary\",\"size\":6},{\"name\":\"Top 10 Downloaders (Visual)\",\"tag\":\"top10downloadersV\",\"size\":6},{\"name\":\"Top 10 Downloaders\",\"tag\":\"top10downloaders\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time (Visual)\",\"tag\":\"worst10downloadersV\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time\",\"tag\":\"worst10downloaders\",\"size\":6},{\"name\":\"Worst 10 Retransmits (Visual)\",\"tag\":\"worst10retransmitsV\",\"size\":6},{\"name\":\"Worst 10 Retransmits\",\"tag\":\"worst10retransmits\",\"size\":6},{\"name\":\"Top 10 Flows (total bytes)\",\"tag\":\"top10flowsBytes\",\"size\":6},{\"name\":\"Top 10 Flows (rate)\",\"tag\":\"top10flowsRate\",\"size\":6},{\"name\":\"Top 10 Endpoints by Country\",\"tag\":\"top10endpointsCountry\",\"size\":6},{\"name\":\"Ether Protocols\",\"tag\":\"etherProtocols\",\"size\":6},{\"name\":\"IP Protocols\",\"tag\":\"ipProtocols\",\"size\":6},{\"name\":\"Combined Top 10 Box\",\"tag\":\"combinedTop10\",\"size\":6},{\"name\":\"Circuits At Capacity\",\"tag\":\"circuitCapacity\",\"size\":6},{\"name\":\"Tree Nodes At Capacity\",\"tag\":\"treeCapacity\",\"size\":6}]}" > "$LQOS_DIR"/bin/dashboards/default.json From 5a04b3019c70bcc8207b1bed6482507b646a4e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Sat, 11 Jan 2025 15:05:28 -0700 Subject: [PATCH 11/13] Update build_dpkg.sh --- src/build_dpkg.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/build_dpkg.sh b/src/build_dpkg.sh index 094ff4d3..326d4670 100755 --- a/src/build_dpkg.sh +++ b/src/build_dpkg.sh @@ -44,6 +44,11 @@ mkdir -p "$ETC_DIR" # shellcheck disable=SC2086 mkdir -p $MOTD_DIR +# Test stuff to remove later +ls bin/static2/ +ls "$LQOS_DIR"/bin/static2 +echo "$LQOS_DIR" + # Create the Debian control file pushd "$DEBIAN_DIR" > /dev/null || exit touch control @@ -144,6 +149,9 @@ do cp rust/target/release/"$prog" "$LQOS_DIR"/bin done +ls bin/static2/ +ls "$LQOS_DIR"/bin/static2 +echo "$LQOS_DIR" cp -r bin/static2/* "$LQOS_DIR"/bin/static2 mkdir "$LQOS_DIR"/bin/dashboards echo "{\"name\":\"default\",\"entries\":[{\"name\":\"Shaped/Unshaped Pie\",\"tag\":\"shapedUnshaped\",\"size\":2},{\"name\":\"Last 5 Minutes Throughput\",\"tag\":\"throughputRing\",\"size\":4},{\"name\":\"Total TCP Retransmits\",\"tag\":\"totalRetransmits\",\"size\":4},{\"name\":\"RAM Utilization\",\"tag\":\"ram\",\"size\":2},{\"name\":\"Throughput Packets/Second\",\"tag\":\"throughputPps\",\"size\":2},{\"name\":\"Round-Trip Time Histogram\",\"tag\":\"rttHistogram\",\"size\":2},{\"name\":\"Total Cake Stats\",\"tag\":\"totalCakeStats\",\"size\":4},{\"name\":\"Tracked Flows Counter\",\"tag\":\"trackedFlowsCount\",\"size\":2},{\"name\":\"CPU Utilization\",\"tag\":\"cpu\",\"size\":2},{\"name\":\"Network Tree Sankey\",\"tag\":\"networkTreeSankey\",\"size\":6},{\"name\":\"Network Tree Summary\",\"tag\":\"treeSummary\",\"size\":6},{\"name\":\"Top 10 Downloaders (Visual)\",\"tag\":\"top10downloadersV\",\"size\":6},{\"name\":\"Top 10 Downloaders\",\"tag\":\"top10downloaders\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time (Visual)\",\"tag\":\"worst10downloadersV\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time\",\"tag\":\"worst10downloaders\",\"size\":6},{\"name\":\"Worst 10 Retransmits (Visual)\",\"tag\":\"worst10retransmitsV\",\"size\":6},{\"name\":\"Worst 10 Retransmits\",\"tag\":\"worst10retransmits\",\"size\":6},{\"name\":\"Top 10 Flows (total bytes)\",\"tag\":\"top10flowsBytes\",\"size\":6},{\"name\":\"Top 10 Flows (rate)\",\"tag\":\"top10flowsRate\",\"size\":6},{\"name\":\"Top 10 Endpoints by Country\",\"tag\":\"top10endpointsCountry\",\"size\":6},{\"name\":\"Ether Protocols\",\"tag\":\"etherProtocols\",\"size\":6},{\"name\":\"IP Protocols\",\"tag\":\"ipProtocols\",\"size\":6},{\"name\":\"Combined Top 10 Box\",\"tag\":\"combinedTop10\",\"size\":6},{\"name\":\"Circuits At Capacity\",\"tag\":\"circuitCapacity\",\"size\":6},{\"name\":\"Tree Nodes At Capacity\",\"tag\":\"treeCapacity\",\"size\":6}]}" > "$LQOS_DIR"/bin/dashboards/default.json From b6ec097693de906605f50255df0b10840ecfb74d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Sat, 11 Jan 2025 15:17:07 -0700 Subject: [PATCH 12/13] Update build_dpkg.sh --- src/build_dpkg.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/build_dpkg.sh b/src/build_dpkg.sh index 326d4670..094ff4d3 100755 --- a/src/build_dpkg.sh +++ b/src/build_dpkg.sh @@ -44,11 +44,6 @@ mkdir -p "$ETC_DIR" # shellcheck disable=SC2086 mkdir -p $MOTD_DIR -# Test stuff to remove later -ls bin/static2/ -ls "$LQOS_DIR"/bin/static2 -echo "$LQOS_DIR" - # Create the Debian control file pushd "$DEBIAN_DIR" > /dev/null || exit touch control @@ -149,9 +144,6 @@ do cp rust/target/release/"$prog" "$LQOS_DIR"/bin done -ls bin/static2/ -ls "$LQOS_DIR"/bin/static2 -echo "$LQOS_DIR" cp -r bin/static2/* "$LQOS_DIR"/bin/static2 mkdir "$LQOS_DIR"/bin/dashboards echo "{\"name\":\"default\",\"entries\":[{\"name\":\"Shaped/Unshaped Pie\",\"tag\":\"shapedUnshaped\",\"size\":2},{\"name\":\"Last 5 Minutes Throughput\",\"tag\":\"throughputRing\",\"size\":4},{\"name\":\"Total TCP Retransmits\",\"tag\":\"totalRetransmits\",\"size\":4},{\"name\":\"RAM Utilization\",\"tag\":\"ram\",\"size\":2},{\"name\":\"Throughput Packets/Second\",\"tag\":\"throughputPps\",\"size\":2},{\"name\":\"Round-Trip Time Histogram\",\"tag\":\"rttHistogram\",\"size\":2},{\"name\":\"Total Cake Stats\",\"tag\":\"totalCakeStats\",\"size\":4},{\"name\":\"Tracked Flows Counter\",\"tag\":\"trackedFlowsCount\",\"size\":2},{\"name\":\"CPU Utilization\",\"tag\":\"cpu\",\"size\":2},{\"name\":\"Network Tree Sankey\",\"tag\":\"networkTreeSankey\",\"size\":6},{\"name\":\"Network Tree Summary\",\"tag\":\"treeSummary\",\"size\":6},{\"name\":\"Top 10 Downloaders (Visual)\",\"tag\":\"top10downloadersV\",\"size\":6},{\"name\":\"Top 10 Downloaders\",\"tag\":\"top10downloaders\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time (Visual)\",\"tag\":\"worst10downloadersV\",\"size\":6},{\"name\":\"Worst 10 Round-Trip Time\",\"tag\":\"worst10downloaders\",\"size\":6},{\"name\":\"Worst 10 Retransmits (Visual)\",\"tag\":\"worst10retransmitsV\",\"size\":6},{\"name\":\"Worst 10 Retransmits\",\"tag\":\"worst10retransmits\",\"size\":6},{\"name\":\"Top 10 Flows (total bytes)\",\"tag\":\"top10flowsBytes\",\"size\":6},{\"name\":\"Top 10 Flows (rate)\",\"tag\":\"top10flowsRate\",\"size\":6},{\"name\":\"Top 10 Endpoints by Country\",\"tag\":\"top10endpointsCountry\",\"size\":6},{\"name\":\"Ether Protocols\",\"tag\":\"etherProtocols\",\"size\":6},{\"name\":\"IP Protocols\",\"tag\":\"ipProtocols\",\"size\":6},{\"name\":\"Combined Top 10 Box\",\"tag\":\"combinedTop10\",\"size\":6},{\"name\":\"Circuits At Capacity\",\"tag\":\"circuitCapacity\",\"size\":6},{\"name\":\"Tree Nodes At Capacity\",\"tag\":\"treeCapacity\",\"size\":6}]}" > "$LQOS_DIR"/bin/dashboards/default.json From 88ff66d50df95d137c98554b526ce44fdcfbb31d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Sat, 11 Jan 2025 15:18:08 -0700 Subject: [PATCH 13/13] Update copy_files.sh --- src/rust/lqosd/copy_files.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rust/lqosd/copy_files.sh b/src/rust/lqosd/copy_files.sh index a3ba1c30..223bdcd5 100755 --- a/src/rust/lqosd/copy_files.sh +++ b/src/rust/lqosd/copy_files.sh @@ -1,6 +1,7 @@ #!/bin/bash set -e echo "Copying static" +mkdir ../../bin/static2/ cp -v -R src/node_manager/static2/* ../../bin/static2/ echo "Done" pushd src/node_manager/js_build || exit