diff --git a/docs/NOTIFICATIONS.md b/docs/NOTIFICATIONS.md index 9e2723bd..78c909c5 100755 --- a/docs/NOTIFICATIONS.md +++ b/docs/NOTIFICATIONS.md @@ -1,6 +1,6 @@ # Notifications 📧 -There are 3 ways how to influence notifications: +There are 4 ways how to influence notifications: 1. On the device itself 2. On the settings of the plugin @@ -38,8 +38,8 @@ On almost all plugins there are 2 core settings, `_WATCH` and `_ In the Notification Processing section, you can specify blanket rules. These allow you to specify exceptions to the Plugin and Device settings and will override those. -1. Notify on (`NTFPRCS_INCLUDED_SECTIONS`) allows you to specify which events trigegr notifications. Usual setups will have `new_devices`, `down_devices`, and possibly `events` set. Setting `plugin` might be too noisy for most setups. -2. Alert down after (`NTFPRCS_alert_down_time`) is useful if you want to wait for some time before the system sends out a down notification for a device. This is related to the on-device **Alert down** setting. +1. Notify on (`NTFPRCS_INCLUDED_SECTIONS`) allows you to specify which events trigger notifications. Usual setups will have `new_devices`, `down_devices`, and possibly `events` set. Setting `plugin` might be too noisy for most setups. +2. Alert down after (`NTFPRCS_alert_down_time`) is useful if you want to wait for some time before the system sends out a down notification for a device. This is related to the on-device **Alert down** setting and only devices with this checked will trigger a down notification. 3. A filter to allow you to set device-specific exceptions to New devices being added to the app. 4. A filter to allow you to set device-specific exceptions to generated Events. @@ -47,7 +47,7 @@ In the Notification Processing section, you can specify blanket rules. These all ![Ignoring new devices](/docs/img/NOTIFICATIONS/NEWDEV_ignores.png) -You can completely ignore detected devices globally. This could be becasue your instance detects docker containers, you want to ignore devices from a specific manufacturer via MAC rules or you want to ignore devices on a specific IP range. +You can completely ignore detected devices globally. This could be because your instance detects docker containers, you want to ignore devices from a specific manufacturer via MAC rules or you want to ignore devices on a specific IP range. 1. Ignored MACs (`NEWDEV_ignored_MACs`) - List of MACs to ignore. 2. Ignored IPs (`NEWDEV_ignored_MACs`) - List of IPs to ignore. \ No newline at end of file diff --git a/server/helper.py b/server/helper.py index a526f3d0..9111bc9a 100755 --- a/server/helper.py +++ b/server/helper.py @@ -574,8 +574,6 @@ import dns.resolver def cleanDeviceName(str, match_IP): - mylog('debug', ["[Name cleanup] NEWDEV_LESS_NAME_CLEANUP Setting:" + get_setting_value('NEWDEV_LESS_NAME_CLEANUP')]) - if get_setting_value('NEWDEV_LESS_NAME_CLEANUP'): mylog('debug', ["[Name cleanup] Using new cleanDeviceName(" + str + ")"])