From 8f574573ce6d772a1d4f63f415d1a5dd1cb80dec Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Fri, 6 Nov 2009 15:44:02 +0000
Subject: [PATCH] 2009-11-06 Miguel de Dios <miguel.dedios@artica.es>

	* operation/snmpconsole/snmp_view.php: fix and optimize the query to traps
	in DB, because the old style didn't run with paginator and it was slow with
	much traps registers.
	* operation/agentes/status_monitor.php,
	godmode/alerts/configure_alert_compound.php: little fix arround the code
	style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2089 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  11 +-
 .../alerts/configure_alert_compound.php       |   2 +-
 .../operation/agentes/status_monitor.php      |  12 +-
 .../operation/snmpconsole/snmp_view.php       | 285 ++++++++++--------
 4 files changed, 184 insertions(+), 126 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 3f3b6ca7d9..db5ec73feb 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,4 +1,13 @@
-2009-11-04  Ramon Novoa  <rnovoa@artica.es>
+2009-11-06 Miguel de Dios <miguel.dedios@artica.es>
+
+	* operation/snmpconsole/snmp_view.php: fix and optimize the query to traps
+	in DB, because the old style didn't run with paginator and it was slow with
+	much traps registers.
+	* operation/agentes/status_monitor.php,
+	godmode/alerts/configure_alert_compound.php: little fix arround the code
+	style.
+
+2009-11-04 Miguel de Dios <miguel.dedios@artica.es>
 
 	* DEBIAN/control: fix dependencies, not necesary mysql-server, because the
 	mysql can install in another machine.
diff --git a/pandora_console/godmode/alerts/configure_alert_compound.php b/pandora_console/godmode/alerts/configure_alert_compound.php
index 68207bcf48..d6b206f272 100644
--- a/pandora_console/godmode/alerts/configure_alert_compound.php
+++ b/pandora_console/godmode/alerts/configure_alert_compound.php
@@ -724,7 +724,7 @@ $(document).ready (function () {
 			"get_agent_alerts_simple" : 1,
 			"id_agent" : this.value
 			},
-			function (data, status) {	
+			function (data, status) {
 				if (! data) {
 					$("#alerts_loading").hide ();
 					tr = $('<tr></tr>').append ($('<td></td>')
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 605f64f2ae..7a4f48ddd0 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -118,11 +118,14 @@ if ($ag_freestring != "") {
 // Status selector
 if ($status == 0) { //Up
 	$sql .= " AND tagente_estado.estado = 0 AND (UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) < (tagente_estado.current_interval * 2)";
-} elseif ($status == 2) { //Critical
+}
+elseif ($status == 2) { //Critical
 	$sql .= " AND tagente_estado.estado = 1 AND (UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) < (tagente_estado.current_interval * 2)";
-} elseif ($status == 1) { //warning
+}
+elseif ($status == 1) { //warning
 	$sql .= " AND tagente_estado.estado = 2 AND (UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) < (tagente_estado.current_interval * 2)";	
-} elseif ($status == 4) { //not normal
+}
+elseif ($status == 4) { //not normal
 	$sql .= " AND ((UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) >= (tagente_estado.current_interval * 2) OR tagente_estado.estado = 2 OR tagente_estado.estado = 1) ";
 } elseif ($status == 3) { //Unknown
 	$sql .= " AND utimestamp > 0 AND tagente_modulo.id_tipo_modulo < 21 AND (UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) >= (tagente_estado.current_interval * 2)";
@@ -246,7 +249,8 @@ foreach ($result as $row) {
 	
 	if ($seconds >= ($row["module_interval"] * 2)) {
 		$option = array ("html_attr" => 'class="redb"');
-	} else {
+	}
+	else {
 		$option = array ();
 	}
 	
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 9e77074578..48c4a30964 100644
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -142,10 +142,48 @@ foreach ($traps as $trap) {
 	$oids[$oid] = $oid;
 }
 
+//Make query to extract traps of DB.
+$sql = "SELECT * FROM ttrap %s ORDER BY timestamp DESC LIMIT %d,%d";
+$whereSubquery = 'WHERE 1=1';
+	if ($filter_agent != '')
+		$whereSubquery .= ' AND source LIKE "' . $filter_agent . "'";
+	
+	if ($filter_oid != '') {
+		//Test if install the enterprise to search oid in text or oid field in ttrap.
+		if ($config['enterprise_installed'])
+			$whereSubquery .= ' AND (text LIKE "' . $filter_oid . '" OR oid LIKE "' . $filter_oid . '")';
+		else
+			$whereSubquery .= ' AND oid LIKE "' . $filter_oid . '"';
+	}
+	if ($filter_fired != -1)
+		$whereSubquery .= ' AND alerted = ' . $filter_fired;
+	if ($search_string != '')
+		$whereSubquery .= ' AND value LIKE "%' . $search_string . '%"';
+
+	if ($filter_severity != -1) {
+		//Test if install the enterprise to search oid in text or oid field in ttrap.
+		if ($config['enterprise_installed'])
+			$whereSubquery .= ' AND (
+				(alerted = 0 AND severity = ' . $filter_severity . ') OR
+				(alerted = 1 AND priority = ' . $filter_severity . '))';
+		else
+			$whereSubquery .= ' AND (
+				(alerted = 0 AND 1 = ' . $filter_severity . ') OR
+				(alerted = 1 AND priority = ' . $filter_severity . '))';
+	}
+	if ($filter_status != -1)
+		$whereSubquery .= ' AND status = ' . $filter_status;
+	
+
+$sql = sprintf($sql, $whereSubquery, $offset, $config['block_size']);
+
+$traps = get_db_all_rows_sql($sql);
+
 if ($config["pure"] == 1) {
 	echo '<div id="filters" style="display:none;">';
-} else {
-	echo '<div id="filters" style="display:block;">'; //There is no value all to property display
+}
+else {
+	echo '<div id="filters" style="display: none;">';
 }
 
 // Agent select
@@ -193,8 +231,13 @@ echo '</div>';
 echo '<br />';
 
 // Prepare index for pagination
-$trapcount = get_db_sql ("SELECT COUNT(*) FROM ttrap");
-pagination ($trapcount, "index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&filter_agent=".$filter_agent."&filter_oid=".$filter_oid."&pagination=".$pagination."&offset=".$offset."&refr=".$config["refr"]."&pure=".$config["pure"], $offset, $pagination);
+$trapcount = get_db_sql ("SELECT COUNT(*) FROM ttrap " . $whereSubquery);
+
+$urlPagination = "index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&filter_agent=" . $filter_agent
+	. "&filter_oid=" . $filter_oid . "&filter_severity=" . $filter_severity
+	. "&filter_fired=" . $filter_fired . "&filter_status=" . $filter_status
+	. "&search_string=" . $search_string . "&pagination=".$pagination."&offset=".$offset."&refr=".$config["refr"]."&pure=".$config["pure"];
+pagination ($trapcount, $urlPagination, $offset, $pagination);
 
 echo '<form name="eventtable" method="POST" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&pagination='.$pagination.'&offset='.$offset.'">';
 
@@ -240,131 +283,133 @@ $table->align[9] = "center";
 
 // Skip offset records
 $idx = 0;
-foreach ($traps as $trap) {
-	$data = array ();
-
-	// Apply filters
-	if ($filter_agent != '' && $trap["source"] != $filter_agent) {
-		continue;
-	}
+if ($traps !== false) {
+	foreach ($traps as $trap) {
+		$data = array ();
 	
-	$oid = enterprise_hook ('get_oid', array ($trap));
-	if ($oid === ENTERPRISE_NOT_HOOK) {
-		$oid = $trap["oid"];
-	}
-
-	if ($filter_oid != '' && $oid != $filter_oid) {
-		continue;
-	}
-
-	if ($filter_fired != -1 && $trap["alerted"] != $filter_fired) {
-		continue;
-	}
-
-	if ($filter_status != -1 && $trap["status"] != $filter_status) {
-		continue;
-	}
-
-	$severity = enterprise_hook ('get_severity', array ($trap));
-	if ($severity === ENTERPRISE_NOT_HOOK) {
-		$severity = $trap["alerted"] == 1 ? $trap["priority"] : 1;
-	}
-
-	if ($filter_severity != -1 && $severity != $filter_severity) {
-		continue;
-	}
-
-	if ($search_string != '' && ereg ($search_string, $trap["value"]) == 0 && 
-	    ereg ($search_string, $trap["value_custom"]) == 0) {
-	    continue;
-	}
-
-	//Status
-	if ($trap["status"] == 0) {
-		$data[0] = '<img src="images/pixel_red.png" title="'.__('Not validated').'" width="20" height="20" />';
-	} else {
-		$data[0] = '<img src="images/pixel_green.png" title="'.__('Validated').'" width="20" height="20" />';
-	}
-
-	// Agent matching source address
-	$agent = get_agent_with_ip ($trap['source']);
-	if ($agent === false) {
-		if (! give_acl ($config["id_user"], 0, "AW")) {
-			continue;
+	//	// Apply filters
+	//	if ($filter_agent != '' && $trap["source"] != $filter_agent) {
+	//		continue;
+	//	}
+	//	
+	//	$oid = enterprise_hook ('get_oid', array ($trap));
+	//	if ($oid === ENTERPRISE_NOT_HOOK) {
+	//		$oid = $trap["oid"];
+	//	}
+	//
+	//	if ($filter_oid != '' && $oid != $filter_oid) {
+	//		continue;
+	//	}
+	//
+	//	if ($filter_fired != -1 && $trap["alerted"] != $filter_fired) {
+	//		continue;
+	//	}
+	//
+	//	if ($filter_status != -1 && $trap["status"] != $filter_status) {
+	//		continue;
+	//	}
+	//
+		$severity = enterprise_hook ('get_severity', array ($trap));
+		if ($severity === ENTERPRISE_NOT_HOOK) {
+			$severity = $trap["alerted"] == 1 ? $trap["priority"] : 1;
 		}
-		$data[1] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&new_agent=1&direccion='.$trap["source"].'" title="'.__('Create agent').'">'.$trap["source"].'</a>';	
-	} else {
-		if (! give_acl ($config["id_user"], $agent["id_grupo"], "AR")) {
-			continue;
+	//
+	//	if ($filter_severity != -1 && $severity != $filter_severity) {
+	//		continue;
+	//	}
+	//
+	//	if ($search_string != '' && ereg ($search_string, $trap["value"]) == 0 && 
+	//	    ereg ($search_string, $trap["value_custom"]) == 0) {
+	//	    continue;
+	//	}
+	
+		//Status
+		if ($trap["status"] == 0) {
+			$data[0] = '<img src="images/pixel_red.png" title="'.__('Not validated').'" width="20" height="20" />';
+		} else {
+			$data[0] = '<img src="images/pixel_green.png" title="'.__('Validated').'" width="20" height="20" />';
 		}
-		$data[1] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'" title="'.__('View agent details').'">';
-		$data[1] .= '<strong>'.$agent["nombre"].'</strong></a>';
-	}
-
-	//OID
-	if (empty ($trap["oid"])) {
-		$data[2] = __('N/A');
-	} else {
-		$data[2] = enterprise_hook ('editor_link', array ($trap));
-		if ($data[2] === ENTERPRISE_NOT_HOOK) {
-			$data[2] = $trap["oid"];
+	
+		// Agent matching source address
+		$agent = get_agent_with_ip ($trap['source']);
+		if ($agent === false) {
+			if (! give_acl ($config["id_user"], 0, "AW")) {
+				continue;
+			}
+			$data[1] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&new_agent=1&direccion='.$trap["source"].'" title="'.__('Create agent').'">'.$trap["source"].'</a>';	
+		} else {
+			if (! give_acl ($config["id_user"], $agent["id_grupo"], "AR")) {
+				continue;
+			}
+			$data[1] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'" title="'.__('View agent details').'">';
+			$data[1] .= '<strong>'.$agent["nombre"].'</strong></a>';
 		}
-	}
-
-	//Value
-	$data[3] = substr ($trap["value"], 0, 15);
 	
-	if (empty ($data[3])) {
-		$data[3] = __('N/A');
-	} elseif (strlen ($trap["value"]) > 15) {
-		$data[3] = '<span title="'.$trap["value"].'">'.$data[3].'...</span>';
-	}
+		//OID
+		if (empty ($trap["oid"])) {
+			$data[2] = __('N/A');
+		} else {
+			$data[2] = enterprise_hook ('editor_link', array ($trap));
+			if ($data[2] === ENTERPRISE_NOT_HOOK) {
+				$data[2] = $trap["oid"];
+			}
+		}
 	
-	//Custom
-	$data[4] = '<span title="' . $trap["oid_custom"] . '">' . $trap["value_custom"] . '</span>';
-
-	if (empty ($data[4])) {
-		$data[4] = __('N/A');
-	} elseif (strlen ($trap["value_custom"]) > 15) {
-		$data[4] = '<span title="'.$trap["value_custom"].'">'.$data[4].'...</span>';
-	}	
-
-	//User
-	if (!empty ($trap["status"])) {
-		$data[5] = '<a href="index.php?sec=usuarios&sec2=operation/users/user_edit&ver='.$trap["id_usuario"].'">'.substr ($trap["id_usuario"], 0, 8).'</a>';
-		$data[5] .= '<a href="#" class="tip">&nbsp;<span>'.dame_nombre_real($trap["id_usuario"]).'</span></a>';
-	} else {
-		$data[5] = '--';
-	}
+		//Value
+		$data[3] = substr ($trap["value"], 0, 15);
+		
+		if (empty ($data[3])) {
+			$data[3] = __('N/A');
+		} elseif (strlen ($trap["value"]) > 15) {
+			$data[3] = '<span title="'.$trap["value"].'">'.$data[3].'...</span>';
+		}
+		
+		//Custom
+		$data[4] = '<span title="' . $trap["oid_custom"] . '">' . $trap["value_custom"] . '</span>';
 	
-	// Timestamp
-	$data[6] = '<span title="'.$trap["timestamp"].'">';
-	$data[6] .= human_time_comparation ($trap["timestamp"]);
-	$data[6] .= '</span>';
+		if (empty ($data[4])) {
+			$data[4] = __('N/A');
+		} elseif (strlen ($trap["value_custom"]) > 15) {
+			$data[4] = '<span title="'.$trap["value_custom"].'">'.$data[4].'...</span>';
+		}	
 	
-	// Use alert severity if fired
-	if (!empty ($trap["alerted"])) {
-		$data[7] = '<img src="images/pixel_yellow.png" width="20" height="20" border="0" title="'.__('Alert fired').'" />';		
-	} else {
-		$data[7] = '<img src="images/pixel_gray.png" width="20" height="20" border="0" title="'.__('Alert not fired').'" />';
-	}
-
-	// Severity	
-	$table->rowclass[$idx] = get_priority_class ($severity);
-
-	//Actions
-	$data[8] = "";
-	if (empty ($trap["status"]) && give_acl ($config["id_user"], 0, "IW")) {
-		$data[8] .= '<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&check='.$trap["id_trap"].'"><img src="images/ok.png" border="0" title="'.__('Validate').'" /></a>';
-	}
-	if (give_acl ($config["id_user"], 0, "IM")) {
-		$data[8] .= '<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&delete='.$trap["id_trap"].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')"><img src="images/cross.png" border="0" title="'.__('Delete').'"/></a>';
-	}
+		//User
+		if (!empty ($trap["status"])) {
+			$data[5] = '<a href="index.php?sec=usuarios&sec2=operation/users/user_edit&ver='.$trap["id_usuario"].'">'.substr ($trap["id_usuario"], 0, 8).'</a>';
+			$data[5] .= '<a href="#" class="tip">&nbsp;<span>'.dame_nombre_real($trap["id_usuario"]).'</span></a>';
+		} else {
+			$data[5] = '--';
+		}
+		
+		// Timestamp
+		$data[6] = '<span title="'.$trap["timestamp"].'">';
+		$data[6] .= human_time_comparation ($trap["timestamp"]);
+		$data[6] .= '</span>';
+		
+		// Use alert severity if fired
+		if (!empty ($trap["alerted"])) {
+			$data[7] = '<img src="images/pixel_yellow.png" width="20" height="20" border="0" title="'.__('Alert fired').'" />';		
+		} else {
+			$data[7] = '<img src="images/pixel_gray.png" width="20" height="20" border="0" title="'.__('Alert not fired').'" />';
+		}
 	
-	$data[9] = print_checkbox_extended ("snmptrapid[]", $trap["id_trap"], false, false, '', 'class="chk"', true);
-
-	array_push ($table->data, $data);
-	$idx++;
+		// Severity	
+		$table->rowclass[$idx] = get_priority_class ($severity);
+	
+		//Actions
+		$data[8] = "";
+		if (empty ($trap["status"]) && give_acl ($config["id_user"], 0, "IW")) {
+			$data[8] .= '<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&check='.$trap["id_trap"].'"><img src="images/ok.png" border="0" title="'.__('Validate').'" /></a>';
+		}
+		if (give_acl ($config["id_user"], 0, "IM")) {
+			$data[8] .= '<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&delete='.$trap["id_trap"].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')"><img src="images/cross.png" border="0" title="'.__('Delete').'"/></a>';
+		}
+		
+		$data[9] = print_checkbox_extended ("snmptrapid[]", $trap["id_trap"], false, false, '', 'class="chk"', true);
+	
+		array_push ($table->data, $data);
+		$idx++;
+	}
 }
 
 // No matching traps