Merge pull request #1530 from netalertx/main

sync

Author: jokob-sk

.devcontainer/Dockerfile

@@ -35,6 +35,7 @@ RUN apk add --no-cache \
         shadow \
         python3 \
         python3-dev \
+        py3-psutil \
         gcc \
         musl-dev \
         libffi-dev \
@@ -136,7 +137,7 @@ ENV LANG=C.UTF-8
 
 RUN apk add --no-cache bash mtr libbsd zip lsblk tzdata curl arp-scan iproute2 iproute2-ss nmap fping \
     nmap-scripts traceroute nbtscan net-tools net-snmp-tools bind-tools awake ca-certificates \
-    sqlite php83 php83-fpm php83-cgi php83-curl php83-sqlite3 php83-session python3 envsubst \
+    sqlite php83 php83-fpm php83-cgi php83-curl php83-sqlite3 php83-session python3 py3-psutil envsubst \
     nginx supercronic shadow su-exec jq && \
     rm -Rf /var/cache/apk/*  && \
     rm -Rf /etc/nginx && \

.github/skills/code-standards/SKILL.md

@@ -5,6 +5,14 @@ description: NetAlertX coding standards and conventions. Use this when writing c
 
 # Code Standards
 
+- ask me to review before going to each next step (mention n step out of x)
+- before starting, prepare implementation plan
+- ask me to review it and ask any clarifying questions first
+- add test creation as last step - follow repo architecture patterns - do not place in the root of /test
+- code has to be maintainable, no duplicate code
+- follow DRY principle
+- code files should be less than 500 LOC for better maintainability
+
 ## File Length
 
 Keep code files under 500 lines. Split larger files into modules.
@@ -42,11 +50,18 @@ Nested subprocess calls need their own timeout—outer timeout won't save you.
 ## Time Utilities
 
 ```python
-from utils.datetime_utils import timeNowDB
+from utils.datetime_utils import timeNowUTC
 
-timestamp = timeNowDB()
+timestamp = timeNowUTC()
 ```
 
+This is the ONLY function that calls datetime.datetime.now() in the entire codebase.
+
+⚠️ CRITICAL: ALL database timestamps MUST be stored in UTC
+This is the SINGLE SOURCE OF TRUTH for current time in NetAlertX
+Use timeNowUTC() for DB writes (returns UTC string by default)
+Use timeNowUTC(as_string=False) for datetime operations (scheduling, comparisons, logging)
+
 ## String Sanitization
 
 Use sanitizers from `server/helper.py` before storing user input.

.github/skills/settings-management/SKILL.md

@@ -37,11 +37,3 @@ Define in plugin's `config.json` manifest under the settings section.
 ## Environment Override
 
 Use `APP_CONF_OVERRIDE` environment variable for settings that must be set before startup.
-
-## Backend API URL
-
-For Codespaces, set `BACKEND_API_URL` to your Codespace URL:
-
-```
-BACKEND_API_URL=https://something-20212.app.github.dev/
-```

.github/workflows/run-all-tests.yml

@@ -12,7 +12,7 @@ on:
         type: boolean
         default: false
       run_backend:
-        description: '📂 backend/ (SQL Builder & Security)'
+        description: '📂 backend/ & db/ (SQL Builder, Security & Migration)'
         type: boolean
         default: false
       run_docker_env:
@@ -43,9 +43,9 @@ jobs:
         run: |
           PATHS=""
           # Folder Mapping with 'test/' prefix
-          if [ "${{ github.event.inputs.scan }}" == "true" ]; then PATHS="$PATHS test/scan/"; fi
+          if [ "${{ github.event.inputs.run_scan }}" == "true" ]; then PATHS="$PATHS test/scan/"; fi
           if [ "${{ github.event.inputs.run_api }}" == "true" ]; then PATHS="$PATHS test/api_endpoints/ test/server/"; fi
-          if [ "${{ github.event.inputs.run_backend }}" == "true" ]; then PATHS="$PATHS test/backend/"; fi
+          if [ "${{ github.event.inputs.run_backend }}" == "true" ]; then PATHS="$PATHS test/backend/ test/db/"; fi
           if [ "${{ github.event.inputs.run_docker_env }}" == "true" ]; then PATHS="$PATHS test/docker_tests/"; fi
           if [ "${{ github.event.inputs.run_ui }}" == "true" ]; then PATHS="$PATHS test/ui/"; fi
 

.gitignore

@@ -25,6 +25,7 @@ front/api/*
 **/plugins/**/*.log
 **/plugins/cloud_services/*
 **/plugins/cloud_connector/*
+**/plugins/heartbeat/*
 **/%40eaDir/
 **/@eaDir/
 

Dockerfile

@@ -32,6 +32,7 @@ RUN apk add --no-cache \
         shadow \
         python3 \
         python3-dev \
+        py3-psutil \
         gcc \
         musl-dev \
         libffi-dev \
@@ -133,7 +134,7 @@ ENV LANG=C.UTF-8
 
 RUN apk add --no-cache bash mtr libbsd zip lsblk tzdata curl arp-scan iproute2 iproute2-ss nmap fping \
     nmap-scripts traceroute nbtscan net-tools net-snmp-tools bind-tools awake ca-certificates \
-    sqlite php83 php83-fpm php83-cgi php83-curl php83-sqlite3 php83-session python3 envsubst \
+    sqlite php83 php83-fpm php83-cgi php83-curl php83-sqlite3 php83-session python3 py3-psutil envsubst \
     nginx supercronic shadow su-exec jq && \
     rm -Rf /var/cache/apk/*  && \
     rm -Rf /etc/nginx && \

Dockerfile.debian

@@ -10,6 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     python3 \
     python3-dev \
     python3-pip \
+    python3-psutil \
     python3-venv \
     gcc \
     git \
@@ -193,7 +194,7 @@ RUN for vfile in .VERSION .VERSION_PREV; do \
     # setcap cap_net_raw,cap_net_admin+eip $(readlink -f ${VIRTUAL_ENV_BIN}/python) && \
     /bin/bash /build/init-nginx.sh && \
     /bin/bash /build/init-php-fpm.sh && \
-    # /bin/bash /build/init-cron.sh && \ 
+    # /bin/bash /build/init-cron.sh && \
     # Debian cron init might differ, skipping for now or need to check init-cron.sh content
     # Checking init-backend.sh
     /bin/bash /build/init-backend.sh && \