Merge pull request #65 from netniV/develop

Fix for Issue #64 and #61

INFO

@@ -1,6 +1,6 @@
 [info]
 name = monitor
-version = 2.3.2
+version = 2.3.4
 longname = Device Monitoring
 author = The Cacti Group
 email = 

README.md

@@ -25,6 +25,11 @@ It would be advisable to view Monitors email notification settings under Setting
 Bug and feature enhancements for the webseer plugin are handled in GitHub. If you find a first search the Cacti forums for a solution before creating an issue in GitHub.
 
 ## Changelog
+--- 2.3.4 ---
+* issue#64: Fixed issue with overlapping rows in tree view
+* issue#61: Fixed issue where monitor_list was not being used
+* feature: Added option to disable inclusion of Threshold alert lists
+
 --- 2.3.3 ---
 * issue#60: Fixed issue with themes
 * issue#57: Fixed issue with mute not working

monitor.css

@@ -31,7 +31,6 @@
 }
 
 .monitor_frame {
-	float: left;
 	display: table-cell;
 }
 
@@ -48,8 +47,8 @@
 }
 
 .monitor_tree_frame {
+	display: inline-block;
 	vertical-align: top;
-	float: left;
 	position: relative;
 	padding: 3px;
 	margin: 4px;
@@ -61,7 +60,6 @@
 	display: block;
 	padding: 3px;
 	margin: 2px;
-	float: left;
 }
 
 .monitor_device_frame a {
@@ -109,7 +107,7 @@
 }
 
 .monitor_medium {
-	height: 80px;
+	height: 60px;
 }
 
 .monitor_medium i {

monitor.php

@@ -956,7 +956,7 @@ function render_tree() {
 						FROM host AS h
 						WHERE id IN (" . implode(',', $host_ids) . ")");
 
-					$result .= '<div class="monitor_tree_frame ' . $class . '"><table class="odd"><tr class="tableHeader"><th>' . $title . '</th></tr><tr><td class="center"><div>';
+					$result .= '<div class="monitor_tree_frame"><table class="odd"><tr class="tableHeader"><th>' . $title . '</th></tr><tr><td class="center"><div>';
 
 					foreach($hosts as $host) {
 						$result .= render_host($host, true, $maxlen);

poller_monitor.php

@@ -147,6 +147,23 @@
 
 exit;
 
+function monitor_addemails(&$reboot_emails, $alert_emails, $host_id) {
+	if (sizeof($alert_emails)) {
+		foreach($alert_emails as $email) {
+			$reboot_emails[trim(strtolower($email))][$host_id] = $host_id;
+		}
+	}
+}
+
+function monitor_addnotificationlist(&$reboot_emails, $notify_list, $host_id, $notification_lists) {
+	if ($notify_list > 0) {
+		if (isset($notification_lists[$notify_list])) {
+			$emails = explode(',', $notification_lists[$notify_list]);
+			monitor_addemails($reboot_emails, $emails, $host_id);
+		}
+	}
+}
+
 function monitor_uptime_checker() {
 	monitor_debug('Checking for Uptime of Devices');
 
@@ -165,69 +182,46 @@ function monitor_uptime_checker() {
 		AND (mu.uptime IS NULL OR mu.uptime > h.snmp_sysUpTimeInstance) AND h.snmp_sysUpTimeInstance > 0');
 
 	if (sizeof($rebooted_hosts)) {
-		$nofitication_lists = array_rekey(
+		$notification_lists = array_rekey(
 			db_fetch_assoc('SELECT id, emails
 				FROM plugin_notification_lists
 				ORDER BY id'),
 			'id', 'emails'
 		);
 
+		$monitor_list = read_config_option('monitor_list');
+		$monitor_thold = read_config_option('monitor_reboot_thold');
+
 		foreach($rebooted_hosts as $host) {
 			db_execute_prepared('INSERT INTO plugin_monitor_reboot_history (host_id, reboot_time) VALUES (?, ?)',
 				array($host['id'], date('Y-m-d H:i:s', time()-$host['snmp_sysUpTimeInstance'])));
 
-			$notify = db_fetch_row_prepared('SELECT thold_send_email, thold_host_email
-				FROM host
-				WHERE id = ?',
-				array($host['id']));
-
-			if (sizeof($notify)) {
-				switch($notify['thold_send_email']) {
-				case '0': // Disabled
-
-					break;
-				case '1': // Global List
-					if (sizeof($alert_emails)) {
-						foreach($alert_emails as $email) {
-							$reboot_emails[trim($email)][$host['id']] = $host['id'];
-						}
-					}
-
-					break;
-				case '2': // Nofitication List
-					if ($notify['thold_host_email'] > 0) {
-						if (isset($nofitication_lists[$notify['thold_host_email']])) {
-							$emails = explode(',', $nofitication_lists[$notify['thold_host_email']]);
-
-							if (sizeof($emails)) {
-								foreach($emails as $email) {
-									$reboot_emails[trim($email)][$host['id']] = $host['id'];
-								}
-							}
-						}
-					}
-
-					break;
-				case '3': // Both Global and Nofication list
-					if (sizeof($alert_emails)) {
-						foreach($alert_emails as $email) {
-							$reboot_emails[trim($email)][$host['id']] = $host['id'];
-						}
-					}
-
-					if ($notify['thold_host_email'] > 0) {
-						if (isset($nofitication_lists[$notify['thold_host_email']])) {
-							$emails = explode(',', $nofitication_lists[$notify['thold_host_email']]);
-
-							if (sizeof($emails)) {
-								foreach($emails as $email) {
-									$reboot_emails[trim($email)][$host['id']] = $host['id'];
-								}
-							}
-						}
+			monitor_addnotificationlist($reboot_emails, $monitor_list, $host['id'], $notification_lists);
+
+			if ($monitor_thold == 'on') {
+				$notify = db_fetch_row_prepared('SELECT thold_send_email, thold_host_email
+					FROM host
+					WHERE id = ?',
+					array($host['id']));
+
+				if (sizeof($notify)) {
+					switch($notify['thold_send_email']) {
+						case '0': // Disabled
+
+							break;
+						case '1': // Global List
+							monitor_addemails($reboot_emails, $alert_emails, $host['id']);
+							break;
+						case '2': // Nofitication List
+							monitor_addnotificationlist($reboot_emails, $notify['thold_host_email'],
+								$host['id'], $notification_lists);
+							break;
+						case '3': // Both Global and Nofication list
+							monitor_addemails($reboot_emails, $alert_emails, $host['id']);
+							monitor_addnotificationlist($reboot_emails, $notify['thold_host_email'],
+								$host['id'], $notification_lists);
+							break;
 					}
-
-					break;
 				}
 			}
 		}

setup.php

@@ -503,6 +503,12 @@ function monitor_config_settings() {
 			'description' => __('Should Device Reboot Notifications be sent to users?', 'monitor'),
 			'default' => 'on',
 		),
+		'monitor_reboot_thold' => array(
+			'friendly_name' => __('Include Threshold Alert Lists', 'monitor'),
+			'method' => 'checkbox',
+			'description' => __('Should Threshold Alert Lists also receive notification', 'monitor'),
+			'default' => 'on',
+		),
 		'monitor_subject' => array(
 			'friendly_name' => __('Subject', 'monitor'),
 			'description' => __('Enter a Reboot message subject for the Reboot Nofication.', 'monitor'),