diff --git a/README.md b/README.md index 70c188a6..c9b8c422 100755 --- a/README.md +++ b/README.md @@ -15,7 +15,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) +🐳 [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/issues/138) ## 🔍 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: diff --git a/back/pialert.py b/back/pialert.py index 070f639c..72714d1d 100755 --- a/back/pialert.py +++ b/back/pialert.py @@ -1786,7 +1786,7 @@ def performNmapScan(devicesToScan): file_print(e.output) file_print(" Error - Nmap Scan - check logs") except subprocess.TimeoutExpired as timeErr: - file_print(' Nmap TIMEOUT - the process forcefully terminated as timeout reached') + file_print(' Nmap TIMEOUT - the process forcefully terminated as timeout reached for', device["dev_LastIP"]) if output == "": # check if the subprocess failed file_print('[', timeNow(), '] Scan: Nmap FAIL - check logs') @@ -1814,13 +1814,10 @@ def performNmapScan(devicesToScan): startCollecting = True elif 'PORT' in line and 'STATE' in line and 'SERVICE' in line: startCollecting = False # end reached - elif startCollecting and len(line.split()) == 3: - # file_print('>>>>>', line, 'len', len(line.split())) + elif startCollecting and len(line.split()) == 3: params.append((device["dev_MAC"], timeNow(), line.split()[0], line.split()[1], line.split()[2], '')) elif 'Nmap done' in line: - duration = line.split('scanned in ')[1] - # else: - # file_print('>>>>>', line, 'len', len(line.split())) + duration = line.split('scanned in ')[1] index += 1 if len(params) > 0: diff --git a/docker-compose.yml b/docker-compose.yml index 082c5fac..74d02ec6 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,9 +6,9 @@ services: network_mode: "host" restart: unless-stopped volumes: - - ${APP_DATA_LOCATION}/pialert/config:/home/pi/pialert/config + - ${APP_DATA_LOCATION}/pialert/config2:/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}/pialert/db2:/home/pi/pialert/db # (optional) map an empty file with the name 'setting_darkmode' if you want to force the dark mode on container rebuilt - ${APP_DATA_LOCATION}/pialert/db/setting_darkmode:/home/pi/pialert/db/setting_darkmode # (optional) useful for debugging if you have issues setting up the container diff --git a/dockerfiles/README.md b/dockerfiles/README.md index 65cb8000..1706647b 100755 --- a/dockerfiles/README.md +++ b/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) +🐳 [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/issues/138) @@ -24,8 +24,8 @@ docker run -d --rm --network=host \ -v local/path/pialert/config:/home/pi/pialert/config \ -v local/path/pialert/db:/home/pi/pialert/db \ - -e TZ=Europe/Berlin - -e PORT=20211 + -e TZ=Europe/Berlin \ + -e PORT=20211 \ jokobsk/pi.alert:latest ``` - The initial scan can take up-to 15min (with 50 devices and MQTT). Subsequent ones 3 and 5 minutes so wait that long for all of the scans to run. diff --git a/docs/VERSIONS_HISTORY.md b/docs/VERSIONS_HISTORY.md index bc2cb87d..b0bd8d36 100755 --- a/docs/VERSIONS_HISTORY.md +++ b/docs/VERSIONS_HISTORY.md @@ -14,6 +14,8 @@ | v2.50 | First public release | +# 🆕 2022+ [Newest Release notes](https://github.com/jokob-sk/Pi.Alert/issues/138) + ## Pi.Alert v3.02 **PENDING UPDATE DOC** diff --git a/front/deviceDetails.php b/front/deviceDetails.php index 9497d17a..e5e8e822 100755 --- a/front/deviceDetails.php +++ b/front/deviceDetails.php @@ -532,7 +532,9 @@ } -

Below results are from scheduled scans you can set up in Settings

+

+ +
diff --git a/front/php/templates/language/en_us.php b/front/php/templates/language/en_us.php index 410b9a03..e37412aa 100755 --- a/front/php/templates/language/en_us.php +++ b/front/php/templates/language/en_us.php @@ -155,6 +155,8 @@ $lang['en_us'] = array( 'DevDetail_Tab_Events' => 'Events', 'DevDetail_Tab_Pholus' => 'Pholus', 'DevDetail_Tab_PholusEmpty' => 'Nothing sniffed out with Pholus for this device.', +'DevDetail_Tab_NmapTableHeader' => 'Scheduled scan results', +'DevDetail_Tab_NmapTableText' => 'Set up a schedule in Settings', 'DevDetail_Tab_NmapEmpty' => 'No ports detected with Nmap on this device.', 'DevDetail_MainInfo_Title' => 'Main Info', 'DevDetail_MainInfo_mac' => 'MAC',