Merge branch 'ui_stability' into fix_merge_ui_stability

.github/workflows/lint_python.yml

@@ -11,7 +11,7 @@ jobs:
       - run: pip install --upgrade pip wheel
       - run: pip install bandit black codespell flake8 flake8-2020 flake8-bugbear
                          flake8-comprehensions isort mypy pytest pyupgrade safety
-      - run: bandit --recursive --skip B105,B110,B404,B602,B603,B605 .
+      - run: bandit --recursive --skip B105,B110,B404,B602,B603,B605,B501,B607 -x ./rust/target/ .
       - run: black --check . || true
 #      - run: codespell --skip="./.*,./old"  # --ignore-words-list="" 
       - run: flake8 . --count --exclude="./.*,./old/" --select=E9,F63,F7,F82 --show-source --statistics
@@ -24,7 +24,7 @@ jobs:
       - run: pytest . || true
       - run: pytest --doctest-modules . || true
       - run: shopt -s globstar && pyupgrade --py37-plus **/*.py || true
-      - run: safety check --ignore=62044
+      - run: safety check --ignore=62044,70612,66742,67895
       #- uses: pyupio/[email protected]
       #  with:
       #    api-key: ${{secrets.SAFETY_API_KEY}}

.github/workflows/rust.yml

@@ -11,6 +11,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - 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
+      if: matrix.os == 'ubuntu-latest'
     - name: Build
       run: pushd src/rust; cargo build --verbose --all; popd
     - name: Run tests

.gitignore

@@ -121,3 +121,5 @@ src/network.pdf
 src/ShapedDevices.csv.good
 .gitignore
 src/rust/lqosd/lts_keys.bin
+src/rust/lqosd/src/node_manager/js_build/out
+src/bin/dashboards

docs/ChangeNotes/v1.5.md

@@ -0,0 +1,5 @@
+# LibreQoS v1.4 to v1.5 Change Summary
+
+## Unified Configuration
+
+All configuration has been moved into `/etc/lqos.conf`.

docs/Quickstart/configuration.md

@@ -15,27 +15,23 @@ Now edit the file to match your setup with
 sudo nano /etc/lqos.conf
 ```
 
-Change `enp1s0f1` and `enp1s0f2` to match your network interfaces. It doesn't matter which one is which. Notice, it's paring the interfaces, so when you first enter enps0f<ins>**1**</ins> in the first line, the `redirect_to` parameter is enp1s0f<ins>**2**</ins> (replacing with your actual interface names).
-
-- First Line: `name = "enp1s0f1", redirect_to = "enp1s0f2"`
-- Second Line: `name = "enp1s0f2", redirect_to = "enp1s0f1"`
+Change `eth0` and `eth1` to match your network interfaces. The interface facing the Internet should be specified in `to_internet`. The interfacing facing your ISP network should be in `to_network`.
 
 Then, if using Bifrost/XDP set `use_xdp_bridge = true` under that same `[bridge]` section.
 
-## Configure ispConfig.py
-
-Copy ispConfig.example.py to ispConfig.py and edit as needed
+For example:
 
-```shell
-cd /opt/libreqos/src/
-cp ispConfig.example.py ispConfig.py
-nano ispConfig.py
+```toml
+[bridge]
+use_xdp_bridge = true
+to_internet = "eth0"
+to_network = "eth1"
 ```
 
-- Set upstreamBandwidthCapacityDownloadMbps and upstreamBandwidthCapacityUploadMbps to match the bandwidth in Mbps of your network's upstream / WAN internet connection. The same can be done for generatedPNDownloadMbps and generatedPNUploadMbps.
-- Set interfaceA to the interface facing your core router (or bridged internal network if your network is bridged)
-- Set interfaceB to the interface facing your edge router
-- Set ```enableActualShellCommands = True``` to allow the program to actually run the commands.
+## Configure Your Network Settings
+
+- Set `uplink_bandwidth_mbps` and `downlink_bandwidth_mbps` to match the bandwidth in Mbps of your network's upstream / WAN internet connection. The same can be done for `generated_pn_download_mbps` and `generated_pn_upload_mbps`.
+- Set ```dry_run = false``` to allow the program to actually run the commands.
 
 ## Network.json
 

docs/TechnicalDocs/integrations.md

@@ -2,7 +2,7 @@
 
 ## UISP Integration
 
-First, set the relevant parameters for UISP (uispAuthToken, UISPbaseURL, etc.) in ispConfig.py.
+First, set the relevant parameters for UISP (uispAuthToken, UISPbaseURL, etc.) in `/etc/lqos.conf`.
 
 To test the UISP Integration, use
 
@@ -14,11 +14,11 @@ On the first successful run, it will create a network.json and ShapedDevices.csv
 If a network.json file exists, it will not be overwritten.
 You can modify the network.json file to more accurately reflect bandwidth limits.
 ShapedDevices.csv will be overwritten every time the UISP integration is run.
-You have the option to run integrationUISP.py automatically on boot and every 10 minutes, which is recommended. This can be enabled by setting ```automaticImportUISP = True``` in ispConfig.py
+You have the option to run integrationUISP.py automatically on boot and every 10 minutes, which is recommended. This can be enabled by setting ```enable_uisp = true``` in `/etc/lqos.conf`
 
 ## Powercode Integration
 
-First, set the relevant parameters for Sonar (powercode_api_key, powercode_api_url, etc.) in ispConfig.py.
+First, set the relevant parameters for Powercode (powercode_api_key, powercode_api_url, etc.) in `/etc/lqos.conf`.
 
 To test the Powercode Integration, use
 
@@ -29,11 +29,11 @@ python3 integrationPowercode.py
 On the first successful run, it will create a ShapedDevices.csv file.
 You can modify the network.json file manually to reflect Site/AP bandwidth limits.
 ShapedDevices.csv will be overwritten every time the Powercode integration is run.
-You have the option to run integrationPowercode.py automatically on boot and every 10 minutes, which is recommended. This can be enabled by setting ```automaticImportPowercode = True``` in ispConfig.py
+You have the option to run integrationPowercode.py automatically on boot and every 10 minutes, which is recommended. This can be enabled by setting ```enable_powercode = true``` in `/etc/lqos.conf`
 
 ## Sonar Integration
 
-First, set the relevant parameters for Sonar (sonar_api_key, sonar_api_url, etc.) in ispConfig.py.
+First, set the relevant parameters for Sonar (sonar_api_key, sonar_api_url, etc.) in `/etc/lqos.conf`.
 
 To test the Sonar Integration, use
 
@@ -45,11 +45,11 @@ On the first successful run, it will create a ShapedDevices.csv file.
 If a network.json file exists, it will not be overwritten.
 You can modify the network.json file to more accurately reflect bandwidth limits.
 ShapedDevices.csv will be overwritten every time the Sonar integration is run.
-You have the option to run integrationSonar.py automatically on boot and every 10 minutes, which is recommended. This can be enabled by setting ```automaticImportSonar = True``` in ispConfig.py
+You have the option to run integrationSonar.py automatically on boot and every 10 minutes, which is recommended. This can be enabled by setting ```enable_sonar = true``` in `/etc/lqos.conf`
 
 ## Splynx Integration
 
-First, set the relevant parameters for Splynx (splynx_api_key, splynx_api_secret, etc.) in ispConfig.py.
+First, set the relevant parameters for Splynx (splynx_api_key, splynx_api_secret, etc.) in `/etc/lqos.conf`.
 
 The Splynx Integration uses Basic authentication. For using this type of authentication, please make sure you enable [Unsecure access](https://splynx.docs.apiary.io/#introduction/authentication) in your Splynx API key settings. Also the Splynx API key should be granted access to the necessary permissions.
 
@@ -62,4 +62,4 @@ python3 integrationSplynx.py
 On the first successful run, it will create a ShapedDevices.csv file.
 You can manually create your network.json file to more accurately reflect bandwidth limits.
 ShapedDevices.csv will be overwritten every time the Splynx integration is run.
-You have the option to run integrationSplynx.py automatically on boot and every 10 minutes, which is recommended. This can be enabled by setting ```automaticImportSplynx = True``` in ispConfig.py
+You have the option to run integrationSplynx.py automatically on boot and every 10 minutes, which is recommended. This can be enabled by setting ```enable_spylnx = true``` in `/etc/lqos.conf`.