UNIFI import plugin 0.2

fix: remove trailing slash for REPORT_DASHBOARD_URL

Dockerfile

@@ -8,7 +8,7 @@ ENV USER=pi USER_ID=1000 USER_GID=1000 TZ=Europe/London PORT=20211
 
 RUN apt-get update \
     && apt-get install --no-install-recommends tini ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo nginx-light php php-cgi php-fpm php-sqlite3 php-curl sqlite3 dnsutils net-tools python3 iproute2 nmap python3-pip zip -y \
-    && pip3 install requests paho-mqtt scapy cron-converter pytz json2table \
+    && pip3 install requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi \
     && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
     && apt-get clean autoclean \
     && apt-get autoremove \

README.md

@@ -7,7 +7,6 @@ Scans for devices connected to your WIFI / LAN and alerts you if new and unknown
 
 ![Main screen][main]
 
-
 # 🐳 Docker image 
 [![Docker](https://img.shields.io/github/actions/workflow/status/jokob-sk/Pi.Alert/docker_prod.yml?label=Build&logo=GitHub)](https://github.com/jokob-sk/Pi.Alert/actions/workflows/docker_prod.yml)
 [![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/Pi.Alert?color=40ba12&label=Committed&logo=GitHub&logoColor=fff)](https://github.com/jokob-sk/Pi.Alert)
@@ -15,7 +14,7 @@ Scans for devices connected to your WIFI / LAN and alerts you if new and unknown
 [![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/pi.alert?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/pi.alert)
 [![Docker Pushed](https://img.shields.io/badge/dynamic/json?color=0aa8d2&logoColor=fff&label=Pushed&query=last_updated&url=https%3A%2F%2Fhub.docker.com%2Fv2%2Frepositories%2Fjokobsk%2Fpi.alert%2F&logo=docker&link=http://left&link=https://hub.docker.com/repository/docker/jokobsk/pi.alert)](https://hub.docker.com/r/jokobsk/pi.alert)
 
-🐳 [Docker hub](https://registry.hub.docker.com/r/jokobsk/pi.alert) | 📄 [Dockerfile](https://github.com/jokob-sk/Pi.Alert/blob/main/Dockerfile) | 📚 [Docker instructions](https://github.com/jokob-sk/Pi.Alert/blob/main//dockerfiles/README.md) | 🆕 [Release notes](https://github.com/jokob-sk/Pi.Alert/releases)
+🐳 [Docker hub](https://registry.hub.docker.com/r/jokobsk/pi.alert) | 📄 [Dockerfile](https://github.com/jokob-sk/Pi.Alert/blob/main/Dockerfile) | 📚 [Docker instructions](https://github.com/jokob-sk/Pi.Alert/blob/main/dockerfiles/README.md) | 🆕 [Release notes](https://github.com/jokob-sk/Pi.Alert/releases)
 
 ## 🔍 Scan Methods
 The system continuously scans the network for, **New devices**, **New connections** (re-connections), **Disconnections**, **"Always Connected" devices down**, Devices **IP changes** and **Internet IP address changes**. Scanning methods are:
@@ -30,7 +29,6 @@ The system continuously scans the network for, **New devices**, **New connection
         examines the DHCP leases (addresses assigned) to find active devices
         that were not discovered by the other methods.
 
-
 ## 🧩 Integrations 
    - [Apprise](https://hub.docker.com/r/caronc/apprise), [Pushsafer](https://www.pushsafer.com/), [NTFY](https://ntfy.sh/)
    - [Webhooks](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/WEBHOOK_N8N.md) ([sample JSON](docs/webhook_json_sample.json))
@@ -49,18 +47,17 @@ The system continuously scans the network for, **New devices**, **New connection
     - Sessions, Connected devices, Favorites, Events, Presence, Concurrent devices, Down alerts, IP's
     - Manual Nmap scans, Optional speedtest for Device "Internet"
     - Simple Network relationship display
-  - Maintenance tasks and Settings like:
-    - Status Infos (active scans, database size, backup counter)
-    - Theme Selection (blue, red, green, yellow, black, purple) and Light/Dark-Mode Switch
-    - Language Selection (English, German, Spanish)    
-    - Pause arp-scan
+  - Maintenance tasks and Settings like:    
+    - Theme Selection (blue, red, green, yellow, black, purple) and Light/Dark-Mode Switch        
     - DB maintenance, Backup, Restore tools and CSV Export / Import
-    - Configurable login to prevent unauthorized use. 
+    - Simple login Support
   - 🌟(Experimental) [Plugin system](https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins)
     - Create custom plugins with automatically generated settings and UI. 
     - Monitor anything for changes
-    - Check the instructions carefully if you are up for a challenge!
-  - Help/FAQ Section 
+    - Check the instructions carefully if you are up for a challenge! Current plugins include:
+      - Detecting Rogue DHCP servers
+      - Monitoring HTTP status changes of domains/URLs 
+      - Import devices from DHCP.leases files or a UniFi controller
 
   | ![Screen 1][screen1] | ![Screen 2][screen2] | ![Screen 5][screen5]  |
   |----------------------|----------------------| ----------------------| 
@@ -93,8 +90,6 @@ Device Management [instructions](docs/DEVICE_MANAGEMENT.md) | Old Versions [Hist
 
 ## ☕ Support me
 
-Disclaimer: Please only donate if you don't have any debt yourself. Support yourself first, then others.
-
 <a href="https://github.com/sponsors/jokob-sk" target="_blank"><img src="https://i.imgur.com/X6p5ACK.png" alt="Sponsor Me on GitHub" style="height: 30px !important;width: 117px !important;" width="150px" ></a>
 <a href="https://www.buymeacoffee.com/jokobsk" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 117px !important;" width="117px" height="30px" ></a>
 <a href="https://www.patreon.com/user?u=84385063" target="_blank"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Patreon_logo_with_wordmark.svg/512px-Patreon_logo_with_wordmark.svg.png" alt="Support me on patreon" style="height: 30px !important;width: 117px !important;" width="117px" ></a>

back/pialert.py

@@ -95,6 +95,7 @@ log_timestamp = time_started
 lastTimeImported = 0
 sql_connection = None
 
+
 #-------------------------------------------------------------------------------
 def timeNow():
     return datetime.datetime.now().replace(microsecond=0)
@@ -314,7 +315,7 @@ def importConfigs ():
     # Specify globals so they can be overwritten with the new config
     global lastTimeImported, mySettings, mySettingsSQLsafe, plugins, plugins_once_run
     # General
-    global ENABLE_ARPSCAN, SCAN_SUBNETS, LOG_LEVEL, TIMEZONE, PIALERT_WEB_PROTECTION, PIALERT_WEB_PASSWORD, INCLUDED_SECTIONS, SCAN_CYCLE_MINUTES, DAYS_TO_KEEP_EVENTS, REPORT_DASHBOARD_URL, DIG_GET_IP_ARG, UI_LANG
+    global ENABLE_ARPSCAN, SCAN_SUBNETS, LOG_LEVEL, TIMEZONE, ENABLE_PLUGINS, PIALERT_WEB_PROTECTION, PIALERT_WEB_PASSWORD, INCLUDED_SECTIONS, SCAN_CYCLE_MINUTES, DAYS_TO_KEEP_EVENTS, REPORT_DASHBOARD_URL, DIG_GET_IP_ARG, UI_LANG
     # Email
     global REPORT_MAIL, SMTP_SERVER, SMTP_PORT, REPORT_TO, REPORT_FROM, SMTP_SKIP_LOGIN, SMTP_USER, SMTP_PASS, SMTP_SKIP_TLS, SMTP_FORCE_SSL
     # Webhooks
@@ -359,6 +360,7 @@ def importConfigs ():
     SCAN_SUBNETS = ccd('SCAN_SUBNETS', ['192.168.1.0/24 --interface=eth1', '192.168.1.0/24 --interface=eth0'] , c_d, 'Subnets to scan', 'subnets', '', 'General')    
     LOG_LEVEL = ccd('LOG_LEVEL', 'verbose' , c_d, 'Log verboseness', 'selecttext', "['none', 'minimal', 'verbose', 'debug']", 'General')
     TIMEZONE = ccd('TIMEZONE', 'Europe/Berlin' , c_d, 'Time zone', 'text', '', 'General')
+    ENABLE_PLUGINS = ccd('ENABLE_PLUGINS', True , c_d, 'Enable plugins', 'boolean', '', 'General') 
     PIALERT_WEB_PROTECTION = ccd('PIALERT_WEB_PROTECTION', False , c_d, 'Enable logon', 'boolean', '', 'General')
     PIALERT_WEB_PASSWORD = ccd('PIALERT_WEB_PASSWORD', '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92' , c_d, 'Logon password', 'readonly', '', 'General')
     INCLUDED_SECTIONS = ccd('INCLUDED_SECTIONS', ['internet', 'new_devices', 'down_devices', 'events', 'ports']   , c_d, 'Notify on', 'multiselect', "['internet', 'new_devices', 'down_devices', 'events', 'ports', 'plugins']", 'General')
@@ -464,44 +466,47 @@ def importConfigs ():
 
     # Plugins START
     # -----------------
-    plugins = get_plugins_configs()
+    if ENABLE_PLUGINS:
+        plugins = get_plugins_configs()
 
-    mylog('none', ['[', timeNow(), '] Plugins: Number of dynamically loaded plugins: ', len(plugins)])
+        mylog('none', ['[', timeNow(), '] Plugins: Number of dynamically loaded plugins: ', len(plugins)])
 
-    #  handle plugins
-    for plugin in plugins:
-        print_plugin_info(plugin, ['display_name','description'])
-        
-        pref = plugin["unique_prefix"]   
+        #  handle plugins
+        for plugin in plugins:
+            print_plugin_info(plugin, ['display_name','description'])
+            
+            pref = plugin["unique_prefix"]   
 
-        # if plugin["enabled"] == 'true': 
-        
-        # collect plugin level language strings
-        collect_lang_strings(plugin, pref)
-        
-        for set in plugin["settings"]:
-            setFunction = set["function"]
-            # Setting code name / key  
-            key = pref + "_" + setFunction 
+            # if plugin["enabled"] == 'true': 
+            
+            # collect plugin level language strings
+            collect_lang_strings(plugin, pref)
+            
+            for set in plugin["settings"]:
+                setFunction = set["function"]
+                # Setting code name / key  
+                key = pref + "_" + setFunction 
 
-            v = ccd(key, set["default_value"], c_d, set["name"][0]["string"], set["type"] , str(set["options"]), pref)
+                v = ccd(key, set["default_value"], c_d, set["name"][0]["string"], set["type"] , str(set["options"]), pref)
 
-            # Save the user defined value into the object
-            set["value"] = v
+                # Save the user defined value into the object
+                set["value"] = v
 
-            # Setup schedules
-            if setFunction == 'RUN_SCHD':
-                newSchedule = Cron(v).schedule(start_date=datetime.datetime.now(tz))
-                mySchedules.append(schedule_class(pref, newSchedule, newSchedule.next(), False))
+                # Setup schedules
+                if setFunction == 'RUN_SCHD':
+                    newSchedule = Cron(v).schedule(start_date=datetime.datetime.now(tz))
+                    mySchedules.append(schedule_class(pref, newSchedule, newSchedule.next(), False))
 
-            # Collect settings related language strings
-            collect_lang_strings(set,  pref + "_" + set["function"])
+                # Collect settings related language strings
+                collect_lang_strings(set,  pref + "_" + set["function"])
+
+        plugins_once_run = False
     # -----------------
     # Plugins END
 
     
            
-    plugins_once_run = False
+    
 
     # Insert settings into the DB    
     sql.execute ("DELETE FROM Settings")    
@@ -565,11 +570,9 @@ def main ():
 
         # re-load user configuration and plugins
         importConfigs()       
-
         
-
         # Handle plugins executed ONCE
-        if plugins_once_run == False:
+        if ENABLE_PLUGINS and plugins_once_run == False:
             run_plugin_scripts('once')  
             plugins_once_run = True
 
@@ -582,7 +585,7 @@ def main ():
         # proceed if 1 minute passed
         if last_run + datetime.timedelta(minutes=1) < time_started :
 
-             # last time any scan or maintenance/Upkeep was run
+             # last time any scan or maintenance/upkeep was run
             last_run = time_started
 
             # Header
@@ -594,7 +597,8 @@ def main ():
             startTime = startTime.replace (microsecond=0) 
 
             # Check if any plugins need to run on schedule
-            run_plugin_scripts('schedule') 
+            if ENABLE_PLUGINS:
+                run_plugin_scripts('schedule') 
 
             # determine run/scan type based on passed time
             # --------------------------------------------
@@ -663,7 +667,8 @@ def main ():
                 #  new devices were found
                 if len(newDevices) > 0:
                     #  run all plugins registered to be run when new devices are found
-                    run_plugin_scripts('on_new_device')
+                    if ENABLE_PLUGINS:
+                        run_plugin_scripts('on_new_device')
 
                     #  Scan newly found devices with Nmap if enabled
                     if NMAP_ACTIVE and len(newDevices) > 0:
@@ -867,7 +872,7 @@ def check_IP_format (pIP):
 
 
 #===============================================================================
-# Cleanup Online History chart
+# Cleanup / upkeep database
 #===============================================================================
 def cleanup_database ():
     # Header    
@@ -875,10 +880,10 @@ def cleanup_database ():
     mylog('verbose', ['[', startTime, '] Upkeep Database:' ])
 
     # Cleanup Online History
-    mylog('verbose', ['    Online_History: Delete all older than 3 days'])
-    sql.execute ("DELETE FROM Online_History WHERE Scan_Date <= date('now', '-3 day')")
-    mylog('verbose', ['    Optimize Database'])
+    mylog('verbose', ['    Online_History: Delete all but keep latest 150 entries'])    
+    sql.execute ("""DELETE from Online_History where "Index" not in ( SELECT "Index" from Online_History order by Scan_Date desc limit 150)""")
 
+    mylog('verbose', ['    Optimize Database'])
     # Cleanup Events
     mylog('verbose', ['    Events: Delete all older than '+str(DAYS_TO_KEEP_EVENTS)+' days'])
     sql.execute ("DELETE FROM Events WHERE eve_DateTime <= date('now', '-"+str(DAYS_TO_KEEP_EVENTS)+" day')")
@@ -1099,7 +1104,8 @@ def scan_network ():
     commitDB()
 
     # Run splugin scripts which are set to run every timne after a scan finished
-    run_plugin_scripts('always_after_scan')
+    if ENABLE_PLUGINS:
+        run_plugin_scripts('always_after_scan')
 
     return reporting
 
@@ -1191,8 +1197,6 @@ def copy_pihole_network ():
 
 #-------------------------------------------------------------------------------
 def read_DHCP_leases ():
-    reporting = False
-            
     # Read DHCP Leases
     # Bugfix #1 - dhcp.leases: lines with different number of columns (5 col)
     data = []
@@ -1203,14 +1207,13 @@ def read_DHCP_leases ():
             if len(row) == 5 :
                 data.append (row)
 
-    # Insert into PiAlert table
-    sql.execute ("DELETE FROM DHCP_Leases")
+    # Insert into PiAlert table    
     sql.executemany ("""INSERT INTO DHCP_Leases (DHCP_DateTime, DHCP_MAC,
                             DHCP_IP, DHCP_Name, DHCP_MAC2)
                         VALUES (?, ?, ?, ?, ?)
                      """, data)
 
-    return reporting
+    
 
 #-------------------------------------------------------------------------------
 def save_scanned_devices (p_arpscan_devices, p_cycle_interval):
@@ -1262,6 +1265,11 @@ def save_scanned_devices (p_arpscan_devices, p_cycle_interval):
     local_ip_cmd = ["ip -o route get 1 | sed 's/^.*src \\([^ ]*\\).*$/\\1/;q'"]
     local_ip = subprocess.Popen (local_ip_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].decode().strip()
 
+    mylog('debug', ['    Saving this IP into the CurrentScan table:', local_ip])
+
+    if check_IP_format(local_ip) == '':
+        local_ip = '0.0.0.0'
+
     # Check if local mac has been detected with other methods
     sql.execute ("SELECT COUNT(*) FROM CurrentScan WHERE cur_ScanCycle = ? AND cur_MAC = ? ", (cycle, local_mac) )
     if sql.fetchone()[0] == 0 :
@@ -1585,8 +1593,7 @@ def update_devices_data_from_scan ():
     sql.execute ("""UPDATE Devices
                     SET dev_NAME = (SELECT PH_Name FROM PiHole_Network
                                     WHERE PH_MAC = dev_MAC)
-                    WHERE (dev_Name = "(unknown)"
-                           OR dev_Name = ""
+                    WHERE (dev_Name in ("(unknown)", "(name not found)", "" )
                            OR dev_Name IS NULL)
                       AND EXISTS (SELECT 1 FROM PiHole_Network
                                   WHERE PH_MAC = dev_MAC
@@ -1597,8 +1604,7 @@ def update_devices_data_from_scan ():
     sql.execute ("""UPDATE Devices
                     SET dev_NAME = (SELECT DHCP_Name FROM DHCP_Leases
                                     WHERE DHCP_MAC = dev_MAC)
-                    WHERE (dev_Name = "(unknown)"
-                           OR dev_Name = ""
+                    WHERE (dev_Name in ("(unknown)", "(name not found)", "" )                           
                            OR dev_Name IS NULL)
                       AND EXISTS (SELECT 1 FROM DHCP_Leases
                                   WHERE DHCP_MAC = dev_MAC)""")
@@ -1619,6 +1625,8 @@ def update_devices_data_from_scan ():
     sql.executemany ("UPDATE Devices SET dev_Vendor = ? WHERE dev_MAC = ? ",
         recordsToUpdate )
 
+    # clean-up device leases table
+    sql.execute ("DELETE FROM DHCP_Leases")
     print_log ('Update devices end')
 
 #-------------------------------------------------------------------------------
@@ -1745,7 +1753,7 @@ def performNmapScan(devicesToScan):
                 append_line_to_file (logPath + '/pialert_nmap.log', line +'\n')                
             
             # collect ports / new Nmap Entries
-            newEntries = []
+            newEntriesTmp = []
 
             index = 0
             startCollecting = False
@@ -1759,7 +1767,7 @@ def performNmapScan(devicesToScan):
                 elif 'PORT' in line and 'STATE' in line and 'SERVICE' in line:    
                     startCollecting = False # end reached
                 elif startCollecting and len(line.split()) == 3:                                    
-                    newEntries.append(nmap_entry(device["dev_MAC"], timeNow(), line.split()[0], line.split()[1], line.split()[2], device["dev_Name"]))
+                    newEntriesTmp.append(nmap_entry(device["dev_MAC"], timeNow(), line.split()[0], line.split()[1], line.split()[2], device["dev_Name"]))
                 elif 'Nmap done' in line:
                     duration = line.split('scanned in ')[1]            
             index += 1
@@ -1767,9 +1775,9 @@ def performNmapScan(devicesToScan):
             # previous Nmap Entries
             oldEntries = []
 
-            mylog('verbose', ['[', timeNow(), '] Scan: Ports found by NMAP: ', len(newEntries)])
+            mylog('verbose', ['[', timeNow(), '] Scan: Ports found by NMAP: ', len(newEntriesTmp)])
             
-            if len(newEntries) > 0:   
+            if len(newEntriesTmp) > 0:   
 
                 #  get all current NMAP ports from the DB
                 sql.execute(sql_nmap_scan_all) 
@@ -1777,18 +1785,28 @@ def performNmapScan(devicesToScan):
                 rows = sql.fetchall()
 
                 for row in rows: 
-                    oldEntries.append(nmap_entry(row["MAC"], row["Port"], row["State"], row["Service"], device["dev_Name"], row["Extra"], row["Index"]))
+                    # only collect entries matching the current MAC address
+                    if row["MAC"] == device["dev_MAC"]:
+                        oldEntries.append(nmap_entry(row["MAC"], row["Time"], row["Port"], row["State"], row["Service"], device["dev_Name"], row["Extra"], row["Index"]))
 
-                indexesToRemove = []
 
-                # Remove all entries already available in the database
-                for newEntry in newEntries:
-                    #  Check if available in oldEntries and remove if yes
-                    if any(x.hash == newEntry.hash for x in oldEntries):
-                        newEntries.pop(index)
+                newEntries = []
 
-                mylog('verbose', ['[', timeNow(), '] Scan: Nmap new or changed ports: ', len(newEntries)])
-                mylog('verbose', ['[', timeNow(), '] Scan: Nmap old entries:          ', len(oldEntries)])
+                # Collect all entries that don't match the ones in the DB               
+                for newTmpEntry in newEntriesTmp:
+
+                    found = False
+                    
+                    #  Check the new entry is already available in oldEntries and remove from processing if yes
+                    for oldEntry in oldEntries: 
+                        if newTmpEntry.hash == oldEntry.hash:
+                            found = True
+
+                    if not found:
+                        newEntries.append(newTmpEntry)
+
+
+                mylog('verbose', ['[', timeNow(), '] Scan: Nmap newly discovered or changed ports: ', len(newEntries)])                
 
                 # collect new ports, find the corresponding old entry and return for notification purposes
                 # also update the DB with the new values after deleting the old ones
@@ -1852,7 +1870,7 @@ def performNmapScan(devicesToScan):
 
                     #  Delete old entries if available
                     if len(indexesToDelete) > 0:
-                        sql.execute ("DELETE FROM Nmap_Scan where Index in (" + indexesToDelete[:-1] +")")
+                        sql.execute ("DELETE FROM Nmap_Scan where \"Index\" in (" + indexesToDelete[:-1] +")")
                         commitDB ()
 
                     # Insert new values into the DB 
@@ -1870,7 +1888,7 @@ class nmap_entry:
         self.name = name
         self.extra = extra
         self.index = index
-        self.hash = str(hash(str(mac) + str(port)+ str(state)+ str(service)))
+        self.hash = str(mac) + str(port)+ str(state)+ str(service)
 
 #-------------------------------------------------------------------------------
 def performPholusScan (timeoutSec):
@@ -1947,7 +1965,9 @@ def cleanResult(str):
     str = str.replace(".lan", "")
     str = str.replace(".home", "")
     str = re.sub(r'-[a-fA-F0-9]{32}', '', str)    # removing last part of e.g. Nest-Audio-ff77ff77ff77ff77ff77ff77ff77ff77
-    # str = str.replace(".", "")
+    # remove trailing dots
+    if str.endswith('.'):
+        str = str[:-1]
 
     return str
 
@@ -2334,8 +2354,8 @@ def send_notifications ():
 
         mail_text = mail_text.replace ('<PORTS_TABLE>', portsTxt )
 
-    if 'plugins' in INCLUDED_SECTIONS:  
-        # Compose Plugins Section   
+    if 'plugins' in INCLUDED_SECTIONS and ENABLE_PLUGINS:  
+        # Compose Plugins Section           
         sqlQuery = """SELECT Plugin, Object_PrimaryId, Object_SecondaryId, DateTimeChanged, Watched_Value1, Watched_Value2, Watched_Value3, Watched_Value4, Status from Plugins_Events"""
 
         notiStruc = construct_notifications(sqlQuery, "Plugins")
@@ -2347,7 +2367,7 @@ def send_notifications ():
         mail_html = mail_html.replace ('<PLUGINS_TABLE>', notiStruc.html)
 
         # check if we need to report something
-        plugins_report = plugin_check_smth_to_report(json_plugins)
+        plugins_report = len(json_plugins) > 0
 
 
     json_final = {
@@ -2736,6 +2756,7 @@ def send_webhook (_json, _html):
     # execute CURL call
     try:
         # try runnning a subprocess
+        mylog('debug', curlParams) 
         p = subprocess.Popen(curlParams, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
         stdout, stderr = p.communicate()
@@ -3266,12 +3287,13 @@ def to_binary_sensor(input):
 # API
 #===============================================================================
 def update_api(isNotification = False, updateOnlyDataSources = []):
-
-    mylog('verbose', ['     [API] Updating files in /front/api'])    
+    
     folder = pialertPath + '/front/api/'
 
     if isNotification:
         #  Update last notification alert in all formats
+        mylog('verbose', ['     [API] Updating notification_* files in /front/api'])
+
         write_file(folder + 'notification_text.txt'  , mail_text)
         write_file(folder + 'notification_text.html'  , mail_html)
         write_file(folder + 'notification_json_final.json'  , json.dumps(json_final))  
@@ -3279,7 +3301,7 @@ def update_api(isNotification = False, updateOnlyDataSources = []):
     # Save plugins
     write_file(folder + 'plugins.json'  , json.dumps({"data" : plugins}))  
 
-    #  prepare databse tables we want to expose 
+    #  prepare database tables we want to expose 
     dataSourcesSQLs = [
         ["devices", sql_devices_all],
         ["nmap_scan", sql_nmap_scan_all],
@@ -3298,9 +3320,56 @@ def update_api(isNotification = False, updateOnlyDataSources = []):
 
         if updateOnlyDataSources == [] or dsSQL[0] in updateOnlyDataSources:
 
-            json_string = get_table_as_json(dsSQL[1]).json
+            api_endpoint_class(dsSQL[1], folder + 'table_' + dsSQL[0] + '.json')
 
-            write_file(folder + 'table_' + dsSQL[0] + '.json'  , json.dumps(json_string))     
+
+#-------------------------------------------------------------------------------
+apiEndpoints = []
+
+class api_endpoint_class:
+    def __init__(self, sql, path):        
+
+        global apiEndpoints
+
+        self.sql = sql
+        self.jsonData = get_table_as_json(sql).json
+        self.path = path
+        self.fileName = path.split('/')[-1]
+        self.hash = hash(json.dumps(self.jsonData))
+
+        # check if the endpoint needs to be updated
+        found = False
+        changed = False
+        changedIndex = -1
+        index = 0
+        
+        # search previous endpoint states to check if API needs updating
+        for endpoint in apiEndpoints:
+            # match sql and API endpoint path 
+            if endpoint.sql == self.sql and endpoint.path == self.path:
+                found = True 
+                if endpoint.hash != self.hash:                    
+                    changed = True
+                    changedIndex = index
+
+            index = index + 1
+        
+        # cehck if API endpoints have changed or if it's a new one
+        if not found or changed:
+
+            mylog('verbose', [f'     [API] Updating {self.fileName} file in /front/api'])
+
+            write_file(self.path, json.dumps(self.jsonData)) 
+            
+            if not found:
+                apiEndpoints.append(self)
+
+            elif changed and changedIndex != -1 and changedIndex < len(apiEndpoints):
+                # update hash
+                apiEndpoints[changedIndex].hash = self.hash
+            else:
+                mylog('info', [f'     [API] ERROR Updating {self.fileName}'])
+            
 
 #-------------------------------------------------------------------------------
 def get_table_as_json(sqlQuery):
@@ -3320,8 +3389,7 @@ def get_table_as_json(sqlQuery):
 
 #-------------------------------------------------------------------------------
 class json_struc:
-    def __init__(self, jsn, columnNames):
-        # mylog('verbose', ['     [] tmp: ', str(json.dumps(jsn))]) 
+    def __init__(self, jsn, columnNames):        
         self.json = jsn
         self.columnNames = columnNames       
 
@@ -3649,7 +3717,7 @@ def isNewVersion():
             data = ""
         
         # make sure we received a valid response and not an API rate limit exceeded message
-        if len(data) > 0 and "published_at" in data[0]:        
+        if data != "" and len(data) > 0 and isinstance(data, list) and "published_at" in data[0]:        
 
             dateTimeStr = data[0]["published_at"]            
 
@@ -3787,6 +3855,9 @@ def execute_plugin(plugin):
     # prepare command from plugin settings, custom parameters  
     command = resolve_wildcards(set_CMD, params).split()
 
+    # build SQL query parameters to insert into the DB
+    sqlParams = []
+
     # python-script 
     if plugin['data_source'] == 'python-script':
 
@@ -3816,9 +3887,6 @@ def execute_plugin(plugin):
         # for line in newLines:
         #     append_line_to_file (pluginsPath + '/plugin.log', line +'\n')         
         
-        # build SQL query parameters to insert into the DB
-        sqlParams = []
-
         for line in newLines:
             columns = line.split("|")
             # There has to be always 9 columns
@@ -3835,15 +3903,12 @@ def execute_plugin(plugin):
         # Execute command
         mylog('verbose', ['     [Plugins] Executing: ', q])
 
-        # build SQL query parameters to insert into the DB
-        sqlParams = []
-
         # set_CMD should contain a SQL query        
         arr = get_sql_array (q) 
 
         for row in arr:
             # There has to be always 9 columns
-            if len(row) == 9:
+            if len(row) == 9 and (row[0] in ['','null']) == False :
                 sqlParams.append((plugin["unique_prefix"], row[0], row[1], 'null', row[2], row[3], row[4], row[5], row[6], 0, row[7], 'null', row[8]))
             else:
                 mylog('none', ['        [Plugins]: Skipped invalid sql result'])
@@ -3877,6 +3942,8 @@ def process_plugin_events(plugin):
 
     pluginPref = plugin["unique_prefix"]
 
+    mylog('debug', ['     [Plugins] Processing        : ', pluginPref])
+
     plugObjectsArr = get_sql_array ("SELECT * FROM Plugins_Objects where Plugin = '" + str(pluginPref)+"'") 
     plugEventsArr  = get_sql_array ("SELECT * FROM Plugins_Events where Plugin = '" + str(pluginPref)+"'") 
 
@@ -3888,8 +3955,8 @@ def process_plugin_events(plugin):
 
     existingPluginObjectsCount = len(pluginObjects)
 
-    mylog('debug', ['     [Plugins] Existing objects: ', existingPluginObjectsCount])
-    mylog('debug', ['     [Plugins] Events objects: ', len(plugEventsArr)])
+    mylog('debug', ['     [Plugins] Existing objects        : ', existingPluginObjectsCount])
+    mylog('debug', ['     [Plugins] New and existing events : ', len(plugEventsArr)])
 
     # set status as new - will be changed later if conditions are fulfilled, e.g. entry found
     for eve in plugEventsArr:
@@ -3921,7 +3988,7 @@ def process_plugin_events(plugin):
                 pluginEvents[index].status = "watched-not-changed"  
         index += 1
 
-    # Merge existing plugin objects with newly discovered ones and update existin ones with new values
+    # Merge existing plugin objects with newly discovered ones and update existing ones with new values
     for eveObj in pluginEvents:
         if eveObj.status == 'new':
             pluginObjects.append(eveObj)
@@ -3951,16 +4018,85 @@ def process_plugin_events(plugin):
             sql.execute (f"UPDATE Plugins_Objects set Plugin = '{plugObj.pluginPref}', DateTimeChanged = '{plugObj.changed}', Watched_Value1 = '{plugObj.watched1}', Watched_Value2 = '{plugObj.watched2}', Watched_Value3 = '{plugObj.watched3}', Watched_Value4 = '{plugObj.watched4}', Status = '{plugObj.status}', Extra = '{plugObj.extra}', ForeignKey = '{plugObj.foreignKey}' WHERE \"Index\" = {plugObj.index}")            
 
     # Update the Plugins_Events with the new statuses    
-    sql.execute ("DELETE FROM Plugins_Events")
+    sql.execute (f'DELETE FROM Plugins_Events where Plugin = "{pluginPref}"')
 
     for plugObj in pluginEvents: 
 
         createdTime = plugObj.created
 
+        # use the same datetime for created and changed if a new entry
         if plugObj.status == 'new':
-            createdTime = plugObj.changed        
+            createdTime = plugObj.changed  
 
-        sql.execute ("INSERT INTO Plugins_Events (Plugin, Object_PrimaryID, Object_SecondaryID, DateTimeCreated, DateTimeChanged, Watched_Value1, Watched_Value2, Watched_Value3, Watched_Value4, Status,  Extra, UserData, ForeignKey) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", (plugObj.pluginPref, plugObj.primaryId , plugObj.secondaryId , createdTime, plugObj.changed , plugObj.watched1 , plugObj.watched2 , plugObj.watched3 , plugObj.watched4 , plugObj.status , plugObj.extra, plugObj.userData, plugObj.foreignKey ))    
+        #  insert only events if they are to be reported on
+        if plugObj.status in  get_plugin_setting_value(plugin, "REPORT_ON"):  
+
+            sql.execute ("INSERT INTO Plugins_Events (Plugin, Object_PrimaryID, Object_SecondaryID, DateTimeCreated, DateTimeChanged, Watched_Value1, Watched_Value2, Watched_Value3, Watched_Value4, Status,  Extra, UserData, ForeignKey) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", (plugObj.pluginPref, plugObj.primaryId , plugObj.secondaryId , createdTime, plugObj.changed , plugObj.watched1 , plugObj.watched2 , plugObj.watched3 , plugObj.watched4 , plugObj.status , plugObj.extra, plugObj.userData, plugObj.foreignKey ))
+
+    # Perform databse table mapping if enabled for the plugin   
+    if len(pluginEvents) > 0 and  "mapped_to_table" in plugin:
+
+        sqlParams = []        
+
+        dbTable = plugin['mapped_to_table']
+
+        mylog('debug', ['     [Plugins] Mapping objects to database table: ', dbTable])
+
+        #  collect all columns to be mapped
+        mappedCols = []        
+        columnsStr = ''
+        valuesStr = ''
+
+        for clmn in plugin['database_column_definitions']:            
+            if 'mapped_to_column' in clmn:                
+                mappedCols.append(clmn)
+                columnsStr = f'{columnsStr}, "{clmn["mapped_to_column"]}"'
+                valuesStr = f'{valuesStr}, ?'
+
+        if len(columnsStr) > 0:
+            columnsStr = columnsStr[1:] # remove first ','
+            valuesStr = valuesStr[1:] # remove first ','
+
+        # map the column names to plugin object event values
+        for plgEv in pluginEvents:
+
+            tmpList = []
+
+            for col in mappedCols:
+                if col['column'] == 'Index':
+                    tmpList.append(plgEv.index)
+                elif col['column'] == 'Plugin':
+                    tmpList.append(plgEv.pluginPref)
+                elif col['column'] == 'Object_PrimaryID':
+                    tmpList.append(plgEv.primaryId)
+                elif col['column'] == 'Object_SecondaryID':
+                    tmpList.append(plgEv.secondaryId)
+                elif col['column'] == 'DateTimeCreated':
+                    tmpList.append(plgEv.created)
+                elif col['column'] == 'DateTimeChanged':
+                    tmpList.append(plgEv.changed)
+                elif col['column'] == 'Watched_Value1':
+                    tmpList.append(plgEv.watched1)
+                elif col['column'] == 'Watched_Value2':
+                    tmpList.append(plgEv.watched2)
+                elif col['column'] == 'Watched_Value3':
+                    tmpList.append(plgEv.watched3)
+                elif col['column'] == 'Watched_Value4':
+                    tmpList.append(plgEv.watched4)
+                elif col['column'] == 'UserData':
+                    tmpList.append(plgEv.userData)
+                elif col['column'] == 'Extra':
+                    tmpList.append(plgEv.extra)
+                elif col['column'] == 'Status':
+                    tmpList.append(plgEv.status)               
+                
+            sqlParams.append(tuple(tmpList))
+
+        q = f'INSERT into {dbTable} ({columnsStr}) VALUES ({valuesStr})'
+
+        mylog('debug', ['     [Plugins] SQL query for mapping: ', q ])
+
+        sql.executemany (q, sqlParams) 
 
     commitDB()
 
@@ -4007,7 +4143,7 @@ class plugin_object_class:
 
         self.watchedHash  = str(hash(tmp))
 
-
+  
 #-------------------------------------------------------------------------------
 # Combine plugin objects, keep user-defined values, created time, changed time if nothing changed and the index
 def combine_plugin_objects(old, new):    
@@ -4028,37 +4164,17 @@ def combine_plugin_objects(old, new):
 def resolve_wildcards(command, params):
 
     mylog('debug', ['        [Plugins]: Pre-Resolved CMD: ', command])
+    
 
     for param in params:
         mylog('debug', ['        [Plugins]: key     : {', param[0], '}'])
         mylog('debug', ['        [Plugins]: resolved: ', param[1]])
         command = command.replace('{' + param[0] + '}', param[1])
 
-    mylog('debug', ['        [Plugins]: Resolved CMD: ', command])
+    mylog('debug', ['        [Plugins]: Resolved     CMD: ', command])
 
     return command
 
-#-------------------------------------------------------------------------------
-# Check if there are events which need to be reported on based on settings
-def plugin_check_smth_to_report(notifs):
-    
-    for notJsn in notifs:
-        
-        pref = notJsn['Plugin'] #"Plugin" column 
-        stat = notJsn['Status'] #"Status" column 
-                 
-        val = get_setting_value(pref + '_REPORT_ON')
-
-        if set is not None:
-            
-            # report if there is at least one value in teh events to be reported on
-            # future improvement - selectively remove events based on this
-            if stat in val: 
-                return True
-
-    return False
-
-
 #-------------------------------------------------------------------------------
 # Flattens a setting to make it passable to a script
 def plugin_param_from_glob_set(globalSetting):
@@ -4092,6 +4208,17 @@ def get_plugin_setting(plugin, function_key):
 
     return result
 
+#-------------------------------------------------------------------------------
+# Gets the setting value
+def get_plugin_setting_value(plugin, function_key):
+    
+    resultObj = get_plugin_setting(plugin, function_key)
+
+    if resultObj != None:
+        return resultObj["value"]
+
+    return None
+
 
 #-------------------------------------------------------------------------------
 # Get localized string value on the top JSON depth, not recursive
@@ -4163,11 +4290,11 @@ class schedule_class:
         #               (maybe the following check is unnecessary:)
         # if the last run is past the last time we run a scheduled Pholus scan
         if nowTime > self.last_next_schedule and self.last_run < self.last_next_schedule:
-            print_log("Scheduler run: YES")
+            print_log(f'Scheduler run for {self.service}: YES')
             self.was_last_schedule_used = True
             result = True
         else:
-            print_log("Scheduler run: NO")
+            print_log(f'Scheduler run for {self.service}: NO')
         
         if self.was_last_schedule_used:
             self.was_last_schedule_used = False

back/update_vendors.sh

@@ -26,16 +26,16 @@ sudo cp *.csv 2_backup
 echo ""
 echo Download Start
 echo ""
-sudo curl $1  -O https://standards-oui.ieee.org/iab/iab.csv \
-              -O https://standards-oui.ieee.org/iab/iab.txt \
-              -O https://standards-oui.ieee.org/oui28/mam.csv \
-              -O https://standards-oui.ieee.org/iab/iab.txt \
-              -O https://standards-oui.ieee.org/oui28/mam.csv \
-              -O https://standards-oui.ieee.org/oui28/mam.txt \
-              -O https://standards-oui.ieee.org/oui36/oui36.csv \
-              -O https://standards-oui.ieee.org/oui36/oui36.txt \
-              -O https://standards-oui.ieee.org/oui/oui.csv \
-              -O https://standards-oui.ieee.org/oui/oui.txt
+sudo curl $1  -LO https://standards-oui.ieee.org/iab/iab.csv \
+              -LO https://standards-oui.ieee.org/iab/iab.txt \
+              -LO https://standards-oui.ieee.org/oui28/mam.csv \
+              -LO https://standards-oui.ieee.org/iab/iab.txt \
+              -LO https://standards-oui.ieee.org/oui28/mam.csv \
+              -LO https://standards-oui.ieee.org/oui28/mam.txt \
+              -LO https://standards-oui.ieee.org/oui36/oui36.csv \
+              -LO https://standards-oui.ieee.org/oui36/oui36.txt \
+              -LO https://standards-oui.ieee.org/oui/oui.csv \
+              -LO https://standards-oui.ieee.org/oui/oui.txt
 echo ""
 echo Download Finished
 

config/pialert.conf

@@ -23,7 +23,8 @@ PIALERT_WEB_PASSWORD='8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923a
 INCLUDED_SECTIONS=['internet','new_devices','down_devices','events']
 SCAN_CYCLE_MINUTES=5
 DAYS_TO_KEEP_EVENTS=90
-REPORT_DASHBOARD_URL='http://pi.alert/'
+# Used for generating links in emails. Make sure not to add a trailing slash!
+REPORT_DASHBOARD_URL='http://pi.alert'
 
 
 # Email

docker-compose.yml

@@ -7,12 +7,14 @@ services:
     network_mode: "host"
     restart: unless-stopped
     volumes:
-      - ${APP_DATA_LOCATION}/pialert/config:/home/pi/pialert/config
+      - ${APP_DATA_LOCATION}/pialert2/config:/home/pi/pialert/config
       # - ${APP_DATA_LOCATION}/pialert/db/pialert.db:/home/pi/pialert/db/pialert.db
-      - ${APP_DATA_LOCATION}/pialert/db:/home/pi/pialert/db      
+      - ${APP_DATA_LOCATION}/pialert2/db:/home/pi/pialert/db      
       # (optional) useful for debugging if you have issues setting up the container
       - ${LOGS_LOCATION}:/home/pi/pialert/front/log      
       # DELETE START anyone trying to use this file: comment out / delete BELOW lines, they are only for development purposes
+      - ${APP_DATA_LOCATION}/pialert/dhcp_samples/dhcp1.leases:/mnt/dhcp1.leases
+      - ${APP_DATA_LOCATION}/pialert/dhcp_samples/dhcp2.leases:/mnt/dhcp2.leases
       - ${DEV_LOCATION}/back/pialert.py:/home/pi/pialert/back/pialert.py
       - ${DEV_LOCATION}/back/report_template.html:/home/pi/pialert/back/report_template.html
       - ${DEV_LOCATION}/back/report_template_new_version.html:/home/pi/pialert/back/report_template_new_version.html

dockerfiles/README.md

@@ -6,7 +6,7 @@
 
 # 🐳 A docker image for Pi.Alert 
 
-🐳 [Docker hub](https://registry.hub.docker.com/r/jokobsk/pi.alert) | 📄 [Dockerfile](https://github.com/jokob-sk/Pi.Alert/blob/main/Dockerfile) | 📚 [Docker instructions](https://github.com/jokob-sk/Pi.Alert/blob/main//dockerfiles/README.md) | 🆕 [Release notes](https://github.com/jokob-sk/Pi.Alert/releases)
+🐳 [Docker hub](https://registry.hub.docker.com/r/jokobsk/pi.alert) | 📄 [Dockerfile](https://github.com/jokob-sk/Pi.Alert/blob/main/Dockerfile) | 📚 [Docker instructions](https://github.com/jokob-sk/Pi.Alert/blob/main/dockerfiles/README.md) | 🆕 [Release notes](https://github.com/jokob-sk/Pi.Alert/releases)
 
 <a href="https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/devices_split.png" target="_blank">
   <img src="https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/devices_split.png" width="300px" />
@@ -53,13 +53,15 @@ docker run -d --rm --network=host \
 
 ### Config (`pialert.conf`)
 
-- Modify [pialert.conf](https://github.com/jokob-sk/Pi.Alert/tree/main/config) or manage the configuration via Settings.  
-- ❗ Set the `SCAN_SUBNETS` variable. 
+- The preferred wy is to manage the configuration via Settings 
+- YOu can modify [pialert.conf](https://github.com/jokob-sk/Pi.Alert/tree/main/config) directly if needed
+- ❗ To use the arp-scan method, you need to set the `SCAN_SUBNETS` variable. ()
    * The adapter will probably be `eth0` or `eth1`. (Run `iwconfig` to find your interface name(s)) 
    * Specify the network filter (which **significantly** speeds up the scan process). For example, the filter `192.168.1.0/24` covers IP ranges 192.168.1.0 to 192.168.1.255.
    * Examples for one and two subnets  (❗ Note the `['...', '...']` format):
      * 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']` 
+   * More documentation on how to [setup vlans](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/SUBNETS.md) 
 
 
 ### 🛑 **Common issues** 
@@ -113,6 +115,27 @@ To run the container execute: `sudo docker-compose up -d`
 
 ### Example 2
 
+Example by [SeimuS](https://github.com/SeimusS).
+
+```yaml
+  pialert:
+    container_name: PiAlert
+    hostname: PiAlert
+    privileged: true
+    image: jokobsk/pi.alert:latest
+    environment:
+      - TZ=Europe/Bratislava
+    restart: always
+    volumes:
+      - ./pialert/pialert_db:/home/pi/pialert/db
+      - ./pialert/pialert_config:/home/pi/pialert/config
+    network_mode: host
+```
+
+To run the container execute: `sudo docker-compose up -d`
+
+### Example 3
+
 `docker-compose.yml` 
 
 ```yaml
@@ -158,7 +181,7 @@ DEV_LOCATION=/path/to/local/source/code
 
 To run the container execute: `sudo docker-compose --env-file /path/to/.env up`
 
-### Example 3
+### Example 4
 
 Courtesy of [pbek](https://github.com/pbek). The volume `pialert_db` is used by the db directory. The two config files are mounted directly from a local folder to their places in the config folder. You can backup the `docker-compose.yaml` folder and the docker volumes folder.
 
@@ -188,8 +211,6 @@ Big thanks to <a href="https://github.com/Macleykun">@Macleykun</a> for help and
 
 ## ☕ Support me
 
-Disclaimer: Please only donate if you don't have any debt yourself. Support yourself first, then others.
-
 <a href="https://github.com/sponsors/jokob-sk" target="_blank"><img src="https://i.imgur.com/X6p5ACK.png" alt="Sponsor Me on GitHub" style="height: 30px !important;width: 117px !important;" width="150px" ></a>
 <a href="https://www.buymeacoffee.com/jokobsk" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 117px !important;" width="117px" height="30px" ></a>
 <a href="https://www.patreon.com/user?u=84385063" target="_blank"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Patreon_logo_with_wordmark.svg/512px-Patreon_logo_with_wordmark.svg.png" alt="Support me on patreon" style="height: 30px !important;width: 117px !important;" width="117px" ></a>

docs/API.md

@@ -28,12 +28,12 @@ You can access the following files:
   | `table_devices.json` | The current (at the time of the last update as mentioned above on this page) state of all of the available Devices detected by the app. |
   | `table_nmap_scan.json` | The current state of the discovered ports by the regular NMAP scans. |
   | `table_pholus_scan.json` | The latest state of the [pholus](https://github.com/jokob-sk/Pi.Alert/tree/main/pholus) (A multicast DNS and DNS Service Discovery Security Assessment Tool) scan results. |
-  | `table_events_pending_alert.json` | The list of the unprocessed (pending) notification events. |
-  | `table_settings.json` | The content of the settings table. |
+  | `table_plugins_events.json` | The list of the unprocessed (pending) notification events (plugins_events DB table). |
+  | `table_plugins_history.json` | The list of notification events history. |  
   | `table_plugins_objects.json` | The content of the plugins_objects table. Find more info on the [Plugin system here](https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins)|
-  | `language_strings.json` | The content of the language_strings table, which in turn is loaded from the plugins `config.json` definitions. |
-  | `table_plugins_events.json` | The content of the plugins_events table. |
+  | `language_strings.json` | The content of the language_strings table, which in turn is loaded from the plugins `config.json` definitions. |  
   | `table_custom_endpoint.json` | A custom endpoint generated by the SQL query specified by the `API_CUSTOM_SQL` setting. |
+  | `table_settings.json` | The content of the settings table. |
   
   Current/latest state of the aforementioned files depends on your settings.
 

docs/NETWORK_TREE.md

@@ -15,7 +15,7 @@ To setup a device named `rapberrypi` as a `Switch` in our network.
 > Note: Only the following device types will show up as selectable Network nodes ( = devices you can connect other devices to):
 > AP, Firewall, Gateway, PLC, Powerline, Router, Switch, USB LAN Adapter, USB WIFI Adapter and WLAN.
 
-- Assign a device to your root device from the `Node` (5) dropdown whitch has the MAC `Internet` (6) (Your name may differ, but the MAC needs to be set to `Internet` - this is done by default). 
+- Assign a device to your root device from the `Node` (5) dropdown which has the MAC `Internet` (6) (Your name may differ, but the MAC needs to be set to `Internet` - this is done by default). 
 
 - Save your changes (7)
 

docs/SUBNETS.md

@@ -7,4 +7,15 @@ For example, a `/24` mask results in 256 IPs to check, where as a `/16` mask che
 
 - Specify the network mask. For example, the filter `192.168.1.0/24` covers IP ranges 192.168.1.0 to 192.168.1.255
 - Run `iwconfig` in your container to find your interface name(s) (e.g.: `eth0`, `eth1`). 
-- Append e.g.: ` -vlan=107` to the interface field (e.g.: `eth0 -vlan=107`) for multiple vlans. More details in this [issue](https://github.com/jokob-sk/Pi.Alert/issues/170)
+- Append e.g.: ` -vlan=107` to the interface field (e.g.: `eth0 -vlan=107`) for multiple vlans. More details in this [comment in this issue](https://github.com/jokob-sk/Pi.Alert/issues/170#issuecomment-1419902988)
+
+### Example:
+
+![Vlan configuration example](/docs/img/SUBNETS/subnets_vlan.png)
+
+### Support for VLANS
+
+Please note about the accessibility of the macvlans when they are configured on the same computer. My understanding this is a general networking behavior, but feel free to clarify via a PR/issue.
+
+- Pi.Alert does not detect the macvlan container when it is running on the same computer.
+- Pi.Alert recognizes the macvlan container when it is running on a different computer.

front/css/pialert.css

@@ -591,7 +591,14 @@ height: 50px;
 }
 
 .nav-tabs-custom .tab-content {
-  background-color: white;
+  background-color: white;  
+  
+}
+
+@media (max-width: 767px) {
+    .nav-tabs-custom .tab-content {          
+        overflow: scroll;
+      }
 }
 
 .top_small_box_gray_text {
@@ -623,20 +630,21 @@ height: 50px;
         width:30%;         
     }
   }
-  @media (min-width: 768px) {
-    .setting_description {        
-        /* color: green; */
-        display: block;
-    }
-    .setting_input{
-        width:35%;        
-        /* background-color: green; */
-    }
-    .setting_name
-    {
-        width:19%;         
-    }
-  }
+
+@media (min-width: 768px) {
+.setting_description {        
+    /* color: green; */
+    display: block;
+}
+.setting_input{
+    width:40%;        
+    /* background-color: green; */
+}
+.setting_name
+{
+    width:19%;         
+}
+}
 
 .table_row {    
     padding: 3px;    
@@ -663,7 +671,7 @@ height: 50px;
 
 .setting_description
 {
-    width:46%;
+    width:40%;
 }
 
 .myhidden
@@ -819,5 +827,15 @@ height: 50px;
     padding-bottom: 8px;
 }
 
+.plugins-description
+{
+    padding-top: 20px;
+}
+
 
   
+.login-page .login-custom
+{
+    width:480px;
+    
+}

front/deviceDetails.php

@@ -441,9 +441,32 @@
                             <i class="fa fa-info-circle"></i> </a>
                         </div>
                       </div>
-
                     </div>
+                </div>
+
+                <div class="col-lg-4 col-sm-6 col-xs-12">
+                  <h4 class="bottom-border-aqua"><?= lang('DevDetail_Run_Actions_Title');?></h4>
+                  <div class="box-body form-horizontal">
+                  <label class="col-sm-3 control-label">
+                    <?= lang('Gen_Action');?>                   
+                  </label>
+                  <div class="col-sm-9">
+                    <div class="input-group">
+                      <input class="form-control" title="<?= lang('DevDetail_Run_Actions_Tooltip');?>" id="txtAction" type="text" value="--">
+                      <span class="input-group-addon" title='<?= lang('Gen_Run');?>'><i class="fa fa-play pointer" onclick="askRunAction();"></i></span>
+                      
+                      <div class="input-group-btn">
+                        <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                          <span class="fa fa-caret-down"></span>
+                        </button>
+                        <ul id="dropdownAction" class="dropdown-menu dropdown-menu-right">
+                        </ul>
+                      </div>
+                    </div>
+                  </div>  
+
                   </div>
+                </div>
 
                   <!-- Buttons -->
                   <div class="col-xs-12">
@@ -924,7 +947,8 @@ function initializeCombos () {
   initializeCombo ( '#dropdownGroup',          'getGroups',       'txtGroup', true);
   initializeCombo ( '#dropdownLocation',       'getLocations',    'txtLocation', true);
   initializeCombo ( '#dropdownNetworkNodeMac', 'getNetworkNodes', 'txtNetworkNodeMac', false);
-  initializeCombo ( '#dropdownIcon',           'getIcons',        'txtIcon', false);
+  initializeCombo ( '#dropdownIcon',           'getIcons',        'txtIcon', false);  
+  initializeCombo ( '#dropdownAction',         'getActions',      'txtAction', false);  
 
   // Initialize static combos
   initializeComboSkipRepeated ();
@@ -1547,8 +1571,6 @@ function setDeviceData (direction='', refreshCallback='') {
   });
 }
 
-
-
 // -----------------------------------------------------------------------------
 function askSkipNotifications () {
   // Check MAC
@@ -1601,6 +1623,39 @@ function deleteDeviceEvents () {
   $('#panDetails :input').attr('disabled', true);
 }
 
+// -----------------------------------------------------------------------------
+function askRunAction() {
+    // Ask 
+    showModalWarning('<?= lang('BackDevDetail_Actions_Title_Run');?>', '<?= lang('BackDevDetail_Actions_Ask_Run');?>',
+    '<?= lang('Gen_Cancel');?>', '<?= lang('Gen_Run');?>', 'runAction');
+}
+
+function runAction() {
+
+  action = $('#txtAction').val();
+
+  switch(action)
+  {
+    case 'wake-on-lan': 
+      wakeonlan();
+      break;
+    default: 
+      showMessage (`<?= lang('BackDevDetail_Actions_Not_Registered');?> ${action} `);
+      break;
+  }
+
+}
+
+function wakeonlan() {
+  // Execute
+  $.get('php/server/devices.php?action=wakeonlan&'
+    + '&mac='         + $('#txtMAC').val()
+    + '&ip='          + $('#txtLastIP').val()
+    , function(msg) {
+    showMessage (msg);
+  });
+}
+
 // -----------------------------------------------------------------------------
 // Overwrite all devices of the same type with the currently selected icon
 function askOverwriteIconType () {

front/index.php

@@ -1,3 +1,6 @@
+<!-- Pi.Alert CSS -->
+<link rel="stylesheet" href="css/pialert.css">
+
 <?php
 require dirname(__FILE__).'/php/server/init.php';
 require 'php/templates/security.php';
@@ -100,7 +103,7 @@ if ($ENABLED_DARKMODE === True) {
   <link rel="stylesheet" href="/front/css/offline-font.css">
 </head>
 <body class="hold-transition login-page">
-<div class="login-box">
+<div class="login-box login-custom">
   <div class="login-logo">
     <a href="/index2.php">Pi.<b>Alert</b></a>
   </div>
@@ -145,7 +148,7 @@ if ($ENABLED_DARKMODE === True) {
           <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><3E></button>
           <h4><i class="icon fa <?php echo $login_icon;?>"></i><?php echo $login_headline;?></h4>
           <p><?php echo $login_info;?></p>
-          <p><?= lang('Login_Psw_run');?><br><span style="border: solid 1px yellow; padding: 2px;">./reset_password.sh <?= lang('Login_Psw_new');?></span><br><?= lang('Login_Psw_folder');?></p>
+          <p><?= lang('Login_Psw_run');?><br><span style="border: solid 1px yellow; padding: 2px;"> /home/pi/pialert/back/pialert-cli set_password <?= lang('Login_Psw_new');?></span><br><?= lang('Login_Psw_folder');?></p>
       </div>
   </div>
 

front/js/pialert_common.js

@@ -345,5 +345,30 @@ function openInNewTab (url) {
 }
 
 
+// -----------------------------------------------------------------------------
+function navigateToDeviceWithIp (ip) {
+
+  $.get('api/table_devices.json', function(res) {    
+        
+    devices = res["data"];
+
+    mac = ""
+    
+    $.each(devices, function(index, obj) {
+      
+      if(obj.dev_LastIP.trim() == ip.trim())
+      {
+        mac = obj.dev_MAC;
+
+        window.open(window.location.origin +'/deviceDetails.php?mac=' + mac , "_blank");
+      }
+    });
+
+
+    
+  });
+}
+
+
 
 

front/network.php

@@ -620,7 +620,7 @@
     
     nodeHeight = ((emSize*100*0.30).toFixed(0))
 
-    $("#networkTree").attr('style', "height:"+treeAreaHeight+"px; width:1070px")
+    $("#networkTree").attr('style', `height:${treeAreaHeight}px; width:${$('.content-header').width()}px`)
 
     myTree = Treeviz.create({
       htmlId: "networkTree",

front/php/server/devices.php

@@ -57,6 +57,8 @@
       case 'updateNetworkLeaf':       updateNetworkLeaf();                     break;
       case 'overwriteIconType':       overwriteIconType();                     break;
       case 'getIcons':                getIcons();                              break;
+      case 'getActions':              getActions();                            break;
+      case 'wakeonlan':               wakeonlan();                             break;
 
       default:                        logServerConsole ('Action: '. $action);  break;
     }
@@ -869,6 +871,18 @@ function getIcons() {
   echo (json_encode ($tableData));
 }
 
+//------------------------------------------------------------------------------
+function getActions() {
+  
+  $tableData = array(
+    array('id'    => 'wake-on-lan', 
+          'name'  =>  lang('DevDetail_WOL_Title'))
+  );
+
+  // Return json
+  echo (json_encode ($tableData));
+}
+
 
 //------------------------------------------------------------------------------
 //  Query the List of types
@@ -1198,6 +1212,27 @@ function overwriteIconType()
 
 }
 
+//------------------------------------------------------------------------------
+//  Wake-on-LAN 
+// Inspired by @leiweibau: https://github.com/leiweibau/Pi.Alert/commit/30427c7fea180670c71a2b790699e5d9e9e88ffd
+//------------------------------------------------------------------------------
+function wakeonlan() {  
+
+  $WOL_HOST_IP = $_REQUEST['ip'];
+  $WOL_HOST_MAC = $_REQUEST['mac'];
+
+  if (!filter_var($WOL_HOST_IP, FILTER_VALIDATE_IP)) {            
+      echo "Invalid IP! ". lang('BackDevDetail_Tools_WOL_error'); exit;
+  } 
+  elseif (!filter_var($WOL_HOST_MAC, FILTER_VALIDATE_MAC)) {      
+      echo "Invalid MAC! ". lang('BackDevDetail_Tools_WOL_error'); exit;      
+  }
+
+  exec('wakeonlan '.$WOL_HOST_MAC , $output);
+
+  echo lang('BackDevDetail_Tools_WOL_okay');
+}
+
 //------------------------------------------------------------------------------
 //  Status Where conditions
 //------------------------------------------------------------------------------

front/php/templates/header.php

@@ -112,7 +112,7 @@ if ($ENABLED_DARKMODE === True) {
 
 <!-- ----------------------------------------------------------------------- -->
 <!-- Layout Boxed Yellow -->
-<body class="hold-transition <?php echo $pia_skin_selected;?> layout-boxed sidebar-mini" <?php echo $BACKGROUND_IMAGE_PATCH;?> onLoad="show_pia_servertime();" >
+<body class="hold-transition <?php echo $pia_skin_selected;?> sidebar-mini" <?php echo $BACKGROUND_IMAGE_PATCH;?> onLoad="show_pia_servertime();" >
 <!-- Site wrapper -->
 <div class="wrapper">
 

front/php/templates/language/en_us.php

@@ -18,6 +18,8 @@ $lang['en_us'] = array(
 'Gen_Okay' => 'Ok',
 'Gen_Save' => 'Save',
 'Gen_Saved' => 'Saved',
+'Gen_Run' => 'Run',
+'Gen_Action' => 'Action',
 'Gen_Purge' => 'Purge',
 'Gen_Backup' => 'Run Backup',
 'Gen_Restore' => 'Run Restore',
@@ -230,6 +232,17 @@ $lang['en_us'] = array(
 'DevDetail_Nmap_buttonSkipDiscovery' => 'Skip host discovery',
 'DevDetail_Nmap_buttonSkipDiscovery_text' => 'Skip host discovery (-Pn option): Default scan without host discovery',
 'DevDetail_Nmap_resultsLink' => 'You can leave this page after starting a scan. Results will be also available in the <code>pialert_front.log</code> file.',
+'BackDevDetail_Actions_Title_Run' => 'Run action',
+'BackDevDetail_Actions_Not_Registered' => 'Action not registered: ',
+'BackDevDetail_Actions_Ask_Run' => 'Do you want to execute the action?',
+'BackDevDetail_Tools_WOL_okay' => 'The command was executed.',
+'BackDevDetail_Tools_WOL_error' => 'The command was NOT executed.',
+'DevDetail_Tools_WOL_noti' => 'Wake-on-LAN',
+'DevDetail_Tools_WOL_noti_text' => 'The Wake-on-LAN command is sent to the broadcast address. If the target is not in the subnet/vlan of Pi.Alert, the target device will not respond.',
+'DevDetail_Tools_WOL' => 'Send Wol command to ',
+'DevDetail_WOL_Title' => '<i class="fa fa-power-off"></i> Wake-on-LAN',
+'DevDetail_Run_Actions_Title' => '<i class="fa fa-play"></i> Run action on device',
+'DevDetail_Run_Actions_Tooltip' => 'Run an action on the current device from the dropdown list.',
 
 //////////////////////////////////////////////////////////////////
 // Maintenance Page
@@ -508,6 +521,8 @@ The arp-scan time itself depends on the number of IP addresses to check so set t
 'LOG_LEVEL_description' => 'This setting will enable more verbose logging. Useful for debugging events writing into the database.',
 'TIMEZONE_name' => 'Time zone',
 'TIMEZONE_description' => 'Time zone to display stats correctly. Find your time zone <a target="_blank" href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones" rel="nofollow">here</a>.',
+'ENABLE_PLUGINS_name' => 'Enable Plugins',
+'ENABLE_PLUGINS_description' => 'Enables the <a target="_blank" href="https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins">plugins</a> functionality. Loading plugins requires more hardware resources so you might want to disable them on low-powered system.',
 'PIALERT_WEB_PROTECTION_name' => 'Enable login',
 'PIALERT_WEB_PROTECTION_description' => 'When enabled a login dialog is displayed. Read below carefully if you get locked out of your instance.',
 'PIALERT_WEB_PASSWORD_name' => 'Login password',

front/php/templates/language/es_es.php

@@ -412,8 +412,196 @@ $lang['es_es'] = array(
 											 puertos (agrupación de puertos), así como múltiples dispositivos a un puerto (máquinas virtuales).',
 
 //////////////////////////////////////////////////////////////////
-// Settings
+// Settings (based on work of https://github.com/mariorodriguezlopez/Pi.Alert/)
 //////////////////////////////////////////////////////////////////
 
+'API_settings_group' => '<i class="fa fa-arrow-down-up-across-line"></i> API',	
+
+// General
+
+'DAYS_TO_KEEP_EVENTS_description' => 'Esta es una configuración de mantenimiento. Esto especifica el número de días de entradas de eventos que se guardarán. Todos los eventos anteriores se eliminarán periódicamente.',
+'DAYS_TO_KEEP_EVENTS_name' => 'Eliminar eventos anteriores a',
+'PIALERT_WEB_PASSWORD_description' => 'La contraseña predeterminada es <code>123456</code>. Para cambiar la contraseña, ejecute <code>/home/pi/pialert/back/pialert-cli</code> en el contenedor',
+'PIALERT_WEB_PASSWORD_name' => 'Contraseña de inicio de sesión',
+'PIALERT_WEB_PROTECTION_description' => 'Cuando está habilitado, se muestra un cuadro de diálogo de inicio de sesión. Lea detenidamente a continuación si se le bloquea el acceso a su instancia.',
+'PIALERT_WEB_PROTECTION_name' => 'Habilitar inicio de sesión',
+'REPORT_DASHBOARD_URL_description' => 'Esta URL se utiliza como base para generar enlaces en los correos electrónicos. Ingrese la URL completa que comienza con <code>http://</code>, incluido el número de puerto (sin barra inclinada al final <code>/</code>).',
+'REPORT_DASHBOARD_URL_name' => 'Pi.Alert URL',
+'REPORT_FROM_description' => 'Asunto del correo electrónico de notificación.',
+'REPORT_FROM_name' => 'Asunto del email',
+'REPORT_MAIL_description' => 'Si está habilitado, se envía un correo electrónico con una lista de cambios a los que se ha suscrito. Complete también todas las configuraciones restantes relacionadas con la configuración de SMTP a continuación',
+'REPORT_MAIL_name' => 'Habilitar email',
+'REPORT_TO_description' => 'Dirección de correo electrónico a la que se enviará la notificación.',
+	'REPORT_TO_name' => 'Enviar el email a',
+	'SCAN_CYCLE_MINUTES_description' => 'El retraso entre escaneos. Si usa arp-scan, el tiempo de escaneo en sí depende de la cantidad de direcciones IP para verificar. Esto está influenciado por la máscara de red configurada en la configuración <a href="#SCAN_SUBNETS"><code>SCAN_SUBNETS</code></a> en la parte superior. Cada IP toma un par de segundos para escanear.',
+	'SCAN_CYCLE_MINUTES_name' => 'Retraso del ciclo de escaneo',
+	'SCAN_SUBNETS_description' => 'El tiempo de escaneo arp en sí depende de la cantidad de direcciones IP para verificar.
+El número de direcciones IP para comprobar depende de la <a target="_blank" href="https://www.calculator.net/ip-subnet-calculator.html">máscara de red</a> que establezca aquí.
+Por ejemplo, una máscara <code>/24</code> da como resultado 256 IP para verificar, mientras que <code>/16</code>
+controles de máscara alrededor de 65,536. Cada IP toma un par de segundos. Esto significa que con una configuración incorrecta
+el arp-scan tardará horas en completarse en lugar de segundos.
+<ol>
+<li>Especifique la máscara de red. Por ejemplo, el filtro <code>192.168.1.0/24</code> cubre los rangos de IP 192.168.1.0 a 192.168.1.255.</li>
+<li>Ejecute <code>ifconfig</code> en su contenedor para encontrar los nombres de su interfaz (por ejemplo: <code>eth0</code>, <code>eth1</code>)</li>
+</ol>
+	',
+'SCAN_SUBNETS_name' => 'Subredes para escanear',
+'TIMEZONE_description' => 'Zona horaria para mostrar las estadísticas correctamente. Encuentra tu zona horaria<a target="_blank" href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones" rel="nofollow">aquí</a>.',
+'TIMEZONE_name' => 'Zona horaria',
+'UI_LANG_description' => 'Seleccione el idioma de interfaz de usuario preferido.',
+'UI_LANG_name' => 'Idioma de interfaz',
+
+// Email
+
+'SMTP_FORCE_SSL_description' => 'Forzar SSL al conectarse a su servidor SMTP',
+'SMTP_FORCE_SSL_name' => 'Forzar SSL',
+'SMTP_PASS_description' => 'La contraseña del servidor SMTP.',
+'SMTP_PASS_name' => 'SMTP password',
+'SMTP_PORT_description' => 'Número de puerto utilizado para la conexión SMTP. Establézcalo en <code>0</code> si no desea utilizar un puerto al conectarse al servidor SMTP.',
+'SMTP_PORT_name' => 'SMTP server PORT',
+'SMTP_SERVER_description' => 'La URL del host del servidor SMTP. Por ejemplo, <code>smtp-relay.sendinblue.com</code>. Para utilizar Gmail como servidor SMTP <a target="_blank" href="https://github.com/jokob-sk/Pi.Alert/blob/main/docs/SMTP_GMAIL.md">siga esta guía</a >',
+'SMTP_SERVER_name' => 'SMTP server URL',
+'SMTP_SKIP_LOGIN_description' => 'No utilice la autenticación cuando se conecte al servidor SMTP.',
+'SMTP_SKIP_LOGIN_name' => 'Omitir autenticación',
+'SMTP_SKIP_TLS_description' => 'Deshabilite TLS cuando se conecte a su servidor SMTP.',
+'SMTP_SKIP_TLS_name' => 'No usar TLS',
+'SMTP_USER_description' => 'El nombre de usuario utilizado para iniciar sesión en el servidor SMTP (a veces, una dirección de correo electrónico completa).',
+'SMTP_USER_name' => 'SMTP user',
+
+//API
+
+'API_CUSTOM_SQL_description' => 'Puede especificar una consulta SQL personalizada que generará un archivo JSON y luego lo expondrá a través del <a href="/api/table_custom_endpoint.json" target="_blank">archivo <code>table_custom_endpoint.json</code ></a>.',
+'API_CUSTOM_SQL_name' => 'Endpoint personalizado',
+
+
+// Apprise
+
+'APPRISE_HOST_description' => 'Apprise host URL que comienza con <code>http://</code> o <code>https://</code>. (no olvide incluir <code>/notify</code> al final)',
+'APPRISE_HOST_name' => 'Apprise host URL',
+'APPRISE_PAYLOAD_description' => 'Seleccione el tipo de carga útil enviada a Apprise. Por ejemplo, <code>html</code> funciona bien con correos electrónicos, <code>text</code> con aplicaciones de chat, como Telegram.',
+'APPRISE_PAYLOAD_name' => 'Tipo de carga',
+'APPRISE_URL_description' => 'Informar de la URL de destino de la notificación. Por ejemplo, para Telegram sería <code>tgram://{bot_token}/{chat_id}</code>.',
+'APPRISE_URL_name' => 'URL de notificación de Apprise',
+
+// Pushsafer
+'REPORT_PUSHSAFER_description' => 'Habilitar el envío de notificaciones a través de <a target="_blank" href="https://www.pushsafer.com/">Pushsafer</a>.',
+'REPORT_PUSHSAFER_name' => 'Habilitar Pushsafer',
+
+
+//DYNDNS
+
+
+'DDNS_ACTIVE_name' => 'Habilitar DynDNS',
+'DDNS_DOMAIN_name' => 'URL del dominio DynDNS',
+'DDNS_PASSWORD_name' => 'DynDNS password',
+'DDNS_UPDATE_URL_description' => 'Actualice la URL que comienza con <code>http://</code> o <code>https://</code>.',
+'DDNS_UPDATE_URL_name' => 'DynDNS update URL',
+'DDNS_USER_name' => 'DynDNS user',
+'DHCP_ACTIVE_description' => 'Debe asignar <code>:/etc/pihole/dhcp.leases</code> en el archivo <code>docker-compose.yml</code> si habilita esta configuración.',
+'DHCP_ACTIVE_name' => 'Habilitar PiHole DHCP',
+'DIG_GET_IP_ARG_description' => 'Cambie los argumentos de la <a href="https://linux.die.net/man/1/dig" target="_blank">utilidad de dig</a> si tiene problemas para resolver su IP de Internet. Los argumentos se agregan al final del siguiente comando: <code>dig +short </code>.',
+'DIG_GET_IP_ARG_name' => 'Descubrir de IP de Internet',
+
+// MQTT
+'REPORT_MQTT_description' => 'Habilitar el envío de notificaciones a través de <a target="_blank" href="https://www.home-assistant.io/integrations/mqtt/">MQTT</a> a su Home Assistance.',
+'REPORT_MQTT_name' => 'Habilitar MQTT',
+'MQTT_BROKER_description' => 'URL del host MQTT (no incluya <code>http://</code> o <code>https://</code>).',
+'MQTT_BROKER_name' => 'MQTT broker URL',
+'MQTT_DELAY_SEC_description' => 'Un pequeño truco: retrase la adición a la cola en caso de que el proceso se reinicie y los procesos de publicación anteriores se anulen (se necesitan ~<code>2</code>s para actualizar la configuración de un sensor en el intermediario). Probado con <code>2</code>-<code>3</code> segundos de retraso. Este retraso solo se aplica cuando se crean dispositivos (durante el primer bucle de notificación). No afecta los escaneos o notificaciones posteriores.',
+'MQTT_DELAY_SEC_name' => 'Retraso de MQTT por dispositivo',
+'MQTT_PASSWORD_description' => 'Contraseña utilizada para iniciar sesión en su instancia de agente de MQTT.',
+'MQTT_PASSWORD_name' => 'MQTT password',
+'MQTT_PORT_description' => 'Puerto donde escucha el broker MQTT. Normalmente <code>1883</code>.',
+'MQTT_PORT_name' => 'MQTT broker puerto',
+'MQTT_QOS_description' => 'Configuración de calidad de servicio para el envío de mensajes MQTT. <code>0</code>: baja calidad a <code>2</code>: alta calidad. Cuanto mayor sea la calidad, mayor será el retraso.',
+'MQTT_QOS_name' => 'Calidad de servicio MQTT',
+'MQTT_USER_description' => 'Nombre de usuario utilizado para iniciar sesión en su instancia de agente de MQTT.',
+'MQTT_USER_name' => 'MQTT user',
+'MQTT_settings_group' => '<i class="fa fa-square-rss"></i> MQTT',
+
+// NMAP 
+
+'NMAP_ACTIVE_description' => 'Si está habilitado, ejecutará un escaneo en un dispositivo recién encontrado. Para un análisis programado o único, verifique la configuración de <a href="#NMAP_RUN"><code>NMAP_RUN</code></a>.',
+'NMAP_ACTIVE_name' => 'Ejecución del ciclo',
+'NMAP_ARGS_description' => 'Argumentos utilizados para ejecutar el análisis de Nmap. Tenga cuidado de especificar <a href="https://linux.die.net/man/1/nmap" target="_blank">los argumentos</a> correctamente. Por ejemplo, <code>-p -10000</code> escanea los puertos del 1 al 10000.',
+'NMAP_ARGS_name' => 'Argumentos',
+'NMAP_RUN_SCHD_description' => 'Solo está habilitado si selecciona <code>programar</code> en la configuración de <a href="#NMAP_RUN"><code>NMAP_RUN</code></a>. Asegúrese de ingresar el cronograma en el formato tipo cron correcto.',
+'NMAP_RUN_SCHD_name' => 'Programar',
+'NMAP_RUN_description' => 'Habilite un escaneo regular de Nmap en su red en todos los dispositivos. Los ajustes de programación se pueden encontrar a continuación. Si selecciona <code>una vez</code>, Nmap se ejecuta solo una vez al inicio durante el tiempo especificado en la configuración de <a href="#NMAP_TIMEOUT"><code>NMAP_TIMEOUT</code></a>.',
+'NMAP_RUN_name' => 'Ejecución programada',
+'NMAP_TIMEOUT_description' => 'Tiempo máximo en segundos para esperar a que finalice un escaneo de Nmap en cualquier dispositivo.',
+
+// NTFY
+'REPORT_NTFY_description' => 'Habilitar el envío de notificaciones a través de <a target="_blank" href="https://ntfy.sh/">NTFY</a>.',
+'REPORT_NTFY_name' => 'Habilitar NTFY',
+'NTFY_HOST_description' => 'URL de host NTFY que comienza con <code>http://</code> o <code>https://</code>. Puede usar la instancia alojada en <a target="_blank" href="https://ntfy.sh/">https://ntfy.sh</a> simplemente ingresando <code>https://ntfy. sh</código>.',
+'NTFY_HOST_name' => 'NTFY host URL',
+'NTFY_PASSWORD_description' => 'Ingrese la contraseña si necesita (host) una instancia con autenticación habilitada.',
+'NTFY_PASSWORD_name' => 'NTFY password',
+'NTFY_TOPIC_name' => 'NTFY topic',
+'NTFY_USER_description' => 'Ingrese usuario si necesita (alojar) una instancia con autenticación habilitada.',
+'NTFY_USER_name' => 'NTFY user',
+'NTFY_settings_group' => '<i class="fa fa-terminal"></i> NTFY',
+
+// Pholus
+
+'Pholus_settings_group' => '<i class="fa fa-search"></i> Pholus',
+'PHOLUS_ACTIVE_description' => '<a href="https://github.com/jokob-sk/Pi.Alert/tree/main/pholus" target="_blank" >Pholus</a> es una herramienta de rastreo para descubrir información adicional sobre los dispositivos en la red, incluido el nombre del dispositivo. Si está habilitado, ejecutará el escaneo antes de cada ciclo de escaneo de red hasta que no haya dispositivos <code>(unknown)</code> o <code>(name not found)</code>. Tenga en cuenta que puede enviar spam a la red con tráfico innecesario. Depende de la configuración de <a onclick="toggleAllSettings()" href="#SCAN_SUBNETS"><code>SCAN_SUBNETS</code></a>. Para un análisis programado o único, verifique la configuración de <a href="#PHOLUS_RUN"><code>PHOLUS_RUN</code></a>.',
+'PHOLUS_ACTIVE_name' => 'Ejecución del ciclo',
+'PHOLUS_DAYS_DATA_description' => 'Cuántos días de entradas de escaneo de Pholus deben conservarse (globalmente, ¡no específico del dispositivo!). El archivo <a href="/maintenance.php#tab_Logging">pialert_pholus.log</a> no se modifica. Introduzca <code>0</code> para desactivar.',
+'PHOLUS_DAYS_DATA_name' => 'Retención de datos',
+'PHOLUS_FORCE_description' => 'Fuerce el escaneo de cada escaneo de red, incluso si no hay dispositivos <code>(unknown)</code> o <code>(name not found)</code>. Tenga cuidado al habilitar esto, ya que la detección puede inundar fácilmente su red.',
+'PHOLUS_FORCE_name' => 'Escaneo de fuerza de ciclo',
+'PHOLUS_RUN_SCHD_description' => 'Solo está habilitado si selecciona <code>programar</code> en la configuración de <a href="#PHOLUS_RUN"><code>PHOLUS_RUN</code></a>. Asegúrese de ingresar el horario en el formato similar a cron correcto
+(por ejemplo, validar en <a href="https://crontab.guru/" target="_blank">crontab.guru</a>). Por ejemplo, ingresar <code>0 4 * * *</code> ejecutará el escaneo después de las 4 am en el <a onclick="toggleAllSettings()" href="#TIMEZONE"><code>TIMEZONE</code> que configuró arriba</a>. Se ejecutará la PRÓXIMA vez que pase el tiempo.',
+'PHOLUS_RUN_SCHD_name' => 'Programar',
+'PHOLUS_RUN_TIMEOUT_description' => 'El tiempo de espera en segundos para el escaneo Pholus programado. Se aplican las mismas notas con respecto a la duración que en la configuración de <a href="#PHOLUS_TIMEOUT"><code>PHOLUS_TIMEOUT</code></a>. Un escaneo programado no verifica si hay dispositivos <code>(unknown)</code> o <code>(name not found)</code>, el escaneo se ejecuta de cualquier manera.',
+'PHOLUS_RUN_TIMEOUT_name' => 'Tiempo de espera de ejecución programado',
+'PHOLUS_RUN_description' => 'Habilite un escaneo regular de Pholus en su red. Los ajustes de programación se pueden encontrar a continuación. Si selecciona <code>una vez</code>, Pholus se ejecuta solo una vez al inicio durante el tiempo especificado en la configuración de <a href="#PHOLUS_RUN_TIMEOUT"><code>PHOLUS_RUN_TIMEOUT</code></a>.',
+'PHOLUS_RUN_name' => 'Ejecución programada',
+'PHOLUS_TIMEOUT_description' => '¿Cuánto tiempo en segundos debe rastrear Pholus en cada interfaz si se cumple la condición anterior? Cuanto más tiempo lo deje encendido, es más probable que los dispositivos transmitan más información. Este tiempo de espera se suma al tiempo que lleva realizar un escaneo arp en su red.',
+'PHOLUS_TIMEOUT_name' => 'Tiempo de espera de ciclo',
+
+// PiHole
+
+'PiHole_settings_group' => '<i class="fa fa-seedling"></i> PiHole',
+'PIHOLE_ACTIVE_description' => 'Debe mapear <code>:/etc/pihole/pihole-FTL.db</code> en el archivo <code>docker-compose.yml</code> si habilita esta configuración.',
+'PIHOLE_ACTIVE_name' => 'Habilitar el mapeo de PiHole',
+'PRINT_LOG_description' => 'Esta configuración habilitará un registro más detallado. Útil para depurar eventos que se escriben en la base de datos.',
+'PRINT_LOG_name' => 'Imprimir registro adicional',
+'PUSHSAFER_TOKEN_description' => 'Su clave secreta de la API de Pushsafer (token).',
+'PUSHSAFER_TOKEN_name' => 'Pushsafer token',
+'PUSHSAFER_settings_group' => '<i class="fa fa-bell"></i> Pushsafer',
+
+//Apprise
+
+'REPORT_APPRISE_description' => 'Habilitar el envío de notificaciones a través de <a target="_blank" href="https://hub.docker.com/r/caronc/apprise">Apprise</a>.',
+'REPORT_APPRISE_name' => 'Habilitar Apprise',
+
+// Webhooks
+'REPORT_WEBHOOK_description' => 'Habilite webhooks para notificaciones. Los webhooks lo ayudan a conectarse a muchas herramientas de terceros, como IFTTT, Zapier o <a href="https://n8n.io/" target="_blank">n8n</a>, por nombrar algunas. Consulte esta sencilla <a href="https://github.com/jokob-sk/Pi.Alert/blob/main/docs/WEBHOOK_N8N.md" target="_blank">guía de n8n aquí</a> para obtener comenzó. Si está habilitado, configure los ajustes relacionados a continuación.',
+'REPORT_WEBHOOK_name' => 'Habilitar webhooks',
+'WEBHOOK_PAYLOAD_description' => 'El formato de datos de carga de Webhook para el atributo <code>body</code> > <code>attachments</code> > <code>text</code> en el json de carga. Vea un ejemplo de la carga <a target="_blank" href="https://github.com/jokob-sk/Pi.Alert/blob/main/back/webhook_json_sample.json">aquí</a>. (por ejemplo: para discord use <code>html</code>)',
+'WEBHOOK_PAYLOAD_name' => 'Tipo de carga',
+'WEBHOOK_REQUEST_METHOD_description' => 'El método de solicitud HTTP que se utilizará para la llamada de webhook.',
+'WEBHOOK_REQUEST_METHOD_name' => 'Método de solicitud',
+'WEBHOOK_URL_description' => 'URL de destino comienza con <code>http://</code> o <code>https://</code>.',
+'WEBHOOK_URL_name' => 'URL de destino',
+'Webhooks_settings_group' => '<i class="fa fa-circle-nodes"></i> Webhooks',	
+	
+// Other
+
+'general_event_description' => 'El evento que ha activado puede tardar un tiempo hasta que finalicen los procesos en segundo plano. La ejecución terminó una vez que vea <code>finished</code> a continuación. Consulte el <a onclick=\'setCache("activeMaintenanceTab", "tab_Logging_id")\' href="/maintenance.php#tab_Logging">registro de errores</a> si no obtuvo el resultado esperado. <br/> <br/> Estado:',
+'general_event_title' => 'Ejecución de un evento ad-hoc',
+'run_event_icon' => 'fa-play',
+'run_event_tooltip' => 'Habilite la configuración y guarde sus cambios al principio antes de ejecutarlo.',
+'settings_expand_all' => 'Expandir todo',
+'settings_imported' => 'La última vez que se importó la configuración desde el archivo pialert.conf:',
+'settings_missing' => 'No se han cargado todos los ajustes, actualice la página. Esto probablemente se deba a una gran carga en la base de datos.',
+'settings_missing_block' => 'No puede guardar su configuración sin especificar todas las claves de configuración. Recarga la página. Esto probablemente se deba a una gran carga en la base de datos.',
+'settings_old' => 'La configuración en la base de datos (que se muestra en esta página) está desactualizada. Esto probablemente se deba a un análisis en ejecución. La configuración se guardó en el archivo <code>pialert.conf</code>, pero el proceso en segundo plano aún no tuvo tiempo de importarlo a la base de datos. Puede esperar hasta que la configuración se actualice para no sobrescribir sus valores anteriores. Siéntase libre de guardar su configuración de cualquier manera si no le importa perder la configuración entre la última vez que guardó y ahora. También se crean archivos de respaldo si necesita comparar su configuración más adelante.',
+'test_event_icon' => 'fa-vial-circle-check',
+'test_event_tooltip' => 'Guarde sus cambios antes de probar su configuración.',
+
 );
 ?>

front/plugins.php

@@ -30,9 +30,7 @@
     </section>    
 </div>
 
-<?php
-  require 'php/templates/footer.php';
-?>
+
 
 <script defer>
 
@@ -66,6 +64,9 @@ function getFormControl(dbColumnDef, value, index) {
         case 'devicemac':
             result = `<span class="anonymizeMac"><a href="/deviceDetails.php?mac=${value}" target="_blank">${value}</a><span>`;
             break;
+        case 'deviceip':
+            result = `<span class="anonymizeIp"><a href="#" onclick="navigateToDeviceWithIp('${value}')" >${value}</a><span>`;
+            break;
         case 'threshold': 
             $.each(dbColumnDef.options, function(index, obj) {
                 if(Number(value) < obj.maximum && result == '')
@@ -357,12 +358,15 @@ function generateTabs()
 
                 </div>
 
-                ${localize(obj, 'description')} 
-            
-                <span>
-                    <a href="https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins/${obj.code_name}" target="_blank"><?= lang('Gen_Help');?></a>
-                </span>
+                <div class='plugins-description'>
+
+                    ${localize(obj, 'description')} 
                 
+                    <span>
+                        <a href="https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins/${obj.code_name}" target="_blank"><?= lang('Gen_Help');?></a>
+                    </span>
+                
+                </div>
             </div>
         `);
 
@@ -458,5 +462,7 @@ getData()
 
 </script>
 
-
+<?php
+  require 'php/templates/footer.php';
+?>
 

front/plugins/README.md

@@ -12,7 +12,16 @@ These issues will be hopefully fixed with time, so please don't report them. Ins
 
 ## Overview
 
-PiAlert comes with a plugin system to feed events from third-party scripts into the UI and then send notifications if desired.
+PiAlert comes with a plugin system to feed events from third-party scripts into the UI and then send notifications, if desired. The highlighted functionality this plugin system supports, is dynamic creation of a simple UI to interact with the discovered objects, a mechanism to surface settings of plugins in the UI, or to import objects into existing PiAlert database tables. (Currently update/overwriting of existing objects is not supported.)
+
+Example use cases for plugins could be:
+
+* Monitor a web service and alert me if it's down
+* Import devices from dhcp.leases files instead/complementary to using PiHole or arp-scans
+* Creating ad-hoc UI tables from existing data in the PiAlert database, e.g. to show all open ports on devices, to list devices that disconnected in the last hour, etc.
+* Using other device discovery methods on the network and importing the data as new devices
+* Creating a script to create FAKE devices based on user input via custom settings
+* ...at this point the limitation is mostly the creativity than the capability (there might be edge cases and need to support more form controls for user input off custom settings, but you probably get the idea)
 
 If you wish to develop a plugin, please check the existing plugin structure. Once the settings are saved by the user they need to be removed from the `pialert.conf` file manually if you want to re-initialize them from the `config.json` of the plugin. 
 
@@ -33,6 +42,23 @@ Again, please read the below carefully if you'd like to contribute with a plugin
 
 More on specifics below.
 
+### Column order and values
+
+  | Order | Represented Column | Required | Description | 
+  |----------------------|----------------------|----------------------|----------------------| 
+  | 0 | `Object_PrimaryID` | yes | The primary ID used to group Events under. |
+  | 1 | `Object_SecondaryID` | no | Optional secondary ID to create a relationship beween other entities, such as a MAC address |
+  | 2 | `DateTime` | yes | When the event occured in the format `2023-01-02 15:56:30` |
+  | 3 | `Watched_Value1` | yes | A value that is watched and users can receive notifications if it changed compared to the previously saved entry. For example IP address |
+  | 4 | `Watched_Value2` | no | As above |
+  | 5 | `Watched_Value3` | no | As above  |
+  | 6 | `Watched_Value4` | no | As above  |
+  | 7 | `Extra` | no | Any other data you want to pass and display in PiAlert and the notifications |
+  | 8 | `ForeignKey` | no | A foreign key that can be used to link to the parent object (usually a MAC address) |
+
+
+# config.json structure
+
 ## Supported data sources
 
 Currently only two data sources are supported:
@@ -45,32 +71,20 @@ You need to set the `data_source` to either `pialert-db-query` or `python-script
 ```json
 "data_source":  "pialert-db-query"
 ```
-Any of the above datasources have to return a "table" of the exact structure as outlined below.
-
-### Column order and values
-
-  | Order | Represented Column | Required | Description | 
-  |----------------------|----------------------|----------------------|----------------------| 
-  | 0 | `Object_PrimaryID` | yes | The primary ID used to group Events under. |
-  | 1 | `Object_SecondaryID` | no | Optionalsecondary ID to create a relationship beween other entities, such as a MAC address |
-  | 2 | `DateTime` | yes | When the event occured in the format `2023-01-02 15:56:30` |
-  | 3 | `Watched_Value1` | yes | A value that is watched and users can receive notifications if it changed compared to the previously saved entry. For example IP address |
-  | 4 | `Watched_Value2` | no | As above |
-  | 5 | `Watched_Value3` | no | As above  |
-  | 6 | `Watched_Value4` | no | As above  |
-  | 7 | `Extra` | no | Any other data you want to pass and display in PiAlert and the notifications |
-  | 8 | `ForeignKey` | no | A foreign key that can be used to link to the parent object (usually a MAC address) |
+Any of the above datasources have to return a "table" of the exact structure as outlined above.
 
 ### "data_source":  "python-script"
 
-Used to interface between PiAlert and the plugin (script). After every scan it should contain only the results from the latest scan/execution. 
-
-- The format is a `csv`-like file with the pipe `|` separator. 8 (eight) values need to be supplied, so every line needs to contain 7 pipe separators. Empty values are represented by `null`  
-- Don't render "headers" for these "columns"
-- Every scan result / event entry needs to be on a new line
-- You can find which "columns" need to be present in the script results and if the value is required below. 
-- The order of these "columns" can't be changed
+ If the datasource is set to `python-script` the `CMD` setting (that you specify in the `settings` array section in the `config.json`) needs to contain a executable linux command, that generates a `last_result.log` file. This file needs to be stored in the same folder as the plugin. 
+ 
+ The content of the `last_result.log` file needs to contain the columns as defined in the "Column order and values" section above. The order of columns can't be changed. After every scan it should contain only the results from the latest scan/execution. 
 
+- The format of the `last_result.log` is a `csv`-like file with the pipe `|` as a separator. 
+- 9 (nine) values need to be supplied, so every line needs to contain 8 pipe separators. Empty values are represented by `null`.  
+- Don't render "headers" for these "columns".
+- Every scan result / event entry needs to be on a new line.
+- You can find which "columns" need to be present, and if the value is required or optional, in the "Column order and values" section. 
+- The order of these "columns" can't be changed.
 
 #### Examples
 
@@ -142,14 +156,111 @@ Required `CMD` setting example with above query (you can set `"type": "label"` i
         }
 ```
 
+### Mapping the plugin results into a database table
 
-### config.json 
+PiAlert will take the results of the plugin execution and insert these results into a database table, if a plugin contains the property `"mapped_to_table"` in the `config.json` root. The mapping of the columns is defined in the `database_column_definitions` array.
+
+This approach is used to implement the `DHCPLSS` plugin. The script parses all supplied "dhcp.leases" files, get's the results in the generic table format outlined in the "Column order and values" section above and takes individual values and inserts them into the `"DHCP_Leases"` database table in the PiAlert database. All this is achieved by:
+
+1) Specifying the database table into which the results are inserted by defining `"mapped_to_table": "DHCP_Leases"` in the root of the `config.json` file as shown below:
+
+```json
+{
+    "code_name": "dhcp_leases",
+    "unique_prefix": "DHCPLSS",
+    ...
+    "data_source":  "python-script",
+    "localized": ["display_name", "description", "icon"],
+    "mapped_to_table": "DHCP_Leases",    
+    ...
+}
+```
+2) Defining the target column with the `mapped_to_column` property for individual columns in the `database_column_definitions` array of the `config.json` file. For example in the `DHCPLSS` plugin, I needed to map the value of the `Object_PrimaryID` column returned by the plugin, to the `DHCP_MAC` column in the PiAlert database `DHCP_Leases` table. Notice the  `"mapped_to_column": "DHCP_MAC"` key-value pair in the sample below.
+
+```json
+{
+            "column": "Object_PrimaryID",
+            "mapped_to_column": "DHCP_MAC", 
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "devicemac",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "MAC address"
+                }]
+        }
+```
+
+3)  That's it. PiAlert takes care of the rest. It loops thru the objects discovered by the plugin, takes the results line, by line and inserts them into the database table specified in `"mapped_to_table"`. The columns are translated from the generic plugin columns to the target table via the `"mapped_to_column"` property in the column definitions.
 
 #### params
 
+The `params` array in the `config.json` is used to enable the user to change the parameters of the executed script. For example, the user wants to monitor a specific URL. 
+
+##### Example:
+
+Passing user defined settings to a command. Let's say, you want to have a script, that is called with a user-defined parameter called `urls`: 
+
+```bash
+root@server# python3 /home/pi/pialert/front/plugins/website_monitor/script.py urls=https://google.com,https://duck.com
+```
+
+* You can allow the user to add URLs to a setting with the `function` property set to a custom name, such as `urls_to_check` (this is not a reserved name from the section "Supported settings `function` values" below). 
+* You specify the parameter `urls` in the `params` section of the `config.json` the following way (`WEBMON_` is the plugin prefix automatically added to all the settings):
+```json
+{
+    "params" : [
+        {
+            "name"  : "urls",
+            "type"  : "setting",
+            "value" : "WEBMON_urls_to_check"
+        }]
+}
+```
+* Then you use this setting as an input parameter for your command in the `CMD` setting. Notice `urls={urls}` in the below json:
+
+```json
+ {
+            "function": "CMD",
+            "type": "text",
+            "default_value":"python3 /home/pi/pialert/front/plugins/website_monitor/script.py urls={urls}",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Command"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Command to run"
+            }]
+        }
+```
+
+During script execution, the app will take the command `"python3 /home/pi/pialert/front/plugins/website_monitor/script.py urls={urls}"`, take the `{urls}` wildcard and replace it by with the value from the `WEBMON_urls_to_check` setting. This is because:
+
+1) The app checks the `params` entries
+2) It finds `"name"  : "urls"`
+3) Checks the type of the `urls` params and finds `"type"  : "setting"`
+4) Gets the setting name from  `"value" : "WEBMON_urls_to_check"` 
+   - IMPORTANT: in the `config.json` this setting is identified by `"function":"urls_to_check"`, not `"function":"WEBMON_urls_to_check"`
+   - You can also use a global setting, or a setting from a different plugin  
+5) The app gets the user defined value from the setting with the code name `WEBMON_urls_to_check`
+   - let's say the setting with the code name  `WEBMON_urls_to_check` contains 2 values entered by the user: 
+   - `WEBMON_urls_to_check=['https://google.com','https://duck.com']`
+6) The app takes the value from `WEBMON_urls_to_check` and replaces the `{urls}` wildcard in the setting where `"function":"CMD"`, so you go from:
+   - `python3 /home/pi/pialert/front/plugins/website_monitor/script.py urls={urls}`
+   - to
+   - `python3 /home/pi/pialert/front/plugins/website_monitor/script.py urls=https://google.com,https://duck.com` 
+
+Below are some general additional notes, when definig `params`: 
+
 - `"name":"name_value"` - is used as a wildcard replacement in the `CMD` setting value by using curly brackets `{name_value}`. The wildcard is replaced by the result of the `"value" : "param_value"` and `"type":"type_value"` combo configuration below.
 - `"type":"<sql|setting>"` - is used to specify the type of the params, currently only 2 supported (`sql`,`setting`).
-  - `"type":"sql"` - will execute the SQL query specified in the `value` property. The sql query needs to return only one column. The column is flattened and separated by commas (`,`), e.g: `SELECT dev_MAC from DEVICES` -> `Internet,74:ac:74:ac:74:ac,44:44:74:ac:74:ac`. This is then used to replace the wildcards in the `CMD`setting.  
+  - `"type":"sql"` - will execute the SQL query specified in the `value` property. The sql query needs to return only one column. The column is flattened and separated by commas (`,`), e.g: `SELECT dev_MAC from DEVICES` -> `Internet,74:ac:74:ac:74:ac,44:44:74:ac:74:ac`. This is then used to replace the wildcards in the `CMD` setting.  
   - `"type":"setting"` - The setting code name. A combination of the value from `unique_prefix` + `_` + `function` value, or otherwise the code name you can find in the Settings page under the Setting dispaly name, e.g. `SCAN_CYCLE_MINUTES`. 
 - `"value" : "param_value"` - Needs to contain a setting code name or sql query without wildcards.
 
@@ -186,9 +297,11 @@ Example:
     
 ##### Supported settings `function` values
 
+You can have any `"function": "my_custom_name"` custom name, however, the ones listed below have a specific functionality attached to them. If you use a custom name, then the setting is mostly used as an input parameter for the `params` section.
+
 - `RUN` - (required) Specifies when the service is executed
     - Supported Options: "disabled", "once", "schedule" (if included then a `RUN_SCHD` setting needs to be specified), "always_after_scan", "on_new_device"
-- `RUN_SCHD` - (required if you include the  `RUN`) Cron-like scheduling used if the `RUN` setting set to `schedule`
+- `RUN_SCHD` - (required if you include the above `RUN` function) Cron-like scheduling used if the `RUN` setting set to `schedule`
 - `CMD` - (required) What command should be executed. 
 - `API_SQL` - (optional) Generates a `table_` + code_name  + `.json` file as per [API docs](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/API.md).
 - `RUN_TIMEOUT` - (optional) Max execution time of the script. If not specified a default value of 10 seconds is used to prevent hanging.
@@ -237,7 +350,7 @@ Example:
 
 The UI will adjust how columns are displayed in the UI based on the definition of the `database_column_definitions` object. Thease are the supported form controls and related functionality:
 
-- Only columns with `"show": true` and also with at least an english translation will be shown in the UI.
+- Only columns with `"show": true` and also with at least an English translation will be shown in the UI.
 - Supported types: `label`, `text`, `threshold`, `replace`
   - `label` makes a column display only
   - `text` makes a column editable
@@ -313,9 +426,15 @@ The UI will adjust how columns are displayed in the UI based on the definition o
 
 ## Full Examples
 
-- Script based plugin: Check the [website_monitor WEBMON) config.json](https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/website_monitor/config.json) file for details.  
-- SQL query nased plugin: Check the [nmap_services NMAPSERV) config.json](https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/nmap_services/config.json) file for details.  
+### Script based plugins
 
+- [website_monitor (WEBMON) config.json](https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/website_monitor/config.json) 
+- [dhcp_servers (DHCPSRVS) config.json](https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/dhcp_servers/config.json) 
+- [dhcp_leases (DHCPLSS) config.json](https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/dhcp_leases/config.json) 
+- [unifi_import (UNFIMP) config.json](https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/unifi_import/config.json) 
+
+### SQL query based plugins
+- [nmap_services (NMAPSERV) config.json](https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/nmap_services/config.json) 
 
 ### Screenshots 
 
@@ -323,7 +442,7 @@ The UI will adjust how columns are displayed in the UI based on the definition o
 |----------------------|----------------------| 
 | ![Screen 3][screen3] | ![Screen 4][screen4] | 
 
-[screen1]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins.png    "Screen 1"
-[screen2]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_settings.png             "Screen 2"
-[screen3]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_json_settings.png             "Screen 3"
-[screen4]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_json_ui.png             "Screen 4"
+[screen1]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins.png                "Screen 1"
+[screen2]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_settings.png       "Screen 2"
+[screen3]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_json_settings.png  "Screen 3"
+[screen4]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_json_ui.png        "Screen 4"

front/plugins/dhcp_leases/README.md

@@ -0,0 +1,32 @@
+## Overview
+
+A plugin allowing for importing devices from DHCP.leases files.  
+
+### Usage
+
+- Specify full paths of all `dhcp.leases` files you want to import and watch in the `DHCPLSS_paths_to_check`setting.
+- Map the paths specified in the `DHCPLSS_paths_to_check`setting in your `docker-compose.yml` file.
+
+#### Example: 
+
+
+`docker-compose.yml` excerpt:
+
+```yaml
+    volumes:
+      ...
+      # mapping different dhcp.leases files
+      - /first/location/dhcp.leases:/mnt/dhcp1.leases
+      - /second/location/dhcp.leases:/mnt/dhcp2.leases      
+      ...
+```
+
+`DHCPLSS_paths_to_check` Setting: 
+
+```python
+DHCPLSS_paths_to_check = ['/mnt/dhcp1.leases','/mnt/dhcp2.leases']
+```
+
+### Notes
+
+- No specific configuration needed.

front/plugins/dhcp_leases/config.json

@@ -0,0 +1,327 @@
+{
+    "code_name": "dhcp_leases",
+    "unique_prefix": "DHCPLSS",
+    "enabled": true,    
+    "data_source":  "python-script",
+    "localized": ["display_name", "description", "icon"],
+    "mapped_to_table": "DHCP_Leases",    
+    "display_name" : [{
+        "language_code":"en_us",
+        "string" : "DHCP Leases"
+    }],
+    "icon":[{
+        "language_code":"en_us",
+        "string" : "<i class=\"fa-solid fa-hourglass-half\"></i>"
+    }],     
+    "description": [{
+        "language_code":"en_us",
+        "string" : "This plugin is to import devices from dhcp.leases files."
+    }],
+    "params" : [
+        {
+            "name"  : "paths",
+            "type"  : "setting",
+            "value" : "DHCPLSS_paths_to_check"
+        }], 
+    "database_column_definitions":
+    [          
+        {
+            "column": "Index",            
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "N/A"
+                }]
+        } ,
+        {
+            "column": "Plugin",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "N/A"
+                }]
+        },
+        {
+            "column": "Object_PrimaryID",
+            "mapped_to_column": "DHCP_MAC", 
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "devicemac",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "MAC address"
+                }]
+        },
+        {
+            "column": "Object_SecondaryID",
+            "mapped_to_column": "DHCP_IP", 
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "deviceip",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "IP"
+                }]
+        } ,
+        {
+            "column": "DateTimeCreated",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Created"
+                }]
+        },
+        {
+            "column": "DateTimeChanged",
+            "mapped_to_column": "DHCP_DateTime", 
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Changed"
+                }]
+        },
+        {
+            "column": "Watched_Value1",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Is active"
+                }]
+        },
+        {
+            "column": "Watched_Value2",
+            "mapped_to_column": "DHCP_Name", 
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Hostname"
+                }]
+        },
+        {
+            "column": "Watched_Value3",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Hardware"
+                }]
+        } ,
+        {
+            "column": "Watched_Value4",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "State"
+                }]
+        } ,       
+        {
+            "column": "UserData",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "textboxsave",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Comments"
+                }]
+        },        
+        {
+            "column": "Extra",
+            "css_classes": "col-sm-3",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "DHCP leases file"
+                }]
+        },        
+        {
+            "column": "Status",
+            "css_classes": "col-sm-1",
+            "show": true,
+            "type": "replace",            
+            "default_value":"",
+            "options": [
+                {
+                    "equals": "watched-not-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+                },
+                {
+                    "equals": "watched-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+                },
+                {
+                    "equals": "new",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+                }
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Status"
+                }]
+        }            
+    ],
+    "settings":[
+        {
+            "function": "RUN",            
+            "type": "selecttext",            
+            "default_value":"disabled",
+            "options": ["disabled", "once", "schedule", "always_after_scan", "on_new_device"],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code":"en_us",
+                "string" : "When to run"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Enable import of devices from <code>dhcp.leases</code> files. If you select <code>schedule</code> the scheduling settings from below are applied. If you select <code>once</code> the scan is run only once on start of the application (container) or after you update your settings."
+            }]
+        },
+        {
+            "function": "CMD",
+            "type": "text",
+            "default_value":"python3 /home/pi/pialert/front/plugins/dhcp_leases/script.py paths={paths}",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Command"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Command to run"
+            }]
+        },
+        {
+            "function": "paths_to_check",
+            "type": "list",
+            "default_value":["/mnt/dhcp1.leases", "/mnt/dhcp2.leases"],
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Files"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Add all dhcp.leases mapped paths to watch. Enter full path within the container, e.g. <code>/mnt/dhcp2.leases</code>. You must map these files accordingly in your <code>docker-compose.yml</code> file."
+            }]
+        },
+        {
+            "function": "RUN_SCHD",
+            "type": "text",
+            "default_value":"0 2 * * *",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Schedule"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Only enabled if you select <code>schedule</code> in the <a href=\"#DHCPLSS_RUN\"><code>DHCPLSS_RUN</code> setting</a>. Make sure you enter the schedule in the correct cron-like format (e.g. validate at <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). For example entering <code>0 4 * * *</code> will run the scan after 4 am in the <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</code> you set above</a>. Will be run NEXT time the time passes."
+            }]
+        },
+        {
+            "function": "RUN_TIMEOUT",
+            "type": "integer",
+            "default_value":5,
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Run timeout"
+            },
+            {
+                "language_code":"de_de",
+                "string" : "Wartezeit"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+            }]
+        },
+        {
+            "function": "WATCH",
+            "type": "multiselect",
+            "default_value":["Watched_Value1", "Watched_Value4"],
+            "options": ["Watched_Value1","Watched_Value2","Watched_Value3","Watched_Value4"],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code":"en_us",
+                "string" : "Watched"
+            }] ,
+            "description":[{
+                "language_code":"en_us",
+                "string" : "Send a notification if selected values change. Use <code>CTRL + Click</code> to select/deselect. <ul> <li><code>Watched_Value1</code> is Active </li><li><code>Watched_Value2</code> is Hostname </li><li><code>Watched_Value3</code> is hardware </li><li><code>Watched_Value4</code> is State </li></ul>"
+            }] 
+        },
+        {
+            "function": "REPORT_ON",
+            "type": "multiselect",
+            "default_value":["new","watched-changed"],
+            "options": ["new","watched-changed","watched-not-changed"],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code":"en_us",
+                "string" : "Report on"
+            }] ,
+            "description":[{
+                "language_code":"en_us",
+                "string" : "Send a notification only on these statuses. <code>new</code> means a new unique (unique combination of PrimaryId and SecondaryId) object was discovered. <code>watched-changed</code> means that selected <code>Watched_ValueN</code> columns changed."
+            }] 
+        }
+    ]
+}
+

front/plugins/dhcp_leases/script.py

@@ -0,0 +1,116 @@
+#!/usr/bin/env python
+# Based on the work of https://github.com/leiweibau/Pi.Alert
+
+from __future__ import unicode_literals
+from time import sleep, time, strftime
+import requests
+import pathlib
+import threading
+import subprocess
+import socket
+import argparse
+import io
+import sys
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+import pwd
+import os
+from dhcp_leases import DhcpLeases
+
+curPath = str(pathlib.Path(__file__).parent.resolve())
+log_file = curPath + '/script.log'
+last_run = curPath + '/last_result.log'
+
+print(last_run)
+
+# Workflow
+
+def main():    
+
+    last_run_logfile = open(last_run, 'a') 
+
+    # empty file
+    last_run_logfile.write("")
+
+    parser = argparse.ArgumentParser(description='Import devices from dhcp.leases files')
+    parser.add_argument('paths',  action="store",  help="absolute dhcp.leases file paths to check separated by ','")  
+    values = parser.parse_args()
+
+    # parse output
+    newEntries = []
+
+    if values.paths:
+        for path in values.paths.split('=')[1].split(','):
+            
+
+            newEntries = get_entries(newEntries, path)  
+
+   
+    for e in newEntries:        
+        # Insert list into the log            
+        service_monitoring_log(e.primaryId, e.secondaryId, e.created, e.watched1, e.watched2, e.watched3, e.watched4, e.extra, e.foreignKey )
+
+
+# -----------------------------------------------------------------------------
+def service_monitoring_log(primaryId, secondaryId, created, watched1, watched2 = '', watched3 = '', watched4 = '', extra ='', foreignKey =''  ):
+    
+    if watched1 == '':
+        watched1 = 'null'
+    if watched2 == '':
+        watched2 = 'null'
+    if watched3 == '':
+        watched3 = 'null'
+    if watched4 == '':
+        watched4 = 'null'
+
+    with open(last_run, 'a') as last_run_logfile:
+        # https://www.duckduckgo.com|192.168.0.1|2023-01-02 15:56:30|200|0.9898|null|null|Best search engine|null
+        last_run_logfile.write("{}|{}|{}|{}|{}|{}|{}|{}|{}\n".format(
+                                                primaryId,
+                                                secondaryId,
+                                                created,                                                
+                                                watched1,
+                                                watched2,
+                                                watched3,
+                                                watched4,
+                                                extra,
+                                                foreignKey
+                                                )
+                             )
+# -----------------------------------------------------------------------------
+def get_entries(newEntries, path):
+
+
+    leases = DhcpLeases(path)
+    leasesList = leases.get()
+
+    for lease in leasesList:
+
+        tmpPlugObj = plugin_object_class(lease.ethernet, lease.ip, lease.active, lease.hostname, lease.hardware, lease.binding_state, path)
+
+        newEntries.append(tmpPlugObj) 
+
+    return newEntries
+
+# -------------------------------------------------------------------
+class plugin_object_class:
+    def __init__(self, primaryId = '',secondaryId = '', watched1 = '',watched2 = '',watched3 = '',watched4 = '',extra = '',foreignKey = ''):        
+        self.pluginPref   = ''
+        self.primaryId    = primaryId
+        self.secondaryId  = secondaryId
+        self.created      = strftime("%Y-%m-%d %H:%M:%S")
+        self.changed      = ''
+        self.watched1     = watched1
+        self.watched2     = watched2
+        self.watched3     = watched3
+        self.watched4     = watched4
+        self.status       = ''
+        self.extra        = extra
+        self.userData     = ''
+        self.foreignKey   = foreignKey
+
+#===============================================================================
+# BEGIN
+#===============================================================================
+if __name__ == '__main__':    
+    main()  
+

front/plugins/dhcp_servers/README.md

@@ -0,0 +1,11 @@
+## Overview
+
+A simple sample plugin allowing for detecting rogue DHCP servers on the network.  
+
+### Usage
+
+- No specific configuration needed.
+
+### Notes
+
+- No specific configuration needed.

front/plugins/dhcp_servers/config.json

@@ -0,0 +1,302 @@
+{
+    "code_name": "dhcp_servers",
+    "unique_prefix": "DHCPSRVS",
+    "enabled": true,    
+    "data_source":  "python-script",
+    "localized": ["display_name", "description", "icon"],
+    "display_name" : [{
+        "language_code":"en_us",
+        "string" : "Rogue DHCP"
+    }],
+    "icon":[{
+        "language_code":"en_us",
+        "string" : "<i class=\"fa-solid fa-skull-crossbones\"></i>"
+    }],     
+    "description": [{
+        "language_code":"en_us",
+        "string" : "This plugin is to use NMAP to monitor for rogue DHCP servers."
+    }],
+    "params" : [],  
+    "database_column_definitions":
+    [          
+        {
+            "column": "Index",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "N/A"
+                }]
+        } ,
+        {
+            "column": "Plugin",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "N/A"
+                }]
+        },
+        {
+            "column": "Object_PrimaryID",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "deviceip",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Server Identifier"
+                }]
+        },
+        {
+            "column": "Object_SecondaryID",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Domain Name"
+                }]
+        } ,
+        {
+            "column": "DateTimeCreated",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Created"
+                }]
+        },
+        {
+            "column": "DateTimeChanged",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Changed"
+                }]
+        },
+        {
+            "column": "Watched_Value1",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Domain Name Server"
+                }]
+        },
+        {
+            "column": "Watched_Value2",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "IP Offered"
+                }]
+        },
+        {
+            "column": "Watched_Value3",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Interface"
+                }]
+        } ,
+        {
+            "column": "Watched_Value4",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Router"
+                }]
+        } ,       
+        {
+            "column": "UserData",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "textboxsave",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Comments"
+                }]
+        },        
+        {
+            "column": "Status",
+            "css_classes": "col-sm-1",
+            "show": true,
+            "type": "replace",            
+            "default_value":"",
+            "options": [
+                {
+                    "equals": "watched-not-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+                },
+                {
+                    "equals": "watched-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+                },
+                {
+                    "equals": "new",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+                }
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Status"
+                }]
+        },        
+        {
+            "column": "Extra",
+            "css_classes": "col-sm-3",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Extra info"
+                }]
+        }            
+    ],
+    "settings":[
+        {
+            "function": "RUN",            
+            "type": "selecttext",            
+            "default_value":"disabled",
+            "options": ["disabled", "once", "schedule", "always_after_scan", "on_new_device"],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code":"en_us",
+                "string" : "When to run"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Enable a regular scan of rogue DHCP servers. If you select <code>schedule</code> the scheduling settings from below are applied. If you select <code>once</code> the scan is run only once on start of the application (container) or after you update your settings."
+            }]
+        },
+        {
+            "function": "CMD",
+            "type": "text",
+            "default_value":"python3 /home/pi/pialert/front/plugins/dhcp_servers/script.py",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Command"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Command to run"
+            }]
+        },
+        {
+            "function": "RUN_SCHD",
+            "type": "text",
+            "default_value":"0 2 * * *",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Schedule"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Only enabled if you select <code>schedule</code> in the <a href=\"#DHCPSRVS_RUN\"><code>DHCPSRVS_RUN</code> setting</a>. Make sure you enter the schedule in the correct cron-like format (e.g. validate at <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). For example entering <code>0 4 * * *</code> will run the scan after 4 am in the <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</code> you set above</a>. Will be run NEXT time the time passes."
+            }]
+        },
+        {
+            "function": "RUN_TIMEOUT",
+            "type": "integer",
+            "default_value":5,
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Run timeout"
+            },
+            {
+                "language_code":"de_de",
+                "string" : "Wartezeit"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+            }]
+        },
+        {
+            "function": "WATCH",
+            "type": "multiselect",
+            "default_value":["Watched_Value1"],
+            "options": ["Watched_Value1","Watched_Value2","Watched_Value3","Watched_Value4"],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code":"en_us",
+                "string" : "Watched"
+            }] ,
+            "description":[{
+                "language_code":"en_us",
+                "string" : "Send a notification if selected values change. Use <code>CTRL + Click</code> to select/deselect. <ul> <li><code>Watched_Value1</code> is Domain Name Server</li><li><code>Watched_Value2</code> is IP Offered</li><li><code>Watched_Value3</code> is Interface </li><li><code>Watched_Value4</code> is Router </li></ul>"
+            }] 
+        },
+        {
+            "function": "REPORT_ON",
+            "type": "multiselect",
+            "default_value":["new","watched-changed"],
+            "options": ["new","watched-changed","watched-not-changed"],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code":"en_us",
+                "string" : "Report on"
+            }] ,
+            "description":[{
+                "language_code":"en_us",
+                "string" : "Send a notification only on these statuses. <code>new</code> means a new unique (unique combination of PrimaryId and SecondaryId) object was discovered. <code>watched-changed</code> means that selected <code>Watched_ValueN</code> columns changed."
+            }] 
+        }
+    ]
+}
+

front/plugins/dhcp_servers/script.py

@@ -0,0 +1,133 @@
+#!/usr/bin/env python
+# Based on the work of https://github.com/leiweibau/Pi.Alert
+
+from __future__ import unicode_literals
+from time import sleep, time, strftime
+import requests
+import pathlib
+import threading
+import subprocess
+import socket
+import argparse
+import io
+import sys
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+import pwd
+import os
+
+curPath = str(pathlib.Path(__file__).parent.resolve())
+log_file = curPath + '/script.log'
+last_run = curPath + '/last_result.log'
+
+print(last_run)
+
+# Workflow
+
+def main():    
+
+    last_run_logfile = open(last_run, 'a') 
+
+    timeoutSec = 10
+
+    nmapArgs = ['sudo', 'nmap', '--script', 'broadcast-dhcp-discover']
+
+    # Execute N probes and insert in list
+    dhcp_probes = 1 #  N probes
+    newLines = []
+    newLines.append(strftime("%Y-%m-%d %H:%M:%S"))
+    #dhcp_server_list_time = []
+    for _ in range(dhcp_probes):
+        output = subprocess.check_output (nmapArgs, universal_newlines=True,  stderr=subprocess.STDOUT, timeout=(timeoutSec ))
+        newLines = newLines + output.split("\n")
+
+    # parse output
+    newEntries = []
+    
+    duration = "" 
+    for line in newLines:  
+        
+        if newEntries is None:
+            index = 0
+        else:    
+            index = len(newEntries) - 1 
+
+        if 'Response ' in line and ' of ' in line:            
+            newEntries.append(plugin_object_class())                        
+        elif 'Server Identifier' in line :
+            newEntries[index].primaryId = line.split(':')[1].strip()   
+        elif 'Domain Name' in line :
+            newEntries[index].secondaryId = line.split(':')[1].strip()
+        elif 'Domain Name Server' in line :
+            newEntries[index].watched1 = line.split(':')[1].strip()
+        elif 'IP Offered' in line :
+            newEntries[index].watched2 = line.split(':')[1].strip()
+        elif 'Interface' in line :
+            newEntries[index].watched3 = line.split(':')[1].strip()
+        elif 'Router' in line :
+            newEntries[index].watched4   = line.split(':')[1].strip()
+            newEntries[index].foreignKey = line.split(':')[1].strip()
+        elif ('IP Address Lease Time' in line or 'Subnet Mask' in line or 'Broadcast Address' in line) :
+
+            newVal = line.split(':')[1].strip()
+
+            if newEntries[index].extra == '':
+                newEntries[index].extra  =  newVal   
+            else: 
+                newEntries[index].extra  = newEntries[index].extra + ',' + newVal    
+
+            
+
+    for e in newEntries:        
+        # Insert list into the log            
+        service_monitoring_log(e.primaryId, e.secondaryId, e.created, e.watched1, e.watched2, e.watched3, e.watched4, e.extra, e.foreignKey )
+
+# -----------------------------------------------------------------------------
+def service_monitoring_log(primaryId, secondaryId, created, watched1, watched2 = '', watched3 = '', watched4 = '', extra ='', foreignKey =''  ):
+    
+    if watched1 == '':
+        watched1 = 'null'
+    if watched2 == '':
+        watched2 = 'null'
+    if watched3 == '':
+        watched3 = 'null'
+    if watched4 == '':
+        watched4 = 'null'
+
+    with open(last_run, 'a') as last_run_logfile:
+        # https://www.duckduckgo.com|192.168.0.1|2023-01-02 15:56:30|200|0.9898|null|null|Best search engine|null
+        last_run_logfile.write("{}|{}|{}|{}|{}|{}|{}|{}|{}\n".format(
+                                                primaryId,
+                                                secondaryId,
+                                                created,                                                
+                                                watched1,
+                                                watched2,
+                                                watched3,
+                                                watched4,
+                                                extra,
+                                                foreignKey
+                                                )
+                             )
+
+# -------------------------------------------------------------------
+class plugin_object_class:
+    def __init__(self, primaryId = '',secondaryId = '', watched1 = '',watched2 = '',watched3 = '',watched4 = '',extra = '',foreignKey = ''):        
+        self.pluginPref   = ''
+        self.primaryId    = primaryId
+        self.secondaryId  = secondaryId
+        self.created      = strftime("%Y-%m-%d %H:%M:%S")
+        self.changed      = ''
+        self.watched1     = watched1
+        self.watched2     = watched2
+        self.watched3     = watched3
+        self.watched4     = watched4
+        self.status       = ''
+        self.extra        = extra
+        self.userData     = ''
+        self.foreignKey   = foreignKey
+
+#===============================================================================
+# BEGIN
+#===============================================================================
+if __name__ == '__main__':
+    sys.exit(main())       
+

front/plugins/nmap_services/config.json

@@ -74,7 +74,7 @@
         {
             "column": "DateTimeCreated",
             "css_classes": "col-sm-2",
-            "show": true,
+            "show": false,
             "type": "label",            
             "default_value":"",
             "options": [],
@@ -87,7 +87,7 @@
         {
             "column": "DateTimeChanged",
             "css_classes": "col-sm-2",
-            "show": true,
+            "show": false,
             "type": "label",            
             "default_value":"",
             "options": [],

front/plugins/unifi_import/README.md

@@ -0,0 +1,18 @@
+## Overview
+
+A plugin allowing for importing devices from a UniFi controller.  
+
+### Usage
+
+Spedify the following settings in the Settings section of PiAlert:
+
+- `UNFIMP_username` - Username used to login into the UNIFI controller.
+- `UNFIMP_password` - Password used to login into the UNIFI controller.
+- `UNFIMP_host` - Host url or IP address where the UNIFI controller is hosted (excluding http://)
+- `UNFIMP_sites` - Name of the sites (usually 'default', check the URL in your UniFi controller UI if unsure. The site id is in the following part of the URL: `https://192.168.1.1:8443/manage/site/this-is-the-site-id/settings/`). 
+- `UNFIMP_protocol` - https:// or http://
+- `UNFIMP_port` - Usually 8443
+
+### Notes
+
+- Currently only used to import devices, not their status, type or network map.

front/plugins/unifi_import/config.json

@@ -0,0 +1,428 @@
+{
+    "code_name": "unifi_import",
+    "unique_prefix": "UNFIMP",
+    "enabled": true,    
+    "data_source":  "python-script",
+    "localized": ["display_name", "description", "icon"],
+    "mapped_to_table": "DHCP_Leases",    
+    "display_name" : [{
+        "language_code":"en_us",
+        "string" : "UniFi import"
+    }],
+    "icon":[{
+        "language_code":"en_us",
+        "string" : "<i class=\"fa-solid fa-upload\"></i>"
+    }],     
+    "description": [{
+        "language_code":"en_us",
+        "string" : "This plugin is used to import devices from an UNIFI controller."
+    }],
+    "params" : [
+        {
+            "name"  : "username",
+            "type"  : "setting",
+            "value" : "UNFIMP_username"
+        },
+        {
+            "name"  : "password",
+            "type"  : "setting",
+            "value" : "UNFIMP_password"
+        },
+        {
+            "name"  : "host",
+            "type"  : "setting",
+            "value" : "UNFIMP_host"
+        },
+        {
+            "name"  : "sites",
+            "type"  : "setting",
+            "value" : "UNFIMP_sites"
+        },
+        {
+            "name"  : "protocol",
+            "type"  : "setting",
+            "value" : "UNFIMP_protocol"
+        },
+        {
+            "name"  : "port",
+            "type"  : "setting",
+            "value" : "UNFIMP_port"
+        }
+    ], 
+    "database_column_definitions":
+    [          
+        {
+            "column": "Index",            
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "N/A"
+                }]
+        } ,
+        {
+            "column": "Plugin",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "N/A"
+                }]
+        },
+        {
+            "column": "Object_PrimaryID",
+            "mapped_to_column": "DHCP_MAC", 
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "devicemac",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "MAC address"
+                }]
+        },
+        {
+            "column": "Object_SecondaryID",
+            "mapped_to_column": "DHCP_IP", 
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "deviceip",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "IP"
+                }]
+        } ,
+        {
+            "column": "DateTimeCreated",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Created"
+                }]
+        },
+        {
+            "column": "DateTimeChanged",
+            "mapped_to_column": "DHCP_DateTime", 
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Changed"
+                }]
+        },
+        {
+            "column": "Watched_Value1",
+            "mapped_to_column": "DHCP_Name", 
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Hostname"
+                }]
+        },
+        {
+            "column": "Watched_Value2",            
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Vendor"
+                }]
+        },
+        {
+            "column": "Watched_Value3",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Type"
+                }]
+        } ,
+        {
+            "column": "Watched_Value4",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Network"
+                }]
+        } ,       
+        {
+            "column": "UserData",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "textboxsave",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Comments"
+                }]
+        },        
+        {
+            "column": "Extra",
+            "css_classes": "col-sm-3",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Hostname"
+                }]
+        },        
+        {
+            "column": "Status",
+            "css_classes": "col-sm-1",
+            "show": true,
+            "type": "replace",            
+            "default_value":"",
+            "options": [
+                {
+                    "equals": "watched-not-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+                },
+                {
+                    "equals": "watched-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+                },
+                {
+                    "equals": "new",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+                }
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Status"
+                }]
+        }            
+    ],
+    "settings":[
+        {
+            "function": "RUN",            
+            "type": "selecttext",            
+            "default_value":"disabled",
+            "options": ["disabled", "once", "schedule", "always_after_scan", "on_new_device"],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code":"en_us",
+                "string" : "When to run"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Enable import of devices from a UNIFI controller. If you select <code>schedule</code> the scheduling settings from below are applied. If you select <code>once</code> the scan is run only once on start of the application (container) or after you update your settings."
+            }]
+        },
+        {
+            "function": "CMD",
+            "type": "text",
+            "default_value":"python3 /home/pi/pialert/front/plugins/unifi_import/script.py username={username} password={password}  host={host} sites={sites}  protocol={protocol} port={port}",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Command"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Command to run. Not recommended to change."
+            }]
+        },
+        {
+            "function": "username",
+            "type": "text",
+            "default_value":"",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Username"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "The username used to login into your UNIFI controller. It is recommended to create a read-only user account."
+            }]
+        },
+        {
+            "function": "password",
+            "type": "password",
+            "default_value":"",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Password"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "The password used to login into your UNIFI controller."
+            }]
+        },
+        {
+            "function": "protocol",
+            "type": "selecttext",
+            "default_value":"https://",
+            "options": ["https://", "http://"],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Protocol"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "The protocol to use to access the controller."
+            }]
+        },
+        {
+            "function": "host",
+            "type": "text",
+            "default_value":"192.168.1.1",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Host"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "The host (IP) where the UNIFI controller is runnig. Do NOT include the protocol (e.g. <code>https://</code>)"
+            }]
+        },
+        {
+            "function": "port",
+            "type": "text",
+            "default_value":"8443",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Port number"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "The port number where the UNIFI controller is runnig. Usually it is <code>8443</code>."
+            }]
+        },
+        {
+            "function": "sites",
+            "type": "list",
+            "default_value":["default"],
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "UNIFI sites"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "The sites you want to connect to. Usually it is only one and the name is <code>default</code>. Check the URL in your UniFi controller UI if unsure."
+            }]
+        },
+        {
+            "function": "RUN_SCHD",
+            "type": "text",
+            "default_value":"0 2 * * *",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Schedule"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Only enabled if you select <code>schedule</code> in the <a href=\"#DHCPLSS_RUN\"><code>DHCPLSS_RUN</code> setting</a>. Make sure you enter the schedule in the correct cron-like format (e.g. validate at <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). For example entering <code>0 4 * * *</code> will run the scan after 4 am in the <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</code> you set above</a>. Will be run NEXT time the time passes."
+            }]
+        },
+        {
+            "function": "RUN_TIMEOUT",
+            "type": "integer",
+            "default_value":5,
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Run timeout"
+            },
+            {
+                "language_code":"de_de",
+                "string" : "Wartezeit"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+            }]
+        },
+        {
+            "function": "WATCH",
+            "type": "multiselect",
+            "default_value":["Watched_Value1", "Watched_Value4"],
+            "options": ["Watched_Value1","Watched_Value2","Watched_Value3","Watched_Value4"],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code":"en_us",
+                "string" : "Watched"
+            }] ,
+            "description":[{
+                "language_code":"en_us",
+                "string" : "Send a notification if selected values change. Use <code>CTRL + Click</code> to select/deselect. <ul> <li><code>Watched_Value1</code> is Hostname </li><li><code>Watched_Value2</code> is Vendor </li><li><code>Watched_Value3</code> is Type </li><li><code>Watched_Value4</code> is Network </li></ul>"
+            }] 
+        },
+        {
+            "function": "REPORT_ON",
+            "type": "multiselect",
+            "default_value":["new","watched-changed"],
+            "options": ["new","watched-changed","watched-not-changed"],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code":"en_us",
+                "string" : "Report on"
+            }] ,
+            "description":[{
+                "language_code":"en_us",
+                "string" : "Send a notification only on these statuses. <code>new</code> means a new unique (unique combination of PrimaryId and SecondaryId) object was discovered. <code>watched-changed</code> means that selected <code>Watched_ValueN</code> columns changed."
+            }] 
+        }
+    ]
+}
+

front/plugins/unifi_import/script.py

@@ -0,0 +1,243 @@
+#!/usr/bin/env python
+# Inspired by https://github.com/stevehoek/Pi.Alert
+
+# Example call
+# python3 /home/pi/pialert/front/plugins/unifi_import/script.py username=pialert password=passw0rd  host=192.168.1.1 site=default  protocol=https:// port=8443
+
+from __future__ import unicode_literals
+from time import sleep, time, strftime
+import requests
+from requests                               import Request, Session, packages
+import pathlib
+import threading
+import subprocess
+import socket
+import json
+import argparse
+import io
+import sys
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+import pwd
+import os
+from pyunifi.controller import Controller
+
+
+curPath = str(pathlib.Path(__file__).parent.resolve())
+log_file = curPath + '/script.log'
+last_run = curPath + '/last_result.log'
+
+# Workflow
+
+def main():    
+
+    # init global variables
+    global UNIFI_USERNAME, UNIFI_PASSWORD, UNIFI_HOST
+    global UNIFI_SITES, PORT, PROTOCOL
+
+    last_run_logfile = open(last_run, 'a') 
+
+    # empty file
+    last_run_logfile.write("")
+
+    parser = argparse.ArgumentParser(description='Import devices from an UNIFI controller')
+
+    parser.add_argument('username',  action="store",  help="Username used to login into the UNIFI controller")  
+    parser.add_argument('password',  action="store",  help="Password used to login into the UNIFI controller")  
+    parser.add_argument('host',  action="store",  help="Host url or IP address where the UNIFI controller is hosted (excluding http://)")  
+    parser.add_argument('sites',  action="store",  help="Name of the sites (usually 'default', check the URL in your UniFi controller UI). Separated by comma (,) if passing multiple sites")      
+    parser.add_argument('protocol',  action="store",  help="https:// or http://")  
+    parser.add_argument('port',  action="store",  help="Usually 8443")  
+
+    values = parser.parse_args()
+
+    # parse output
+    newEntries = []
+
+    if values.username and values.password and values.host and values.sites:
+        
+        UNIFI_USERNAME = values.username.split('=')[1] 
+        UNIFI_PASSWORD = values.password.split('=')[1]
+        UNIFI_HOST = values.host.split('=')[1]  
+        UNIFI_SITES = values.sites.split('=')[1]  
+        PROTOCOL = values.protocol.split('=')[1]
+        PORT = values.port.split('=')[1]
+        
+        newEntries = get_entries(newEntries)  
+
+   
+    for e in newEntries:        
+        # Insert list into the log            
+        service_monitoring_log(e.primaryId, e.secondaryId, e.created, e.watched1, e.watched2, e.watched3, e.watched4, e.extra, e.foreignKey )
+
+
+
+# -----------------------------------------------------------------------------
+def get_entries(newEntries):
+
+    sites = []
+
+    if ',' in UNIFI_SITES:
+        sites = UNIFI_SITES.split(',')
+    
+    else:
+        sites.append(UNIFI_SITES)
+
+
+    for site in sites:
+
+        c = Controller(UNIFI_HOST, UNIFI_USERNAME, UNIFI_PASSWORD, ssl_verify=False, site_id=site )
+
+        for ap in c.get_aps():
+
+            # print(f'{json.dumps(ap)}')
+
+            deviceType = ''
+            if (ap['type'] == 'udm'):
+                deviceType = 'Router'
+            elif (ap['type'] == 'usg'):
+                deviceType = 'Router'
+            elif (ap['type'] == 'usw'):
+                deviceType = 'Switch'
+            elif (ap['type'] == 'uap'):
+                deviceType = 'AP'
+
+            name = get_unifi_val(ap, 'name')
+            hostName = get_unifi_val(ap, 'hostname')
+
+            if name == 'null' and hostName != 'null':
+                name = hostName
+
+            tmpPlugObj = plugin_object_class(
+                ap['mac'], 
+                get_unifi_val(ap, 'ip'), 
+                name, 
+                'Ubiquiti Networks Inc.', 
+                deviceType, 
+                ap['state'], 
+                get_unifi_val(ap, 'connection_network_name')
+                )        
+
+            newEntries.append(tmpPlugObj)
+
+        # print(f'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
+
+        for cl in c.get_clients():
+
+            # print(f'{json.dumps(cl)}')
+
+            name = get_unifi_val(cl, 'name')
+            hostName = get_unifi_val(cl, 'hostname')
+
+            if name == 'null' and hostName != 'null':
+                name = hostName
+
+            tmpPlugObj = plugin_object_class(
+                cl['mac'], 
+                get_unifi_val(cl, 'ip'), 
+                name, 
+                get_unifi_val(cl, 'oui'), 
+                'Other', 
+                1, 
+                get_unifi_val(cl, 'connection_network_name')
+            )     
+
+        # print(f'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
+
+        for us in c.get_clients():
+
+            # print(f'{json.dumps(us)}')
+
+            name = get_unifi_val(us, 'name')
+            hostName = get_unifi_val(us, 'hostname')
+
+            if name == 'null' and hostName != 'null':
+                name = hostName
+
+            tmpPlugObj = plugin_object_class(
+                us['mac'], 
+                get_unifi_val(us, 'ip'), 
+                name, 
+                get_unifi_val(us, 'oui'), 
+                'Other', 
+                1, 
+                get_unifi_val(us, 'connection_network_name')
+            )         
+
+            newEntries.append(tmpPlugObj)
+
+    return newEntries
+
+
+# -----------------------------------------------------------------------------
+def get_unifi_val(obj, key):
+
+    res = ''
+
+    if key in obj:
+        res = obj[key]
+
+    if res not in ['','None']:
+        return res
+    
+    if obj.get(key) is not None:
+        res = obj.get(key)
+
+    if res not in ['','None']:
+        return res
+
+    return 'null'
+
+# -------------------------------------------------------------------
+class plugin_object_class:
+    def __init__(self, primaryId = '',secondaryId = '', watched1 = '',watched2 = '',watched3 = '',watched4 = '',extra = '',foreignKey = ''):        
+        self.pluginPref   = ''
+        self.primaryId    = primaryId
+        self.secondaryId  = secondaryId
+        self.created      = strftime("%Y-%m-%d %H:%M:%S")
+        self.changed      = ''
+        self.watched1     = watched1
+        self.watched2     = watched2
+        self.watched3     = watched3
+        self.watched4     = watched4
+        self.status       = ''
+        self.extra        = extra
+        self.userData     = ''
+        self.foreignKey   = foreignKey
+
+# -----------------------------------------------------------------------------
+def service_monitoring_log(primaryId, secondaryId, created, watched1, watched2 = 'null', watched3 = 'null', watched4 = 'null', extra ='null', foreignKey ='null'  ):
+    
+    if watched1 == '':
+        watched1 = 'null'
+    if watched2 == '':
+        watched2 = 'null'
+    if watched3 == '':
+        watched3 = 'null'
+    if watched4 == '':
+        watched4 = 'null'
+    if extra == '':
+        extra = 'null'
+    if foreignKey == '':
+        foreignKey = 'null'
+
+    with open(last_run, 'a') as last_run_logfile:        
+        last_run_logfile.write("{}|{}|{}|{}|{}|{}|{}|{}|{}\n".format(
+                                                primaryId,
+                                                secondaryId,
+                                                created,                                                
+                                                watched1,
+                                                watched2,
+                                                watched3,
+                                                watched4,
+                                                extra,
+                                                foreignKey
+                                                )
+                             )
+
+
+#===============================================================================
+# BEGIN
+#===============================================================================
+if __name__ == '__main__':    
+    main()  
+

front/plugins/website_monitor/config.json

@@ -73,7 +73,7 @@
                 }]
         },
         {
-            "column": "Object_SecondaryD",
+            "column": "Object_SecondaryID",
             "css_classes": "col-sm-2",
             "show": false,
             "type": "label",            
@@ -359,7 +359,7 @@
             }],
             "description": [{
                 "language_code":"en_us",
-                "string" : "Services to watch. Enter full URL, e.g. <code>https://google.com</code>."
+                "string" : "Services to watch. Enter full URL, e.g. <code>https://google.com</code>. The values from this setting will be used to replace the <code>{urls}</code> wildcard in the <code>WEBMON_CMD</code> setting."
             }]
         },
         {

front/settings.php

@@ -32,6 +32,7 @@ $result = $db->query("SELECT * FROM Settings");
 
 // array 
 $settingKeyOfLists = array();
+$settingCoreGroups = array('General', 'Email', 'Webhooks', 'Apprise', 'NTFY', 'PUSHSAFER', 'MQTT', 'DynDNS', 'PiHole', 'Pholus', 'Nmap', 'API');
 $settings = array();
 while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {   
   // Push row data      
@@ -82,10 +83,18 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
       $isIn = ' in ';
       foreach ($groups as $group) 
       { 
+        if (in_array($group, $settingCoreGroups))
+        {
+          $settingGroupTypeHtml = "";
+        } else
+        {
+          $settingGroupTypeHtml = ' (<i class="fa-regular fa-plug fa-sm"></i>) ';
+        }
+
         $html = $html.'<div  class=" box panel panel-default">
                           <a data-toggle="collapse" data-parent="#accordion_gen" href="#'.$group.'">
                             <div class="panel-heading">                              
-                                <h4 class="panel-title">'.lang($group.'_icon')." ".lang($group.'_display_name').'</h4>                              
+                                <h4 class="panel-title">'.lang($group.'_icon')." ".lang($group.'_display_name').$settingGroupTypeHtml.'</h4>                              
                             </div>
                           </a>
                           <div id="'.$group.'" data-myid="collapsible" class="panel-collapse collapse '.$isIn.'"> 
@@ -209,12 +218,12 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
             {
               $input = $input.
               '<div class="row form-group">
-                <div class="col-xs-6">
+                <div class="col-xs-5">
                   <input class="form-control" id="ipMask" type="text" placeholder="192.168.1.0/24"/>
                 </div>';
               // Add interface button
               $input = $input.
-                '<div class="col-xs-3">
+                '<div class="col-xs-4">
                   <input class="form-control " id="ipInterface" type="text" placeholder="eth0" />
                 </div>
                 <div class="col-xs-3"><button class="btn btn-primary" onclick="addInterface()" >Add</button></div>