diff --git a/back/pialert.py b/back/pialert.py index 093290ea..680d191d 100755 --- a/back/pialert.py +++ b/back/pialert.py @@ -1743,7 +1743,8 @@ def resolve_device_name_pholus (pMAC, pIP, allRes): index = 0 for result in allRes: - if result["MAC"] == pMAC and result["Record_Type"] == "Answer" and '._googlezone' not in result["Value"]: + # limiting entries used for name resolution to the ones containing the current IP (v4 only) + if result["MAC"] == pMAC and result["Record_Type"] == "Answer" and result["IP_v4_or_v6"] == pIP and '._googlezone' not in result["Value"]: # found entries with a matching MAC address, let's collect indexes pholusMatchesIndexes.append(index) diff --git a/docs/RAMDOM_MAC.md b/docs/RANDOM_MAC.md similarity index 100% rename from docs/RAMDOM_MAC.md rename to docs/RANDOM_MAC.md diff --git a/docs/webhook_json_sample.json b/docs/webhook_json_sample.json index fde5b797..df7bcf7c 100755 --- a/docs/webhook_json_sample.json +++ b/docs/webhook_json_sample.json @@ -17,9 +17,129 @@ "title": "Pi.Alert Notifications", "title_link": "", "text": { - "internet": [], - "new_devices": [], - "down_devices": [], + "internet": [ + [ + "Internet", + "243.243.243.243", + "2022-01-06 18:32:03", + "Internet IP Changed", + "Previous Internet IP: 0.0.0.0", + 1, + null + ], + [ + "Internet", + "243.243.243.243", + "2022-01-06 18:32:03", + "New Device", + null, + 1, + null + ] + ], + "new_devices": [ + [ + "b8:b8:b8:b8:b8:b8", + "192.168.1.19", + "2023-01-06 18:32:03", + "New Device", + "Raspberry Pi Foundation", + 1, + null, + "b8:b8:b8:b8:b8:b8", + "raspberrypi", + "(unknown)", + null, + "Raspberry Pi Foundation", + 0, + null, + null, + "2021-01-06 18:32:03", + "2021-01-06 18:32:03", + "192.168.1.19", + 0, + 1, + 1, + 1, + 0, + 0, + null, + 1, + 1, + null, + 0, + null, + null + ], + [ + "b1:b8:b8:b8:b8:b8", + "192.168.1.45", + "2021-01-06 18:32:03", + "New Device", + "EliteGroup Computer Systems Co., LTD", + 1, + null, + "b1:b8:b8:b8:b8:b8", + "my-NUC", + "(unknown)", + null, + "EliteGroup Computer Systems Co., LTD", + 0, + null, + null, + "2023-01-06 18:32:03", + "2023-01-06 18:32:03", + "192.168.1.45", + 0, + 1, + 1, + 1, + 0, + 0, + null, + 1, + 1, + null, + 0, + null, + null + ] + ], + "down_devices": [ + [ + "aa:77:aa:77:aa:77", + "192.168.1.151", + "2021-01-07 14:20:53", + "Device Down", + "", + 1, + 25, + "aa:77:aa:77:aa:77", + "ttgo_tdisplay_weather", + "(unknown)", + "", + "Espressif Inc.", + 0, + "", + "", + "2021-01-06 23:13:06", + "2021-01-06 23:13:06", + "192.168.1.151", + 0, + 1, + 1, + 0, + 1, + 0, + "2021-01-06 23:34:37.067330", + 0, + 0, + "", + 0, + "", + "" + ] + ], "events": [ [ "aa:77:aa:77:aa:77", diff --git a/front/deviceDetails.php b/front/deviceDetails.php index dedfb02f..e9823909 100755 --- a/front/deviceDetails.php +++ b/front/deviceDetails.php @@ -414,7 +414,7 @@ - + diff --git a/front/php/templates/language/en_us.php b/front/php/templates/language/en_us.php index ee7582fd..4069b52d 100755 --- a/front/php/templates/language/en_us.php +++ b/front/php/templates/language/en_us.php @@ -496,7 +496,7 @@ the arp-scan will take hours to complete instead of seconds. //Webhooks 'REPORT_WEBHOOK_name' => 'Enable Webhooks', -'REPORT_WEBHOOK_description' => 'Enable webhooks for notifications. If enabled, configure related settings below.', +'REPORT_WEBHOOK_description' => 'Enable webhooks for notifications. Webhooks help you to connect to a lot of 3rd party tools, such as IFTTT, Zapier or n8n to name a few. Check out this simple n8n guide here to get started. If enabled, configure related settings below.', 'WEBHOOK_URL_name' => 'Target URL', 'WEBHOOK_URL_description' => 'Target URL starting with http:// or https://.', 'WEBHOOK_PAYLOAD_name' => 'Payload type', diff --git a/front/settings.php b/front/settings.php index dafac46a..14cecb60 100644 --- a/front/settings.php +++ b/front/settings.php @@ -49,7 +49,12 @@ CommitDB();

- + + + + + +

@@ -70,13 +75,13 @@ CommitDB(); $isIn = ' in '; foreach ($groups as $group) { $html = $html.'
-
- -

'.$group.'

- -
+ +
+

'.$group.'

+
+
-
'; +
'; $isIn = ' '; // open the first panel only by default on page load // populate settings for each group id="collapse100" class="panel-collapse collapse"