Automation fixes / features

Fix various PHP errors Add options for 20 and 50 threads (Bumping it to 100 threads finishes a /24 in 8 seconds, but can cause MySQL connection issues, it does work without error though)
routenull0 · May 28, 2015 · f276e3c · f276e3c
1 parent 420ad37
commit f276e3c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/automation_networks.php b/automation_networks.php
@@ -388,7 +388,9 @@ function network_edit() {
 			'7' => '7 Threads', 
 			'8' => '8 Threads', 
 			'9' => '9 Threads', 
-			'10' => '10 Threads'
+			'10' => '10 Threads',
+			'20' => '20 Threads',
+			'50' => '50 Threads'
 			),
 		'default' => 1
 		),

diff --git a/lib/api_automation.php b/lib/api_automation.php
@@ -3158,7 +3158,7 @@ function automation_primeIPAddressTable($network_id) {
 		}
 	}
 
-	automation_debug("A Total of $total IP Addressed Primed");
+	automation_debug("A Total of $total IP Addresses Primed\n");
 }
 
 function automation_valid_snmp_device (&$device) {
@@ -3172,6 +3172,7 @@ function automation_valid_snmp_device (&$device) {
 		snmp_set_oid_numeric_print(TRUE);
 	}
 
+	$snmp_items = db_fetch_assoc_prepared('SELECT * FROM automation_snmp_items WHERE snmp_id = ? ORDER BY sequence ASC', array($device['snmp_id']));
 
 	if (sizeof($snmp_items)) {
 		foreach($snmp_items as $item) {

diff --git a/poller_automation.php b/poller_automation.php
@@ -46,9 +46,9 @@ function sig_handler($signo) {
 					AND task!='tmaster'", array($network_id)), 'pid', 'pid');
 
 				if (sizeof($pids)) {
-				foreach($pids as $pid) {
-					posix_kill($pid, SIGTERM);
-				}
+					foreach($pids as $pid) {
+						posix_kill($pid, SIGTERM);
+					}
 				}
 
 				clearTask($network_id, getmypid());
@@ -59,9 +59,9 @@ function sig_handler($signo) {
 					AND task='tmaster'", array($poller_id)), 'pid', 'pid');
 
 				if (sizeof($pids)) {
-				foreach($pids as $pid) {
-					posix_kill($pid);
-				}
+					foreach($pids as $pid) {
+						posix_kill($pid, SIGTERM);
+					}
 				}
 
 				clearTask($network_id, getmypid());
@@ -188,16 +188,16 @@ function sig_handler($signo) {
 	$networks = db_fetch_assoc_prepared('SELECT * FROM automation_networks WHERE poller_id = ?', array($poller_id));
 	$launched = 0;
 	if (sizeof($networks)) {
-	foreach($networks as $network) {
-		if (api_automation_is_time_to_start($network['id'])) {
-			automation_debug("Launching Network Master for '" . $network['name'] . "'\n");
-			exec_background(read_config_option('path_php_binary'), '-q ' . read_config_option('path_webroot') . "/poller_automation.php --poller=" . $poller_id . " --network=" . $network['id'] . ($force ? ' --force':'') . ($debug ? ' --debug':''));
-			$launched++;
-		}else{
-			automation_debug("Not time to Run Discovery for '" . $network['name'] . "'\n");
+		foreach($networks as $network) {
+			if (api_automation_is_time_to_start($network['id'])) {
+				automation_debug("Launching Network Master for '" . $network['name'] . "'\n");
+				exec_background(read_config_option('path_php_binary'), '-q ' . read_config_option('path_webroot') . "/poller_automation.php --poller=" . $poller_id . " --network=" . $network['id'] . ($force ? ' --force':'') . ($debug ? ' --debug':''));
+				$launched++;
+			}else{
+				automation_debug("Not time to Run Discovery for '" . $network['name'] . "'\n");
+			}
 		}
 	}
-	}
 
 	exit;
 }
@@ -326,7 +326,7 @@ function discoverDevices($network_id, $thread) {
 
 		$device = db_fetch_row_prepared('SELECT * FROM automation_ips WHERE pid = ? AND thread = ? AND status=0', array(getmypid(), $thread));
 
-		if (sizeof($device)) {
+		if (sizeof($device) && isset($device['ip_address'])) {
 			$count++;
 			if ($dns != '') {
 				$dnsname = automation_get_dns_from_ip($device['ip_address'], $dns, 300);
@@ -429,7 +429,9 @@ function discoverDevices($network_id, $thread) {
 							$snmp_sysName[0] = '';
 						}
 						$snmp_sysName_short = preg_split('/[\.]+/', strtolower($snmp_sysName[0]), -1, PREG_SPLIT_NO_EMPTY);
-
+						if(!isset($snmp_sysName_short[0])) {
+							$snmp_sysName_short[0] = '';
+						}
 						$exists = db_fetch_row_prepared('SELECT status, snmp_version FROM host WHERE hostname IN (?,?)', array($snmp_sysName_short[0], $snmp_sysName[0]));
 
 						if (sizeof($exists)) {
@@ -594,7 +596,7 @@ function isProcessRunning($pid) {
 }
 
 function killProcess($pid) {
-	return posix_kill($pid);
+	return posix_kill($pid, SIGINT);
 }
 
 function registerTask($network_id, $pid, $poller_id, $task = 'collector') {