- added housekeeping of trends (Alexei)

 - added column items.trends (Alexei)
 - added escaping of SQL statements where needed (Alexei)
 - added src/zabbix_sucker/checks_agent.[h,c] (Alexei)
 - added src/zabbix_sucker/checks_internal.[h,c] (Alexei)
 - added src/zabbix_sucker/checks_snmp.[h,c] (Alexei)
 - added src/zabbix_sucker/checks_simple.[h,c] (Alexei)


git-svn-id: svn://svn.zabbix.com/trunk@1378 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 11 insertions, 3 deletions

diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 19189f79..675de396 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -104,7 +104,8 @@
 		$host=@iif(isset($_GET["host"]),$_GET["host"],"");
 		$port=@iif(isset($_GET["port"]),$_GET["port"],10000);
 		$delay=@iif(isset($_GET["delay"]),$_GET["delay"],30);
-		$history=@iif(isset($_GET["history"]),$_GET["history"],365);
+		$history=@iif(isset($_GET["history"]),$_GET["history"],90);
+		$trends=@iif(isset($_GET["trends"]),$_GET["trends"],365);
 		$status=@iif(isset($_GET["status"]),$_GET["status"],0);
 		$type=@iif(isset($_GET["type"]),$_GET["type"],0);
 		$snmp_community=@iif(isset($_GET["snmp_community"]),$_GET["snmp_community"],"public");
@@ -119,7 +120,7 @@
 
 		if(isset($_GET["register"])&&($_GET["register"] == "change"))
 		{
-			$result=DBselect("select i.description, i.key_, h.host, h.port, i.delay, i.history, i.status, i.type, i.snmp_community,i.snmp_oid,i.value_type,i.trapper_hosts,i.snmp_port,i.units,i.multiplier,h.hostid,i.delta from items i,hosts h where i.itemid=".$_GET["itemid"]." and h.hostid=i.hostid");
+			$result=DBselect("select i.description, i.key_, h.host, h.port, i.delay, i.history, i.status, i.type, i.snmp_community,i.snmp_oid,i.value_type,i.trapper_hosts,i.snmp_port,i.units,i.multiplier,h.hostid,i.delta,i.trends from items i,hosts h where i.itemid=".$_GET["itemid"]." and h.hostid=i.hostid");
 		
 			$description=DBget_field($result,0,0);
 			$key=DBget_field($result,0,1);
@@ -138,6 +139,7 @@
 			$multiplier=DBget_field($result,0,14);
 			$hostid=DBget_field($result,0,15);
 			$delta=DBget_field($result,0,16);
+			$trends=DBget_field($result,0,17);
 		}
 
 		echo "<br>";
@@ -269,6 +271,11 @@
 		echo "<input class=\"biginput\" name=\"history\" value=\"$history\" size=8>";
 
 		show_table2_v_delimiter();
+		echo nbsp("Keep trends (in days)");
+		show_table2_h_delimiter();
+		echo "<input class=\"biginput\" name=\"trends\" value=\"$trends\" size=8>";
+
+		show_table2_v_delimiter();
 		echo "Status";
 		show_table2_h_delimiter();
 		echo "<SELECT class=\"biginput\" NAME=\"status\" value=\"$status\" size=\"1\">";
diff --git a/frontends/php/include/local_en.inc.php b/frontends/php/include/local_en.inc.php
index 90800db9..6a4b6a51 100644
--- a/frontends/php/include/local_en.inc.php
+++ b/frontends/php/include/local_en.inc.php
@@ -240,7 +240,7 @@
 	define("S_USE_THE_HOST_AS_A_TEMPLATE",		"Use the host as a template");
 	define("S_DELETE_SELECTED_HOST_Q",		"Delete selected host?");
 
-//	config.php
+//	items.php
 	define("S_CONFIGURATION_OF_ITEMS",		"Configuration of items");
 	define("S_CONFIGURATION_OF_ITEMS_BIG",		"CONFIGURATION OF ITEMS");
 	define("S_CANNOT_UPDATE_ITEM",			"Cannot update item");
@@ -258,6 +258,7 @@
 	define("S_DESCRIPTION",				"Description");
 	define("S_UPDATE_INTERVAL",			"Update interval");
 	define("S_HISTORY",				"History");
+	define("S_TRENDS",				"Trends");
 	define("S_SHORT_NAME",				"Short name");
 	define("S_ZABBIX_AGENT",			"Zabbix agent");
 	define("S_SNMPV1_AGENT",			"SNMPv1 agent");