diff --git a/docs/NOTIFICATIONS.md b/docs/NOTIFICATIONS.md index a746f6b2a..237b8934d 100755 --- a/docs/NOTIFICATIONS.md +++ b/docs/NOTIFICATIONS.md @@ -11,16 +11,15 @@ There are 4 ways how to influence notifications: > It's recommended to use the same schedule interval for all plugins responsible for scanning devices, otherwise false positives might be reported if different devices are discovered by different plugins. Check the **Settings** > **Enabled settings** section for a warning: > ![Schedules out-of-sync](/docs/img/NOTIFICATIONS/Schedules_out-of-sync.png) - ## Device settings 💻 ![Device notification settings](/docs/img/NOTIFICATIONS/Device-notification-settings.png) There are 4 settings on the device for influencing notifications. You can: -1. **Scan device** - Completely disable the scanning of the device -2. **Alert all events** - Enables extensive alerts of connections, disconnections, IP changes (noisy, usually not recommended) -3. **Alert down** - Alerts when a device goes down. This setting overrides disabled Alert All Events, so you will get a notification of a device going down even if you don't have **Alert All Events** ticked. +1. **Scan Device** - Completely disable the scanning of the device. +2. **Alert Events** - Enables alerts of connections, disconnections, IP changes. +3. **Alert Down** - Alerts when a device goes down. This setting overrides a disabled **Alert Events** setting, so you will get a notification of a device going down even if you don't have **Alert Events** ticked. 4. **Skip repeated notifications**, if for example you know there is a temporary issue and want to pause the same notification for this device for a given time. ## Plugin settings 🔌 @@ -40,7 +39,7 @@ Click the **Read more in the docs.** Link at the top of each plugin to get more In Notification Processing settings, 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 trigger notifications. Usual setups will have `new_devices`, `down_devices`, and possibly `events` set. Setting `plugin` might be too noisy for most setups. More info in the [NTFPRCS plugin](/front/plugins/notification_processing/README.md) +1. Notify on (`NTFPRCS_INCLUDED_SECTIONS`) allows you to specify which events trigger notifications. Usual setups will have `new_devices`, `down_devices`, and possibly `down_reconnected` set. Including `plugin` (dependenton the Plugin `_WATCH` and `_REPORT_ON` settings) and `events` (dependent on the on-device **Alert Events** setting) might be too noisy for most setups. More info in the [NTFPRCS plugin](/front/plugins/notification_processing/README.md) 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. diff --git a/front/css/app.css b/front/css/app.css index 917b87469..d1196bdd6 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -1102,7 +1102,11 @@ input[readonly] { .settingsSearchWrap { - padding:10px; + /* padding:10px; */ + /* display: flex; */ + justify-content: center; /* Centers horizontally */ + align-items: center; /* Centers vertically */ + /* height: 60px; */ } .settings-sticky-bottom-section { @@ -1112,11 +1116,12 @@ input[readonly] { /* opacity: 0.8; */ bottom: 30px; border-radius: 5px; - margin:1px; + /* margin:1px; */ border-width: 1px; border-style: solid; border-color: inherit; /* width: 87%; */ + padding: 10px; } .settings-sticky-bottom-section:hover { @@ -1135,7 +1140,7 @@ input[readonly] { width: 14px; position: absolute; right: -6px; - top: 6px; + top: 13px; } @@ -1147,9 +1152,9 @@ input[readonly] { .saveSettingsWrapper button { width:70%; - margin-top:20px; + /* margin-top:20px; */ margin-left:15%; - margin-bottom:20px; + /* margin-bottom:20px; */ } #settingsPage .select2-selection diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index 9bd300d4d..9a323bcaf 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -62,7 +62,7 @@ "DAYS_TO_KEEP_EVENTS_name": "Delete events older than", "DevDetail_Copy_Device_Title": " Copy details from device", "DevDetail_Copy_Device_Tooltip": "Copy details from device from the dropdown list. Everything on this page will be overwritten", - "DevDetail_EveandAl_AlertAllEvents": "Alert All Events", + "DevDetail_EveandAl_AlertAllEvents": "Alert Events", "DevDetail_EveandAl_AlertDown": "Alert Down", "DevDetail_EveandAl_Archived": "Archived", "DevDetail_EveandAl_NewDevice": "New Device", diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json old mode 100644 new mode 100755 diff --git a/front/plugins/events_notifications/config.json b/front/plugins/events_notifications/config.json index e41bb4bc7..ff2de9eb6 100755 --- a/front/plugins/events_notifications/config.json +++ b/front/plugins/events_notifications/config.json @@ -666,7 +666,7 @@ "description": [ { "language_code": "en_us", - "string": "Indicates whether events related to the device should trigger alerts. The default value of the Alert All Events checkbox." + "string": "Indicates whether events related to the device should trigger alerts. The default value of the Alert Events checkbox. Down and New Device notifications are always sent unless unselected in NTFPRCS_INCLUDED_SECTIONS." } ] }, diff --git a/front/plugins/notification_processing/README.md b/front/plugins/notification_processing/README.md index 44f403981..49ae450f6 100755 --- a/front/plugins/notification_processing/README.md +++ b/front/plugins/notification_processing/README.md @@ -7,7 +7,7 @@ Plugin supplying settings for Notification Processing. - `new_devices` - if a new device is detected - `down_devices` - if a device with **Alert down** enabled (on a specific Device) disconnects - `down_reconnected` - if a device, previously marked down and notified on, reconnects -- `events` - if an event for a device that has **Alert All Events** enabled, is triggered +- `events` - if an event for a device that has **Alert Events** enabled, is triggered - `plugins` - if an event for a plugin, is triggered diff --git a/front/settings.php b/front/settings.php index 484764da7..64e075403 100755 --- a/front/settings.php +++ b/front/settings.php @@ -145,10 +145,7 @@
-
-
- -
+
diff --git a/server/reporting.py b/server/reporting.py index d0c259ebc..380a3e659 100755 --- a/server/reporting.py +++ b/server/reporting.py @@ -46,7 +46,7 @@ def get_notifications (db): # Disable reporting on events for devices where reporting is disabled based on the MAC address sql.execute ("""UPDATE Events SET eve_PendingAlertEmail = 0 - WHERE eve_PendingAlertEmail = 1 AND eve_EventType not in ('Device Down', 'Down Reconnected') AND eve_MAC IN + WHERE eve_PendingAlertEmail = 1 AND eve_EventType not in ('Device Down', 'Down Reconnected', 'New Device' ) AND eve_MAC IN ( SELECT dev_MAC FROM Devices WHERE dev_AlertEvents = 0 )""")