diff --git a/.gitignore b/.gitignore index f6a4f740..af6b8b6e 100644 --- a/.gitignore +++ b/.gitignore @@ -78,6 +78,7 @@ src/bin/webusers src/bin/lqusers src/bin/Rocket.toml src/bin/lqos_map_perf +src/bin/lqos_netplan_helper # Ignore project folders for some IDEs .idea/ diff --git a/docs-es/v2.0/TechnicalDocs/integrations.md b/docs-es/v2.0/TechnicalDocs/integrations.md index db57eb03..dd7ac82e 100644 --- a/docs-es/v2.0/TechnicalDocs/integrations.md +++ b/docs-es/v2.0/TechnicalDocs/integrations.md @@ -50,13 +50,11 @@ Once set, run `sudo systemctl restart lqos_scheduler`. ### Splynx Overrides -You can also modify the the file `integrationSplynxBandwidths.csv` to override the default bandwidths for each Node (Site, AP). +Use the LibreQoS Web UI override system to change the configured rate for a Site or AP. -A template is available in the `/opt/libreqos/src` folder. To utilize the template, copy the file `integrationSplynxBandwidths.template.csv` (removing the `.template` part of the filename) and set the appropriate information inside each file. For example, if you want to change the set bandwidth for a site, you would do: -``` -sudo cp /opt/libreqos/src/integrationSplynxBandwidths.template.csv /opt/libreqos/src/integrationSplynxBandwidths.csv -``` -And edit the CSV using LibreOffice or your preferred CSV editor. +Open the relevant node in the tree or topology views and save the desired bandwidth there. LibreQoS will preserve that operator override across future Splynx refreshes. + +Do not create or depend on legacy `integrationSplynxBandwidths*.csv` template files for new deployments. The supported workflow is the regular UI-based override system. ## UISP Integration diff --git a/docs-es/v2.0/integrations-reference-es.md b/docs-es/v2.0/integrations-reference-es.md index 0b779816..3761142a 100644 --- a/docs-es/v2.0/integrations-reference-es.md +++ b/docs-es/v2.0/integrations-reference-es.md @@ -128,13 +128,11 @@ Una vez configurado, ejecute `sudo systemctl restart lqos_scheduler`. ### Sobrescrituras de Splynx -También puede modificar el archivo `integrationSplynxBandwidths.csv` para sobrescribir los anchos de banda predeterminados de cada Nodo (Sitio, AP). +Use las sobrescrituras de la interfaz web de LibreQoS para cambiar la velocidad configurada de un Sitio o AP. -Hay una plantilla disponible en la carpeta `/opt/libreqos/src`. Para usarla, copie el archivo `integrationSplynxBandwidths.template.csv` (eliminando la parte `.template` del nombre) y edítelo con la información correspondiente. Por ejemplo, si desea cambiar el bando de ancha de un sitio, ejecutaría: -``` -sudo cp /opt/libreqos/src/integrationSplynxBandwidths.template.csv /opt/libreqos/src/integrationSplynxBandwidths.csv -``` -Y luego editaría el CSV con LibreOffice o el editor de CSV de su preferencia. +Abra el nodo correspondiente en la vista de árbol o de topología y guarde allí el ancho de banda deseado. LibreQoS conservará esa sobrescritura del operador en futuras actualizaciones de Splynx. + +No cree ni dependa de archivos heredados `integrationSplynxBandwidths*.csv` en implementaciones nuevas. El flujo compatible es el sistema normal de sobrescrituras desde la interfaz web. ## Integración con Netzur diff --git a/docs/v2.0/integrations-reference.md b/docs/v2.0/integrations-reference.md index 1675b18e..68b86217 100644 --- a/docs/v2.0/integrations-reference.md +++ b/docs/v2.0/integrations-reference.md @@ -130,13 +130,11 @@ Once set, run `sudo systemctl restart lqos_scheduler`. ### Splynx Overrides -You can also modify the the file `integrationSplynxBandwidths.csv` to override the default bandwidths for each Node (Site, AP). +Use LibreQoS Web UI overrides to change the configured rate for a Site or AP. -A template is available in the `/opt/libreqos/src` folder. To utilize the template, copy the file `integrationSplynxBandwidths.template.csv` (removing the `.template` part of the filename) and set the appropriate information inside each file. For example, if you want to change the set bandwidth for a site, you would do: -``` -sudo cp /opt/libreqos/src/integrationSplynxBandwidths.template.csv /opt/libreqos/src/integrationSplynxBandwidths.csv -``` -And edit the CSV using LibreOffice or your preferred CSV editor. +Open the relevant node in the tree or topology views and save the desired bandwidth there. LibreQoS will preserve that operator override across future Splynx refreshes. + +Do not create or depend on legacy `integrationSplynxBandwidths*.csv` template files for new deployments. The supported workflow is the regular UI-based override system. ## Netzur Integration diff --git a/docs/v2.0/integrations-splynx.md b/docs/v2.0/integrations-splynx.md index ac020c35..1066a671 100644 --- a/docs/v2.0/integrations-splynx.md +++ b/docs/v2.0/integrations-splynx.md @@ -130,17 +130,11 @@ If sync looks successful but data is incomplete, recheck API permissions and str ### Splynx Overrides -You can also modify the the file `integrationSplynxBandwidths.csv` to override the default bandwidths for each Node (Site, AP). +Use LibreQoS Web UI overrides to change the configured rate for a Site or AP. -Rate overrides saved from the tree page are separate from this legacy Splynx CSV workflow. Pick one long-term override method for a given node so your changes stay predictable. +Open the relevant node in the tree or topology views and save the desired bandwidth there. LibreQoS will preserve that operator override across future Splynx refreshes. -A template is available in the `/opt/libreqos/src` folder. To utilize the template, copy the file `integrationSplynxBandwidths.template.csv` (removing the `.template` part of the filename) and set the appropriate information inside each file. For example, if you want to change the set bandwidth for a site, you would do: -``` -sudo cp /opt/libreqos/src/integrationSplynxBandwidths.template.csv /opt/libreqos/src/integrationSplynxBandwidths.csv -``` -And edit the CSV using LibreOffice or your preferred CSV editor. - -To avoid conflicting edits, prefer one long-term override path per node: either the legacy Splynx CSV workflow or WebUI overrides. +Do not create or depend on legacy `integrationSplynxBandwidths*.csv` template files for new deployments. The supported workflow is the regular UI-based override system. ## Related Pages diff --git a/src/build_dpkg.sh b/src/build_dpkg.sh index 4355bf2b..8ac45696 100755 --- a/src/build_dpkg.sh +++ b/src/build_dpkg.sh @@ -43,10 +43,7 @@ LQOS_FILES=( shaping_skip_report.py systemd_hotfix.sh virtual_tree_nodes.py - integrationUISPbandwidths.template.csv manualNetwork.template.csv - integrationUISProutes.template.csv - integrationSplynxBandwidths.template.csv ../requirements.txt update_api.sh ) @@ -186,6 +183,13 @@ chmod a+x postinst postrm popd > /dev/null || exit # Copy files into the LibreQoS directory +for file in "${LQOS_FILES[@]}"; do + if [ ! -f "$file" ]; then + echo "Missing packaged file: $file" >&2 + exit 1 + fi +done + for file in "${LQOS_FILES[@]}"; do cp "$file" "$LQOS_DIR" done diff --git a/src/rust/lqosd/src/node_manager/js_build/src/dave.js b/src/rust/lqosd/src/node_manager/js_build/src/dave.js deleted file mode 100644 index 19e3752d..00000000 --- a/src/rust/lqosd/src/node_manager/js_build/src/dave.js +++ /dev/null @@ -1,66 +0,0 @@ -export function inMemoriam() { - if (!localStorage.getItem('displayedDaveMemorial')) { - displayDaveMemorial(); - } -} - -export function displayDaveMemorial() { - // Create modal elements using Bootstrap classes - const modalHTML = ` - - `; - - // Add modal to DOM - document.body.insertAdjacentHTML('beforeend', modalHTML); - - // Initialize and show modal - const daveModal = new bootstrap.Modal(document.getElementById('daveModal')); - daveModal.show(); - - // Set flag when modal closes - document.getElementById('daveModal').addEventListener('hidden.bs.modal', () => { - localStorage.setItem('displayedDaveMemorial', 'true'); - document.getElementById('daveModal').remove(); - }); -} \ No newline at end of file diff --git a/src/rust/lqosd/src/node_manager/js_build/src/help.js b/src/rust/lqosd/src/node_manager/js_build/src/help.js index c1853865..469ad2f4 100644 --- a/src/rust/lqosd/src/node_manager/js_build/src/help.js +++ b/src/rust/lqosd/src/node_manager/js_build/src/help.js @@ -1,4 +1,3 @@ -import {displayDaveMemorial} from "./dave"; import {get_ws_client} from "./pubsub/ws"; function escapeHtml(str) { @@ -307,7 +306,6 @@ function initSupportTickets() { } // Perform wireups -$("#btnDave").click(displayDaveMemorial); $("#btnNewTicket").on("click", openNewTicketModal); $("#btnSubmitTicket").on("click", submitNewTicket); $("#btnRefreshTickets").on("click", () => refreshTickets()); diff --git a/src/rust/lqosd/src/node_manager/static2/help.html b/src/rust/lqosd/src/node_manager/static2/help.html index 9fac25f4..5ff67d3e 100644 --- a/src/rust/lqosd/src/node_manager/static2/help.html +++ b/src/rust/lqosd/src/node_manager/static2/help.html @@ -47,10 +47,15 @@ Visit LibreQoS.io - + In Loving Memory of Dave Täht +