Skip to content

Commit acfd560

Browse files
rchacrchac
authored
Merge pull request #826 from LibreQoE/support_tool_retire
Support tool retire
2 parents 101e308 + e2fdf13 commit acfd560

File tree

5 files changed

+23
-156
lines changed

5 files changed

+23
-156
lines changed

‎src/build_dpkg.sh‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ RUSTPROGS=(
5858
lqos_setup
5959
lqos_map_perf
6060
uisp_integration
61-
lqos_support_tool
6261
)
6362

6463
####################################################
@@ -91,8 +90,17 @@ popd > /dev/null || exit
9190

9291
# Build the Rust programs (before the control file, we need to LDD lqosd)
9392
pushd rust > /dev/null || exit
94-
#cargo clean
95-
cargo build --all --release
93+
# Build only required binaries and artifacts (exclude lqos_support_tool executable)
94+
cargo build --release \
95+
-p lqosd \
96+
-p lqtop \
97+
-p xdp_iphash_to_cpu_cmdline \
98+
-p xdp_pping \
99+
-p lqusers \
100+
-p lqos_setup \
101+
-p lqos_map_perf \
102+
-p uisp_integration \
103+
-p lqos_python
96104
popd > /dev/null || exit
97105

98106
# Create the post-installation file

‎src/build_rust.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ rustup update
3838

3939
# Start building
4040
echo "Please wait while the system is compiled. Service will not be interrupted during this stage."
41-
PROGS="lqosd lqtop xdp_iphash_to_cpu_cmdline xdp_pping lqusers lqos_map_perf uisp_integration lqos_support_tool"
41+
PROGS="lqosd lqtop xdp_iphash_to_cpu_cmdline xdp_pping lqusers lqos_map_perf uisp_integration"
4242
mkdir -p bin/static
4343
pushd rust > /dev/null || exit
4444
#cargo clean

‎src/rust/lqosd/src/node_manager/local_api.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ pub fn local_api(shaper_query: tokio::sync::mpsc::Sender<ShaperQueryCommand>) ->
3737
.route("/devicesAll", get(shaped_device_api::all_shaped_devices))
3838
.route("/networkTree", get(network_tree::get_network_tree))
3939
.route("/sanity", get(support::run_sanity_check))
40-
.route("/gatherSupport", post(support::gather_support_data))
41-
.route("/submitSupport", post(support::submit_support_data))
4240
.route("/ltsCheck", get(lts::stats_check))
4341
.route("/search", post(search::search))
4442
.route("/unknownIps", get(unknown_ips::unknown_ips))

‎src/rust/lqosd/src/node_manager/local_api/support.rs‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,9 @@
11
use axum::Json;
2-
use axum::body::Body;
3-
use axum::http::header;
4-
use axum::response::IntoResponse;
5-
use lqos_config::load_config;
62
use lqos_support_tool::{SanityChecks, run_sanity_checks};
7-
use serde::Deserialize;
8-
use std::time::{SystemTime, UNIX_EPOCH};
93

104
pub async fn run_sanity_check() -> Json<SanityChecks> {
115
let mut status = run_sanity_checks(false)
126
.expect("Failed to run sanity checks");
137
status.results.sort_by(|a, b| a.success.cmp(&b.success));
148
Json(status)
159
}
16-
17-
#[derive(Deserialize, Clone)]
18-
pub struct SupportMetadata {
19-
name: String,
20-
comment: String,
21-
}
22-
23-
pub async fn gather_support_data(info: Json<SupportMetadata>) -> impl IntoResponse {
24-
let timestamp = SystemTime::now()
25-
.duration_since(UNIX_EPOCH)
26-
.expect("SystemTime is before UNIX_EPOCH")
27-
.as_secs();
28-
let filename = format!("libreqos_{}.support", timestamp);
29-
let lts_key = if let Ok(cfg) = load_config() {
30-
cfg.long_term_stats
31-
.license_key
32-
.clone()
33-
.unwrap_or("None".to_string())
34-
} else {
35-
"None".to_string()
36-
};
37-
let dump = lqos_support_tool::gather_all_support_info(&info.name, &info.comment, &lts_key)
38-
.expect("Failed to gather support information");
39-
40-
let body = Body::from(
41-
dump.serialize_and_compress()
42-
.expect("Failed to serialize/compress support bundle"),
43-
);
44-
let headers = [
45-
(header::CONTENT_TYPE, "application/octet-stream"),
46-
(
47-
header::CONTENT_DISPOSITION,
48-
&format!("attachment; filename=\"{filename}\""),
49-
),
50-
];
51-
(headers, body).into_response()
52-
}
53-
54-
pub async fn submit_support_data(info: Json<SupportMetadata>) -> String {
55-
let lts_key = if let Ok(cfg) = load_config() {
56-
cfg.long_term_stats
57-
.license_key
58-
.clone()
59-
.unwrap_or("None".to_string())
60-
} else {
61-
"None".to_string()
62-
};
63-
if let Ok(dump) =
64-
lqos_support_tool::gather_all_support_info(&info.name, &info.comment, &lts_key)
65-
{
66-
lqos_support_tool::submit_to_network(dump);
67-
"Your support submission has been sent".to_string()
68-
} else {
69-
"Something went wrong".to_string()
70-
}
71-
}

‎src/rust/lqosd/src/node_manager/static2/help.html‎

Lines changed: 11 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ <h5 class="card-title"><i class="fa fa-question-circle"></i> Help & Support</h5>
1111
</p>
1212
<p>
1313
<a href="https://github.com/sponsors/LibreQoE/" class="btn btn-primary">
14-
<i class="fa fa-money"></i> Support LibreQoS Today
14+
<i class="fa fa-dollar-sign"></i> Support LibreQoS Today
1515
</a>
16-
<button class="btn btn-outline-primary" type="button" id="btnDave">
16+
<button class="btn btn-outline-primary mt-2" type="button" id="btnDave">
1717
In Memory of Dave Täht
1818
</button>
1919
</p>
@@ -46,7 +46,7 @@ <h5 class="card-title"><i class="fa fa-user-circle"></i> Chat</h5>
4646
<div class="col-4">
4747
<div class="card">
4848
<div class="card-body">
49-
<h5 class="card-title"><i class="fa fa-youtube"></i> Learn</h5>
49+
<h5 class="card-title"><i class="fab fa-youtube"></i> Learn</h5>
5050
<p>
5151
Learn about LibreQoS, bufferbloat and our battle against Internet
5252
latency at our <a href="https://www.youtube.com/@LibreQoS">YouTube channel</a>.
@@ -58,13 +58,13 @@ <h5 class="card-title"><i class="fa fa-youtube"></i> Learn</h5>
5858
<div class="col-4">
5959
<div class="card">
6060
<div class="card-body">
61-
<h5 class="card-title"><i class="fa fa-connectdevelop"></i> Connect</h5>
61+
<h5 class="card-title"><i class="fab fa-connectdevelop"></i> Connect</h5>
6262
<p>
6363
We're on social media! Connect with us at:
6464
<ul>
65-
<li><a href="https://www.linkedin.com/company/libreqos/"><i class="fa fa-linkedin"></i> LinkedIn</a></li>
66-
<li><a href="https://twitter.com/libreqos"><i class="fa fa-twitter"></i> Twitter</a></li>
67-
<li><a href="https://www.facebook.com/libreqos"><i class="fa fa-facebook"></i> Facebook</a></li>
65+
<li><a href="https://www.linkedin.com/company/libreqos/"><i class="fab fa-linkedin"></i> LinkedIn</a></li>
66+
<li><a href="https://twitter.com/libreqos"><i class="fab fa-twitter"></i> Twitter</a></li>
67+
<li><a href="https://www.facebook.com/libreqos"><i class="fab fa-facebook"></i> Facebook</a></li>
6868
<li><a href="https://fosstodon.org/@LibreQoS/"><i class="fa fa-link"></i> Fosstodon (Free Open Source Mastadon)</a></li>
6969
</ul>
7070
</div>
@@ -75,22 +75,12 @@ <h5 class="card-title"><i class="fa fa-connectdevelop"></i> Connect</h5>
7575
<div class="card">
7676
<div class="card-body">
7777
<h5 class="card-title"><i class="fa fa-wrench"></i> Tools</h5>
78-
<p style="border: 1px solid #eee">
78+
<p>
7979
<strong>Sanity check</strong> reads your configuration and looks for common issues. This should be
8080
your first step when troubleshooting the system.<br />
8181
<button id="btnSanity" class="btn btn-primary"><i class="fa fa-info"></i> Sanity Check Your Installation</button>
8282
</p>
83-
<p style="border: 1px solid #eee">
84-
<strong>Download</strong> support data to a local file. You can send this to LibreQoS via the
85-
chat or email (as part of an ongoing support discussion).<br />
86-
<button id="btnDownload" class="btn btn-secondary" data-bs-toggle="modal" data-bs-target="#downloadDump"><i class="fa fa-download"></i> Download Support Dump</button>
87-
</p>
88-
<p style="border: 1px solid #eee">
89-
<strong>Submit</strong> support data directly to LibreQoS. Please contact us when you do this,
90-
with detailed information about the problems you are experiencing. Repeatedly hitting this
91-
button will get you slower - or no - service!<br />
92-
<button id="btnSubmit" class="btn btn-warning" data-bs-toggle="modal" data-bs-target="#submitDump"><i class="fa fa-send"></i> Send Support Dump</button>
93-
</p>
83+
<!-- Support dump download/submission removed; server discontinued -->
9484

9585
</div>
9686
</div>
@@ -114,73 +104,6 @@ <h5 class="modal-title">Configuration Check Results</h5>
114104
</div>
115105
</div>
116106

117-
<div class="modal" tabindex="-1" id="downloadDump">
118-
<div class="modal-dialog">
119-
<div class="modal-content">
120-
<div class="modal-header">
121-
<h5 class="modal-title">Information To Add to the Support Dump</h5>
122-
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
123-
</div>
124-
<div class="modal-body" style="overflow: auto;">
125-
<div class="row">
126-
<div class="col">
127-
<label for="gatherName" class="form-label">Your Name</label>
128-
<input type="text" id="gatherName" class="form-control" />
129-
</div>
130-
<div class="col">
131-
<label for="gatherEmail" class="form-label">Your Email Address</label>
132-
<input type="text" id="gatherEmail" class="form-control" />
133-
</div>
134-
</div>
135-
<div class="row">
136-
<div class="col">
137-
<label for="gatherComments" class="form-label">Comments</label>
138-
<input type="text" id="gatherComments" class="form-control" />
139-
</div>
140-
</div>
141-
</div>
142-
<div class="modal-footer">
143-
<button id="btnGather" type="button" class="btn btn-primary"><i class="fa fa-download"></i> Generate and Download</button>
144-
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
145-
</div>
146-
</div>
147-
</div>
148-
</div>
149-
150-
<div class="modal" tabindex="-1" id="submitDump">
151-
<div class="modal-dialog">
152-
<div class="modal-content">
153-
<div class="modal-header">
154-
<h5 class="modal-title">Information To Add to the Support Dump</h5>
155-
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
156-
</div>
157-
<div class="modal-body" style="overflow: auto;">
158-
<p class="alert-warning"><i class="fa fa-warning"></i> Your support dump will contain unredated data about your customers, and lots
159-
of information about your server. By submitting, you are acknowledging that LibreQoS bear no liability for this data.
160-
LibreQoS will take all reasonable measures to protect your data, and will not share it.</p>
161-
<div class="row">
162-
<div class="col">
163-
<label for="submitName" class="form-label">Your Name</label>
164-
<input type="text" id="submitName" class="form-control" />
165-
</div>
166-
<div class="col">
167-
<label for="submitEmail" class="form-label">Your Email Address</label>
168-
<input type="text" id="submitEmail" class="form-control" />
169-
</div>
170-
</div>
171-
<div class="row">
172-
<div class="col">
173-
<label for="submitComments" class="form-label">Comments</label>
174-
<input type="text" id="submitComments" class="form-control" />
175-
</div>
176-
</div>
177-
</div>
178-
<div class="modal-footer">
179-
<button id="btnClickSub" type="button" class="btn btn-primary"><i class="fa fa-send"></i> Submit Support Data to LibreQoS</button>
180-
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
181-
</div>
182-
</div>
183-
</div>
184-
</div>
107+
<!-- Removed support dump modals: downloadDump and submitDump -->
185108

186-
<script src="help.js%CACHEBUSTERS%"></script>
109+
<script src="help.js%CACHEBUSTERS%"></script>

0 commit comments

Comments
 (0)