Merge branch 'main' of https://github.com/jokob-sk/NetAlertX

Currently translated at 100.0% (751 of 751 strings)

Translation: NetAlertX/core
Translate-URL: https://hosted.weblate.org/projects/pialert/core/it/

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature Request
 description: 'Suggest an idea for NetAlertX'
-labels: ['Feature request➕']
+labels: ['Feature request ➕']
 body:
 - type: checkboxes
   attributes:

.github/ISSUE_TEMPLATE/i-have-an-issue.yml

@@ -59,12 +59,15 @@ body:
   validations:
     required: false
 - type: dropdown
+  id: installation_type
   attributes:
     label: What installation are you running?
     options:
       - Production (netalertx)
       - Dev (netalertx-dev)
       - Home Assistant (addon)
+      - Home Assistant fa (full-access addon)
+      - Bare-metal (community only support - Check Discord)
   validations:
     required: true
 - type: textarea

.github/ISSUE_TEMPLATE/setup-help.yml

@@ -44,12 +44,15 @@ body:
   validations:
     required: false
 - type: dropdown
+  id: installation_type
   attributes:
     label: What installation are you running?
     options:
       - Production (netalertx)
       - Dev (netalertx-dev)
       - Home Assistant (addon)
+      - Home Assistant fa (full-access addon)
+      - Bare-metal (community only support - Check Discord)
   validations:
     required: true
 - type: textarea

.github/tweet.md

@@ -0,0 +1,2 @@
+🎉 New release: **v25.5.24 - MQTT, UI improvements, multiple notification emails** is live! 🚀
+Check it out here: https://github.com/jokob-sk/NetAlertX/releases/tag/v25.5.24

.github/workflows/code_checks.yml

@@ -0,0 +1,41 @@
+name: Code checks
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '*.*.*'
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  check-url-paths:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Check for incorrect absolute '/php/' URLs in frontend code
+        run: |
+          echo "🔍 Checking for incorrect absolute '/php/' URLs (should be 'php/' or './php/')..."
+
+          MATCHES=$(grep -rE "['\"]\/php\/" --include=\*.{js,php,html} ./front | grep -E "\.get|\.post|\.ajax|fetch|url\s*:") || true
+
+          if [ -n "$MATCHES" ]; then
+            echo "$MATCHES"
+            echo "❌ Found incorrectly absolute '/php/' URLs. Use 'php/' or './php/' for relative paths."
+            exit 1
+          else
+            echo "✅ No bad '/php/' URLs found."
+          fi
+
+
+
+      - name: Check Python syntax
+        run: |
+          set -e
+          echo "🔍 Checking Python syntax..."
+          find . -name "*.py" -print0 | xargs -0 -n1 python3 -m py_compile
+

.github/workflows/docker_dev.yml

@@ -3,12 +3,12 @@ name: docker
 on:
   push:
     branches:
-      - '**'
+      - main
     tags:
       - '*.*.*'
   pull_request:
     branches:
-      - master
+      - main
 
 jobs: 
   docker_dev:

.github/workflows/label-issues.yml

@@ -0,0 +1,43 @@
+name: Label Issues by Installation Type
+
+on:
+  issues:
+    types: [opened]
+
+permissions:
+  issues: write
+
+jobs:
+  add-label:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get issue content
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const body = context.payload.issue.body;
+
+            const lowerBody = body.toLowerCase();
+
+            let labelsToAdd = [];
+
+            if (lowerBody.includes('bare-metal')) {
+              labelsToAdd.push('bare-metal ❗');
+            }
+
+            if (lowerBody.includes('home assistant')) {
+              labelsToAdd.push('Home Assistant 🏠');
+            }
+
+            if (lowerBody.includes('production (netalertx)') || lowerBody.includes('dev (netalertx-dev)')) {
+              labelsToAdd.push('Docker 🐋');
+            }
+
+            if (labelsToAdd.length > 0) {
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                labels: labelsToAdd
+              });
+            }

.github/workflows/social_post_on_release.yml

@@ -25,13 +25,23 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Set Git config
+        run: |
+          git config --global user.email "github-actions@github.com"
+          git config --global user.name "GitHub Actions"
+
       - name: Create tweet file
         run: |
           echo "🎉 New release: **${{ github.event.release.name }}** is live! 🚀" > .github/tweet.md
           echo "Check it out here: ${{ github.event.release.html_url }}" >> .github/tweet.md
           git add .github/tweet.md
           git commit -m "Add release tweet for ${{ github.event.release.name }}"
-          git push
+
+      - name: Push changes
+        run: |
+          git push https://github.com/${{ github.repository }}.git HEAD:main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Tweet
         uses: twitter-together/action@v3

Dockerfile

@@ -13,7 +13,7 @@ ENV PATH="/opt/venv/bin:$PATH"
 
 COPY . ${INSTALL_DIR}/
 
-RUN pip install openwrt-luci-rpc asusrouter asyncio aiohttp graphene flask tplink-omada-client wakeonlan pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros git+https://github.com/foreign-sub/aiofreepybox.git \
+RUN pip install openwrt-luci-rpc asusrouter asyncio aiohttp graphene flask tplink-omada-client wakeonlan pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros yattag git+https://github.com/foreign-sub/aiofreepybox.git \
     && bash -c "find ${INSTALL_DIR} -type d -exec chmod 750 {} \;" \
     && bash -c "find ${INSTALL_DIR} -type f -exec chmod 640 {} \;" \
     && bash -c "find ${INSTALL_DIR} -type f \( -name '*.sh' -o -name '*.py'  -o -name 'speedtest-cli' \) -exec chmod 750 {} \;"

Dockerfile.debian

@@ -43,7 +43,7 @@ RUN phpenmod -v 8.2 sqlite3
 RUN apt-get install -y python3-venv
 RUN python3 -m venv myenv
 
-RUN /bin/bash -c "source myenv/bin/activate && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && pip3 install openwrt-luci-rpc asusrouter asyncio aiohttp graphene flask tplink-omada-client wakeonlan pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros "
+RUN /bin/bash -c "source myenv/bin/activate && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && pip3 install openwrt-luci-rpc asusrouter asyncio aiohttp graphene flask tplink-omada-client wakeonlan pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros yattag "
 
 # Create a buildtimestamp.txt to later check if a new version was released
 RUN date +%s > ${INSTALL_DIR}/front/buildtimestamp.txt

README.md

@@ -41,6 +41,10 @@ Send notifications to more than 80+ services, including Telegram via [Apprise](h
 Feed your data and device changes into [Home Assistant](https://github.com/jokob-sk/NetAlertX/blob/main/docs/HOME_ASSISTANT.md), read [API endpoints](https://github.com/jokob-sk/NetAlertX/blob/main/docs/API.md), or use [Webhooks](https://github.com/jokob-sk/NetAlertX/blob/main/docs/WEBHOOK_N8N.md) to setup custom automation flows. You can also 
 build your own scanners with the [Plugin system](https://github.com/jokob-sk/NetAlertX/tree/main/docs/PLUGINS.md#readme) in as little as [15 minutes](https://www.youtube.com/watch?v=cdbxlwiWhv8).
 
+### Workflows
+
+The [workflows module](https://github.com/jokob-sk/NetAlertX/blob/main/docs/WORKFLOWS.md) allows to automate repetitive tasks, making network management more efficient. Whether you need to assign newly discovered devices to a specific Network Node, auto-group devices from a given vendor, unarchive a device if detected online, or automatically delete devices, this module provides the flexibility to tailor the automations to your needs.
+
 
 ## 📚 Documentation
 <!--- --------------------------------------------------------------------- --->
@@ -119,7 +123,6 @@ Proudly using [Weblate](https://hosted.weblate.org/projects/pialert/). Help out
 [network]:                  ./docs/img/network.png                        "Screen 5"
 [settings]:                 ./docs/img/settings.png                       "Screen 6"
 [showcase]:                 ./docs/img/showcase.gif                       "Screen 6"
-[help_faq]:                 ./docs/img/help_faq.png                       "Screen 7"
 [sync_hub]:                 ./docs/img/sync_hub.png                       "Screen 8"
 [notification_center]:      ./docs/img/notification_center.png            "Screen 8"
 [sent_reports_text]:        ./docs/img/sent_reports_text.png              "Screen 8"

back/app.conf

@@ -18,13 +18,13 @@
 # SCAN_SUBNETS    = [ '192.168.1.0/24 --interface=eth1', '192.168.1.0/24 --interface=eth0' ]
 
 DISCOVER_PLUGINS=True
-SCAN_SUBNETS=['192.168.1.0/24 --interface=eth0']
+SCAN_SUBNETS=['--localnet']
 TIMEZONE='Europe/Berlin'
-LOADED_PLUGINS = ['ARPSCAN','CSVBCKP','DBCLNP', 'INTRNT','MAINT','NEWDEV','NSLOOKUP','NTFPRCS', 'AVAHISCAN', 'SETPWD','SMTP', 'SYNC', 'VNDRPDT', 'WORKFLOWS', 'UI']
+LOADED_PLUGINS=['ARPSCAN','CSVBCKP','DBCLNP', 'DIGSCAN', 'INTRNT','MAINT','NEWDEV', 'NBTSCAN', 'NSLOOKUP','NTFPRCS', 'AVAHISCAN', 'SETPWD','SMTP', 'SYNC', 'VNDRPDT', 'WORKFLOWS', 'UI']
 
 DAYS_TO_KEEP_EVENTS=90
 # Used for generating links in emails. Make sure not to add a trailing slash!
-REPORT_DASHBOARD_URL='http://netalertx'
+REPORT_DASHBOARD_URL='http://127.0.0.1'
 
 # Make sure at least these scanners are enabled for new installs, other defaults are taken from the config.json
 INTRNT_RUN='schedule'

docker-compose.yml

@@ -52,8 +52,8 @@ services:
       - ${DEV_LOCATION}/front/events.php:/app/front/events.php
       - ${DEV_LOCATION}/front/plugins.php:/app/front/plugins.php
       - ${DEV_LOCATION}/front/pluginsCore.php:/app/front/pluginsCore.php
-      - ${DEV_LOCATION}/front/help_faq.php:/app/front/help_faq.php
       - ${DEV_LOCATION}/front/index.php:/app/front/index.php
+      - ${DEV_LOCATION}/front/initCheck.php:/app/front/initCheck.php
       - ${DEV_LOCATION}/front/maintenance.php:/app/front/maintenance.php
       - ${DEV_LOCATION}/front/network.php:/app/front/network.php
       - ${DEV_LOCATION}/front/presence.php:/app/front/presence.php
@@ -62,6 +62,8 @@ services:
       - ${DEV_LOCATION}/front/cloud_services.php:/app/front/cloud_services.php      
       - ${DEV_LOCATION}/front/report.php:/app/front/report.php      
       - ${DEV_LOCATION}/front/workflows.php:/app/front/workflows.php      
+      - ${DEV_LOCATION}/front/workflowsCore.php:/app/front/workflowsCore.php      
+      - ${DEV_LOCATION}/front/appEvents.php:/app/front/appEvents.php      
       - ${DEV_LOCATION}/front/appEventsCore.php:/app/front/appEventsCore.php      
       - ${DEV_LOCATION}/front/multiEditCore.php:/app/front/multiEditCore.php      
       - ${DEV_LOCATION}/front/plugins:/app/front/plugins      

dockerfiles/README.md

@@ -31,7 +31,7 @@ docker run -d --rm --network=host \
   -e PUID=200 -e PGID=300 \
   -e TZ=Europe/Berlin \
   -e PORT=20211 \
-  jokobsk/netalertx:latest
+  ghcr.io/jokob-sk/netalertx:latest
 ```
 
 See alternative [docked-compose examples](https://github.com/jokob-sk/NetAlertX/blob/main/docs/DOCKER_COMPOSE.md).

dockerfiles/init.sh

@@ -54,8 +54,6 @@ if [[ $EUID -ne 0 ]]; then
     exit 1
 fi
 
-echo "[INSTALL] Copy starter ${DB_FILE} and ${CONF_FILE} if they don't exist"
-
 # DANGER ZONE: ALWAYS_FRESH_INSTALL
 if [ "$ALWAYS_FRESH_INSTALL" = true ]; then
   echo "[INSTALL] ❗ ALERT /db and /config folders are cleared because the ALWAYS_FRESH_INSTALL is set to: $ALWAYS_FRESH_INSTALL❗"
@@ -96,7 +94,9 @@ if [ -f "${INSTALL_DIR_OLD}/config/${OLD_APP_NAME}.conf" ]; then
 fi
 # 🔺 FOR BACKWARD COMPATIBILITY - REMOVE AFTER 12/12/2025
 
-# Copy starter .db and .conf if they don't exist
+echo "[INSTALL] Copy starter ${DB_FILE} and ${CONF_FILE} if they don't exist"
+
+# Copy starter app.db, app.conf if they don't exist
 cp -na "${INSTALL_DIR}/back/${CONF_FILE}" "${INSTALL_DIR}/config/${CONF_FILE}"
 cp -na "${INSTALL_DIR}/back/${DB_FILE}" "${FULL_FILEDB_PATH}"
 
@@ -143,6 +143,7 @@ fi
 # Create the execution_queue.log and app_front.log files if they don't exist
 touch "${INSTALL_DIR}"/log/{app.log,execution_queue.log,app_front.log,app.php_errors.log,stderr.log,stdout.log,db_is_locked.log}
 touch "${INSTALL_DIR}"/api/user_notifications.json
+
 # Create plugins sub-directory if it doesn't exist in case a custom log folder is used
 mkdir -p "${INSTALL_DIR}"/log/plugins
 

docs/BACKUPS.md

@@ -4,20 +4,21 @@
 > To backup 99% of your configuration backup at least the `/app/config` folder. Please read the whole page (or at least "Scenario 2: Corrupted database") for details.
 > Note that database definitions might change over time. The safest way is to restore your older backups into the **same version** of the app they were taken from and then gradually upgarde between releases to the latest version.
 
-There are 3 artifacts that can be used to backup the application:
+There are 4 artifacts that can be used to backup the application:
 
 | File                  | Description                   | Limitations                   |
 |-----------------------|-------------------------------|-------------------------------|
 | `/db/app.db`       | Database file(s)  | The database file might be in an uncommitted state or corrupted |
 | `/config/app.conf` | Configuration file |  Can be overridden with the [`APP_CONF_OVERRIDE` env variable](https://github.com/jokob-sk/NetAlertX/tree/main/dockerfiles#docker-environment-variables).  |
 | `/config/devices.csv`  | CSV file containing device information |     Doesn't contain historical data        |
+| `/config/workflows.json`  | A JSON file containing your workflows |     N/A        |
 
 
 ## Backup strategies
 
-The safest approach to backups is to backup everything, by taking regular file system backups (I use [Kopia](https://github.com/kopia/kopia)). 
+The safest approach to backups is to backup everything, by taking regular file system backups of the `/db` and `/config` folders (I use [Kopia](https://github.com/kopia/kopia)). 
 
-Arguably, the most time is spent setting up the device list, so if only one file is kept I'd recommend to have a latest backup of the `devices_<timestamp>.csv` or `devices.csv` file, followed by the `app.conf` file. You can also download `app.conf` and `devices.csv` file in the Maintenance section:
+Arguably, the most time is spent setting up the device list, so if only one file is kept I'd recommend to have a latest backup of the `devices_<timestamp>.csv` or `devices.csv` file, followed by the `app.conf` and `workflows.json` files. You can also download `app.conf` and `devices.csv` file in the Maintenance section:
 
 ![Backup and Restore Section in Maintenance](./img/BACKUPS/Maintenance_Backup_Restore.png)
 
@@ -29,6 +30,7 @@ End-result: Full restore
 
 - `/app/db/app.db` (uncorrupted)
 - `/app/config/app.conf`
+- `/app/config/workflows.json`
 
 #### 📥 Recovery:
 
@@ -43,12 +45,13 @@ End-result: Partial restore (historical data and some plugin data will be missin
 
 - `/app/config/app.conf`
 - `/app/config/devices_<timestamp>.csv` or `/app/config/devices.csv`
+- `/app/config/workflows.json`
 
 #### 📥 Recovery:
 
 Even with a corrupted database you can recover what I would argue is 99% of the configuration. 
 
-- upload the `app.conf` file into the mounted `/app/config/` folder as described in the [Setup documentation](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md#docker-paths).
+- upload the `app.conf` and `workflows.json` files into the mounted `/app/config/` folder as described in the [Setup documentation](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md#docker-paths).
 - rename the `devices_<timestamp>.csv` to `devices.csv` and place it in the `/app/config` folder
 - Restore the `devices.csv` backup via the [Maintenance section](./DEVICES_BULK_EDITING.md)
 

docs/CUSTOM_PROPERTIES.md

@@ -4,7 +4,7 @@
 
 ## Overview
 
-This functionality allows you to define **custom properties** for devices, which can store and display additional information on the device listing page. By marking properties as visible, you can enhance the user interface with quick actions, notes, or external links.
+This functionality allows you to define **custom properties** for devices, which can store and display additional information on the device listing page. By marking properties as "Show", you can enhance the user interface with quick actions, notes, or external links.
 
 ### Key Features:
 - **Customizable Properties**: Define specific properties for each device.
@@ -63,10 +63,10 @@ Visible properties (`CUSTPROP_show: true`) are displayed as interactive icons in
 
 ---
 
-## Example Scenarios
+## Example Use Cases
 
 1. **Device Documentation Link**:
-   - Add a custom property with `CUSTPROP_type` set to `link` or `link_new_tab` to allow quick navigation to the documentation.
+   - Add a custom property with `CUSTPROP_type` set to `link` or `link_new_tab` to allow quick navigation to the external documentation of the device.
 
 2. **Firmware Details**:
    - Use `CUSTPROP_type: show_notes` to display firmware versions or upgrade instructions in a modal.

docs/DATABASE.md

@@ -1,11 +1,54 @@
   
 # A high-level description of the database structure
 
-  ⚠ Disclaimer: As I'm not the original author, some of the information might be inaccurate. Feel free to submit a PR to correct anything within this page or documentation in general. 
+ An overview of the most important database tables as well as an detailed overview of the Devices table. The MAC address is used as a foreign key in most cases. 
 
-  The MAC address is used as a foreign key in most cases. 
+## Devices database table
 
-## 🔍Tables overview
+| Field Name              | Description | Sample Value |
+|-------------------------|-------------|--------------|
+| `devMac`               | MAC address of the device. | `00:1A:2B:3C:4D:5E` |
+| `devName`              | Name of the device. | `iPhone 12` |
+| `devOwner`             | Owner of the device. | `John Doe` |
+| `devType`              | Type of the device (e.g., phone, laptop, etc.). If set to a network type (e.g., switch), it will become selectable as a Network Parent Node. | `Laptop` |
+| `devVendor`            | Vendor/manufacturer of the device. | `Apple` |
+| `devFavorite`          | Whether the device is marked as a favorite. | `1` |
+| `devGroup`             | Group the device belongs to. | `Home Devices` |
+| `devComments`          | User comments or notes about the device. | `Used for work purposes` |
+| `devFirstConnection`   | Timestamp of the device's first connection. | `2025-03-22 12:07:26+11:00` |
+| `devLastConnection`    | Timestamp of the device's last connection. | `2025-03-22 12:07:26+11:00` |
+| `devLastIP`            | Last known IP address of the device. | `192.168.1.5` |
+| `devStaticIP`          | Whether the device has a static IP address. | `0` |
+| `devScan`              | Whether the device should be scanned. | `1` |
+| `devLogEvents`         | Whether events related to the device should be logged. | `0` |
+| `devAlertEvents`       | Whether alerts should be generated for events. | `1` |
+| `devAlertDown`         | Whether an alert should be sent when the device goes down. | `0` |
+| `devSkipRepeated`      | Whether to skip repeated alerts for this device. | `1` |
+| `devLastNotification`  | Timestamp of the last notification sent for this device. | `2025-03-22 12:07:26+11:00` |
+| `devPresentLastScan`   | Whether the device was present during the last scan. | `1` |
+| `devIsNew`             | Whether the device is marked as new. | `0` |
+| `devLocation`          | Physical or logical location of the device. | `Living Room` |
+| `devIsArchived`        | Whether the device is archived. | `0` |
+| `devParentMAC`         | MAC address of the parent device (if applicable) to build the [Network Tree](./NETWORK_TREE.md). | `00:1A:2B:3C:4D:5F` |
+| `devParentPort`        | Port of the parent device to which this device is connected. | `Port 3` |
+| `devIcon`              | [Icon](./ICONS.md) representing the device. The value is a base64-encoded SVG or Font Awesome HTML tag. | `PHN2ZyB...` |
+| `devGUID`              | Unique identifier for the device. | `a2f4b5d6-7a8c-9d10-11e1-f12345678901` |
+| `devSite`              | Site or location where the device is registered. | `Office` |
+| `devSSID`              | SSID of the Wi-Fi network the device is connected to. | `HomeNetwork` |
+| `devSyncHubNode`       | The NetAlertX node ID used for synchronization between NetAlertX instances. | `node_1` |
+| `devSourcePlugin`      | Source plugin that discovered the device. | `ARPSCAN` |
+| `devCustomProps`       | [Custom properties](./CUSTOM_PROPERTIES.md) related to the device. The value is a base64-encoded JSON object. | `PHN2ZyB...` |
+| `devFQDN`              | Fully qualified domain name. | `raspberrypi.local` |
+
+
+To understand how values of these fields influuence application behavior, such as Notifications or Network topology, see also: 
+
+- [Device Management](./DEVICE_MANAGEMENT.md)
+- [Network Tree Topology Setup](./NETWORK_TREE.md)
+- [Notifications](./NOTIFICATIONS.md)
+
+
+## Other Tables overview
   
   | Table name | Description  | Sample data |
   |----------------------|----------------------| ----------------------| 

docs/DEBUG_PLUGINS.md

@@ -2,7 +2,7 @@
 
 ## High-level overview
 
-If a Plugin supplies data to the main app it's doine either vie a SQL query or via a script that updates the `last_result.log` file in the plugin folder (`front/plugins/<plugin>`).
+If a Plugin supplies data to the main app it's done either vie a SQL query or via a script that updates the `last_result.log` file in the plugin log folder (`app/log/plugins/`).
 
 For a more in-depth overview on how plugins work check the [Plugins development docs](https://github.com/jokob-sk/NetAlertX/blob/main/docs/PLUGINS.md).
 

docs/DEBUG_TIPS.md

@@ -18,7 +18,7 @@ docker run --rm --network=host \
   -v local/path/netalertx/db:/app/db \
   -e TZ=Europe/Berlin \
   -e PORT=20211 \
-  jokobsk/netalertx:latest
+  ghcr.io/jokob-sk/netalertx:latest
 
 ```
 

docs/DEVICES_BULK_EDITING.md

@@ -14,6 +14,8 @@ You can select devices in the _Devices_ view by selecting devices to edit and th
 
 ## CSV bulk edit
 
+The database and device structure may change with new releases. When using the CSV import functionality, ensure the format matches what the application expects. To avoid issues, you can first export the devices and review the column formats before importing any custom data.
+
 > [!NOTE] 
 > As always, backup everything, just in case.
 

docs/DEVICE_DISPLAY_SETTINGS.md

@@ -3,4 +3,13 @@
 This set of settings allows you to group Devices under different views. The Archived toggle allows you to exclude a Device from most listings and notifications. 
 
 
-![Display settings](./img/DEVICE_MANAGEMENT/DeviceDetails_DisplaySettings.png)
+![Display settings](./img/DEVICE_MANAGEMENT/DeviceDetails_DisplaySettings.png)
+
+
+## Status Colors
+
+![Sattus colors](./img/DEVICE_MANAGEMENT/device_management_display_settings.png)
+
+1. Online (Green) = A device that is no longer marked as a "New Device"
+2. New (Green) = A newly discovered device that is online and is still "ticked" as a "New Device"
+3. New (Grey) = Same as No.2 but device is now offline.

docs/DEV_ENV_SETUP.md

@@ -1,35 +1,38 @@
-## Development environment set up
+# Development environment set up
 
 >[!NOTE]
 > Replace `/development` with the path where your code files will be stored. The default container name is `netalertx` so there might be a conflict with your running containers.
 
-### Development Guidelines
+## Development Guidelines
 
-**Priority Order (Highest to Lowest):**
+Before starting development, please scan the below development guidelines.
+
+### Priority Order (Highest to Lowest)
 
 1. 🔼 Fixing core bugs that lack workarounds.
 2. 🔵 Adding core functionality that unlocks other features (e.g., plugins).
 3. 🔵 Refactoring to enable faster development.
 4. 🔽 UI improvements (PRs welcome).
 
-💡 **Design Philosophy:**  
+### Design Philosophy
+
 Focus on core functionality and integrate with existing tools rather than reinventing the wheel.  
 Examples:
 
 - Using **Apprise** for notifications instead of implementing multiple separate gateways.
 - Implementing **regex-based validation** instead of one-off validation for each setting.
 
-📌 **Note on UI requests:**  
+> [!NOTE]
+> UI changes have lower priority, however, PRs are welcome, but **keep them small & focused**.
 
-- UI changes have lower priority due to framework limitations and mobile support constraints.  
-- PRs are welcome, but **keep them small & focused**.
+## Development Environment Set Up
 
-## 1. Download the code:
+### 1. Download the code:
 
 - `mkdir /development`
 - `cd /development && git clone https://github.com/jokob-sk/NetAlertX.git`
 
-## 2. Create a DEV .env_dev file
+### 2. Create a DEV .env_dev file
 
 `touch /development/.env_dev && sudo nano /development/.env_dev`
 
@@ -43,10 +46,12 @@ TZ=Europe/Berlin
 PORT=22222    # make sure this port is unique on your whole network
 DEV_LOCATION=/development/NetAlertX
 APP_DATA_LOCATION=/volume/docker_appdata
+# Make sure your GRAPHQL_PORT setting has a port that is unique on your whole host network
+APP_CONF_OVERRIDE={"GRAPHQL_PORT":"22223"} 
 # ALWAYS_FRESH_INSTALL=true # uncommenting this will always delete the content of /config and /db dirs on boot to simulate a fresh install
 ```
 
-## 3. Create /db and /config dirs 
+### 3. Create /db and /config dirs 
 
 Create a folder `netalertx` in the `APP_DATA_LOCATION` (in this example in `/volume/docker_appdata`) with 2 subfolders `db` and `config`. 
 
@@ -54,7 +59,7 @@ Create a folder `netalertx` in the `APP_DATA_LOCATION` (in this example in `/vol
 - `mkdir /volume/docker_appdata/netalertx/db`
 - `mkdir /volume/docker_appdata/netalertx/config`
 
-## 4. Run the container
+### 4. Run the container
 
 - `cd /development/NetAlertX &&  sudo docker-compose --env-file ../.env_dev `
 
@@ -63,7 +68,7 @@ You can then modify the python script without restarting/rebuilding the containe
 ![image](https://github.com/jokob-sk/NetAlertX/assets/96159884/3cbf2748-03c8-49e7-b801-f38c7755246b)
 
 
-## 💡 Tips
+## Tips
 
 A quick cheat sheet of useful commands. 
 
@@ -75,9 +80,9 @@ A command to stop, remove the container and the image (replace `netalertx` and `
 
 ### Restart the server backend
 
-Most code changes can be tetsed without rebuilding the container. When working on the python server backend, you only need to restart the server.
+Most code changes can be tested without rebuilding the container. When working on the python server backend, you only need to restart the server.
 
-1. You can usually restart the backend via Maintenance > Logs > Restart server
+1. You can usually restart the backend via _Maintenance > Logs > Restart_ server
 
 ![image](./img/DEV_ENV_SETUP/Maintenance_Logs_Restart_server.png)
 
@@ -86,11 +91,13 @@ Most code changes can be tetsed without rebuilding the container. When working o
 - `sudo docker exec -it netalertx /bin/bash`
 - `pkill -f "python /app/server" && python /app/server & `
 
-3. If none of the above work, restart the docker image. This is usually the last resort as sometimes the Docker engine becomes unresponsive and the whole engine needs to be restarted. 
+3. If none of the above work, restart the docker caontainer. 
 
-## ➕ Contributing & Pull Requests
+- This is usually the last resort as sometimes the Docker engine becomes unresponsive and the whole engine needs to be restarted. 
 
-**Before submitting a PR, please ensure:**
+## Contributing & Pull Requests
+
+### Before submitting a PR, please ensure:
 
 ✔ Changes are **backward-compatible** with existing installs.  
 ✔ No unnecessary changes are made.  

docs/DOCKER_COMPOSE.md

@@ -1,5 +1,8 @@
 # `docker-compose.yaml` Examples
 
+> [!NOTE] 
+> The container needs to run in `network_mode:"host"`. This also means that not all functionality is supported on a Windows host as Docker for Windows doesn't support this networking option. 
+
 ### Example 1
 
 ```yaml
@@ -8,7 +11,7 @@ services:
     container_name: netalertx
     # use the below line if you want to test the latest dev image
     # image: "ghcr.io/jokob-sk/netalertx-dev:latest" 
-    image: "jokobsk/netalertx:latest"      
+    image: "ghcr.io/jokob-sk/netalertx:latest"      
     network_mode: "host"        
     restart: unless-stopped
     volumes:
@@ -40,7 +43,7 @@ services:
     privileged: true
     # use the below line if you want to test the latest dev image
     # image: "ghcr.io/jokob-sk/netalertx-dev:latest" 
-    image: jokobsk/netalertx:latest
+    image: ghcr.io/jokob-sk/netalertx:latest
     environment:
       - TZ=Europe/Bratislava
     restart: always
@@ -62,7 +65,7 @@ services:
     container_name: netalertx
     # use the below line if you want to test the latest dev image
     # image: "ghcr.io/jokob-sk/netalertx-dev:latest" 
-    image: "jokobsk/netalertx:latest"      
+    image: "ghcr.io/jokob-sk/netalertx:latest"      
     network_mode: "host"        
     restart: unless-stopped
     volumes:
@@ -100,3 +103,37 @@ DEV_LOCATION=/path/to/local/source/code
 ```
 
 To run the container execute: `sudo docker-compose --env-file /path/to/.env up`
+
+
+### Example 4: Docker swarm
+
+Notice how the host network is defined in a swarm setup:
+
+```yaml
+services:
+  netalertx:
+    # Use the below line if you want to test the latest dev image
+    # image: "jokobsk/netalertx-dev:latest"
+    image: "ghcr.io/jokob-sk/netalertx:latest"
+    volumes:
+      - /mnt/MYSERVER/netalertx/config:/config:rw
+      - /mnt/MYSERVER/netalertx/db:/netalertx/db:rw
+      - /mnt/MYSERVER/netalertx/logs:/netalertx/front/log:rw
+    environment:
+      - TZ=Europe/London
+      - PORT=20211
+    networks:
+      - outside
+    deploy:
+      mode: replicated
+      replicas: 1
+      restart_policy:
+        condition: on-failure
+
+networks:
+  outside:
+    external:
+      name: "host"
+
+
+```

docs/DOCKER_SWARM.md

@@ -0,0 +1,79 @@
+# Docker Swarm Deployment Guide (IPvlan)
+
+This guide describes how to deploy **NetAlertX** in a **Docker Swarm** environment using an `ipvlan` network. This enables the container to receive a LAN IP address directly, which is ideal for network monitoring.
+
+---
+
+## ⚙️ Step 1: Create an IPvlan Config-Only Network on All Nodes
+
+> Run this command on **each node** in the Swarm.
+
+```bash
+docker network create -d ipvlan \
+  --subnet=192.168.1.0/24 \              # 🔧 Replace with your LAN subnet
+  --gateway=192.168.1.1 \                # 🔧 Replace with your LAN gateway
+  -o ipvlan_mode=l2 \
+  -o parent=eno1 \                       # 🔧 Replace with your network interface (e.g., eth0, eno1)
+  --config-only \
+  ipvlan-swarm-config
+```
+
+---
+
+## 🖥️ Step 2: Create the Swarm-Scoped IPvlan Network (One-Time Setup)
+
+> Run this on **one Swarm manager node only**.
+
+```bash
+docker network create -d ipvlan \
+  --scope swarm \
+  --config-from ipvlan-swarm-config \
+  swarm-ipvlan
+```
+
+---
+
+## 🧾 Step 3: Deploy NetAlertX with Docker Compose
+
+Use the following Compose snippet to deploy NetAlertX with a **static LAN IP** assigned via the `swarm-ipvlan` network.
+
+```yaml
+services:
+  netalertx:
+    image: ghcr.io/jokob-sk/netalertx:latest
+    ports:
+      - 20211:20211
+    volumes:
+      - /mnt/YOUR_SERVER/netalertx/config:/app/config:rw
+      - /mnt/YOUR_SERVER/netalertx/db:/netalertx/app/db:rw
+      - /mnt/YOUR_SERVER/netalertx/logs:/netalertx/app/log:rw
+    environment:
+      - TZ=Europe/London
+      - PORT=20211
+    networks:
+      swarm-ipvlan:
+        ipv4_address: 192.168.1.240     # ⚠️ Choose a free IP from your LAN
+    deploy:
+      mode: replicated
+      replicas: 1
+      restart_policy:
+        condition: on-failure
+      placement:
+        constraints:
+          - node.role == manager        # 🔄 Or use: node.labels.netalertx == true
+
+networks:
+  swarm-ipvlan:
+    external: true
+```
+
+---
+
+## ✅ Notes
+
+* The `ipvlan` setup allows **NetAlertX** to have a direct IP on your LAN.
+* Replace `eno1` with your interface, IP addresses, and volume paths to match your environment.
+* Make sure the assigned IP (`192.168.1.240` above) is not in use or managed by DHCP.
+* You may also use a node label constraint instead of `node.role == manager` for more control.
+
+

docs/FILE_PERMISSIONS.md

@@ -7,7 +7,7 @@
 >  -e TZ=Europe/Berlin \
 >  -e PUID=200 -e PGID=200 \
 >  -e PORT=20211 \
->  jokobsk/netalertx:latest
+>  ghcr.io/jokob-sk/netalertx:latest
 > ```
 NetAlertX runs on an Nginx web server. On Alpine Linux, Nginx operates as the `nginx` user (if PUID and GID environment variables are not specified, nginx user UID will be set to 102, and its supplementary group `www-data` ID to 82). Consequently, files accessed or written by the NetAlertX application are owned by `nginx:www-data`.
 

docs/HOME_ASSISTANT.md

@@ -1,9 +1,9 @@
-# Overview
+# Home Assistant integration overview
 
 NetAlertX comes with MQTT support, allowing you to show all detected devices as devices in Home Assistant. It also supplies a collection of stats, such as number of online devices.
 
 > [!TIP]
-> You can install NetAlertX also as a Home Assistant addon [![Home Assistant](https://img.shields.io/badge/Repo-blue?logo=home-assistant&style=for-the-badge&color=0aa8d2&logoColor=fff&label=Add)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Falexbelgium%2Fhassio-addons) via the [alexbelgium/hassio-addons](https://github.com/alexbelgium/hassio-addons/). This is only possible if you run a supervised instance of Home Assistant. If not, you can still run NetAlertX in a separate Docker container and follow this guide to configure MQTT.
+> You can install NetAlertX also as a Home Assistant addon [![Home Assistant](https://img.shields.io/badge/Repo-blue?logo=home-assistant&style=for-the-badge&color=0aa8d2&logoColor=fff&label=Add)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Falexbelgium%2Fhassio-addons) via the [alexbelgium/hassio-addons](https://github.com/alexbelgium/hassio-addons/) repository. This is only possible if you run a supervised instance of Home Assistant. If not, you can still run NetAlertX in a separate Docker container and follow this guide to configure MQTT.
 
 ## ⚠ Note 
 
@@ -49,3 +49,44 @@ NetAlertX comes with MQTT support, allowing you to show all detected devices as
   [list]:            ./img/HOME_ASISSTANT/HomeAssistant-Devices-List.png            "list"  
   [overview]:        ./img/HOME_ASISSTANT/HomeAssistant-Overview-Card.png           "overview"
 
+## Troubleshooting
+
+If you can't see all devices detected, run `sudo arp-scan  --interface=eth0 192.168.1.0/24` (change these based on your setup, read [Subnets](./SUBNETS.md) docs for details). This command has to be executed the NetAlertX container, not in the Home Assistant container.
+
+You can access the NetAlertX container via Portainer on your host or via ssh. The container name will be something like `addon_db21ed7f_netalertx` (you can copy the `db21ed7f_netalertx` part from the browser when accessing the UI of NetAlertX). 
+
+## Accessing the NetAlertX container via SSH
+
+1. Log into your Home Assistant host via SSH
+
+```bash
+local@local:~ $ ssh pi@192.168.1.9
+```
+2. Find the NetAlertX container name, in this case `addon_db21ed7f_netalertx`
+
+```bash
+pi@raspberrypi:~ $ sudo docker container ls | grep netalertx
+06c540d97f67   ghcr.io/alexbelgium/netalertx-armv7:25.3.1                   "/init"               6 days ago      Up 6 days (healthy)    addon_db21ed7f_netalertx
+```
+
+3. SSH into the NetAlertX cointainer
+
+```bash
+pi@raspberrypi:~ $ sudo docker exec -it addon_db21ed7f_netalertx  /bin/sh
+/ #
+```
+
+4. Execute a test `asrp-scan` scan
+
+```bash
+/ # sudo arp-scan --ignoredups --retry=6 192.168.1.0/24 --interface=eth0
+Interface: eth0, type: EN10MB, MAC: dc:a6:32:73:8a:b1, IPv4: 192.168.1.9
+Starting arp-scan 1.10.0 with 256 hosts (https://github.com/royhills/arp-scan)
+192.168.1.1     74:ac:b9:54:09:fb       Ubiquiti Networks Inc.
+192.168.1.21    74:ac:b9:ad:c3:30       Ubiquiti Networks Inc.
+192.168.1.58    1c:69:7a:a2:34:7b       EliteGroup Computer Systems Co., LTD
+192.168.1.57    f4:92:bf:a3:f3:56       Ubiquiti Networks Inc.
+...
+```
+
+If your result doesn't contain results similar to the above, double check your subnet, interface and if you are dealing with an inaccessible network segment, read the [Remote networks documentation](./REMOTE_NETWORKS.md).

docs/INITIAL_SETUP.md

@@ -1,42 +1,109 @@
-# ⚙ Initial Setup
+# ⚡ Quick Start Guide
 
-## 📁 Configuration Files
-
-- On first run, the app generates a default `app.conf` and `app.db` if unavailable.
-- Preferred method: Use the **Settings UI**.
-- If the UI is inaccessible, manually edit [`app.conf`](https://github.com/jokob-sk/NetAlertX/tree/main/back) in `/app/config/`.
+Get **NetAlertX** up and running in a few simple steps.
 
 ---
 
-## 🖥️ Setting Up Scanners
+### 1. Configure Scanner Plugin(s)
 
-- Define networks to scan by entering accessible subnets.
-- Default plugin: **ARPSCAN** → Requires at least one valid subnet + interface in `SCAN_SUBNETS`.
-- 📖 [Subnet & VLAN setup guide](./SUBNETS.md) (for troubleshooting and advanced scenarios).
+> [!TIP]
+> Enable additional plugins under **Settings → `LOADED_PLUGINS`**.
+> Make sure to **save** your changes and **reload the page** to activate them.
+> ![Loaded plugins settings](./img/PLUGINS/loaded_plugins_setting.png)
 
-### 🔄 PiHole Sync
-- If using **PiHole**, devices can be synced automatically.  
-- 📖 [PiHole configuration guide](./PIHOLE_GUIDE.md).
+**Initial configuration**: `ARPSCAN`, `INTRNT`
 
-### 📦 Bulk Import
-> [!NOTE]  
-> You can bulk-import devices via the [CSV import method](./DEVICES_BULK_EDITING.md).
+> [!NOTE]
+> `ARPSCAN` and `INTRNT` scan the current network. You can complement them with other `🔍 dev scanner` plugins like `NMAPDEV`, or import devices using `📥 importer` plugins.
+> See the [Subnet & VLAN Setup Guide](./SUBNETS.md) and [Remote Networks](./REMOTE_NETWORKS.md) for advanced configurations.
 
 ---
 
-## 🌍 Community Guides
+### 2. Choose a Publisher Plugin
 
-- Various community-written configuration guides in **Chinese, Korean, German, French**.  
-- 📖 [Community Guides](./COMMUNITY_GUIDES.md)  
+**Initial configuration**: `SMTP`
 
-> ⚠️ **Note:** These guides may be outdated. Always refer to the official documentation first.
+> [!NOTE]
+> Configure your SMTP settings or enable additional `▶️ publisher` plugins to send alerts.
+> For more flexibility, try [📚 `_publisher_apprise`](/front/plugins/_publisher_apprise/), which supports over 80 notification services.
 
 ---
 
-## 🛠️ Common Issues
+### 3. Set Up a Network Topology Diagram
 
-Before creating a new issue:
+![Network tree](./img/NETWORK_TREE/Network_tree_details.png)
 
-- Check if a similar issue was [already resolved](https://github.com/jokob-sk/NetAlertX/issues?q=is%3Aissue+is%3Aclosed).
-- Review [common debugging tips](./DEBUG_TIPS.md).
-- Check [Common Issues](./COMMON_ISSUES.md)
+**Initial configuration**: The app auto-selects a root node (MAC `internet`) and attempts to identify other network devices by vendor or name.
+
+> [!NOTE]
+> Visualize and manage your network using the [Network Guide](./NETWORK_TREE.md).
+> Some plugins (e.g., `UNFIMP`) build the topology automatically, or you can use [Custom Workflows](./WORKFLOWS.md) to generate it based on your own rules.
+
+---
+
+### 4. Configure Notifications
+
+![Notification settings](./img/NOTIFICATIONS/Global-notification-settings.png)
+
+**Initial configuration**: Notifies on `new_devices`, `down_devices`, and `events` as defined in `NTFPRCS_INCLUDED_SECTIONS`.
+
+> [!NOTE]
+> Notification settings support global, plugin-specific, and per-device rules.
+> For fine-tuning, refer to the [Notification Guide](./NOTIFICATIONS.md).
+
+---
+
+### 5. Set Up Workflows
+
+![Workflows](./img/WORKFLOWS/workflows.png)
+
+**Initial configuration**: N/A
+
+> [!NOTE]
+> Automate responses to device status changes, group management, topology updates, and more.
+> See the [Workflows Guide](./WORKFLOWS.md) to simplify your network operations.
+
+---
+
+### 6. Backup Your Configuration
+
+![Backups](./img/BACKUPS/Maintenance_Backup_Restore.png)
+
+**Initial configuration**: The `CSVBCKP` plugin creates a daily backup to `/config/devices.csv`.
+
+> [!NOTE]
+> For a complete backup strategy, follow the [Backup Guide](./BACKUPS.md).
+
+---
+
+### 7. (Optional) Create Custom Plugins
+
+[![Custom Plugin Video](./img/YouTube_thumbnail.png)](https://youtu.be/cdbxlwiWhv8)
+
+**Initial configuration**: N/A
+
+> [!NOTE]
+> Build your own scanner, importer, or publisher plugin.
+> See the [Plugin Development Guide](./PLUGINS_DEV.md) and included video tutorials.
+
+---
+
+## 📁 Recommended Guides
+
+* 📘 [PiHole Setup Guide](./PIHOLE_GUIDE.md)
+* 📘 [CSV Import Method](./DEVICES_BULK_EDITING.md)
+* 📘 [Community Guides (Chinese, Korean, German, French)](./COMMUNITY_GUIDES.md)
+
+---
+
+## 🛠️ Troubleshooting & Help
+
+Before opening a new issue:
+
+* 📘 [Common Issues](./COMMON_ISSUES.md)
+* 🧰 [Debugging Tips](./DEBUG_TIPS.md)
+* ✅ [Browse resolved GitHub issues](https://github.com/jokob-sk/NetAlertX/issues?q=is%3Aissue+is%3Aclosed)
+
+---
+
+Let me know if you want a condensed README version, separate pages for each section, or UI copy based on this!

docs/INSTALLATION.md

@@ -2,7 +2,7 @@
 
 ## Installation options
 
-NetAlertX can be installed several ways. The best supported option is Docker, followed by a supervised the Home Assistant instance, as an Unraid app and lastly on bare metal. 
+NetAlertX can be installed several ways. The best supported option is Docker, followed by a supervised Home Assistant instance, as an Unraid app, and lastly, on bare metal. 
 
 - [[Installation] Docker (recommended)](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md) 
 - [[Installation] Home Assistant](https://github.com/alexbelgium/hassio-addons/tree/master/netalertx) 

docs/LOGGING.md

@@ -0,0 +1,26 @@
+# Logging
+
+NetAlertX comes with several logs that help to identify application issues. 
+
+For plugin-specific log debugging, please read the [Debug Plugins](./DEBUG_PLUGINS.md) guide.
+
+When debugging any issue, increase the `LOG_LEVEL` Setting as per the [Debug tips](./DEBUG_TIPS.md) documentation.
+
+
+## Main logs
+
+You can find most of the logs exposed in the UI under _Maintenance -> Logs_. 
+
+If the UI is inaccessible, you can access them under `/app/log`.
+
+![Logs](./img/LOGGING/maintenance_logs.png)
+
+In the _Maintennace -> Logs_ you can **Purge logs**, download the full log file or Filter the lines with some substring to narrow down your search. 
+
+## Plugin logging
+
+If a Plugin supplies data to the main app it's done either vie a SQL query or via a script that updates the `last_result.log` file in the plugin log folder (`app/log/plugins/`). These files are processed at the end of the scan and deleted on successful processing.
+
+The data is in most of the cases then displayed in the application under _Integrations -> Plugins_ (or _Device -> Plugins_ if the plugin is supplying device-specific data). 
+
+![Plugin objects](./img/LOGGING/logging_integrations_plugins.png)

docs/MIGRATION.md

@@ -1,7 +1,7 @@
 # Migration form PiAlert to NetAlertX
 
 > [!WARNING] 
-> Follow this guide only after you you downloaded and started NetAlert X at least once after previously using the PiAlert image.
+> Follow this guide only after you you downloaded and started a version of NetAlertX prior to v25.6.7 (e.g. `docker pull ghcr.io/jokob-sk/netalertx:25.5.24`) at least once after previously using the PiAlert image. Later versions don't support migration and devices and settings will have to migrated manually, e.g. via [CSV import](./DEVICES_BULK_EDITING.md).
 
 ## STEPS: 
 
@@ -43,14 +43,13 @@ The application installation folder in the docker container has changed from `/h
 
 # Examples
 
-Exmaples of docker files with the new mount points.
+Examples of docker files with the new mount points.
 
 ## Example 1: Mapping folders
 
 ### Old docker-compose.yml
 
 ```yaml
-version: "3"
 services:
   pialert:
     container_name: pialert
@@ -72,13 +71,12 @@ services:
 ### New docker-compose.yml
 
 ```yaml
-version: "3"
 services:
   netalertx:                                  # ⚠  This has changed (🟡optional) 
     container_name: netalertx                 # ⚠  This has changed (🟡optional) 
     # use the below line if you want to test the latest dev image
     # image: "ghcr.io/jokob-sk/netalertx-dev:latest" 
-    image: "jokobsk/netalertx:latest"         # ⚠  This has changed (🟡optional/🔺required in future) 
+    image: "ghcr.io/jokob-sk/netalertx:latest"         # ⚠  This has changed (🟡optional/🔺required in future) 
     network_mode: "host"        
     restart: unless-stopped
     volumes:
@@ -100,7 +98,6 @@ services:
 ### Old docker-compose.yml
 
 ```yaml
-version: "3"
 services:
   pialert:
     container_name: pialert
@@ -122,13 +119,12 @@ services:
 ### New docker-compose.yml
 
 ```yaml
-version: "3"
 services:
   netalertx:                                  # ⚠  This has changed (🟡optional) 
     container_name: netalertx                 # ⚠  This has changed (🟡optional) 
     # use the below line if you want to test the latest dev image
     # image: "ghcr.io/jokob-sk/netalertx-dev:latest" 
-    image: "jokobsk/netalertx:latest"         # ⚠  This has changed (🟡optional/🔺required in future) 
+    image: "ghcr.io/jokob-sk/netalertx:latest"         # ⚠  This has changed (🟡optional/🔺required in future) 
     network_mode: "host"        
     restart: unless-stopped
     volumes:

docs/NAME_RESOLUTION.md

@@ -0,0 +1,54 @@
+# Device Name Resolution
+
+Name resolution in NetAlertX relies on multiple plugins to resolve device names from IP addresses. If you are seeing `(name not found)` as device names, follow these steps to diagnose and fix the issue.
+
+> [!TIP]  
+> Before proceeding, make sure [Reverse DNS](./REVERSE_DNS.md) is enabled on your network.  
+> You can control how names are handled and cleaned using the `NEWDEV_NAME_CLEANUP_REGEX` setting.  
+> To auto-update Fully Qualified Domain Names (FQDN), enable the `REFRESH_FQDN` setting.
+
+
+## Required Plugins
+
+For best results, ensure the following name resolution plugins are enabled:
+
+- **AVAHISCAN** – Uses mDNS/Avahi to resolve local network names.
+- **NBTSCAN** – Queries NetBIOS to find device names.
+- **NSLOOKUP** – Performs standard DNS lookups.
+- **DIGSCAN** – Performs Name Resolution with the Dig utility (DNS).
+
+You can check which plugins are active in your _Settings_ section and enable any that are missing.
+
+There are other plugins that can supply device names as well, but they rely on bespoke hardware and services. See [Plugins overview](./PLUGINS.md) for details and look for plugins with name discovery (🆎) features.
+
+## Checking Logs
+
+If names are not resolving, check the logs for errors or timeouts.
+
+See how to explore logs in the [Logging guide](./LOGGING.md).
+
+Logs will show which plugins attempted resolution and any failures encountered.
+
+## Adjusting Timeout Settings
+
+If resolution is slow or failing due to timeouts, increase the timeout settings in your configuration, for example.
+
+```ini
+NSLOOKUP_RUN_TIMEOUT = 30
+```
+
+Raising the timeout may help if your network has high latency or slow DNS responses.
+
+## Checking Plugin Objects
+
+Each plugin stores results in its respective object. You can inspect these objects to see if they contain valid name resolution data.
+
+See [Logging guide](./LOGGING.md) and [Debug plugins](./DEBUG_PLUGINS.md) guides for details.
+
+If the object contains no results, the issue may be with DNS settings or network access.
+
+## Improving name resolution
+
+For more details how to improve name resolution refer to the 
+[Reverse DNS Documentation](./REVERSE_DNS.md).
+

docs/NOTIFICATIONS.md

@@ -17,10 +17,13 @@ There are 4 ways how to influence notifications:
 
 There are 4 settings on the device for influencing notifications. You can:
 
-1. **Alert Events** - Enables alerts of connections, disconnections, IP changes.
-2. **Alert Down** - Alerts when a device goes down. This setting overrides a disabled **Alert Events** setting, so you will get a notification of a device going down even if you don't have **Alert Events** ticked.
+1. **Alert Events** - Enables alerts of connections, disconnections, IP changes (down and down reconnected notifications are still sent even if this is disabled).
+2. **Alert Down** - Alerts when a device goes down. This setting overrides a disabled **Alert Events** setting, so you will get a notification of a device going down even if you don't have **Alert Events** ticked. Disabling this will disable down and down reconnected notifications on the device.
 3. **Skip repeated notifications**, if for example you know there is a temporary issue and want to pause the same notification for this device for a given time.
 
+> [!NOTE]
+> Please read through the [NTFPRCS plugin](https://github.com/jokob-sk/NetAlertX/blob/main/front/plugins/notification_processing/README.md) documentation to understand how device and global settings influence the notification processing. 
+
 ## Plugin settings 🔌
 
 ![Plugin notification settings](./img/NOTIFICATIONS/Plugin-notification-settings.png)
@@ -38,7 +41,7 @@ Click the **Read more in the docs.** Link at the top of each plugin to get more
 
 In Notification Processing settings, you can specify blanket rules. These allow you to specify exceptions to the Plugin and Device settings and will override those.
 
-1. Notify on (`NTFPRCS_INCLUDED_SECTIONS`) allows you to specify which events trigger notifications. Usual setups will have `new_devices`, `down_devices`, and possibly `down_reconnected` set. Including `plugin` (dependenton the Plugin `<plugin>_WATCH` and `<plugin>_REPORT_ON` settings) and `events` (dependent on the on-device **Alert Events** setting) might be too noisy for most setups. More info in the [NTFPRCS plugin](/front/plugins/notification_processing/README.md)
+1. Notify on (`NTFPRCS_INCLUDED_SECTIONS`) allows you to specify which events trigger notifications. Usual setups will have `new_devices`, `down_devices`, and possibly `down_reconnected` set. Including `plugin` (dependenton the Plugin `<plugin>_WATCH` and `<plugin>_REPORT_ON` settings) and `events` (dependent on the on-device **Alert Events** setting) might be too noisy for most setups. More info in the [NTFPRCS plugin](https://github.com/jokob-sk/NetAlertX/blob/main/front/plugins/notification_processing/README.md) on what events these selections include. 
 2. Alert down after (`NTFPRCS_alert_down_time`) is useful if you want to wait for some time before the system sends out a down notification for a device. This is related to the on-device **Alert down** setting and only devices with this checked will trigger a down notification.
 3. A filter to allow you to set device-specific exceptions to New devices being added to the app.
 4. A filter to allow you to set device-specific exceptions to generated Events.

docs/PERFORMANCE.md

@@ -76,7 +76,7 @@ services:
     container_name: netalertx
     # Uncomment the line below to test the latest dev image
     # image: "ghcr.io/jokob-sk/netalertx-dev:latest"
-    image: "jokobsk/netalertx:latest"      
+    image: "ghcr.io/jokob-sk/netalertx:latest"      
     network_mode: "host"        
     restart: unless-stopped
     volumes:

docs/PLUGINS.md

@@ -8,73 +8,20 @@ NetAlertX supports additional plugins to extend its functionality, each with its
 ## ⚡ Quick start
 
 > [!TIP]
-> You can load additional Plugins via the General -> `LOADED_PLUGINS` setting. 
+> You can load additional Plugins via the General -> `LOADED_PLUGINS` setting. You need to save the settings for the new plugins to load (cache/page reload may be necessary). 
+> ![Loaded plugins settings](./img/PLUGINS/loaded_plugins_setting.png)
 
-1. Pick your `🔍 dev scanner` plugin (e.g. `ARPSCAN` or `NMAPDEV`), or import devices into the application with an `📥 importer` plugin. (See **✅Enabling plugins** below)
+1. Pick your `🔍 dev scanner` plugin (e.g. `ARPSCAN` or `NMAPDEV`), or import devices into the application with an `📥 importer` plugin. (See **Enabling plugins** below)
 2. Pick a `▶️ publisher` plugin, if you want to send notifications. If you don't see a publisher you'd like to use, look at the  [📚_publisher_apprise](/front/plugins/_publisher_apprise/) plugin which is a proxy for over 80 notification services. 
 3. Setup your [Network topology diagram](./NETWORK_TREE.md)
 4. Fine-tune [Notifications](./NOTIFICATIONS.md)
-5. [Backup your setup](./BACKUPS.md)
-6. Contribute and [Create custom plugins](./PLUGINS_DEV.md)
+5. Setup [Workflows](./WORKFLOWS.md)
+6. [Backup your setup](./BACKUPS.md)
+7. Contribute and [Create custom plugins](./PLUGINS_DEV.md)
 
 
-## 📑 Available Plugins
- 
-Device-detecting plugins insert values into the `CurrentScan` database table.  The plugins that are not required are safe to ignore, however, it makes sense to have at least some device-detecting plugins enabled, such as `ARPSCAN` or `NMAPDEV`. 
-
-
-| ID            | Type    | Description                                | Features | Required | Data source  | Detailed docs                                                       |
-|---------------|---------|--------------------------------------------|----------|----------|--------------|---------------------------------------------------------------------|
-| `APPRISE`     | ▶️      | Apprise notification proxy                |           |          | Script       | [_publisher_apprise](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_apprise/)          |
-| `ARPSCAN`     | 🔍      | ARP-scan on current network               |           |          | Script       | [arp_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/arp_scan/)                              |
-| `AVAHISCAN`   | 🆎      | Avahi (mDNS-based) name resolution        |           |          | Script       | [avahi_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/avahi_scan/)                          |
-| `ASUSWRT`     | 🔍       | Import connected devices from AsusWRT    |           |          | Script       | [asuswrt_import](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/asuswrt_import/)                  |
-| `CSVBCKP`     | ⚙       | CSV devices backup                        |           |          | Script       | [csv_backup](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/csv_backup/)                          |
-| `CUSTPROP`    | ⚙       | Managing custom device properties values  |           |  Yes     | Template     | [custom_props](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/custom_props/)                      |
-| `DBCLNP`      | ⚙       | Database cleanup                          |           |  Yes*    | Script       | [db_cleanup](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/db_cleanup/)                          |
-| `DDNS`        | ⚙       | DDNS update                               |           |          | Script       | [ddns_update](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/ddns_update/)                        |
-| `DHCPLSS`     | 🔍/📥/🆎| Import devices from DHCP leases          |           |          | Script       | [dhcp_leases](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/dhcp_leases/)                        |
-| `DHCPSRVS`    | ♻       | DHCP servers                              |           |          | Script       | [dhcp_servers](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/dhcp_servers/)                      |
-| `FREEBOX`     | 🔍/♻/🆎| Pull data and names from Freebox/Iliadbox |          |          | Script       | [freebox](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/freebox/)                                 |
-| `ICMP`        | 🔍      | ICMP (ping) status checker                |           |          | Script       | [icmp_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/icmp_scan/)                            |
-| `INTRNT`      | 🔍      | Internet IP scanner                       |           |          | Script       | [internet_ip](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/internet_ip/)                        |
-| `INTRSPD`     | ♻       | Internet speed test                       |           |          | Script       | [internet_speedtest](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/internet_speedtest/)          |
-| `IPNEIGH`     | 🔍       | Scan ARP (IPv4) and NDP (IPv6) tables    |           |          | Script       | [ipneigh](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/ipneigh/)                                |
-| `LUCIRPC`     | 🔍       | Import connected devices from OpenWRT    |           |          | Script       | [luci_import](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/luci_import/)                        |
-| `MAINT`       | ⚙       | Maintenance of logs, etc.                 |           |          | Script       | [maintenance](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/maintenance/)                        |
-| `MQTT`        | ▶️      | MQTT for synching to Home Assistant       |           |          | Script       | [_publisher_mqtt](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_mqtt/)                |
-| `NBTSCAN`     | 🆎       | Nbtscan (NetBIOS-based) name resolution  |           |          | Script       | [nbtscan_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/nbtscan_scan/)                      |
-| `NEWDEV`      | ⚙       | New device template                       |           |  Yes     | Template     | [newdev_template](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/newdev_template/)                |
-| `NMAP`        | ♻       | Nmap port scanning & discovery            |           |          | Script       | [nmap_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/nmap_scan/)                            |
-| `NMAPDEV`     | 🔍      | Nmap dev scan on current network          |           |          | Script       | [nmap_dev_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/nmap_dev_scan/)                    |
-| `NSLOOKUP`    | 🆎       | NSLookup (DNS-based) name resolution     |           |          | Script       | [nslookup_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/nslookup_scan/)                    |
-| `NTFPRCS`     | ⚙       | Notification processing                   |           |  Yes     | Template     | [notification_processing](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/notification_processing/)|
-| `NTFY`        | ▶️      | NTFY notifications                        |           |          | Script       | [_publisher_ntfy](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_ntfy/)                |
-| `OMDSDN`      | 📥/🆎   | OMADA TP-Link import                      |   🖧 🔄  |          | Script       | [omada_sdn_imp](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/omada_sdn_imp/)                    |
-| `OMDSDNOPENAPI`| 📥/🆎   | OMADA TP-Link import via OpenAPI        |   🖧      |          | Script       | [omada_sdn_openapi](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/omada_sdn_openapi/)                    |
-| `PIHOLE`      | 🔍/🆎/📥| Pi-hole device import & sync             |           |          | SQLite DB    | [pihole_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/pihole_scan/)                        |
-| `PUSHSAFER`   | ▶️      | Pushsafer notifications                   |           |          | Script       | [_publisher_pushsafer](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_pushsafer/)      |
-| `PUSHOVER`    | ▶️      | Pushover notifications                    |           |          | Script       | [_publisher_pushover](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_pushover/)        |
-| `SETPWD`      | ⚙       | Set password                              |           |  Yes     | Template     | [set_password](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/set_password/)                      |
-| `SMTP`        | ▶️      | Email notifications                       |           |          | Script       | [_publisher_email](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_email/)              |
-| `SNMPDSC`     | 🔍/📥   | SNMP device import & sync                 |           |          | Script       | [snmp_discovery](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/snmp_discovery/)                  |
-| `SYNC`        | 🔍/⚙/📥| Sync & import from NetAlertX instances    |   🖧 🔄   | Yes     | Script        | [sync](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/sync/)                                      |
-| `TELEGRAM`    | ▶️      | Telegram notifications                    |           |          | Script       | [_publisher_telegram](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_telegram/)        |
-| `UI`          | ♻       | UI specific settings                      |           |  Yes     | Template     | [ui_settings](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/ui_settings/)                        |
-| `UNFIMP`      | 🔍/📥/🆎| UniFi device import & sync               |  🖧       |          | Script       | [unifi_import](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/unifi_import/)                      |
-| `VNDRPDT`     | ⚙       | Vendor database update                    |           |          | Script       | [vendor_update](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/vendor_update/)                    |
-| `WEBHOOK`     | ▶️      | Webhook notifications                     |           |          | Script       | [_publisher_webhook](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_webhook/)          |
-| `WEBMON`      | ♻       | Website down monitoring                   |           |          | Script       | [website_monitor](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/website_monitor/)                |
-| `WOL`         | ♻       | Automatic wake-on-lan                     |           |          | Script       | [wake_on_lan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/wake_on_lan/)                        |
-
-
-> \* The database cleanup plugin (`DBCLNP`) is not _required_ but the app will become unusable after a while if not executed.
-> ❌ marked for removal
-> ⌚It's recommended to use the same schedule interval for all plugins responsible for discovering new devices.
-
 ## Plugin types
 
-
 | Plugin type    | Icon | Description                                                      | When to run                         | Required | Data source [?](./PLUGINS_DEV.md) |
 | -------------- | ---- | ---------------------------------------------------------------- | ----------------------------------- | -------- | ------------------------------------- |
 | publisher      | ▶️    | Sending notifications to services.                               | `on_notification`                   | ✖        | Script                                |
@@ -92,7 +39,64 @@ Device-detecting plugins insert values into the `CurrentScan` database table.  T
 | 🔄    | Has the option to sync some data back into the plugin source |
 
 
-## ✅Enabling plugins
+## Available Plugins
+ 
+Device-detecting plugins insert values into the `CurrentScan` database table.  The plugins that are not required are safe to ignore, however, it makes sense to have at least some device-detecting plugins enabled, such as `ARPSCAN` or `NMAPDEV`. 
+
+
+| ID            | Type    | Description                                | Features | Required | Data source  | Detailed docs                                                       |
+|---------------|---------|--------------------------------------------|----------|----------|--------------|---------------------------------------------------------------------|
+| `APPRISE`     | ▶️      | Apprise notification proxy                |           |          | Script       | [_publisher_apprise](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_apprise/)          |
+| `ARPSCAN`     | 🔍      | ARP-scan on current network               |           |          | Script       | [arp_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/arp_scan/)                              |
+| `AVAHISCAN`   | 🆎      | Avahi (mDNS-based) name resolution        |           |          | Script       | [avahi_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/avahi_scan/)                          |
+| `ASUSWRT`     | 🔍       | Import connected devices from AsusWRT    |           |          | Script       | [asuswrt_import](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/asuswrt_import/)                  |
+| `CSVBCKP`     | ⚙       | CSV devices backup                        |           |          | Script       | [csv_backup](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/csv_backup/)                          |
+| `CUSTPROP`    | ⚙       | Managing custom device properties values  |           |  Yes     | Template     | [custom_props](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/custom_props/)                      |
+| `DBCLNP`      | ⚙       | Database cleanup                          |           |  Yes*    | Script       | [db_cleanup](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/db_cleanup/)                          |
+| `DDNS`        | ⚙       | DDNS update                               |           |          | Script       | [ddns_update](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/ddns_update/)                        |
+| `DHCPLSS`     | 🔍/📥/🆎| Import devices from DHCP leases          |           |          | Script       | [dhcp_leases](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/dhcp_leases/)                        |
+| `DHCPSRVS`    | ♻       | DHCP servers                              |           |          | Script       | [dhcp_servers](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/dhcp_servers/)                      |
+| `DIGSCAN`    | 🆎       | Dig (DNS) Name resolution                 |           |          | Script       | [dig_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/dig_scan/)                      |
+| `FREEBOX`     | 🔍/♻/🆎| Pull data and names from Freebox/Iliadbox |          |          | Script       | [freebox](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/freebox/)                                 |
+| `ICMP`        | ♻      | ICMP (ping) status checker                |           |          | Script       | [icmp_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/icmp_scan/)                            |
+| `INTRNT`      | 🔍      | Internet IP scanner                       |           |          | Script       | [internet_ip](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/internet_ip/)                        |
+| `INTRSPD`     | ♻       | Internet speed test                       |           |          | Script       | [internet_speedtest](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/internet_speedtest/)          |
+| `IPNEIGH`     | 🔍       | Scan ARP (IPv4) and NDP (IPv6) tables    |           |          | Script       | [ipneigh](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/ipneigh/)                                |
+| `LUCIRPC`     | 🔍       | Import connected devices from OpenWRT    |           |          | Script       | [luci_import](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/luci_import/)                        |
+| `MAINT`       | ⚙       | Maintenance of logs, etc.                 |           |          | Script       | [maintenance](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/maintenance/)                        |
+| `MQTT`        | ▶️      | MQTT for synching to Home Assistant       |           |          | Script       | [_publisher_mqtt](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_mqtt/)                |
+| `NBTSCAN`     | 🆎       | Nbtscan (NetBIOS-based) name resolution  |           |          | Script       | [nbtscan_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/nbtscan_scan/)                      |
+| `NEWDEV`      | ⚙       | New device template                       |           |  Yes     | Template     | [newdev_template](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/newdev_template/)                |
+| `NMAP`        | ♻       | Nmap port scanning & discovery            |           |          | Script       | [nmap_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/nmap_scan/)                            |
+| `NMAPDEV`     | 🔍      | Nmap dev scan on current network          |           |          | Script       | [nmap_dev_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/nmap_dev_scan/)                    |
+| `NSLOOKUP`    | 🆎       | NSLookup (DNS-based) name resolution     |           |          | Script       | [nslookup_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/nslookup_scan/)                    |
+| `NTFPRCS`     | ⚙       | Notification processing                   |           |  Yes     | Template     | [notification_processing](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/notification_processing/)|
+| `NTFY`        | ▶️      | NTFY notifications                        |           |          | Script       | [_publisher_ntfy](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_ntfy/)                |
+| `OMDSDN`      | 📥/🆎 ❌  |  UNMAINTAINED use `OMDSDNOPENAPI`        |   🖧 🔄  |          | Script       | [omada_sdn_imp](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/omada_sdn_imp/)                    |
+| `OMDSDNOPENAPI`| 📥/🆎   | OMADA TP-Link import via OpenAPI       |   🖧      |          | Script       | [omada_sdn_openapi](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/omada_sdn_openapi/)                    |
+| `PIHOLE`      | 🔍/🆎/📥| Pi-hole device import & sync             |           |          | SQLite DB    | [pihole_scan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/pihole_scan/)                        |
+| `PUSHSAFER`   | ▶️      | Pushsafer notifications                   |           |          | Script       | [_publisher_pushsafer](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_pushsafer/)      |
+| `PUSHOVER`    | ▶️      | Pushover notifications                    |           |          | Script       | [_publisher_pushover](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_pushover/)        |
+| `SETPWD`      | ⚙       | Set password                              |           |  Yes     | Template     | [set_password](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/set_password/)                      |
+| `SMTP`        | ▶️      | Email notifications                       |           |          | Script       | [_publisher_email](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_email/)              |
+| `SNMPDSC`     | 🔍/📥   | SNMP device import & sync                 |           |          | Script       | [snmp_discovery](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/snmp_discovery/)                  |
+| `SYNC`        | 🔍/⚙/📥| Sync & import from NetAlertX instances    |   🖧 🔄   | Yes     | Script        | [sync](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/sync/)                                      |
+| `TELEGRAM`    | ▶️      | Telegram notifications                    |           |          | Script       | [_publisher_telegram](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_telegram/)        |
+| `UI`          | ♻       | UI specific settings                      |           |  Yes     | Template     | [ui_settings](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/ui_settings/)                        |
+| `UNFIMP`      | 🔍/📥/🆎| UniFi device import & sync               |  🖧       |          | Script       | [unifi_import](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/unifi_import/)                      |
+| `VNDRPDT`     | ⚙       | Vendor database update                    |           |          | Script       | [vendor_update](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/vendor_update/)                    |
+| `WEBHOOK`     | ▶️      | Webhook notifications                     |           |          | Script       | [_publisher_webhook](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_webhook/)          |
+| `WEBMON`      | ♻       | Website down monitoring                   |           |          | Script       | [website_monitor](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/website_monitor/)                |
+| `WOL`         | ♻       | Automatic wake-on-lan                     |           |          | Script       | [wake_on_lan](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/wake_on_lan/)                        |
+
+
+> \* The database cleanup plugin (`DBCLNP`) is not _required_ but the app will become unusable after a while if not executed.
+> ❌ marked for removal/unmaintained - looking for help
+> ⌚It's recommended to use the same schedule interval for all plugins responsible for discovering new devices.
+
+
+
+## Enabling plugins
 
 Plugins can be enabled via Settings, and can be disabled as needed. 
 

docs/REMOTE_NETWORKS.md

@@ -2,11 +2,14 @@
 
 By design, local network scanners such as `arp-scan` use ARP (Address Resolution Protocol) to map IP addresses to MAC addresses on the local network. Since ARP operates at Layer 2 (Data Link Layer), it typically works only within a single broadcast domain, usually limited to a single router or network segment.
 
-To scan multiple locally accessible network segments, add them as subnets according to the [subnets](./SUBNETS.md) documentation.
+> [!NOTE]
+> Ping and `ARPSCAN` use different protocols so even if you can ping devices it doesn't mean `ARPSCAN` can detect them.
+
+To scan multiple locally accessible network segments, add them as subnets according to the [subnets](./SUBNETS.md) documentation. If `ARPSCAN` is not suitable for your setup, read on.
 
 ## Complex Use Cases
 
-The following network setups might make some devices undetectable. Check the specific setup to understand the cause and find potential workarounds to still report on these devices.
+The following network setups might make some devices undetectable with `ARPSCAN`. Check the specific setup to understand the cause and find potential workarounds to report on these devices.
 
 ### Wi-Fi Extenders
 
@@ -28,7 +31,7 @@ The following workarounds should work for most complex network setups.
 
 ## Supplementing Plugins
 
-You can use supplementary plugins that employ alternate methods. Protocols used by the `SNMPDSC` or `DHCPLSS` plugins are widely supported on different routers and can be effective as workarounds. Check the [plugins list](https://github.com/jokob-sk/NetAlertX/blob/main/docs/PLUGINS.md) to find a plugin that works with your router and network setup.
+You can use supplementary plugins that employ alternate methods. Protocols used by the `SNMPDSC` or `DHCPLSS` plugins are widely supported on different routers and can be effective as workarounds. Check the [plugins list](./PLUGINS.md) to find a plugin that works with your router and network setup.
 
 ## Multiple NetAlertX Instances
 

docs/REVERSE_DNS.md

@@ -2,6 +2,11 @@
 
 If you are running a DNS server, such as **AdGuard**, set up **Private reverse DNS servers** for a better name resolution on your network. Enabling this setting will enable NetAlertX to execute dig and nslookup commands to automatically resolve device names based on their IP addresses.
 
+> [!TIP]  
+> Before proceeding, ensure that [name resolution plugins](./NAME_RESOLUTION.md) are enabled.  
+> You can customize how names are cleaned using the `NEWDEV_NAME_CLEANUP_REGEX` setting.  
+> To auto-update Fully Qualified Domain Names (FQDN), enable the `REFRESH_FQDN` setting.
+
 
 > Example 1: Reverse DNS `disabled`
 > 
@@ -34,7 +39,7 @@ You can specify the DNS server in the docker-compose to improve name resolution
 services:
   netalertx:
     container_name: netalertx
-    image: "jokobsk/netalertx:latest"
+    image: "ghcr.io/jokob-sk/netalertx:latest"
     restart: unless-stopped
     volumes:
       -  /home/netalertx/config:/app/config
@@ -60,7 +65,7 @@ version: "3"
 services:
   netalertx:
     container_name: netalertx
-    image: "jokobsk/netalertx:latest"
+    image: "ghcr.io/jokob-sk/netalertx:latest"
     restart: unless-stopped
     volumes:
       - ./config/app.conf:/app/config/app.conf

docs/REVERSE_PROXY.md

@@ -477,7 +477,7 @@ docker run -d --rm --network=host \
   -v /appl/docker/netalertx/default:/etc/nginx/sites-available/default \
   -e TZ=Europe/Amsterdam \
   -e PORT=20211 \
-  jokobsk/netalertx:latest
+  ghcr.io/jokob-sk/netalertx:latest
 
 ```
 

docs/SUBNETS.md

@@ -2,17 +2,14 @@
 
 You need to specify the network interface and the network mask. You can also configure multiple subnets and specify VLANs (see VLAN exceptions below).
 
-`ARPSCAN` can scan multiple networks if the network allows it. To scan networks directly, the subnets must be accessible from the network where NetAlertX is running. This means NetAlertX needs to have access to the interface attached to that subnet. You can verify this by running the following command in the container (replace the interface and ip mask):
+`ARPSCAN` can scan multiple networks if the network allows it. To scan networks directly, the subnets must be accessible from the network where NetAlertX is running. This means NetAlertX needs to have access to the interface attached to that subnet. 
 
-`sudo arp-scan --interface=eth0 192.168.1.0/24`
+> [!WARNING] 
+> If you don't see all expected devices run the following command in the NetAlertX container (replace the interface and ip mask):
+> `sudo arp-scan --interface=eth0 192.168.1.0/24`
+> 
+>  If this command returns no results, the network is not accessible due to your network or firewall restrictions (Wi-Fi Extenders, VPNs and inaccessible networks). If direct scans are not possible, check the [remote networks documentation](./REMOTE_NETWORKS.md) for workarounds. 
 
-In this example, `--interface=eth0 192.168.1.0/24` represents a neighboring subnet. If this command returns no results, the network is not accessible due to your network or firewall restrictions.
-
-If direct scans are not possible (Wi-Fi Extenders, VPNs and inaccessible networks), check the [remote networks documentation](./REMOTE_NETWORKS.md). 
-
-> [!TIP] 
-> You may need to increase the time between scans `ARPSCAN_RUN_SCHD` and the timeout `ARPSCAN_RUN_TIMEOUT` (and similar settings for related plugins) when adding more subnets. If the timeout setting is exceeded, the scan is canceled to prevent the application from hanging due to rogue plugins.  
-> Check [debugging plugins](./DEBUG_PLUGINS.md) for more tips.
 
 ## Example Values
 
@@ -24,7 +21,17 @@ If direct scans are not possible (Wi-Fi Extenders, VPNs and inaccessible network
   * One subnet: `SCAN_SUBNETS = ['192.168.1.0/24 --interface=eth0']`
   * Two subnets: `SCAN_SUBNETS = ['192.168.1.0/24 --interface=eth0','192.168.1.0/24 --interface=eth1 --vlan=107']`
 
-If you get timeout messages, decrease the network mask (e.g.: from `/16` to `/24`) or increase the `TIMEOUT` setting (e.g.: `ARPSCAN_RUN_TIMEOUT` to `300` (5-minute timeout)) for the plugin and the interval between scans (e.g.: `ARPSCAN_RUN_SCHD` to `*/10 * * * *` (scans every 10 minutes)).
+> [!TIP]  
+> When adding more subnets, you may need to increase both the scan interval (`ARPSCAN_RUN_SCHD`) and the timeout (`ARPSCAN_RUN_TIMEOUT`)—as well as similar settings for related plugins.  
+>  
+> If the timeout is too short, you may see timeout errors in the log. To prevent the application from hanging due to unresponsive plugins, scans are canceled when they exceed the timeout limit.  
+>  
+> To fix this:  
+> - Reduce the subnet size (e.g., change `/16` to `/24`).  
+> - Increase the timeout (e.g., set `ARPSCAN_RUN_TIMEOUT` to `300` for a 5-minute timeout).  
+> - Extend the scan interval (e.g., set `ARPSCAN_RUN_SCHD` to `*/10 * * * *` to scan every 10 minutes).  
+>  
+> For more troubleshooting tips, see [Debugging Plugins](./DEBUG_PLUGINS.md).
 
 ---
 

docs/SYNOLOGY_GUIDE.md

@@ -36,7 +36,7 @@ services:
     container_name: netalertx
     # use the below line if you want to test the latest dev image
     # image: "ghcr.io/jokob-sk/netalertx-dev:latest" 
-    image: "jokobsk/netalertx:latest"      
+    image: "ghcr.io/jokob-sk/netalertx:latest"      
     network_mode: "host"        
     restart: unless-stopped
     volumes:
@@ -51,7 +51,7 @@ services:
 
 ![Project settings](./img/SYNOLOGY/07_Create_project.png)
 
-7. Replace the paths to your volume and/or comment out unnecessary line(s):
+7. Replace the paths to your volume and comment out unnecessary line(s):
 
 - This is only an example, your paths will differ.
 

docs/UPDATES.md

@@ -1,5 +1,8 @@
 # Docker Update Strategies to upgrade NetAlertX
 
+> [!WARNING] 
+> For versions prior to `v25.6.7` upgrade to version `v25.5.24` first (`docker pull ghcr.io/jokob-sk/netalertx:25.5.24`) as later versions don't support a full upgrade. Alternatovelly, devices and settings can be migrated manually, e.g. via [CSV import](./DEVICES_BULK_EDITING.md).
+
 This guide outlines approaches for updating Docker containers, usually when upgrading to a newer version of NetAlertX. Each method offers different benefits depending on the situation. Here are the methods:
 
 - Manual: Direct commands to stop, remove, and rebuild containers.

docs/WEB_UI_PORT_DEBUG.md

@@ -1,49 +1,70 @@
 # Debugging inaccessible UI
 
-## 1. Port conflicts
+The application uses the following default ports:
 
-When opening an issue please:
+- **Web UI**: `20211`  
+- **GraphQL API**: `20212`
+
+The **Web UI** is served by an **nginx** server, while the **API backend** runs on a **Flask (Python)** server.
+
+## Changing Ports
+
+- To change the **Web UI** port, update the `PORT` environment variable in the `docker-compose.yml` file.
+- To change the **GraphQL API** port, use the `GRAPHQL_PORT` setting, either directly or via Docker:
+  ```yaml
+  APP_CONF_OVERRIDE={"GRAPHQL_PORT":"20212"}
+  ```
+
+For more information, check the [Docker installation guide](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md).
+
+## Possible issues and troubleshooting
+
+Follow all of the below in order to disqualify potential causes of issues and to troubleshoot these problems faster.
+
+### 1. Port conflicts
+
+When opening an issue or debugging:
 
 1. Include a screenshot of what you see when accessing `HTTP://<your rpi IP>/20211` (or your custom port)
 1. [Follow steps 1, 2, 3, 4  on this page](./DEBUG_TIPS.md) 
 1. Execute the following in the container to see the processes and their ports and submit a screenshot of the result:
-   1. `sudo apk add lsof`
-   1. `sudo lsof -i`
-1. Try running the `nginx` command in the container
-   1. if you get `nginx: [emerg] bind() to 0.0.0.0:20211 failed (98: Address in use)` try using a different port number
+   - `sudo apk add lsof`
+   - `sudo lsof -i`
+1. Try running the `nginx` command in the container:
+   - if you get `nginx: [emerg] bind() to 0.0.0.0:20211 failed (98: Address in use)` try using a different port number
 
 
 ![lsof ports](./img/WEB_UI_PORT_DEBUG/container_port.png)
 
-## 2. JavaScript issues 
+### 2. JavaScript issues 
 
 Check for browser console (F12 browser dev console) errors + check different browsers.
 
-## 3. Clear the app cache and cached JavaScript files
+### 3. Clear the app cache and cached JavaScript files
 
 Refresh the browser cache (usually shoft + refresh), try a private window, or different browsers. Please also refresh the app cache by clicking the 🔃 (reload) button in the header of the application. 
 
-## 4. Disable proxy
+### 4. Disable proxies
 
 If you have any reverse proxy or similar, try disabling it. 
 
-## 5. Disable your firewall
+### 5. Disable your firewall
 
 If you are using a firewall, try to temporarily disabling it. 
 
-## 6. Post your docker start details
+### 6. Post your docker start details
 
 If you haven't, post your docker compose/run command.
 
-## 7. Check for errors in your PHP/NGINX error logs
+### 7. Check for errors in your PHP/NGINX error logs
 
-In the container execute:
+In the container execute and investigate:
 
 `cat /var/log/nginx/error.log`
 
 `cat /app/log/app.php_errors.log`
 
-## 8. Make sure permissions are correct
+### 8. Make sure permissions are correct
 
 > [!TIP]
 > You can try to start the container without mapping the `/app/config` and `/app/db` dirs and if the UI shows up then the issue is most likely related to your file system permissions or file ownership. 

docs/WORKFLOWS.md

@@ -0,0 +1,130 @@
+# Workflows Overview
+
+The workflows module in allows to automate repetitive tasks, making network management more efficient. Whether you need to assign newly discovered devices to a specific Network Node, auto-group devices from a given vendor, unarchive a device if detected online, or automatically delete devices, this module provides the flexibility to tailor the automations to your needs.
+
+![Workflows diagram](./img/WORKFLOWS/workflows_diagram.png)
+
+Below are a few examples that demonstrate how this module can be used to simplify network management tasks.
+
+## Updating Workflows
+
+> [!NOTE] 
+> In order to apply a workflow change, you must first **Save** the changes and then reload the application by clicking **Restart server**.
+
+## Workflow components
+
+### Triggers
+
+![Trigger example](./img/WORKFLOWS/trigger.jpg)
+
+Triggers define the event that activates a workflow. They monitor changes to objects within the system, such as updates to devices or the insertion of new entries. When the specified event occurs, the workflow is executed.
+
+> [!TIP]
+> Workflows not running? Check the [Workflows debugging](./WORKFLOWS_DEBUGGING.md) guide how to troubleshoot triggers and conditions.
+
+#### Example Trigger:
+- **Object Type**: `Devices`
+- **Event Type**: `update`
+  
+This trigger will activate when a `Device` object is updated.
+
+### Conditions
+
+![Conditions example](./img/WORKFLOWS/conditions.png)
+
+Conditions determine whether a workflow should proceed based on certain criteria. These criteria can be set for specific fields, such as whether a device is from a certain vendor, or whether it is new or archived. You can combine conditions using logical operators (`AND`, `OR`).
+
+> [!TIP]
+> To better understand how to use specific Device fields, please read through the [Database overview](./DATABASE.md) guide.
+
+#### Example Condition:
+- **Logic**: `AND`
+  - **Field**: `devVendor`
+  - **Operator**: `contains` (case in-sensitive)
+  - **Value**: `Google`
+  
+  This condition checks if the device's vendor is `Google`. The workflow will only proceed if the condition is true.
+
+### Actions
+
+![Actions example](./img/WORKFLOWS/actions.jpg)
+
+Actions define the tasks that the workflow will perform once the conditions are met. Actions can include updating fields or deleting devices.
+
+You can include multiple actions that should execute once the conditions are met.
+
+#### Example Action:
+- **Action Type**: `update_field`
+  - **Field**: `devIsNew`
+  - **Value**: `0`
+  
+  This action updates the `devIsNew` field to `0`, marking the device as no longer new.
+
+
+# Examples
+
+Below you can find a couple of configuration examples.
+
+![Workflow example](./img/WORKFLOWS/workflows.png)
+
+---
+
+## Example 1: Assign Device to Network Node Based on IP
+
+This workflow assigns newly added devices with IP addresses in the `192.168.1.*` range to the device with the MAC address `6c:6d:6d:6c:6c:6c`.
+
+### Trigger:
+- **Object Type**: `Devices`
+- **Event Type**: `insert`
+
+### Conditions:
+- **Logic**: `AND`
+  - `Field`: `devLastIP`
+  - `Operator`: `contains`
+  - `Value`: `192.168.1.`
+  
+  This condition ensures that the workflow only applies to devices with an IP address in the `192.168.1.*` range.
+
+### Actions:
+- **Action Type**: `update_field`
+  - **Field**: `devNetworkNode`
+  - **Value**: `6c:6d:6d:6c:6c:6c`
+
+---
+
+## Example 2: Mark Device as Not New and Delete If from Google Vendor
+
+This workflow automates the process of marking Google devices as not new and deleting them if they meet the criteria.
+
+### Trigger:
+- **Object Type**: `Devices`
+- **Event Type**: `update`
+
+### Conditions:
+- **Logic**: `AND`
+  - `Field`: `devVendor`
+  - `Operator`: `contains`
+  - `Value`: `Google`
+  
+  This condition checks if the device's vendor is `Google`.
+
+- **Logic**: `AND`
+  - `Field`: `devIsNew`
+  - `Operator`: `equals`
+  - `Value`: `1`
+  
+  This ensures the workflow applies only to new devices.
+
+### Actions:
+1. **Action Type**: `update_field`
+   - **Field**: `devIsNew`
+   - **Value**: `0`
+
+   This action marks the device as no longer new.
+
+2. **Action Type**: `delete_device`
+   
+   This action deletes the device after it is marked as not new.
+
+> [!TIP]
+> Share your workflows in [Discord](https://discord.com/invite/NczTUTWyRr) or [GitHub Discussions](https://github.com/jokob-sk/NetAlertX/discussions).  

docs/WORKFLOWS_DEBUGGING.md

@@ -0,0 +1,38 @@
+# Workflows debugging and troubleshooting
+
+> [!TIP]
+> Before troubleshooting, please ensure you have [Debugging enabled](./DEBUG_TIPS.md).
+
+Workflows are triggered by various events. These events are captured and listed in the _Integrations -> App Events_ section of the application. 
+
+## Troubleshooting triggers
+
+> [!NOTE]
+> Workflow events are processed once every 5 seconds. However, if a scan or other background tasks are running, this can cause a delay up to a few minutes. 
+
+If an event doesn't trigger a workflow as expected, check the _App Events_ section for the event. You can filter these by the ID of the device (`devMAC` or `devGUID`). 
+
+![App events search](./img/WORKFLOWS/workflows_app_events_search.png)
+
+Once you find the _Event Guid_ and _Object GUID_, use them to find relevant debug entries. 
+
+Navigate to _Mainetenace -> Logs_ where you can filter the logs based on the _Event or Object GUID_. 
+
+![Log events search](./img/WORKFLOWS/workflows_logs_search.png)
+
+Below you can find some example `app.log` entries that will help you understand why a Workflow was or was not triggered.
+
+```bash
+16:27:03 [WF] Checking if '13f0ce26-1835-4c48-ae03-cdaf38f328fe' triggers the workflow 'Sample Device Update Workflow'
+16:27:03 [WF] self.triggered 'False' for event '[[155], ['13f0ce26-1835-4c48-ae03-cdaf38f328fe'], [0], ['2025-04-02 05:26:56'], ['Devices'], ['050b6980-7af6-4409-950d-08e9786b7b33'], ['DEVICES'], ['00:11:32:ef:a5:6c'], ['192.168.1.82'], ['050b6980-7af6-4409-950d-08e9786b7b33'], [None], [0], [0], ['devPresentLastScan'], ['online'], ['update'], [None], [None], [None], [None]] and trigger {"object_type": "Devices", "event_type": "insert"}' 
+16:27:03 [WF] Checking if '13f0ce26-1835-4c48-ae03-cdaf38f328fe' triggers the workflow 'Location Change'
+16:27:03 [WF] self.triggered 'True' for event '[[155], ['13f0ce26-1835-4c48-ae03-cdaf38f328fe'], [0], ['2025-04-02 05:26:56'], ['Devices'], ['050b6980-7af6-4409-950d-08e9786b7b33'], ['DEVICES'], ['00:11:32:ef:a5:6c'], ['192.168.1.82'], ['050b6980-7af6-4409-950d-08e9786b7b33'], [None], [0], [0], ['devPresentLastScan'], ['online'], ['update'], [None], [None], [None], [None]] and trigger {"object_type": "Devices", "event_type": "update"}' 
+16:27:03 [WF] Event with GUID '13f0ce26-1835-4c48-ae03-cdaf38f328fe' triggered the workflow 'Location Change'
+```
+
+Note how one trigger executed, but the other didn't based on different `"event_type"` values. One is `"event_type": "insert"`, the other `"event_type": "update"`.
+
+Given the Event is a update event (note `...['online'], ['update'], [None]...` in the event structure), the `"event_type": "insert"` trigger didn't execute.
+
+
+

docs/index.md

@@ -2,18 +2,21 @@
 
 Welcome to the official NetAlertX documentation! NetAlertX is a powerful tool designed to simplify the management and monitoring of your network. Below, you will find guides and resources to help you set up, configure, and troubleshoot your NetAlertX instance.
 
+![Preview](./img/devices_split.png)
+
 ## In-App Help
 
 NetAlertX provides contextual help within the application:
 
 - **Hover over settings, fields, or labels** to see additional tooltips and guidance.
 - **Click ❔ (question-mark) icons** next to various elements to view detailed information.
-- Access the in-app **Help / FAQ** section for frequently asked questions and quick answers.
 
 ---
 
 ## Installation Guides
 
+The app can be installed different ways, with the best support of the docker-based deployments. This includes the Home Assistant and Unraid installation approaches. See details below. 
+
 ### Docker (Fully Supported)
 
 NetAlertX is fully supported in Docker environments, allowing for easy setup and configuration. Follow the official guide to get started:
@@ -22,12 +25,25 @@ NetAlertX is fully supported in Docker environments, allowing for easy setup and
 
 This guide will take you through the process of setting up NetAlertX using Docker Compose or standalone Docker commands.
 
+### Home Assistant (Fully Supported)
+
+You can install NetAlertX also as a Home Assistant addon [![Home Assistant](https://img.shields.io/badge/Repo-blue?logo=home-assistant&style=for-the-badge&color=0aa8d2&logoColor=fff&label=Add)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Falexbelgium%2Fhassio-addons) via the [alexbelgium/hassio-addons](https://github.com/alexbelgium/hassio-addons/) repository. This is only possible if you run a supervised instance of Home Assistant. If not, you can still run NetAlertX in a separate Docker container and follow this guide to configure MQTT.
+
+- [[Installation] Home Assistant](https://github.com/alexbelgium/hassio-addons/tree/master/netalertx) 
+
+### Unraid (Partial Support)
+
+The Unraid template was created by the community, so it's only partially supported. Alternatively, here is [another version of the Unraid template](https://github.com/jokob-sk/NetAlertX-unraid). 
+
+- [[Installation] Unraid App](https://unraid.net/community/apps) 
+
 ### Bare-Metal Installation (Experimental)
 
-If you prefer to run NetAlertX on your own hardware, you can try the experimental bare-metal installation. Please note that this method is still under development, and we're looking for maintainers to help improve it.
+If you prefer to run NetAlertX on your own hardware, you can try the experimental bare-metal installation. Please note that this method is still under development, and are looking for maintainers to help improve it.
 
 - [Bare-Metal Installation Guide](./HW_INSTALL.md)
 
+
 ---
 
 ## Help and Support
@@ -67,14 +83,10 @@ To keep up with the latest changes and updates to NetAlertX, please refer to the
 Make sure to follow the project on GitHub to get notifications for new releases and important updates.
 
 ---
+## Additional info
 
-## Additional Resources
-
-- **Configuration Tips**: Learn how to optimize NetAlertX for your network setup.
-- **Advanced Features**: Explore advanced functionalities like plugin development and custom configurations.
 - **Documentation Index**: Check out the full [documentation index](https://github.com/jokob-sk/NetAlertX/tree/main/docs) for all the guides available.
 
-We hope you find this documentation helpful. If you have any suggestions or improvements, please don’t hesitate to contribute!
+If you have any suggestions or improvements, please don’t hesitate to contribute!
 
----
 NetAlertX is actively maintained. You can find the source code, report bugs, or request new features on our [GitHub page](https://github.com/jokob-sk/NetAlertX).

front/appEvents.php

@@ -0,0 +1,21 @@
+<?php
+
+  require 'php/templates/header.php';  
+  require 'php/templates/notification.php'; 
+?>
+<!-- ----------------------------------------------------------------------- -->
+ 
+
+<!-- Page ------------------------------------------------------------------ -->
+<div class="content-wrapper">
+
+<?php
+   require 'appEventsCore.php';
+?>
+
+        
+</div>
+
+<?php
+  require 'php/templates/footer.php';
+?>

front/appEventsCore.php

@@ -1,12 +1,12 @@
 <section class="content">
-    <div class="nav-tabs-custom app-event-content" style="margin-bottom: 0px;">
-        <ul id="tabs-location" class="nav nav-tabs col-sm-2">
-        <li class="left-nav"><a class="col-sm-12" href="#" id="" data-toggle="tab">Events</a></li>
-        </ul>
-        <div id="tabs-content-location" class="tab-content col-sm-10">
-            <table class="table table-striped" id="appevents-table" data-my-dbtable="AppEvents"></table>
-        </div>
+  <div class="nav-tabs-custom app-event-content" style="margin-bottom: 0px;">
+    <ul id="tabs-location" class="nav nav-tabs col-sm-2 hidden">
+      <li class="left-nav"><a class="col-sm-12" href="#" id="" data-toggle="tab">Events</a></li>
+    </ul>
+    <div id="tabs-content-location" class="tab-content col-sm-12">
+      <table class="table table-striped" id="appevents-table" data-my-dbtable="AppEvents"></table>
     </div>
+  </div>
 </section>
 
 
@@ -18,75 +18,111 @@ showSpinner()
 
 $(document).ready(function() {
 
-    // Load JSON data from the provided URL
-    $.getJSON('/php/server/query_json.php?file=table_appevents.json', function(data) {
-        // Process the JSON data and generate UI dynamically        
-        processData(data)
+  // Load JSON data from the provided URL
+  $.getJSON('php/server/query_json.php?file=table_appevents.json', function(data) {
+    // Process the JSON data and generate UI dynamically    
+    processData(data)
 
-        // hide loading dialog
-        hideSpinner()
-    });
+    // hide loading dialog
+    hideSpinner()
+  });
 });
 
 function processData(data) {
-    // Create an object to store unique ObjectType values as app event identifiers
-    var appEventIdentifiers = {};
+  // Create an object to store unique ObjectType values as app event identifiers
+  var appEventIdentifiers = {};
 
-    // Array to accumulate data for DataTable
-    var allData = [];
+  // Array to accumulate data for DataTable
+  var allData = [];
 
-    // Iterate through the data and generate tabs and content dynamically
-    $.each(data.data, function(index, item) {
-        
-        // Accumulate data for DataTable
-        allData.push(item);
-        
-    });
-
-    // Initialize DataTable for all app events
+  // Iterate through the data and generate tabs and content dynamically
+  $.each(data.data, function(index, item) {
     
-    $('#appevents-table').DataTable({
-        data: allData,
-        paging: true,
-        lengthChange: true,
-        lengthMenu: [[10, 25, 50, 100, 500, -1], [10, 25, 50, 100, 500, 'All']],
-        searching: true,
-        ordering: true,
-        info: true,
-        autoWidth: false,
-        pageLength: 25, // Set the default paging to 25
-        columns: [
-            { data: 'DateTimeCreated', title: getString('AppEvents_DateTimeCreated') },
-            { data: 'AppEventType', title: getString('AppEvents_Type') }, 
-            { data: 'ObjectType', title: getString('AppEvents_ObjectType') },
-            { data: 'ObjectPrimaryID', title: getString('AppEvents_ObjectPrimaryID') },
-            { data: 'ObjectSecondaryID', title: getString('AppEvents_ObjectSecondaryID') },
-            { data: 'ObjectStatus', title: getString('AppEvents_ObjectStatus') },            
-            { data: 'Extra', title: getString('AppEvents_Extra') },    
-            { data: 'ObjectPlugin', title: getString('AppEvents_Plugin') },    
-            // Add other columns as needed
-        ],
-        // Add column-specific configurations if needed
-        columnDefs: [
-            { className: 'text-center', targets: [3] },
-            { width: '80px', targets: [6] },
-            // ... Add other columnDefs as needed
-            // Full MAC      
-            {targets: [3, 4],
-            'createdCell': function (td, cellData, rowData, row, col) {
-                if (!emptyArr.includes(cellData)){
-                $(td).html (createDeviceLink(cellData));
-                } else {
-                $(td).html ('');
-                }
-            } },
-        ]
-    });
+    // Accumulate data for DataTable
+    allData.push(item);
+    
+  });
+
+  console.log(allData);
+  
+
+  // Initialize DataTable for all app events
+  
+  $('#appevents-table').DataTable({
+    data: allData,
+    paging: true,
+    lengthChange: true,
+    lengthMenu: [[10, 25, 50, 100, 500, -1], [10, 25, 50, 100, 500, 'All']],
+    searching: true,
+    ordering: true,
+    info: true,
+    autoWidth: false,
+    pageLength: 25, // Set the default paging to 25
+    columns: [
+      { data: 'DateTimeCreated', title: getString('AppEvents_DateTimeCreated') },
+      { data: 'AppEventProcessed', title: getString('AppEvents_AppEventProcessed') },
+      { data: 'AppEventType', title: getString('AppEvents_Type') }, 
+      { data: 'ObjectType', title: getString('AppEvents_ObjectType') },
+      { data: 'ObjectPrimaryID', title: getString('AppEvents_ObjectPrimaryID') },
+      { data: 'ObjectSecondaryID', title: getString('AppEvents_ObjectSecondaryID') },
+      { data: 'ObjectStatus', title: getString('AppEvents_ObjectStatus') },            
+      { data: 'ObjectPlugin', title: getString('AppEvents_Plugin') },  
+      { data: 'ObjectGUID', title: "Object GUID" },  
+      { data: 'GUID', title: "Event GUID" },  
+      // Add other columns as needed
+    ],
+    // Add column-specific configurations if needed
+    columnDefs: [
+      { className: 'text-center', targets: [4] },
+      { width: '80px', targets: [7] },
+      // ... Add other columnDefs as needed
+      // Full MAC    
+      {targets: [4, 5],
+      'createdCell': function (td, cellData, rowData, row, col) {
+        if (!emptyArr.includes(cellData)){
+          $(td).html (createDeviceLink(cellData));
+        } else {
+          $(td).html ('');
+        }
+      } },
+      // Processed 
+      {targets: [1],
+        'createdCell': function (td, cellData, rowData, row, col) {
+          // console.log(cellData);
+          $(td).html (cellData);          
+        } 
+      },
+      // Datetime
+      {targets: [0],
+        'createdCell': function (td, cellData, rowData, row, col) {
+          let timezone = $("#NAX_TZ").html(); // e.g., 'Europe/Berlin'
+          let utcDate = new Date(cellData + ' UTC'); // Adding ' UTC' makes it interpreted as UTC time
+
+          // Format the date in the desired timezone
+          let options = {
+              year: 'numeric',
+              month: 'short',
+              day: '2-digit',
+              hour: '2-digit',
+              minute: '2-digit',
+              second: '2-digit',
+              hour12: false, // Use 24-hour format
+              timeZone: timezone // Use the specified timezone
+          };
+
+          let localDate = new Intl.DateTimeFormat('en-GB', options).format(utcDate);
+
+          // Update the table cell
+          $(td).html(localDate);    
+        } 
+      },
+    ]
+  });
 
 
-    // Activate the first tab
-    $('#tabs-location li:first-child').addClass('active');
-    $('#tabs-content-location .tab-pane:first-child').addClass('active');
+  // Activate the first tab
+  $('#tabs-location li:first-child').addClass('active');
+  $('#tabs-content-location .tab-pane:first-child').addClass('active');
 }
 
 </script>

front/css/app.css

@@ -695,6 +695,39 @@ body
 
 /* maintenance buttons */
 
+#file-check-list{
+    display: block;
+}
+
+.file-checking .icon-wrap{
+    width: 200px;
+    overflow: hidden;
+    text-overflow: ellipsis; 
+    display: block;
+}
+
+.file-checking .icon-wrap i{
+    position: absolute;
+    font-size: xx-large;
+    right: 0;
+    top: 0;
+    opacity: 0.2;
+}
+
+.file-checking .file-name-wrap{
+    overflow: hidden;
+    text-overflow: ellipsis; 
+    display: flex;
+    padding: 5px;
+}
+
+.file-checking{
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis; 
+}
+
+
 .dbtools-button {
     display: inline-block;
     width: 160px;
@@ -842,6 +875,11 @@ height: 50px;
     margin-bottom: 10px;
 }
 
+#notifications .notification-buttons{
+    margin: 10px;
+    padding: 10px;
+}
+
 #notificationData textarea{
     width: 100%;
 }
@@ -1098,7 +1136,7 @@ height: 50px;
 input[readonly] {
     /* Apply styles to the readonly input */
     background-color: #646566 !important;
-    color: #000;    
+    color: #e6e6e6;    
     cursor: not-allowed;
   }
 
@@ -1141,14 +1179,14 @@ input[readonly] {
 .settings-sticky-bottom-section {
     position: fixed;
     z-index: 999;
-    background-color: #5B5B66;
+    /* background-color: #5B5B66; */
     /* opacity: 0.8; */
     bottom: 30px;
     border-radius: 5px;
     /* margin:1px; */
-    border-width: 1px;
+    /* border-width: 1px;
     border-style: solid;
-    border-color: inherit;
+    border-color: inherit; */
     /* width: 87%; */
     padding: 10px;
   }
@@ -1418,6 +1456,11 @@ input[readonly] {
     cursor: default;
 }
 
+.small-box:hover
+{
+    color: inherit;
+}
+
 /* ----------------------------------------------------------------- */
 /* Device details */
 /* ----------------------------------------------------------------- */
@@ -1517,25 +1560,25 @@ input[readonly] {
 /* AdminLTE overrides */
 #networkTree .box
 {
-    border-top:1px;
+    /* border-top:1px; */
     border-top-color:grey;
     padding:0px;
-    padding-top:6px;
     margin:0px;
     align-items:center;
     border-radius:20px;
-    width:180px;
-    display:flex;
+    /* width:190px; Don't change, smaller causes line break in network view */
+    /* display:flex; */
     flex-direction:column;
     justify-content:center;
+    /* display: inline-grid; */
 }
-.networkHelpIcon
+.helpIcon
 {
-  padding: 5px;
-  margin-left: 5px;
-  top: 55px;
-  position: absolute;
-  z-index:5;
+    padding: 5px;
+    margin-left: 0px;
+    top: 47px;
+    position: absolute;
+    z-index: 5;
 }
 #networkTree .netNodeText
 { 
@@ -1576,17 +1619,16 @@ input[readonly] {
     width: auto;
 }
 
+
 #networkTree .netCollapse
 {
-    display: block;
     position: absolute;
-    margin-left: 170px;    
-    font-size: large;
-    left: -15px;
+    right: 0;
+    margin-right: -3px;
 }
 #networkTree .highlightedNode
 {
-    border: solid;
+    /* border: solid; */
     border-color:cyan;
 }
 #networkTree .netStatus-Off-line i,
@@ -1597,7 +1639,6 @@ input[readonly] {
 
 .spanNetworkTree {
     display: inline-block;
-    width: 135px;
     white-space: nowrap;
     overflow: hidden !important;
     text-overflow: ellipsis;
@@ -1613,6 +1654,11 @@ input[readonly] {
     /* margin-left: 0.2em; */
 }
 
+.networkTable .networkNodeTabHeaders a {
+    display: block;
+    height: 3em;
+}
+
 .networkTable .icon {
     /* padding-left:2em; */
     width:2em;
@@ -1631,7 +1677,6 @@ input[readonly] {
 
 .networkNodeTabHeaders
 {
-    max-width: 200px;
     text-overflow: ellipsis;
     overflow: hidden;
     text-wrap: nowrap;
@@ -1709,13 +1754,6 @@ input[readonly] {
     padding-top: 20px;
 }
 
-  
-.login-page .login-custom
-{
-    width:480px;
-    
-}
-
 /*Hidden special button*/
 
 @media (max-width: 365px) {
@@ -1840,6 +1878,179 @@ input[readonly] {
     height:50px;
 }
 
+/* -----------------------------------------------------------------------------
+   Workflows
+----------------------------------------------------------------------------- */
+#wf-content-wrapper
+{
+    display: grid;
+}
+
+#workflowContainer
+{
+    display: grid;
+}
+
+#workflowContainerWrap {
+    display: grid;
+}
+
+#workflowContainerWrap .panel-collapse 
+{
+    padding: 5px;
+}
+
+.workflows 
+{
+    max-width: 800px;
+}
+
+.workflows .col-sm-12, .workflows .col-sx-12
+{
+    padding-right: 5px;
+    padding-left: 5px;
+}
+
+.workflows .add-button-wrap .button-container
+{
+    padding-bottom: 5px;
+    text-align: center;
+}
+
+.workflows .actions-list {
+
+    display: block;
+}
+
+.workflows .form-group {
+    margin-bottom: 7px;
+    z-index: 1;
+    display: flex;
+    opacity: 0.7;
+}
+
+.workflows .section-title
+{
+    padding: 10px;
+    font-weight: bolder;
+    font-size: large;
+}
+
+.workflows .panel, .workflows .box   {
+    padding-top: 5px;
+    padding-bottom: 5px;
+
+}
+
+.workflows .btn-secondary{
+    color: #000;
+}
+
+.workflows .button-container 
+{
+    /* display: contents; */
+    text-align: center;
+    /* width: 100%; */
+}
+
+/* .workflows .panel:hover{
+    opacity: 1;
+}
+
+.workflows .panel{
+    opacity: 0.8;
+} */
+
+.workflows .bottom-buttons button
+{
+    margin: 5px;
+}
+
+.workflows .button-container 
+{
+    padding-right: 0px !important;
+    padding-left: 0px !important;
+}
+
+/* .workflows .condition-list button
+{
+    margin: 2px;
+} */
+
+/* .button-container button
+{
+    width:100%; 
+} */
+
+.red-hover-text:hover
+{
+    color: var(--color-red) !important;    
+}
+
+.green-hover-text:hover
+{
+    color: var(--color-green) !important;
+}
+ 
+.workflows .bckg-icon-1-line
+{
+    font-size: 3em;
+    display: block;
+    position: absolute;
+    opacity: 0.1;
+    right: 0.1em;
+}
+.workflows .bckg-icon-2-line
+{
+    font-size: 6em;
+    display: block;
+    position: absolute;
+    opacity: 0.1;
+    right: 0.1em;
+}
+.workflows .bckg-icon-3-line
+{
+    font-size: 9em;
+    display: block;
+    position: absolute;
+    opacity: 0.1;
+    right: 0.1em;
+}
+
+
+.workflows .remove-condition
+{
+    z-index: 1;
+}
+
+.workflows .workflow-card 
+{
+    display: block;
+}
+
+.workflow-card .panel-title
+{
+    padding: 10px;
+}
+
+.workflow-card, .actions-list 
+{
+    display: contents;
+    padding: 5px;
+    padding-left: 10px;
+}
+
+.condition-list
+{
+    z-index:1;
+}
+
+.condition 
+{
+    padding: 5px;
+    padding-left: 10px;
+}
+
 /* -----------------------------------------------------------------------------
    Floating edit button
 ----------------------------------------------------------------------------- */

front/css/system-dark-patch.css

@@ -744,4 +744,5 @@
 .thresholdFormControl
 {
   color:#000;   
-}
+}
+

front/deviceDetailsEdit.php

@@ -63,14 +63,14 @@
 
       // some race condition, need to implement delay
       setTimeout(() => {
-        $.get('/php/server/query_json.php', { file: 'table_settings.json', nocache: Date.now() }, function(res) {  
+        $.get('php/server/query_json.php', { file: 'table_settings.json', nocache: Date.now() }, function(res) {  
         
         settingsData = res["data"];
 
         // columns to hide
         hiddenFields = ["NEWDEV_devScan", "NEWDEV_devPresentLastScan" ]
-        // columns to disable - conditional depending if a new dummy device is created
-        disabledFields =  mac == "new" ? ["NEWDEV_devLastNotification", "NEWDEV_devFirstConnection", "NEWDEV_devLastConnection"] : ["NEWDEV_devLastNotification", "NEWDEV_devFirstConnection", "NEWDEV_devLastConnection", "NEWDEV_devMac", "NEWDEV_devLastIP", "NEWDEV_devSyncHubNode" ];
+        // columns to disable/readonly - conditional depending if a new dummy device is created
+        disabledFields =  mac == "new" ? ["NEWDEV_devLastNotification", "NEWDEV_devFirstConnection", "NEWDEV_devLastConnection"] : ["NEWDEV_devLastNotification", "NEWDEV_devFirstConnection", "NEWDEV_devLastConnection", "NEWDEV_devMac", "NEWDEV_devLastIP", "NEWDEV_devSyncHubNode", "NEWDEV_devFQDN" ];
         
         // Grouping of fields into categories with associated documentation links
         const fieldGroups = {
@@ -82,16 +82,7 @@
                 inputGroupClasses: "field-group main-group col-lg-4 col-sm-6 col-xs-12",
                 labelClasses: "col-sm-4 col-xs-12 control-label",
                 inputClasses: "col-sm-8 col-xs-12 input-group"
-            },
-            // Group for session information
-            DevDetail_SessionInfo_Title: {
-                data: ["devStatus", "devLastConnection", "devFirstConnection"],
-                docs: "https://github.com/jokob-sk/NetAlertX/blob/main/docs/SESSION_INFO.md",
-                iconClass: "fa fa-calendar",
-                inputGroupClasses: "field-group session-group col-lg-4 col-sm-6 col-xs-12",
-                labelClasses: "col-sm-4 col-xs-12 control-label",
-                inputClasses: "col-sm-8 col-xs-12 input-group"
-            },
+            },            
              // Group for event and alert settings
              DevDetail_EveandAl_Title: {
                 data: ["devAlertEvents", "devAlertDown", "devSkipRepeated"],
@@ -119,6 +110,15 @@
                 labelClasses: "col-sm-4 col-xs-12 control-label",
                 inputClasses: "col-sm-8 col-xs-12 input-group"
             },
+            // Group for session information
+            DevDetail_SessionInfo_Title: {
+                data: ["devStatus", "devLastConnection", "devFirstConnection", "devFQDN"],
+                docs: "https://github.com/jokob-sk/NetAlertX/blob/main/docs/SESSION_INFO.md",
+                iconClass: "fa fa-calendar",
+                inputGroupClasses: "field-group session-group col-lg-4 col-sm-6 col-xs-12",
+                labelClasses: "col-sm-4 col-xs-12 control-label",
+                inputClasses: "col-sm-8 col-xs-12 input-group"
+            },
             // Group for Custom properties.
             DevDetail_CustomProperties_Title: {
                 data: ["devCustomProps"],
@@ -173,7 +173,7 @@
 
                     // Additional form elements like the random MAC address button for devMac
                     let inlineControl = "";
-                    // handle rendom mac
+                    // handle random mac
                     if (setting.setKey == "NEWDEV_devMac" && deviceData["devIsRandomMAC"] == true) {
                       inlineControl += `<span class="input-group-addon pointer"
                                               title="${getString("RandomMAC_hover")}">
@@ -266,7 +266,7 @@
       
       })
     
-      }, 1);
+      }, 100);
     });
   
   }
@@ -338,6 +338,7 @@
 
 
   // -----------------------------------------------------------------------------
+  // Save device data to DB
   function setDeviceData(direction = '', refreshCallback = '') {
     // Check MAC
     if (mac === '') {

front/deviceDetailsEvents.php

@@ -65,7 +65,7 @@ function initializeSessionsDatatable () {
         // Replace HTML codes
         {targets: [0],
           'createdCell': function (td, cellData, rowData, row, col) {
-            $(td).html (translateHTMLcodes (cellData));
+            $(td).html (translateHTMLcodes (localizeTimestamp(cellData)));
         } }
     ],
 

front/deviceDetailsPresence.php

@@ -219,9 +219,8 @@ function initializeCalendar() {
     },
 
     eventRender: function (event, element) {
-      $(element).tooltip({container: 'body', placement: 'bottom',
-                          title: event.tooltip});
-      // element.attr ('title', event.tooltip);  // Alternative tooltip
+      // $(element).tooltip({container: 'body', placement: 'bottom',  title: event.tooltip});
+      element.attr ('title', event.tooltip);  // Alternative tooltip
     },
       
     loading: function( isLoading, view ) {

front/deviceDetailsSessions.php

@@ -47,9 +47,28 @@
           {visible:   false,  targets: [0]},
 
           // Replace HTML codes
-          {targets: [1,2,3,5],
+          {targets: [3,5],
             'createdCell': function (td, cellData, rowData, row, col) {
               $(td).html (translateHTMLcodes (cellData));
+          } },
+           // Date
+          {targets: [1,2],
+            "createdCell": function (td, cellData, rowData, row, col) {
+              // console.log(cellData);
+              
+              if (!cellData.includes("missing event") && !cellData.includes("..."))
+              {               
+                if (cellData.includes("+")) { // Check if timezone offset is present
+                  cellData = cellData.split('+')[0]; // Remove timezone offset
+                } 
+                // console.log(cellData);
+                result = localizeTimestamp(cellData);
+              } else
+              {
+                result = translateHTMLcodes(cellData)
+              }
+              
+              $(td).html (result);              
           } }
       ],
 

front/devices.php

@@ -74,10 +74,10 @@
 
             <!-- box-header -->
             <div class="box-header">
-              <div class=" col-md-9 ">
+              <div class=" col-sm-8 ">
                 <h3 id="tableDevicesTitle" class="box-title text-gray "></h3>  
               </div>    
-              <div  class="dummyDevice col-md-3 ">
+              <div  class="dummyDevice col-sm-4 ">
                 <span id="multiEditPlc">
                   <!-- multi edit button placeholder -->
                 </span>
@@ -123,7 +123,7 @@
 <!-- page script ----------------------------------------------------------- -->
 <script>
   var deviceStatus    = 'all';
-  var tableRows       = getCache ("nax_parTableRows") == "" ? 10 : getCache ("nax_parTableRows") ;
+  var tableRows       = getCache ("nax_parTableRows") == "" ? 20 : getCache ("nax_parTableRows") ;
   var tableOrder      = getCache ("nax_parTableOrder") == "" ? [[3,'desc'], [0,'asc']] : JSON.parse(getCache ("nax_parTableOrder")) ;
   
   var tableColumnHide = [];
@@ -218,7 +218,7 @@ function getDevicesTotals() {
 
         // Attempt to fetch data
         $.ajax({
-            url: '/php/server/query_json.php',
+            url: 'php/server/query_json.php',
             type: "GET",
             dataType: "json",
             data: {
@@ -336,7 +336,7 @@ let columnFilters = [];
 function initFilters() {
     // Attempt to fetch data
     $.ajax({
-        url: '/php/server/query_json.php',
+        url: 'php/server/query_json.php',
         type: "GET",
         dataType: "json",
         data: {
@@ -538,7 +538,8 @@ function mapColumnIndexToFieldName(index, tableColumnVisible) {
     "devSourcePlugin",
     "devPresentLastScan",
     "devAlertDown",
-    "devCustomProps"
+    "devCustomProps",
+    "devFQDN"
   ];
 
   // console.log("OrderBy: " + columnNames[tableColumnOrder[index]]);  
@@ -648,6 +649,7 @@ function initializeDatatable (status) {
                 devParentChildrenCount
                 devIpLong
                 devCustomProps
+                devFQDN
               }
               count
             }
@@ -722,7 +724,8 @@ function initializeDatatable (status) {
                 device.devSourcePlugin || "",
                 device.devPresentLastScan || "",
                 device.devAlertDown || "",
-                device.devCustomProps || ""
+                device.devCustomProps || "",
+                device.devFQDN || ""
             ];
 
             const newRow = [];
@@ -737,12 +740,13 @@ function initializeDatatable (status) {
     },
     'paging'       : true,
     'lengthChange' : true,
-    'lengthMenu'   : [[10, 25, 50, 100, 500, 100000], [10, 25, 50, 100, 500, getString('Device_Tablelenght_all')]],
+    'lengthMenu'   : [[10, 20, 25, 50, 100, 500, 100000], [10, 20, 25, 50, 100, 500, getString('Device_Tablelenght_all')]],
     'searching'    : true,
 
     'ordering'     : true,
     'info'         : true,
     'autoWidth'    : false,
+    'dom': '<"top"f>rtl<"bottom"ip><"clear">',
 
     // Parameters
     'pageLength'   : tableRows,
@@ -759,13 +763,13 @@ function initializeDatatable (status) {
       {visible:   false,         targets: tableColumnHide },      
       {className: 'text-center', targets: [mapIndx(4), mapIndx(9), mapIndx(10), mapIndx(15), mapIndx(18)] },      
       {className: 'iconColumn text-center',  targets: [mapIndx(3)]},      
-      {width:     '80px',        targets: [mapIndx(6), mapIndx(7), mapIndx(15)] },      
+      {width:     '80px',        targets: [mapIndx(6), mapIndx(7), mapIndx(15), mapIndx(27)] },      
       {width:     '85px',        targets: [mapIndx(9)] },      
       {width:     '30px',        targets: [mapIndx(3), mapIndx(10), mapIndx(13), mapIndx(18)] },      
       {orderData: [mapIndx(12)],          targets: mapIndx(8) },
 
-      // Device Name
-      {targets: [mapIndx(0)],
+      // Device Name and FQDN
+      {targets: [mapIndx(0), mapIndx(27)],
         'createdCell': function (td, cellData, rowData, row, col) {      
             
             // console.log(cellData)      
@@ -844,7 +848,7 @@ function initializeDatatable (status) {
       {targets: [mapIndx(26)],
         'createdCell': function (td, cellData, rowData, row, col) {
             if (!emptyArr.includes(cellData)){
-              $(td).html (`<span>${renderCustomProps(cellData, rowData[mapIndx(11)])}<span>`);
+              $(td).html (`<span>${renderCustomProps(cellData, rowData[mapIndx(11)])}</span>`);
             } else {
               $(td).html ('');
             }
@@ -987,7 +991,7 @@ function handleLoadingDialog(needsReload = false)
 {
   // console.log(`needsReload: ${needsReload}`); 
 
-  $.get('/php/server/query_logs.php?file=execution_queue.log&nocache=' + Date.now(), function(data) {     
+  $.get('php/server/query_logs.php?file=execution_queue.log&nocache=' + Date.now(), function(data) {     
 
     if(data.includes("update_api|devices"))
     {       

front/events.php

@@ -216,7 +216,7 @@ function initializeDatatable () {
       } },
 
       // Replace HTML codes
-      {targets: [3,4,5,6,7],
+      {targets: [4,5,6,7],
         "createdCell": function (td, cellData, rowData, row, col) {
           $(td).html (translateHTMLcodes (cellData));
       } },
@@ -226,6 +226,12 @@ function initializeDatatable () {
         "createdCell": function (td, cellData, rowData, row, col) {
           // console.log(cellData);
           $(td).html (cellData);
+      } },
+      // Date
+      {targets: [3],
+        "createdCell": function (td, cellData, rowData, row, col) {
+          // console.log(cellData);
+          $(td).html (localizeTimestamp(cellData));
       } }
     ],
 

front/help_faq.php

@@ -1,230 +0,0 @@
-<?php
-  require 'php/templates/header.php';
-  require 'php/templates/notification.php';
-?>
-<!-- Page ------------------------------------------------------------------ -->
-<div class="content-wrapper">
-    <!-- Main content ---------------------------------------------------------- -->
-    <section class="content">
-      <h4>
-        <i class="fa fa-question"></i>
-        <?= lang('HelpFAQ_Cat_General');?>
-      </h4>
-
-       <div class="panel-group" id="accordion_gen">
-        <div class="panel panel-default">
-
-          <div class="panel-heading">
-            <h4 class="panel-title">
-              <a data-toggle="collapse" data-parent="#accordion_gen" href="#collapse100">
-              <?= lang('HelpFAQ_Cat_General_100_head');?></a>
-            </h4>
-          </div>
-
-          <div id="collapse100" class="panel-collapse collapse" style="font-size: 16px;">
-            <div class="panel-body"><?= lang('HelpFAQ_Cat_General_100_text_a');?>
-              <span class="text-danger help_faq_code"><?php echo date_default_timezone_get(); ?></span><br>
-              <?= lang('HelpFAQ_Cat_General_100_text_b');?> 
-              <span class="text-danger help_faq_code"><?php echo php_ini_loaded_file(); ?></span><br>
-              <?= lang('HelpFAQ_Cat_General_100_text_c');?>
-            </div>
-          </div>
-
-        </div>
-
-        
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            <h4 class="panel-title">
-              <a data-toggle="collapse" data-parent="#accordion_gen" href="#collapse101">
-              <?= lang('HelpFAQ_Cat_General_101_head');?></a>
-            </h4>
-          </div>
-          <div id="collapse101" class="panel-collapse collapse" style="font-size: 16px;">
-            <div class="panel-body">
-              <?= lang('HelpFAQ_Cat_General_101_text');?>
-            </div>
-          </div>
-        </div>
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            <h4 class="panel-title">
-              <a data-toggle="collapse" data-parent="#accordion_gen" href="#collapse102">
-              <?= lang('HelpFAQ_Cat_General_102_head');?></a>
-            </h4>
-          </div>
-          <div id="collapse102" class="panel-collapse collapse" style="font-size: 16px;">
-            <div class="panel-body">
-              <?= lang('HelpFAQ_Cat_General_102_text');?>
-            </div>
-          </div>
-        </div>
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            <h4 class="panel-title">
-              <a data-toggle="collapse" data-parent="#accordion_gen" href="#collapse102docker">
-              <?= lang('HelpFAQ_Cat_General_102docker_head');?></a>
-            </h4>
-          </div>
-          <div id="collapse102docker" class="panel-collapse collapse" style="font-size: 16px;">
-            <div class="panel-body">
-              <?= lang('HelpFAQ_Cat_General_102docker_text');?>
-            </div>
-          </div>
-        </div>
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            <h4 class="panel-title">
-              <a data-toggle="collapse" data-parent="#accordion_gen" href="#collapse103">
-              <?= lang('HelpFAQ_Cat_General_103_head');?></a>
-            </h4>
-          </div>
-          <div id="collapse103" class="panel-collapse collapse" style="font-size: 16px;">
-            <div class="panel-body">
-              <?= lang('HelpFAQ_Cat_General_103_text');?>
-            </div>
-          </div>
-          <div class="panel panel-default">
-          <div class="panel-heading">
-            <h4 class="panel-title">
-              <a data-toggle="collapse" data-parent="#accordion_net" href="#collapse601">
-              <?= lang('HelpFAQ_Cat_Network_601_head');?></a>
-            </h4>
-          </div>
-          <div id="collapse601" class="panel-collapse collapse" style="font-size: 16px;">
-            <div class="panel-body">
-              <?= lang('HelpFAQ_Cat_Network_601_text');?>
-            </div>
-          </div>
-        </div>
-        </div>
-      </div> 
-
-<h4>
-  <i class="fa fa-laptop"></i>
-  <?= lang('Navigation_Devices');?>
-</h4>
- <div class="panel-group" id="accordion_dev">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion_dev" href="#collapse200">
-        <?= lang('HelpFAQ_Cat_Device_200_head');?></a>
-      </h4>
-    </div>
-    <div id="collapse200" class="panel-collapse collapse" style="font-size: 16px;">
-      <div class="panel-body">
-         <?= lang('HelpFAQ_Cat_Device_200_text');?>
-      </div>
-    </div>
-  </div>
-</div> 
-
-
-<h4>
-  <i class="fa fa-info-circle"></i><?= lang('HelpFAQ_Cat_Detail');?></h4>
- <div class="panel-group" id="accordion_det">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion_det" href="#collapse300">
-        <?= lang('HelpFAQ_Cat_Detail_300_head');?> "<?= lang('DevDetail_MainInfo_Network');?>" / "<?= lang('DevDetail_MainInfo_Network_Port');?>"?</a>
-      </h4>
-    </div>
-    <div id="collapse300" class="panel-collapse collapse" style="font-size: 16px;">
-      <div class="panel-body">
-        "<?= lang('DevDetail_MainInfo_Network');?>" <?= lang('HelpFAQ_Cat_Detail_300_text_a');?><br>
-        "<?= lang('DevDetail_MainInfo_Network_Port');?>" <?= lang('HelpFAQ_Cat_Detail_300_text_b');?>
-      </div>
-    </div>
-  </div>
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion_det" href="#collapse302">
-        <?= lang('HelpFAQ_Cat_Detail_302_head_a');?> "<?= lang('DevDetail_EveandAl_RandomMAC');?>" <?= lang('HelpFAQ_Cat_Detail_302_head_b');?></a>
-      </h4>
-    </div>
-    <div id="collapse302" class="panel-collapse collapse" style="font-size: 16px;">
-      <div class="panel-body">
-        <?= lang('HelpFAQ_Cat_Detail_302_text');?>
-      </div>
-    </div>
-  </div>
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion_det" href="#collapse303">
-        <?= lang('HelpFAQ_Cat_Detail_303_head');?></a>
-      </h4>
-    </div>
-    <div id="collapse303" class="panel-collapse collapse" style="font-size: 16px;">
-      <div class="panel-body">
-        <?= lang('HelpFAQ_Cat_Detail_303_text');?>
-      </div>
-    </div>
-
-  </div>
-</div> 
-
-<h4>
-  <i class="fa fa-calendar"></i>
-  <?= lang('Navigation_Presence');?>
-</h4>
- <div class="panel-group" id="accordion_pre">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion_pre" href="#collapse400">
-        <?= lang('HelpFAQ_Cat_Presence_400_head');?></a>
-      </h4>
-    </div>
-    <div id="collapse400" class="panel-collapse collapse" style="font-size: 16px;">
-      <div class="panel-body">
-        <?= lang('HelpFAQ_Cat_Presence_400_text');?>
-      </div>
-    </div>
-  </div>
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion_pre" href="#collapse401">
-        <?= lang('HelpFAQ_Cat_Presence_401_head');?></a>
-      </h4>
-    </div>
-    <div id="collapse401" class="panel-collapse collapse" style="font-size: 16px;">
-      <div class="panel-body">
-        <?= lang('HelpFAQ_Cat_Presence_401_text');?>
-      </div>
-    </div>
-  </div>
-</div> 
-
-<h4>
-  <i class="fa fa-network-wired"></i><?= lang('Navigation_Network');?></h4>
- <div class="panel-group" id="accordion_net">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion_net" href="#collapse600">
-        <?= lang('HelpFAQ_Cat_Network_600_head');?></a>
-      </h4>
-    </div>
-    <div id="collapse600" class="panel-collapse collapse" style="font-size: 16px;">
-      <div class="panel-body">
-        <?= lang('HelpFAQ_Cat_Network_600_text');?>
-      </div>
-    </div>
-  
-</div> 
-
-    </section>
-    <br>
-    <!-- /.content -->
-</div>
-  <!-- /.content-wrapper -->
-
-<!-- ----------------------------------------------------------------------- -->
-<?php
-  require 'php/templates/footer.php';
-?>

front/index.php

@@ -2,10 +2,13 @@
 <link rel="stylesheet" href="css/app.css">
 
 <?php
-require dirname(__FILE__).'/php/server/init.php';
+
 //------------------------------------------------------------------------------
 // check if authenticated
-require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+// Be CAREFUL WHEN INCLUDING NEW PHP FILES
+require_once $_SERVER['DOCUMENT_ROOT'] . '/php/server/db.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/php/templates/language/lang.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
 
 $CookieSaveLoginName = 'NetAlertX_SaveLogin';
 
@@ -26,7 +29,7 @@ if (isset ($_GET["action"]) && $_GET["action"] == 'logout')
 }
 
 // Password without Cookie check -> pass and set initial cookie
-if (isset ($_POST["loginpassword"]) && $nax_Password == hash('sha256',$_POST["loginpassword"]))
+if (isset ($_POST["loginpassword"]) && $nax_Password === hash('sha256',$_POST["loginpassword"]))
 {
     header('Location: devices.php');
     $_SESSION["login"] = 1;
@@ -34,7 +37,7 @@ if (isset ($_POST["loginpassword"]) && $nax_Password == hash('sha256',$_POST["lo
 }
 
 // active Session or valid cookie (cookie not extends)
-if (( isset ($_SESSION["login"]) && ($_SESSION["login"] == 1)) || (isset ($_COOKIE[$CookieSaveLoginName]) && $nax_Password == $_COOKIE[$CookieSaveLoginName]))
+if (( isset ($_SESSION["login"]) && ($_SESSION["login"] == 1)) || (isset ($_COOKIE[$CookieSaveLoginName]) && $nax_Password === $_COOKIE[$CookieSaveLoginName]))
 {
     header('Location: devices.php');
     $_SESSION["login"] = 1;
@@ -50,7 +53,7 @@ $login_icon = 'fa-info';
 // no active session, cookie not checked
 if (isset ($_SESSION["login"]) == FALSE || $_SESSION["login"] != 1)
 {
-  if ($nax_Password == '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92') 
+  if ($nax_Password === '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92') 
   {
     $login_info = lang('Login_Default_PWD');
     $login_mode = 'danger';
@@ -92,10 +95,8 @@ if (isset ($_SESSION["login"]) == FALSE || $_SESSION["login"] != 1)
   <!-- iCheck -->
   <link rel="stylesheet" href="lib/iCheck/square/blue.css">
   <!-- Font Awesome -->
-  <link rel="stylesheet" href="lib/font-awesome/fontawesome.min.css">
-  <link rel="stylesheet" href="lib/font-awesome/solid.css">
-  <link rel="stylesheet" href="lib/font-awesome/brands.css">
-  <link rel="stylesheet" href="lib/font-awesome/v5-font-face.css">
+  <link rel="stylesheet" href="lib/font-awesome/all.min.css">
+
   <!-- Favicon -->
   <link id="favicon" rel="icon" type="image/x-icon" href="img/NetAlertX_logo.png">
 
@@ -112,7 +113,7 @@ switch ($UI_THEME) {
 ?>
   <link rel="stylesheet" href="/css/offline-font.css">
 </head>
-<body class="hold-transition login-page">
+<body class="hold-transition login-page col-sm-12 col-sx-12">
 <div class="login-box login-custom">
   <div class="login-logo">
     <a href="/index2.php">Net<b>Alert</b><sup>x</sup></a>

front/initCheck.php

@@ -0,0 +1,52 @@
+<?php
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+?>
+
+    <div class="col-md-12">
+      <div class="py-5">
+        <div class="mt-4 text-center" id="check-status-plc" >
+          <div class="alert alert-warning">
+            <i class="fa-solid fa-spinner fa-spin text-secondary"></i> <?= lang('Maintenance_InitCheck_Checking');?>
+          </div>
+        </div>
+        <div class="mt-4 text-center" id="check-status" style="display: none;">
+          <div class="alert alert-success">
+            <i class="fa-solid fa-check text-success"></i> <?= lang('Maintenance_InitCheck_Success');?>
+          </div>
+        </div>
+        
+        <div class="row">
+          <div class="col-12">
+            <div class="d-flex flex-wrap gap-2 w-100" id="file-check-list"></div>        
+          </div>
+        </div>
+        <div class="row">
+          <div class="text-center box box-secondary col-md-6">
+            <p class="text-muted"><?= lang('Maintenance_InitCheck_QuickSetupGuide');?></p>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-md-12 center text-center" >
+              <button type="button" class=" col-md-12 btn btn-default bg-green " onclick="retryCheck()"><?= lang('Maintenance_ReCheck');?></button>
+            </div>
+        </div>
+      </div>
+    </div>
+
+<script>
+  
+  function retryCheck() {
+    // re-set page
+    $('#file-check-list').empty();
+    $('#check-status').hide();
+    $('#check-status-plc').show();
+    // re-run check
+    checkAppInitializedJsonInit();
+  }
+
+  $(document).ready(() => {
+    checkAppInitializedJsonInit();
+  });
+</script>

front/js/common.js

@@ -113,7 +113,7 @@ function deleteAllCookies() {
 function cacheSettings()
 {
   return new Promise((resolve, reject) => {
-    if(!getCache('completedCalls').includes('cacheSettings'))
+    if(!getCache('cacheSettings_completed') === true)
     {  
       $.get('php/server/query_json.php', { file: 'table_settings.json', nocache: Date.now() }, function(resSet) { 
 
@@ -211,8 +211,18 @@ function getSetting (key) {
 function cacheStrings() {
   return new Promise((resolve, reject) => {
     
-      // Create a promise for each language
-      languagesToLoad = ['en_us', getLangCode()]
+      // Create a promise for each language (include en_us by default as fallback)
+      languagesToLoad = ['en_us']
+
+      additionalLanguage = getLangCode()
+
+      if(additionalLanguage != 'en_us')
+      {
+        languagesToLoad.push(additionalLanguage)
+      }
+
+      console.log(languagesToLoad);
+      
       const languagePromises = languagesToLoad.map((language_code) => {
         return new Promise((resolveLang, rejectLang) => {
           // Fetch core strings and translations
@@ -235,7 +245,7 @@ function cacheStrings() {
                   });
 
                   // Handle successful completion of language processing
-                  handleSuccess(`cacheStrings[${language_code}]`, resolveLang);
+                  handleSuccess(`cacheStrings`, resolveLang);
                 })
                 .fail((pluginError) => {
                   // Handle failure in plugin strings fetching
@@ -353,6 +363,30 @@ function getLangCode() {
 // String utilities
 // -----------------------------------------------------------------------------
 
+
+function localizeTimestamp(result)
+{
+  // contains TZ in format Europe/Berlin
+  tz = getSetting("TIMEZONE")
+
+  // set default if not available or app still loading
+  tz == ""  ? tz = 'Europe/Berlin' : tz = tz;
+  
+  const date = new Date(result); // Assumes result is a timestamp or ISO string
+  const formatter = new Intl.DateTimeFormat('default', {
+    timeZone: tz,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    hour12: false // change to true if you want AM/PM format
+  });
+
+  return formatter.format(date);
+}
+
 // ----------------------------------------------------
 /**
  * Replaces double quotes within single-quoted strings, then converts all single quotes to double quotes,
@@ -1303,6 +1337,38 @@ $(document).ready(function() {
   }
 });
 
+// -----------------------------------------------------------
+// Restart Backend Python Server
+
+function askRestartBackend() {
+  // Ask 
+  showModalWarning(getString('Maint_RestartServer'), getString('Maint_Restart_Server_noti_text'),
+  getString('Gen_Cancel'), getString('Maint_RestartServer'), 'restartBackend');
+}
+
+// -----------------------------------------------------------
+function restartBackend() {
+
+  modalEventStatusId = 'modal-message-front-event'
+  
+  // Execute
+  $.ajax({
+      method: "POST",
+      url: "php/server/util.php",
+      data: { function: "addToExecutionQueue", action: `${getGuid()}|cron_restart_backend`  },
+      success: function(data, textStatus) {
+          // showModalOk ('Result', data );
+
+          // show message
+          showModalOk(getString("general_event_title"), `${getString("general_event_description")}  <br/> <br/> <code id='${modalEventStatusId}'></code>`);
+
+          updateModalState()
+
+          write_notification('[Maintenance] App manually restarted', 'info')
+      }
+    })
+}
+
 // -----------------------------------------------------------------------------
 // initialize
 // -----------------------------------------------------------------------------
@@ -1312,8 +1378,8 @@ $(document).ready(function() {
 const sessionStorageKey = "myScriptExecuted_common_js";
 var completedCalls = []
 var completedCalls_final = ['cacheSettings', 'cacheStrings', 'cacheDevices'];
-var completedCallsCount  = 0; 
-var completedCallsCount_final;
+var lang_completedCalls = 0;
+
 
 // -----------------------------------------------------------------------------
 // Clearing all the caches
@@ -1399,12 +1465,27 @@ async function isGraphQLServerRunning() {
 // Check if the code has been executed before by checking sessionStorage
 function isAppInitialized() {
 
-  completedCalls = parseInt(getCache("completedCallsCount"));
-  shouldBeCompletedCalls = getLangCode() == 'en_us' ? 3 : 4;
+  lang_shouldBeCompletedCalls = getLangCode() == 'en_us' ? 1 : 2;
 
-  return (
-    completedCalls >= shouldBeCompletedCalls
-  );
+  // check if each ajax call completed succesfully 
+  $.each(completedCalls_final, function(index, call_name){
+
+    if(getCache(call_name + "_completed") != "true")
+    {
+      console.log(`[isAppInitialized] AJAX call ${call_name} unsuccesful: ${getCache(call_name + "_completed")}`)
+      return false;
+    }
+
+  });
+
+  // check if all required languages chached
+  if(parseInt(getCache("cacheStringsCountCompleted")) != lang_shouldBeCompletedCalls)
+  {
+    console.log(`[isAppInitialized] AJAX call cacheStrings unsuccesful: ${getCache("cacheStringsCountCompleted")} out of ${lang_shouldBeCompletedCalls}`)
+    return false;
+  }
+
+  return true;
 }
 
 // -----------------------------------------------------------------------------
@@ -1435,27 +1516,25 @@ async function executeOnce() {
 // Function to handle successful completion of an AJAX call
 const handleSuccess = (callName) => {
   console.log(`AJAX call successful: ${callName}`);
-  // completedCalls.push(callName);
-  // setCache('completedCalls', mergeUniqueArrays(getCache('completedCalls').split(','), [callName]));
 
-  val = getCache('completedCallsCount');
-
-  if(val == "")
+  if(callName.includes("cacheStrings"))
   {
-    val = 0;
-  } else
-  {
-    val = parseInt(val)
+    completed_tmp = getCache("cacheStringsCountCompleted");
+    completed_tmp == "" ? completed_tmp = 0 : completed_tmp = completed_tmp;
+    completed_tmp++;
+    setCache("cacheStringsCountCompleted", completed_tmp);
   }
 
-  setCache('completedCallsCount', val + 1)
+  setCache(callName + "_completed", true)
 };
 
 // -----------------------------------------------------------------------------
 // Function to handle failure of an AJAX call
 const handleFailure = (callName, callback) => {
-  console.error(`AJAX call ${callName} failed`);
+  msg = `AJAX call ${callName} failed`
+  console.error(msg);
   // Implement retry logic here if needed
+  // write_notification(msg, 'interrupt')
 };
 
 // -----------------------------------------------------------------------------

front/js/db_methods.js

@@ -85,7 +85,7 @@ function renderList(
 // Check if database is locked
 function checkDbLock() {
   $.ajax({
-    url: "/php/server/query_logs.php?file=db_is_locked.log", 
+    url: "php/server/query_logs.php?file=db_is_locked.log", 
     type: "GET",
 
     success: function (response) {

front/js/handle_version.js

@@ -33,7 +33,7 @@ function versionUpdateUI(){
 // Checks if a new version is available via the global app_state.json
 function checkIfNewVersionAvailable()
 {
-  $.get('/php/server/query_json.php', { file: 'app_state.json', nocache: Date.now() }, function(appState) {   
+  $.get('php/server/query_json.php', { file: 'app_state.json', nocache: Date.now() }, function(appState) {   
     
     // console.log(appState["isNewVersionChecked"])
     // console.log(appState["isNewVersion"])
@@ -48,4 +48,4 @@ function checkIfNewVersionAvailable()
 }
 
 // handle the dispaly of the NEW icon
-checkIfNewVersionAvailable()
+checkIfNewVersionAvailable()

front/js/modal.js

@@ -68,11 +68,13 @@ function showModalWarning(
   callbackFunction = null,
   triggeredBy = null
 ) {
+  prefix = "modal-warning";
+
   // set captions
-  $("#modal-warning-title").html(title);
-  $("#modal-warning-message").html(message);
-  $("#modal-warning-cancel").html(btnCancel);
-  $("#modal-warning-OK").html(btnOK);
+  $(`#${prefix}-title`).html(title);
+  $(`#${prefix}-message`).html(message);
+  $(`#${prefix}-cancel`).html(btnCancel);
+  $(`#${prefix}-OK`).html(btnOK);
 
   if (callbackFunction != null) {
     modalCallbackFunction = callbackFunction;
@@ -83,7 +85,7 @@ function showModalWarning(
   }
 
   // Show modal
-  $("#modal-warning").modal("show");
+  $(`#${prefix}`).modal("show");
 }
 
 // -----------------------------------------------------------------------------
@@ -93,7 +95,8 @@ function showModalInput(
   btnCancel = getString("Gen_Cancel"),
   btnOK = getString("Gen_Okay"),
   callbackFunction = null,
-  triggeredBy = null  
+  triggeredBy = null,
+  defaultValue = ""  
 ) {
   prefix = "modal-input";
 
@@ -102,6 +105,7 @@ function showModalInput(
   $(`#${prefix}-message`).html(message);
   $(`#${prefix}-cancel`).html(btnCancel);
   $(`#${prefix}-OK`).html(btnOK);
+  $(`#${prefix}-textarea`).val(defaultValue);
 
   if (callbackFunction != null) {
     modalCallbackFunction = callbackFunction;

front/js/settings_utils.js

@@ -433,7 +433,7 @@ function initListInteractionOptions(element) {
       if (clickCounter === 1) {
         // Single-click action
         showModalFieldInput(
-          `<i class="fa-regular fa-pen-to-square"></i> ${getString(
+          `<i class="fa fa-pen-to-square"></i> ${getString(
             "Gen_Update_Value"
           )}`,
           getString("settings_update_item_warning"),

front/js/tests.js

@@ -26,6 +26,134 @@ function lockDatabase(delay=20) {
 }
 
 
+const requiredFiles = [
+    'app_state.json',
+    'plugins.json',
+    'table_devices.json',
+    'table_devices_filters.json',
+    'table_devices_tiles.json',
+    'table_notifications.json',
+    'table_online_history.json',
+    'table_appevents.json',
+    'table_custom_endpoint.json',
+    'table_events_pending_alert.json',
+    'table_plugins_events.json',
+    'table_plugins_history.json',
+    'table_plugins_language_strings.json',
+    'table_plugins_objects.json',
+    'table_settings.json',
+    'user_notifications.json'
+  ];
+
+  const internalChecks = ['isAppInitialized', 'isGraphQLServerRunning'];
+
+  const fileStatus = {}; // Track file check results
+
+  function updateFileStatusUI(file, status) {
+    const item = $(`#file-${file.replace(/[^a-z0-9]/gi, '-')}`);
+    const icon = item.find('span.icon-wrap');
+  
+    if (status === 'ok') {
+      icon.html('<i class="fa-solid fa-check "></i>');
+    } else if (status === 'fail') {
+      icon.html('<i class="fa-solid fa-xmark "></i>');
+    } else {
+      icon.html('<i class="fa-solid fa-spinner fa-spin text-secondary"></i>');
+    }
+  }
+  
+
+  function checkAppInitializedJson() {
+    requiredFiles.forEach(file => {
+      $.get('php/server/query_json.php', { file, nocache: Date.now() })
+        .done(() => {
+          if (fileStatus[file] !== 'ok') {
+            fileStatus[file] = 'ok';
+            updateFileStatusUI(file, 'ok');
+          }
+        })
+        .fail(() => {
+          fileStatus[file] = 'fail';
+          updateFileStatusUI(file, 'fail');
+        });
+    });
+  
+    const allOk = requiredFiles.every(file => fileStatus[file] === 'ok');
+  
+    if (allOk) {
+      checkInternalStatusAfterFiles();
+    } else {
+      setTimeout(checkAppInitializedJson, 1000);
+    }
+  }
+  
+  
+  function checkInternalStatusAfterFiles() {
+    const promises = [
+      waitForAppInitialized().then(() => {
+        fileStatus['isAppInitialized'] = 'ok';
+        updateFileStatusUI('isAppInitialized', 'ok');
+      }).catch(() => {
+        fileStatus['isAppInitialized'] = 'fail';
+        updateFileStatusUI('isAppInitialized', 'fail');
+      }),
+  
+      waitForGraphQLServer().then(() => {
+        fileStatus['isGraphQLServerRunning'] = 'ok';
+        updateFileStatusUI('isGraphQLServerRunning', 'ok');
+      }).catch(() => {
+        fileStatus['isGraphQLServerRunning'] = 'fail';
+        updateFileStatusUI('isGraphQLServerRunning', 'fail');
+      })
+    ];
+  
+    Promise.allSettled(promises).then(() => {
+      const allPassed = internalChecks.every(key => fileStatus[key] === 'ok');
+      if (allPassed) {
+        $('#check-status').show();
+        $('#check-status-plc').hide();
+      } else {
+        setTimeout(checkInternalStatusAfterFiles, 1000);
+      }
+    });
+  }
+  function waitForAppInitialized() {
+    return new Promise((resolve, reject) => {
+      if (isAppInitialized()) {
+        resolve();
+      } else {
+        reject();
+      }
+    });
+  }
+
+// Initial UI setup for all items
+function checkAppInitializedJsonInit() {
+  const allItems = [...requiredFiles, ...internalChecks];
+
+  allItems.forEach(file => {
+    
+  
+    $('#file-check-list').append(`
+      <div class="panel panel-secondary col-xs-6 col-sm-4 col-md-3 col-lg-2 col-xxl-1 padding-5px">
+        <div class="file-checking border rounded p-2 d-flex flex-column justify-content-between h-100" id="file-${file.replace(/[^a-z0-9]/gi, '-')}">
+          <div class="d-flex align-items-center gap-2 mb-2">
+            <span class="file-name-wrap flex-grow-1 text-truncate" title="${file}">${file}</span>
+            <span class="icon-wrap align-items-center text-center"><i class="fa-solid fa-spinner fa-spin text-secondary"></i></span>
+          </div>
+        </div>
+      </div>
+    `);
+
+    fileStatus[file] = 'checking';
+  });
+
+  checkAppInitializedJson();
+}
+
+  
+
+
 
 
 

front/js/ui_components.js

@@ -200,9 +200,9 @@ function validateRegex(elem) {
 
       // Validate against regex
       if (regex.test(value)) {
-          iconSpan.html("<i class='fa-regular fa-check'></i>");
+          iconSpan.html("<i class='fa fa-check'></i>");
       } else {
-          iconSpan.html("<i class='fa-regular fa-xmark'></i>");
+          iconSpan.html("<i class='fa fa-xmark'></i>");
       }
   }
 
@@ -422,7 +422,7 @@ function updateModalState() {
   setTimeout(function() {
       // Fetch the content from the log file using an AJAX request
       $.ajax({
-          url: '/php/server/query_logs.php?file=execution_queue.log',
+          url: 'php/server/query_logs.php?file=execution_queue.log',
           type: 'GET',
           success: function(data) {
               // Update the content of the HTML element (e.g., a div with id 'logContent')

front/lib/font-awesome/solid.css

@@ -1,19 +0,0 @@
-/*!
- * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- * Copyright 2022 Fonticons, Inc.
- */
-:root, :host {
-  --fa-style-family-classic: 'Font Awesome 6 Free';
-  --fa-font-solid: normal 900 1em/1 'Font Awesome 6 Free'; }
-
-@font-face {
-  font-family: 'Font Awesome 6 Free';
-  font-style: normal;
-  font-weight: 900;
-  font-display: block;
-  src: url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.ttf") format("truetype"); }
-
-.fas,
-.fa-solid {
-  font-weight: 900; }

front/lib/font-awesome/solid.min.css

@@ -1,6 +0,0 @@
-/*!
- * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- * Copyright 2022 Fonticons, Inc.
- */
-:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-solid:normal 900 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}.fa-solid,.fas{font-weight:900}

front/lib/font-awesome/v5-font-face.css

@@ -1,22 +0,0 @@
-/*!
- * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- * Copyright 2022 Fonticons, Inc.
- */
-@font-face {
-  font-family: 'Font Awesome 5 Brands';
-  font-display: block;
-  font-weight: 400;
-  src: url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.ttf") format("truetype"); }
-
-@font-face {
-  font-family: 'Font Awesome 5 Free';
-  font-display: block;
-  font-weight: 900;
-  src: url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.ttf") format("truetype"); }
-
-@font-face {
-  font-family: 'Font Awesome 5 Free';
-  font-display: block;
-  font-weight: 400;
-  src: url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.ttf") format("truetype"); }

front/lib/font-awesome/v5-font-face.min.css

@@ -1,6 +0,0 @@
-/*!
- * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- * Copyright 2022 Fonticons, Inc.
- */
-@font-face{font-family:"Font Awesome 5 Brands";font-display:block;font-weight:400;src:url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.ttf) format("truetype")}@font-face{font-family:"Font Awesome 5 Free";font-display:block;font-weight:900;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}@font-face{font-family:"Font Awesome 5 Free";font-display:block;font-weight:400;src:url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.ttf) format("truetype")}

front/maintenance.php

@@ -51,7 +51,7 @@ $db->close();
           <div class="box" id="Maintain-Status">
               <div class="box-header with-border">
                 <h3 class="box-title">
-                  <i class="fa fa-display"></i></i>         
+                  <i class="fa fa-display"></i>         
                   <?= lang('Maintenance_Status');?>
                 </h3>
               </div>
@@ -59,7 +59,7 @@ $db->close();
                 <div class="db_info_table">
                     <div class="db_info_table_row">                      
                         <div class="db_info_table_cell" style="min-width: 140px"><?= lang('Maintenance_version');?>
-                          <a href="https://github.com/jokob-sk/NetAlertX/blob/main/docs/VERSIONS.md" target="_blank"> <span><i class="fa fa-circle-question"></i></a><span>
+                          <a href="https://github.com/jokob-sk/NetAlertX/blob/main/docs/VERSIONS.md" target="_blank"> <span><i class="fa fa-circle-question"></i></a></span>
                         </div>
                         <div class="db_info_table_cell">
                         <div class="version" id="version" data-build-time="<?php echo file_get_contents( "buildtimestamp.txt");?>">
@@ -111,7 +111,7 @@ $db->close();
       </div>
 
     <div class="nav-tabs-custom">
-    <ul class="nav nav-tabs">
+      <ul class="nav nav-tabs">
         <li class="active">
           <a id="tab_DBTools_id" href="#tab_DBTools" data-toggle="tab">
             <i class="fa fa-toolbox"></i> 
@@ -136,7 +136,13 @@ $db->close();
             <?= lang('Device_MultiEdit');?>
           </a>
         </li>
-    </ul>
+        <li>
+          <a id="tab_initCheck_id" href="#tab_initCheck" data-toggle="tab">
+            <i class="fa-solid fa-check"></i> 
+            <?= lang('Maintenance_InitCheck');?>
+          </a>
+        </li>
+      </ul>
     <div class="tab-content">
         <div class="tab-pane active" id="tab_DBTools">
                 <div class="db_info_table">
@@ -178,6 +184,8 @@ $db->close();
                     </div>
                 </div>
         </div>
+
+        <!-- ---------------------------Backup restore -------------------------------------------- -->
         <div class="tab-pane" id="tab_BackupRestore">
           <div class="db_info_table">
             <div class="db_info_table_row">
@@ -209,7 +217,13 @@ $db->close();
                     <button type="button" class="btn btn-default pa-btn pa-btn-delete bg-red dbtools-button" id="btnImportPastedConfig" onclick="askImportPastedConfig()"><?= lang('Maintenance_Tool_ImportPastedConfig');?></button>
                 </div>
                 <div class="db_tools_table_cell_b"><?= lang('Maintenance_Tool_ImportPastedConfig_text');?></div>
-            </div>                 
+            </div>
+            <div class="db_info_table_row">
+              <div class="db_tools_table_cell_a" >
+                  <button type="button" class="btn btn-default pa-btn bg-green dbtools-button" id="btnDownloadWorkflows" onclick="DownloadWorkflows()"><?= lang('Maintenance_Tool_DownloadWorkflows');?></button>
+              </div>
+              <div class="db_tools_table_cell_b"><?= lang('Maintenance_Tool_DownloadWorkflows_text');?></div>
+            </div>                    
           </div>
         </div>
         <!-- ---------------------------Logging-------------------------------------------- -->
@@ -239,11 +253,11 @@ $db->close();
               </div>
             </div>
           </div>
-          <div class="db_info_table">
-            
+          <div class="db_info_table">            
             <div id="logsPlc"></div>                                
           </div>
         </div>
+        
         <!-- ---------------------------Bulk edit -------------------------------------------- -->
         <div class="tab-pane" id="tab_multiEdit">
             <div class="db_info_table">
@@ -254,35 +268,53 @@ $db->close();
 
                 </div>
             </div>
-          </div>
-
         </div>
+
+        <!-- ---------------------------Init check -------------------------------------------- -->
+        <div class="tab-pane" id="tab_initCheck">
+            <div class="db_info_table">
+                <div class="box box-solid">
+                  
+                    <?php
+                      require 'initCheck.php';
+                    ?>
+
+                </div>
+            </div>
+        </div>      
+
+        
         <!-- ------------------------------------------------------------------------------ -->
 
       </div>
+      </div>
 
-      <div class="box-body" style="text-align: center;">
+      <div class="box-body " style="text-align: center;">
         <h5 class="text-aqua" style="font-size: 16px;">
           <span id="lastCommit">
-           
+            
           </span>
           <span id="lastDockerUpdate">
-           
+            
           </span>          
-      </h5>
-  </div>
+        </h5>
+      </div>
       
       
+    </div>
+
+
+
+  </section>
+
+  
+
+  <!-- /.content -->
+  <?php
+    require 'php/templates/footer.php';
+  ?>
 </div>
-
-</section>
-
-    <!-- /.content -->
-    <?php
-      require 'php/templates/footer.php';
-    ?>
-  </div>
-  <!-- /.content-wrapper -->
+<!-- /.content-wrapper -->
 
 <!-- ----------------------------------------------------------------------- -->
 
@@ -395,38 +427,6 @@ function deleteActHistory()
   });
 }
 
-// -----------------------------------------------------------
-// Restart Backend Python Server
-
-function askRestartBackend() {
-  // Ask 
-  showModalWarning('<?= lang('Maint_RestartServer');?>', '<?= lang('Maint_Restart_Server_noti_text');?>',
-    '<?= lang('Gen_Cancel');?>', '<?= lang('Maint_RestartServer');?>', 'restartBackend');
-}
-
-// -----------------------------------------------------------
-function restartBackend() {
-
-  modalEventStatusId = 'modal-message-front-event'
-  
-  // Execute
-  $.ajax({
-      method: "POST",
-      url: "php/server/util.php",
-      data: { function: "addToExecutionQueue", action: `${getGuid()}|cron_restart_backend`  },
-      success: function(data, textStatus) {
-          // showModalOk ('Result', data );
-
-          // show message
-          showModalOk(getString("general_event_title"), `${getString("general_event_description")}  <br/> <br/> <code id='${modalEventStatusId}'></code>`);
-
-          updateModalState()
-
-          write_notification('[Maintenance] App manually restarted', 'info')
-      }
-    })
-}
-
 // -----------------------------------------------------------
 // Import pasted Config ASK
 function askImportPastedConfig() {
@@ -440,17 +440,15 @@ function askImportPastedConfig() {
 // Upload Settings Config
 function UploadConfig()
 { 
-  // alert("aaa")
-
   appConf = $('#modal-input-textarea').val()
   // encode for import
   appConfBase64 = btoa(appConf)
 
   // import
-  $.post('php/server/query_replace_config.php', { config: appConfBase64 }, function(msg) {
+  $.post('php/server/query_replace_config.php', { base64data: appConfBase64, fileName: "app.conf" }, function(msg) {
     console.log(msg);            
     // showMessage(msg);            
-    write_notification(`[Maintenance] Settings imported from backup: ${msg}`, 'interrupt');
+    write_notification(`[Maintenance]: ${msg}`, 'interrupt');
   });
 
 }
@@ -463,6 +461,15 @@ function DownloadConfig()
   openInNewTab("php/server/query_config.php?file=app.conf&download=true")
 }
 
+// -----------------------------------------------------------
+// Download Workflows
+
+function DownloadWorkflows()
+{ 
+  // Execute
+  openInNewTab("php/server/query_config.php?file=workflows.json&download=true")
+}
+
 
 
 // -----------------------------------------------------------

front/multiEditCore.php

@@ -64,10 +64,6 @@
     </div>
   </div>
 
-</div>
-
-
-
 
 <script defer>
   
@@ -77,7 +73,7 @@
 
     // some race condition, need to implement delay
     setTimeout(() => {
-      $.get('/php/server/query_json.php', { file: 'table_settings.json', nocache: Date.now() }, function(res) {    
+      $.get('php/server/query_json.php', { file: 'table_settings.json', nocache: Date.now() }, function(res) {    
         
         settingsData = res["data"];
 

front/network.php

@@ -6,8 +6,6 @@
   // online / offline badges HTML snippets 
   define('badge_online', '<div class="badge bg-green text-white" style="width: 60px;">Online</div>');
   define('badge_offline', '<div class="badge bg-red text-white" style="width: 60px;">Offline</div>');
-  define('circle_online', '<div class="badge bg-green text-white" style="width: 10px; height: 10px; padding:2px; margin-top: -25px;">&nbsp;</div>');
-  define('circle_offline', '<div class="badge bg-red text-white" style="width: 10px;  height: 10px; padding:2px; margin-top: -25px;">&nbsp;</div>'); 
   define('sortable_column', ' <span class="sort-btn" onclick="sortColumn(this)"><i class="fa-solid fa-arrow-up-short-wide"></i></span>'); 
   
 ?>
@@ -22,7 +20,7 @@
 <div class="content-wrapper">
 
 
-  <span class="networkHelpIcon"> <a target="_blank" href="https://github.com/jokob-sk/NetAlertX/blob/main/docs/NETWORK_TREE.md"><i class="fa fa-circle-question"></i></a></span>
+  <span class="helpIcon"> <a target="_blank" href="https://github.com/jokob-sk/NetAlertX/blob/main/docs/NETWORK_TREE.md"><i class="fa fa-circle-question"></i></a></span>
 
   <div id="networkTree" class="drag"></div>
 
@@ -39,21 +37,18 @@
         }
 
         // online/offline status circle (red/green)
-        $node_badge = "";
-        if($node_status == 1) // 1 means online, 0 offline
+        $icon_style = "";
+        if($node_status == 0) // 1 means online, 0 offline
         {
-          $node_badge = circle_online; 
-        } else
-        {
-          $node_badge = circle_offline;
-        }
+          $icon_style = "style=\"color:var(--color-red);\""; 
+        } 
 
         $decoded_icon = base64_decode($icon);
         $idFromMac = str_replace(":", "_", $node_mac);
         $str_tab_header = '<li class="networkNodeTabHeaders '.$activetab.' " >
                               
                               <a href="#'.$idFromMac.'" data-mytabmac="'.$node_mac.'" id="'.$idFromMac.'_id" data-toggle="tab" title="'.$node_name.' ">' // _id is added so it doesn't conflict with AdminLTE tab behavior
-                                .'<div class="icon">'.$decoded_icon.' </div> <span class="node-name">'.$node_name.'</span>' .$str_port.$node_badge.
+                                .'<div class="icon" '.$icon_style.'>'.$decoded_icon.' </div> <span class="node-name">'.$node_name.'</span>' .$str_port.
                               '</a>
                           </li>';
 
@@ -130,8 +125,7 @@
                                   </td>
                               </tr>
                               </tbody>
-                            </table>
-                            <br>
+                            </table>                            
                              <div id="assignedDevices"  class="box-body no-padding">
                               <div class="page-header">
                                 <h3>
@@ -465,7 +459,7 @@
 ?>
 
 <script src="lib/treeviz/bundle.js"></script> 
-<script src="lib/treeviz/bundle.js.map"></script> 
+
 
 
 <script defer>
@@ -697,34 +691,56 @@ function attachTreeEvents()
 
 // --------------------------------------------------------------------------- 
 // Handle network node click - select correct tab in the bottom table
-function handleNodeClick(nodeData)
+function handleNodeClick(el)
 {    
-  const targetTabMAC = nodeData.data.mac;    
+  const targetTabMAC = $(el).attr("data-mytreemacmain");    
 
   var targetTab = $(`a[data-mytabmac="${targetTabMAC}"]`);
 
-  // Simulate a click event on the target tab
-  targetTab.click();
+  if (targetTab.length) {
+    // Simulate a click event on the target tab
+    targetTab.click();
+
+    // Smooth scroll to the tab content
+    $('html, body').animate({
+      scrollTop: targetTab.offset().top - 50
+    }, 500); // Adjust the duration as needed
+  }
 }
 
 // --------------------------------------------------------------------------- 
 var myTree;
-var visibleTreeArea = $(window).height()-155;
-var nodeWidth = 120;
+
+
 var emSize;
 var nodeHeight;
-var sizeCoefficient = 1.4
+// var sizeCoefficient = 1.4
+
+function pxToEm(px, element) {
+    var baseFontSize = parseFloat($(element || "body").css("font-size"));
+    return px / baseFontSize;
+}
+
+function emToPx(em, element) {
+    var baseFontSize = parseFloat($(element || "body").css("font-size"));
+    return Math.round(em * baseFontSize);
+}
 
 function initTree(myHierarchy)
 {
   // calculate the drawing area based on teh tree width and available screen size
-  var treeAreaHeight = visibleTreeArea > 800 ? 800 : visibleTreeArea;
-  let screenWidth = $('.content-header').width();
-  let treeWidth = (nodeWidth + 20) *  parentNodesCount;
-  let treeAreaWidth  =  screenWidth < treeWidth ? treeWidth : screenWidth;
+  
+  let baseFontSize = parseFloat($('html').css('font-size')); 
+  let treeAreaHeight = ($(window).height() - 155); ;
+  // calculate the font size of the leaf nodes to fit everything into the tree area
+  leafNodesCount == 0 ? 1 : leafNodesCount;
+
+  emSize = pxToEm((treeAreaHeight/(leafNodesCount)).toFixed(2));
+  
+  let screenWidthEm = pxToEm($('.networkTable').width());
 
   // init the drawing area size
-  $("#networkTree").attr('style', `height:${treeAreaHeight}px; width:${treeAreaWidth}px`)
+  $("#networkTree").attr('style', `height:${treeAreaHeight}px; width:${emToPx(screenWidthEm)}px`)
 
   if(myHierarchy.type == "")
   {
@@ -733,13 +749,14 @@ function initTree(myHierarchy)
     return;
   }
 
-  // calculate the font size of the leaf nodes to fit everything into the tree area
-  leafNodesCount == 0 ? 1 : leafNodesCount;
-  emSize = ((treeAreaHeight/(25*leafNodesCount)).toFixed(2));
-  emSize = emSize > 1 ? 1 : emSize;
+  // handle if only a few nodes
+  emSize > 1 ? emSize = 1 : emSize = emSize;
 
-  // nodeHeight = ((emSize*100*0.30).toFixed(0))
-  nodeHeight = ((emSize*100*0.30).toFixed(0))
+  let nodeHeightPx = emToPx(emSize*1);
+  let nodeWidthPx = emToPx(screenWidthEm / (parentNodesCount));
+
+  // handle if only a few nodes
+  nodeWidthPx > 160 ? nodeWidthPx = 160 : nodeWidthPx = nodeWidthPx;
 
   console.log(Treeviz);
 
@@ -747,8 +764,7 @@ function initTree(myHierarchy)
     htmlId: "networkTree",
     renderNode:  nodeData =>  {
 
-      var fontSize = "font-size:"+emSize+"em;";
-
+      
       (!emptyArr.includes(nodeData.data.port )) ? port =  nodeData.data.port : port = "";
 
       (port == "" || port == 0 || port == 'None' ) ? portBckgIcon = `<i class="fa fa-wifi"></i>` : portBckgIcon = `<i class="fa fa-ethernet"></i>`;
@@ -761,10 +777,10 @@ function initTree(myHierarchy)
                       ${atob(nodeData.data.icon)}
                 </div>` : "";
       devicePort = `<div  class="netPort" 
-                          style="width:${emSize*sizeCoefficient}em;height:${emSize*sizeCoefficient}em">
+                          style="width:${emSize}em;height:${emSize}em">
                       ${portHtml}</div> 
                     <div  class="portBckgIcon" 
-                          style="margin-left:-${emSize*sizeCoefficient}em;">
+                          style="margin-left:-${emSize}em;">
                           ${portBckgIcon}
                     </div>`;
       collapseExpandIcon = nodeData.data.hiddenChildren ? 
@@ -773,7 +789,7 @@ function initTree(myHierarchy)
       // generate +/- icon if node has children nodes
       collapseExpandHtml = nodeData.data.hasChildren ? 
                     `<div class="netCollapse" 
-                          style="font-size:${emSize*sizeCoefficient}em;top:${emSize/6}em" 
+                          style="font-size:${nodeHeightPx/2}px;top:${nodeHeightPx/4}px" 
                           data-mytreepath="${nodeData.data.path}" 
                           data-mytreemac="${nodeData.data.mac}">
                       <i class="fa fa-${collapseExpandIcon} pointer"></i>
@@ -787,21 +803,24 @@ function initTree(myHierarchy)
       // css indicating online/offline status
       statusCss = ` netStatus-${nodeData.data.status}`;
 
-      return result = `<div class="box ${nodeData.data.hasChildren ? "pointer":""} ${statusCss} ${highlightedCss}"
+      return result = `<div 
+                            class="node-inner box ${nodeData.data.hasChildren ? "pointer":""} ${statusCss} ${highlightedCss}"
                             data-mytreemacmain="${nodeData.data.mac}"
-                            style="height:${nodeData.settings.nodeHeight}px;${fontSize}"
+                            style="height:${nodeHeightPx}px;font-size:${nodeHeightPx-5}px;"
+                            onclick="handleNodeClick(this)"
                         >
                           <div class="netNodeText">
                             <strong>${devicePort}  ${deviceIcon}
-                              <span class="spanNetworkTree anonymizeDev" >${nodeData.data.name}</span>
-                            </strong>
-                            ${collapseExpandHtml}
-                          </div>
-                        </div>`;
+                              <span class="spanNetworkTree anonymizeDev" style="width:${nodeWidthPx-50}px">${nodeData.data.name}</span>
+                            </strong>                            
+                          </div>                          
+                        </div>
+                        ${collapseExpandHtml}`;
     },
     mainAxisNodeSpacing: 'auto',
-    secondaryAxisNodeSpacing: 0.3,
-    nodeHeight: nodeHeight.toString(),
+    // secondaryAxisNodeSpacing: 0.3,
+    nodeHeight: nodeHeightPx,
+    nodeWidth: nodeWidthPx,
     marginTop: '5',
     isHorizontal : true,
     hasZoom: true,
@@ -811,8 +830,8 @@ function initTree(myHierarchy)
     hasFlatData: false,
     relationnalField: "children",
     linkWidth: (nodeData) => 3,
-    linkColor: (nodeData) => "#ffcc80",
-    onNodeClick: (nodeData) => handleNodeClick(nodeData),
+    linkColor: (nodeData) => "#ffcc80"
+    // onNodeClick: (nodeData) => handleNodeClick(nodeData),
   });      
 
   console.log(deviceListGlobal);

front/php/components/graph_online_history.php

@@ -18,7 +18,7 @@
 
 
 function initOnlineHistoryGraph() {
-    $.get('/php/server/query_json.php', { file: 'table_online_history.json', nocache: Date.now() }, function(res) {
+    $.get('php/server/query_json.php', { file: 'table_online_history.json', nocache: Date.now() }, function(res) {
         // Extracting data from the JSON response
         var timeStamps = [];
         var onlineCounts = [];
@@ -53,4 +53,4 @@ function initOnlineHistoryGraph() {
 
 </script>
 <!-- <canvas id="clientsChart" width="800" height="140" class="extratooltipcanvas no-user-select"></canvas> -->
-<canvas id="OnlineChart" style="width:100%; height: 150px;  margin-bottom: 15px;"></canvas>
+<canvas id="OnlineChart" style="width:100%; height: 150px;  margin-bottom: 15px;"></canvas>

front/php/server/devices.php

@@ -112,7 +112,8 @@ function getServerDeviceData() {
       "devSessions" => 0,
       "devEvents" => 0,
       "devDownAlerts" => 0,
-      "devPresenceHours" => 0
+      "devPresenceHours" => 0,
+      "devFQDN"  => ""
     ];
     echo json_encode($deviceData);
     return;

front/php/server/init.php

@@ -1,6 +1,6 @@
 <?php
 ini_set('error_log', '../../log/app.php_errors.log'); // initializing the app.php_errors.log file for the maintenance section
-require dirname(__FILE__).'/../templates/timezone.php';
+require dirname(__FILE__).'/../templates/globals.php';
 require dirname(__FILE__).'/db.php';
 require dirname(__FILE__).'/util.php';
 require dirname(__FILE__).'/../templates/language/lang.php';