- fixed processing of simple checks (Alexei)

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

3 files changed, 8 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 250df536..b46845d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Changes for 1.1beta5:
 
+ - fixed processing of simple checks (Alexei)
  - new concept of defenition of actions, one screen (Alexei)
  - new fields for table 'actions' (Alexei)
  - new item value type: integer 64bit (Alexei)
diff --git a/TODO b/TODO
index 8e49e38a..e85a61d8 100644
--- a/TODO
+++ b/TODO
@@ -12,7 +12,6 @@
  - http://www.zabbix.com/forum/showthread.php?t=1842
  - http://www.zabbix.com/forum/showthread.php?t=1784
  - http://www.zabbix.com/forum/showthread.php?t=1837
- - http://www.zabbix.com/forum/showthread.php?t=1865
  - check if icmpping and icmppingsec works
 
  - fix undeleted warnings for host and trigger statuses
diff --git a/src/zabbix_server/poller/checks_simple.c b/src/zabbix_server/poller/checks_simple.c
index 3e29ac68..1443776b 100644
--- a/src/zabbix_server/poller/checks_simple.c
+++ b/src/zabbix_server/poller/checks_simple.c
@@ -39,18 +39,18 @@ int	get_value_simple(DB_ITEM *item, AGENT_RESULT *result)
 		l=strstr(item->key,"[");
 		r=strstr(item->key,"]");
 		if(l==NULL || r==NULL)
-			snprintf(c,sizeof(c)-1,"check_service[%s]",item->key);
+			snprintf(c,sizeof(c)-1,"net.tcp.service[%s]",item->key);
 		else
 		{
 			strncpy( param,l+1, r-l-1);
 			param[r-l-1]=0;
 			if(item->useip==1)
 			{
-				snprintf(c,sizeof(c)-1,"check_service[%s,%s]",item->key,item->ip);
+				snprintf(c,sizeof(c)-1,"net.tcp.service[%s,%s]",item->key,item->ip);
 			}
 			else
 			{
-				snprintf(c,sizeof(c)-1,"check_service[%s,%s]",item->key,item->host);
+				snprintf(c,sizeof(c)-1,"net.tcp.service[%s,%s]",item->key,item->host);
 			}
 		}
 	}
@@ -82,11 +82,11 @@ int	get_value_simple(DB_ITEM *item, AGENT_RESULT *result)
 	{
 		if(item->useip==1)
 		{
-			snprintf(c,sizeof(c)-1,"check_service[%s,%s]",item->key,item->ip);
+			snprintf(c,sizeof(c)-1,"net.tcp.service[%s,%s]",item->key,item->ip);
 		}
 		else
 		{
-			snprintf(c,sizeof(c)-1,"check_service[%s,%s]",item->key,item->host);
+			snprintf(c,sizeof(c)-1,"net.tcp.service[%s,%s]",item->key,item->host);
 		}
 	}
 	else
@@ -97,15 +97,14 @@ int	get_value_simple(DB_ITEM *item, AGENT_RESULT *result)
 		
 		if(item->useip==1)
 		{
-			snprintf(c,sizeof(c)-1,"check_service_perf[%s,%s]",s,item->ip);
+			snprintf(c,sizeof(c)-1,"net.tcp.service.perf[%s,%s]",s,item->ip);
 		}
 		else
 		{
-			snprintf(c,sizeof(c)-1,"check_service_perf[%s,%s]",s,item->host);
+			snprintf(c,sizeof(c)-1,"net.tcp.service.perf[%s,%s]",s,item->host);
 		}
 	}
 
-
 	if(process(c, 0, result) == NOTSUPPORTED)
 	{
 		snprintf(error,MAX_STRING_LEN-1,"Simple check [%s] is not supported", c);