- added new drchecks (Eugene)

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

3 files changed, 29 insertions, 7 deletions

diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index a2f0a75a..19d1b13a 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -361,6 +361,9 @@
 	define('SVC_NNTP',	6);
 	define('SVC_IMAP',	7);
 	define('SVC_TCP',	8);
+	define('SVC_AGENT',	9);
+	define('SVC_SNMPv1',	10);
+	define('SVC_SNMPv2',	11);
 
 	define('DHOST_STATUS_ACTIVE',		0);
 	define('DHOST_STATUS_DISABLED',		1);
diff --git a/frontends/php/include/discovery.inc.php b/frontends/php/include/discovery.inc.php
index c27db23c..a44dc398 100644
--- a/frontends/php/include/discovery.inc.php
+++ b/frontends/php/include/discovery.inc.php
@@ -48,6 +48,9 @@
 		$str_type[SVC_NNTP]	= S_NNTP;
 		$str_type[SVC_IMAP]	= S_IMAP;
 		$str_type[SVC_TCP]	= S_TCP;
+		$str_type[SVC_AGENT]	= S_ZABBIX_AGENT;
+		$str_type[SVC_SNMPv1]	= S_SNMPV1_AGENT;
+		$str_type[SVC_SNMPv2]	= S_SNMPV2_AGENT;
 
 		if(isset($str_type[$type_int]))
 			return $str_type[$type_int];
@@ -100,11 +103,12 @@
 		return DBexecute('update drules set status='.$status.' where druleid='.$druleid);
 	}
 
-	function	add_discovery_check($druleid, $type, $ports)
+	function	add_discovery_check($druleid, $type, $ports, $key, $snmp_community)
 	{
 		$dcheckid = get_dbid('dchecks', 'dcheckid');
-		$result = DBexecute('insert into dchecks (dcheckid,druleid,type,ports) '.
-			' values ('.$dcheckid.','.$druleid.','.$type.','.zbx_dbstr($ports).')');
+		$result = DBexecute('insert into dchecks (dcheckid,druleid,type,ports,key_,snmp_community) '.
+			' values ('.$dcheckid.','.$druleid.','.$type.','.zbx_dbstr($ports).','.
+				zbx_dbstr($key).','.zbx_dbstr($snmp_community).')');
 
 		if(!$result)
 			return $result;
@@ -129,7 +133,7 @@
 		{
 			DBexecute('delete from dchecks where druleid='.$druleid);
 			if(isset($dchecks)) foreach($dchecks as $val)
-				add_discovery_check($druleid,$val["type"],$val["ports"]);
+				add_discovery_check($druleid,$val["type"],$val["ports"],$val["key"],$val["snmp_community"]);
 
 			$result = $druleid;
 		}
@@ -153,7 +157,7 @@
 		{
 			DBexecute('delete from dchecks where druleid='.$druleid);
 			if(isset($dchecks)) foreach($dchecks as $val)
-				add_discovery_check($druleid,$val["type"],$val["ports"]);
+				add_discovery_check($druleid,$val["type"],$val["ports"],$val["key"],$val["snmp_community"]);
 		}
 		return $result;
 	}
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 1adb7679..4ec6c864 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -202,6 +202,8 @@
 		}
 		$new_check_type	= get_request('new_check_type', SVC_HTTP);
 		$new_check_ports= get_request('new_check_ports', '80');
+		$new_check_key= get_request('new_check_key', '');
+		$new_check_snmp_community= get_request('new_check_snmp_community', '');
 
 		$form->AddRow(S_NAME, new CTextBox('name', $name, 40));
 		$form->AddRow(S_IP_RANGE, new CTextBox('iprange', $iprange, 27));
@@ -228,7 +230,7 @@
 		$cmbChkType = new CComboBox('new_check_type',$new_check_type,
 			"if(add_variable(this, 'type_changed', 1)) submit()"
 			);
-		foreach(array(SVC_SSH, SVC_LDAP, SVC_SMTP, SVC_FTP, SVC_HTTP, SVC_POP, SVC_NNTP, SVC_IMAP, SVC_TCP) as $type_int)
+		foreach(array(SVC_SSH, SVC_LDAP, SVC_SMTP, SVC_FTP, SVC_HTTP, SVC_POP, SVC_NNTP, SVC_IMAP, SVC_TCP, SVC_AGENT, SVC_SNMPv1, SVC_SNMPv2) as $type_int)
 			$cmbChkType->AddItem($type_int, discovery_check_type2str($type_int));
 
 		if(isset($_REQUEST['type_changed']))
@@ -244,12 +246,25 @@
 				case SVC_NNTP:	$new_check_ports = 119;	break;
 				case SVC_IMAP:	$new_check_ports = 143;	break;
 				case SVC_TCP:	$new_check_ports = 80;	break;
+				case SVC_AGENT:	$new_check_ports = 10050;	break;
+				case SVC_SNMPv1:$new_check_ports = 161;	break;
+				case SVC_SNMPv2:$new_check_ports = 161;	break;
 			}
 		}
+		$external_param = array();
+		switch($new_check_type)
+		{
+			case SVC_SNMPv1:
+				$external_param = array_merge($external_param, array(BR, S_SNMP_COMMUNITY, SPACE, new CTextBox('new_check_snmp_community', $new_check_snmp_community)));
+			case SVC_SNMPv2:
+			case SVC_AGENT:	
+				$external_param = array_merge($external_param, array(BR, S_KEY, new CTextBox('new_check_key', $new_check_key), BR));
+		}
 
 		$form->AddRow(S_NEW_CHECK, array(
 			$cmbChkType, SPACE,
 			S_PORTS_SMALL, SPACE, new CTextBox('new_check_ports', $new_check_ports),
+			$external_param,
 			new CButton('add_check', S_ADD)
 		),'new');
 
@@ -2961,7 +2976,7 @@ include_once 'include/discovery.inc.php';
 				case CONDITION_TYPE_DSERVICE_TYPE:
 					$cmbCondVal = new CComboBox('new_condition[value]');
 					foreach(array(SVC_SSH, SVC_LDAP, SVC_SMTP, SVC_FTP, SVC_HTTP,
-						SVC_POP, SVC_NNTP, SVC_IMAP, SVC_TCP) as $svc)
+						SVC_POP, SVC_NNTP, SVC_IMAP, SVC_TCP,SVC_AGENT,SVC_SNMPv1,SVC_SNMPv2) as $svc)
 						$cmbCondVal->AddItem($svc,discovery_check_type2str($svc));
 
 					$rowCondition[] = $cmbCondVal;