PLG: ICMP v2 #1331

Signed-off-by: jokob-sk <jokob.sk@gmail.com>
2026-03-30 23:03:03 -07:00 · 2026-01-04 11:27:34 +11:00
parent 6e194185ed
commit bdb9377061
7 changed files with 254 additions and 103 deletions
--- a/install/debian12/install_dependencies.debian12.sh
+++ b/install/debian12/install_dependencies.debian12.sh
@@ -17,19 +17,19 @@ fi

 # Check if script is run as root
 if [[ $EUID -ne 0 ]]; then
-    echo "This script must be run as root. Please use 'sudo'." 
+    echo "This script must be run as root. Please use 'sudo'."
    exit 1
 fi

 # Install dependencies
 apt-get install -y \
    tini snmp ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo gettext-base \
-    nginx-light php php-cgi php-fpm php-sqlite3 php-curl sqlite3 dnsutils net-tools \
-    python3 python3-dev iproute2 nmap python3-pip zip usbutils traceroute nbtscan avahi-daemon avahi-utils openrc build-essential git
+    nginx-light php php-cgi php-fpm php-sqlite3 php-curl sqlite3 dnsutils net-tools  \
+    python3 python3-dev iproute2 nmap fping python3-pip zip usbutils traceroute nbtscan avahi-daemon avahi-utils openrc build-essential git

 # alternate dependencies
 sudo apt-get install nginx nginx-core mtr php-fpm php8.2-fpm php-cli php8.2 php8.2-sqlite3 -y
-sudo phpenmod -v 8.2 sqlite3 
+sudo phpenmod -v 8.2 sqlite3

 # setup virtual python environment so we can use pip3 to install packages
 apt-get install python3-venv -y
--- a/install/proxmox/proxmox-install-netalertx.sh
+++ b/install/proxmox/proxmox-install-netalertx.sh
@@ -9,7 +9,7 @@ set -o pipefail
 # Safe IFS
 IFS=$' \t\n'

-# 🛑 Important: This is only used for the bare-metal install 🛑 
+# 🛑 Important: This is only used for the bare-metal install 🛑
 # Colors (guarded)
 if [ -t 1 ] && [ -z "${NO_COLOR:-}" ]; then
  RESET='\e[0m'
@@ -37,13 +37,13 @@ DB_FILE=app.db
 NGINX_CONF_FILE=netalertx.conf
 WEB_UI_DIR=/var/www/html/netalertx
 NGINX_CONFIG=/etc/nginx/conf.d/$NGINX_CONF_FILE
-OUI_FILE="/usr/share/arp-scan/ieee-oui.txt" 
+OUI_FILE="/usr/share/arp-scan/ieee-oui.txt"
 FILEDB=$INSTALL_DIR/db/$DB_FILE
-# DO NOT CHANGE ANYTHING ABOVE THIS LINE! 
+# DO NOT CHANGE ANYTHING ABOVE THIS LINE!

 # Check if script is run as root
 if [[ $EUID -ne 0 ]]; then
-    echo "This script must be run as root." 
+    echo "This script must be run as root."
    exit 1
 fi

@@ -51,7 +51,7 @@ fi
 if [ -z "${NETALERTX_ASSUME_YES:-}" ] && [ -z "${ASSUME_YES:-}" ] && [ -z "${NETALERTX_FORCE:-}" ]; then
    printf "%b\n" "------------------------------------------------------------------------"
    printf "%b\n" "${RED}[WARNING]              ${RESET}This script should be run on a fresh server"
-    printf "%b\n" "${RED}[WARNING]              ${RESET}This script will install NetAlertX and will:" 
+    printf "%b\n" "${RED}[WARNING]              ${RESET}This script will install NetAlertX and will:"
    printf "%b\n" "${RED}[WARNING]              ${RESET}• Update OS with apt-get update/upgrade"
    printf "%b\n" "${RED}[WARNING]              ${RESET}• Overwrite existing files under ${INSTALL_DIR}  "
    printf "%b\n" "${RED}[WARNING]              ${RESET}• Wipe any existing database"
@@ -137,7 +137,7 @@ printf "%b\n" "-----------------------------------------------------------------
 printf "%b\n" "${GREEN}[INSTALLING]                          ${RESET}Detected OS: ${OS_ID} ${OS_VER}"
 printf "%b\n" "--------------------------------------------------------------------------"

-if 
+if
  [ "${OS_ID}" = "ubuntu" ] && printf '%s' "${OS_VER}" | grep -q '^24'; then
  # Ubuntu 24.x typically ships PHP 8.3; add ondrej/php PPA and set 8.4
  printf "%b\n" "--------------------------------------------------------------------------"
@@ -152,15 +152,15 @@ elif
  printf "%b\n" "${GREEN}[INSTALLING]                          ${RESET}Debian 13 detected - using built-in PHP 8.4"
  printf "%b\n" "--------------------------------------------------------------------------"
 fi
-  
+
 apt-get install -y --no-install-recommends \
    tini snmp ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo \
    php8.4 php8.4-cgi php8.4-fpm php8.4-sqlite3 php8.4-curl sqlite3 dnsutils net-tools mtr \
-    python3 python3-dev iproute2 nmap python3-pip zip usbutils traceroute nbtscan \
+    python3 python3-dev iproute2 nmap fping python3-pip zip usbutils traceroute nbtscan \
    avahi-daemon avahi-utils build-essential git gnupg2 lsb-release \
    debian-archive-keyring python3-venv

-if 
+if
  [ "${OS_ID}" = "ubuntu" ] && printf '%s' "${OS_VER}" | grep -q '^24'; then  # Set PHP 8.4 as the default alternatives where applicable
  update-alternatives --set php /usr/bin/php8.4 || true
  systemctl enable php8.4-fpm || true
@@ -211,7 +211,7 @@ source /opt/myenv/bin/activate
 python -m pip install --upgrade pip
 python -m pip install -r "${INSTALLER_DIR}/requirements.txt"

-# Backup default NGINX site just in case  
+# Backup default NGINX site just in case
 if [ -L /etc/nginx/sites-enabled/default ] ; then
  rm /etc/nginx/sites-enabled/default
 elif [ -f /etc/nginx/sites-enabled/default ]; then
@@ -350,7 +350,7 @@ printf "%b\n" "-----------------------------------------------------------------
 printf "%b\n" "${GREEN}[STARTING]                          ${RESET}Starting PHP and NGINX"
 printf "%b\n" "--------------------------------------------------------------------------"
 /etc/init.d/php8.4-fpm start
-nginx -t || {  
+nginx -t || {
  printf "%b\n" "--------------------------------------------------------------------------"
  printf "%b\n" "${RED}[ERROR]                         ${RESET}NGINX config test failed!"
  printf "%b\n" "--------------------------------------------------------------------------"; exit 1; }
@@ -405,7 +405,7 @@ systemctl daemon-reload
 systemctl enable netalertx.service
 systemctl start netalertx.service
 systemctl restart nginx
-  
+
  # Verify service is running
  if systemctl is-active --quiet netalertx.service; then
    printf "%b\n" "--------------------------------------------------------------------------"
--- a/install/ubuntu24/install.sh
+++ b/install/ubuntu24/install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-# 🛑 Important: This is only used for the bare-metal install 🛑 
+# 🛑 Important: This is only used for the bare-metal install 🛑

 echo "---------------------------------------------------------"
 echo "[INSTALL] Starting NetAlertX installation for Ubuntu"
@@ -34,7 +34,7 @@ ALWAYS_FRESH_INSTALL=false  # Set to true to always reset /config and /db on eac

 # Check if script is run as root
 if [[ $EUID -ne 0 ]]; then
-    echo "[INSTALL] This script must be run as root. Please use 'sudo'." 
+    echo "[INSTALL] This script must be run as root. Please use 'sudo'."
    exit 1
 fi

@@ -62,7 +62,7 @@ apt-get install -y --no-install-recommends \

 # Install plugin dependencies
 apt-get install -y --no-install-recommends \
-  dnsutils mtr arp-scan snmp iproute2 nmap zip usbutils traceroute nbtscan avahi-daemon avahi-utils
+  dnsutils mtr arp-scan snmp iproute2 nmap fping zip usbutils traceroute nbtscan avahi-daemon avahi-utils

 # nginx-core install nginx and nginx-common as dependencies
 apt-get install -y --no-install-recommends \
@@ -156,14 +156,14 @@ python3 -m venv "${VENV_DIR}"
 source "${VENV_DIR}/bin/activate"

 if [[ ! -f "${REQUIREMENTS_FILE}" ]]; then
-  echo "[INSTALL] requirements.txt not found at ${REQUIREMENTS_FILE}"  
-  exit 1  
+  echo "[INSTALL] requirements.txt not found at ${REQUIREMENTS_FILE}"
+  exit 1
 fi

-pip3 install -r "${REQUIREMENTS_FILE}" || {  
-  echo "[INSTALL] Failed to install Python dependencies"  
-  exit 1  
-}  
+pip3 install -r "${REQUIREMENTS_FILE}" || {
+  echo "[INSTALL] Failed to install Python dependencies"
+  exit 1
+}


 # We now should have all dependencies and files in place
@@ -179,11 +179,11 @@ fi


 # if custom variables not set we do not need to do anything
-if [ -n "${TZ}" ]; then    
-  FILECONF=${INSTALL_DIR}/config/${CONF_FILE} 
+if [ -n "${TZ}" ]; then
+  FILECONF=${INSTALL_DIR}/config/${CONF_FILE}
  if [ -f "$FILECONF" ]; then
    sed -i -e "s|Europe/Berlin|${TZ}|g" "${INSTALL_DIR}/config/${CONF_FILE}"
-  else 
+  else
    sed -i -e "s|Europe/Berlin|${TZ}|g" "${INSTALL_DIR}/back/${CONF_FILE}.bak"
  fi
 fi
@@ -253,7 +253,7 @@ else
  if [ -f "${SYSTEM_SERVICES}/update_vendors.sh" ]; then
    "${SYSTEM_SERVICES}/update_vendors.sh"
  else
-    echo "[INSTALL] update_vendors.sh script not found in ${SYSTEM_SERVICES}."    
+    echo "[INSTALL] update_vendors.sh script not found in ${SYSTEM_SERVICES}."
  fi
 fi

@@ -282,12 +282,12 @@ touch "${INSTALL_DIR}"/api/user_notifications.json
 mkdir -p "${INSTALL_DIR}"/log/plugins


-# DANGER ZONE: ALWAYS_FRESH_INSTALL 
+# 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}❗"
  # Delete content of "/config/"
  rm -rf "${INSTALL_DIR}/config/"*
-  
+
  # Delete content of "/db/"
  rm -rf "${INSTALL_DIR}/db/"*
 fi