Minor changes.

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

4 files changed, 228 insertions, 80 deletions

diff --git a/src/libs/zbxsysinfo/Makefile.am b/src/libs/zbxsysinfo/Makefile.am
index 7df625a5..00162fcf 100644
--- a/src/libs/zbxsysinfo/Makefile.am
+++ b/src/libs/zbxsysinfo/Makefile.am
@@ -1,27 +1,27 @@
 SUBDIRS=
 
 if CONFIG_HOST_HPUX
-libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
+libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/supported. linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
 endif
 
 if CONFIG_HOST_FREEBSD
-libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
+libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/supported. linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
 endif
 
 if CONFIG_HOST_LINUX
-libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
+libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/supported. linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
 endif
 
 if CONFIG_HOST_OPENBSD
-libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
+libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/supported. linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
 endif
 
 if CONFIG_HOST_SOLARIS
-libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
+libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/supported. linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
 endif
 
 if CONFIG_HOST_UNKNOWN
-libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
+libzbxsysinfo_a_SOURCES=common/file.c common/system.c linux/supported. linux/cpu.c linux/diskio.c linux/diskspace.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c
 endif
 
 lib_LIBRARIES=libzbxsysinfo.a
diff --git a/src/libs/zbxsysinfo/common/file.c b/src/libs/zbxsysinfo/common/file.c
index dbf042b9..9dc62ff3 100644
--- a/src/libs/zbxsysinfo/common/file.c
+++ b/src/libs/zbxsysinfo/common/file.c
@@ -20,64 +20,15 @@
 #include "config.h"
 
 #include <errno.h>
-
 #include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
+
+/* stat() */
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
-/* Definitions of uint32_t under OS/X */
-#ifdef HAVE_STDINT_H
-	#include <stdint.h>
-#endif
-#ifdef HAVE_STRINGS_H
-	#include <strings.h>
-#endif
-#ifdef HAVE_FCNTL_H
-	#include <fcntl.h>
-#endif
-#ifdef HAVE_DIRENT_H
-	#include <dirent.h>
-#endif
-/* Linux */
-#ifdef HAVE_SYS_VFS_H
-	#include <sys/vfs.h>
-#endif
-#ifdef HAVE_SYS_SYSINFO_H
-	#include <sys/sysinfo.h>
-#endif
-/* Solaris */
-#ifdef HAVE_SYS_STATVFS_H
-	#include <sys/statvfs.h>
-#endif
-/* Solaris */
-#ifdef HAVE_SYS_PROCFS_H
-/* This is needed to access the correct procfs.h definitions */
-	#define _STRUCTURED_PROC 1
-	#include <sys/procfs.h>
-#endif
-#ifdef HAVE_SYS_LOADAVG_H
-	#include <sys/loadavg.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-	#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-	#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-	#include <arpa/inet.h>
-#endif
-/* OpenBSD/Solaris */
-#ifdef HAVE_SYS_PARAM_H
-	#include <sys/param.h>
-#endif
-
-#ifdef HAVE_SYS_MOUNT_H
-	#include <sys/mount.h>
-#endif
+/* FILE */
+#include <stdio.h>
 
 #include "common.h"
 #include "sysinfo.h"
diff --git a/src/libs/zbxsysinfo/linux/supported.c b/src/libs/zbxsysinfo/linux/supported.c
new file mode 100644
index 00000000..64d4fc2d
--- /dev/null
+++ b/src/libs/zbxsysinfo/linux/supported.c
@@ -0,0 +1,203 @@
+/* 
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+**/
+
+#include "config.h"
+
+COMMAND	parameters_specific[]=
+/* 	KEY		FUNCTION (if double) FUNCTION (if string) PARAM*/
+	{
+
+/* Outdated */
+
+	{"cksum[*]"		,VFS_FILE_CKSUM, 	0, "/etc/services"},
+	{"cpu[idle1]"		,SYSTEM_CPU_IDLE1, 	0, 0},
+	{"cpu[idle5]"		,SYSTEM_CPU_IDLE5, 	0, 0},
+	{"cpu[idle15]"		,SYSTEM_CPU_IDLE15, 	0, 0},
+	{"cpu[nice1]"		,SYSTEM_CPU_NICE1, 	0, 0},
+	{"cpu[nice5]"		,SYSTEM_CPU_NICE5, 	0, 0},
+	{"cpu[nice15]"		,SYSTEM_CPU_NICE15, 	0, 0},
+	{"cpu[system1]"		,SYSTEM_CPU_SYS1, 	0, 0},
+	{"cpu[system5]"		,SYSTEM_CPU_SYS5, 	0, 0},
+	{"cpu[system15]"	,SYSTEM_CPU_SYS15, 	0, 0},
+	{"cpu[user1]"		,SYSTEM_CPU_USER1, 	0, 0},
+	{"cpu[user5]"		,SYSTEM_CPU_USER5, 	0, 0},
+	{"cpu[user15]"		,SYSTEM_CPU_USER15, 	0, 0},
+	{"diskfree[*]"		,VFS_FS_FREE,		0, "/"},
+	{"disktotal[*]"		,VFS_FS_TOTAL,		0, "/"},
+	{"diskused[*]"		,VFS_FS_USED,		0, "/"},
+	{"diskfree_perc[*]"	,VFS_FS_PFREE,		0, "/"},
+	{"diskused_perc[*]"	,VFS_FS_PUSED,		0, "/"},
+	{"file[*]"		,VFS_FILE_EXISTS,	0, "/etc/passwd"},
+	{"filesize[*]"		,VFS_FILE_SIZE, 		0, "/etc/passwd"},
+	{"inodefree[*]"		,VFS_FS_INODE_FREE,	0, "/"},
+	{"inodetotal[*]"	,VFS_FS_INODE_TOTAL,	0, "/"},
+	{"inodefree_perc[*]"	,VFS_FS_INODE_PFREE,	0, "/"},
+	{"kern[maxfiles]"	,KERNEL_MAXFILES,	0, 0},
+	{"kern[maxproc]"	,KERNEL_MAXPROC, 	0, 0},
+	{"md5sum[*]"		,0, 			VFS_FILE_MD5SUM, "/etc/services"},
+	{"memory[buffers]"	,VM_MEMORY_BUFFERS,	0, 0},
+	{"memory[cached]"	,VM_MEMORY_CACHED, 	0, 0},
+	{"memory[free]"		,VM_MEMORY_FREE, 	0, 0},
+	{"memory[shared]"	,VM_MEMORY_SHARED, 	0, 0},
+	{"memory[total]"	,VM_MEMORY_TOTAL,	0, 0},
+	{"netloadin1[*]"	,NET_IF_IBYTES1,	0, "lo"},
+	{"netloadin5[*]"	,NET_IF_IBYTES5,	0, "lo"},
+	{"netloadin15[*]"	,NET_IF_IBYTES15,	0, "lo"},
+	{"netloadout1[*]"	,NET_IF_OBYTES1,	0, "lo"},
+	{"netloadout5[*]"	,NET_IF_OBYTES5, 	0, "lo"},
+	{"netloadout15[*]"	,NET_IF_OBYTES15,	0, "lo"},
+	{"ping"			,AGENT_PING, 		0, 0},
+	{"proc_cnt[*]"		,PROC_NUM, 		0, "inetd"},
+	{"swap[free]"		,SYSTEM_SWAP_FREE,	0, 0},
+	{"swap[total]"		,SYSTEM_SWAP_TOTAL,	0, 0},
+	{"system[procload]"	,SYSTEM_CPU_LOAD1, 	0, 0},
+	{"system[procload5]"	,SYSTEM_CPU_LOAD5, 	0, 0},
+	{"system[procload15]"	,SYSTEM_CPU_LOAD15, 	0, 0},
+	{"system[hostname]"	,0,		EXECUTE_STR, "hostname"},
+	{"system[uname]"	,0,		EXECUTE_STR, "uname -a"},
+	{"system[uptime]"	,SYSTEM_UPTIME,	0, 0},
+	{"system[users]"	,EXECUTE, 	0,"who|wc -l"},
+	{"version[zabbix_agent]",	0, 		AGENT_VERSION, 0},
+/* New naming  */
+
+	{"agent.ping"		,AGENT_PING, 		0, 0},
+	{"agent.version",		0, 		AGENT_VERSION, 0},
+
+	{"kernel.maxfiles]"	,KERNEL_MAXFILES,	0, 0},
+	{"kernel.maxproc"	,KERNEL_MAXPROC, 	0, 0},
+
+	{"proc.num[*]"		,PROC_NUM, 		0, "inetd"},
+
+	{"vm.memory.total"	,VM_MEMORY_TOTAL,	0, 0},
+	{"vm.memory.shared"	,VM_MEMORY_SHARED,	0, 0},
+	{"vm.memory.buffers"	,VM_MEMORY_BUFFERS,	0, 0},
+	{"vm.memory.cached"	,VM_MEMORY_CACHED, 	0, 0},
+	{"vm.memory.free"	,VM_MEMORY_FREE, 	0, 0},
+
+	{"vfs.fs.free[*]"	,VFS_FS_FREE,		0, "/"},
+	{"vfs.fs.total[*]"	,VFS_FS_TOTAL,		0, "/"},
+	{"vfs.fs.used[*]"	,VFS_FS_USED,		0, "/"},
+
+	{"vfs.fs.pfree[*]"	,VFS_FS_PFREE,		0, "/"},
+	{"vfs.fs.pused[*]"	,VFS_FS_PUSED,		0, "/"},
+
+	{"vfs.fs.inode.free[*]"	,VFS_FS_INODE_FREE,	0, "/"},
+	{"vfs.fs.inode.total[*]",VFS_FS_INODE_TOTAL,	0, "/"},
+	{"vfs.fs.inode.pfree[*]",VFS_FS_INODE_PFREE,	0, "/"},
+
+	{"vfs.file.atime[*]"	,VFS_FILE_ATIME,	0, "/etc/passwd"},
+	{"vfs.file.cksum[*]"	,VFS_FILE_CKSUM,	0, "/etc/services"},
+	{"vfs.file.ctime[*]"	,VFS_FILE_CTIME,	0, "/etc/passwd"},
+	{"vfs.file.exists[*]"	,VFS_FILE_EXISTS,	0, "/etc/passwd"},
+	{"vfs.file.md5sum[*]"	,0, 			VFS_FILE_MD5SUM, "/etc/services"},
+	{"vfs.file.mtime[*]"	,VFS_FILE_MTIME,		0, "/etc/passwd"},
+	{"vfs.file.regexp[*]"	,0, 			VFS_FILE_REGEXP, "/etc/passwd,root"},
+	{"vfs.file.regmatch[*]"	,VFS_FILE_REGMATCH, 	0, "/etc/passwd,root"},
+	{"vfs.file.size[*]"	,VFS_FILE_SIZE, 		0, "/etc/passwd"},
+
+	{"system.cpu.idle1"	,SYSTEM_CPU_IDLE1, 		0, 0},
+	{"system.cpu.idle5"	,SYSTEM_CPU_IDLE5, 		0, 0},
+	{"system.cpu.idle15"	,SYSTEM_CPU_IDLE15, 		0, 0},
+	{"system.cpu.nice1"	,SYSTEM_CPU_NICE1, 		0, 0},
+	{"system.cpu.nice5"	,SYSTEM_CPU_NICE5, 		0, 0},
+	{"system.cpu.nice15"	,SYSTEM_CPU_NICE15, 		0, 0},
+	{"system.cpu.sys1"	,SYSTEM_CPU_SYS1, 		0, 0},
+	{"system.cpu.sys5"	,SYSTEM_CPU_SYS5, 		0, 0},
+	{"system.cpu.sys15"	,SYSTEM_CPU_SYS15, 		0, 0},
+	{"system.cpu.user1"	,SYSTEM_CPU_USER1, 		0, 0},
+	{"system.cpu.user5"	,SYSTEM_CPU_USER5, 		0, 0},
+	{"system.cpu.user15"	,SYSTEM_CPU_USER15, 		0, 0},
+
+	{"net.if.ibytes1[*]"	,NET_IF_IBYTES1,	0, "lo"},
+	{"net.if.ibytes5[*]"	,NET_IF_IBYTES5,	0, "lo"},
+	{"net.if.ibytes15[*]"	,NET_IF_IBYTES15,	0, "lo"},
+	{"net.if.obytes1[*]"	,NET_IF_OBYTES1,	0, "lo"},
+	{"net.if.obytes5[*]"	,NET_IF_OBYTES5,	0, "lo"},
+	{"net.if.obytes15[*]"	,NET_IF_OBYTES15,	0, "lo"},
+
+	{"disk_read_ops1[*]"	,DISKREADOPS1, 		0, "hda"},
+	{"disk_read_ops5[*]"	,DISKREADOPS5, 		0, "hda"},
+	{"disk_read_ops15[*]"	,DISKREADOPS15,		0, "hda"},
+
+	{"disk_read_blks1[*]"	,DISKREADBLKS1,		0, "hda"},
+	{"disk_read_blks5[*]"	,DISKREADBLKS5,		0, "hda"},
+	{"disk_read_blks15[*]"	,DISKREADBLKS15,	0, "hda"},
+
+	{"disk_write_ops1[*]"	,DISKWRITEOPS1, 	0, "hda"},
+	{"disk_write_ops5[*]"	,DISKWRITEOPS5, 	0, "hda"},
+	{"disk_write_ops15[*]"	,DISKWRITEOPS15,	0, "hda"},
+
+	{"disk_write_blks1[*]"	,DISKWRITEBLKS1,	0, "hda"},
+	{"disk_write_blks5[*]"	,DISKWRITEBLKS5,	0, "hda"},
+	{"disk_write_blks15[*]"	,DISKWRITEBLKS15,	0, "hda"},
+
+	{"sensor[temp1]"	,SENSOR_TEMP1, 		0, 0},
+	{"sensor[temp2]"	,SENSOR_TEMP2, 		0, 0},
+	{"sensor[temp3]"	,SENSOR_TEMP3, 		0, 0},
+
+	{"system.cpu.load1"	,SYSTEM_CPU_LOAD1,	0, 0},
+	{"system.cpu.load5"	,SYSTEM_CPU_LOAD5,	0, 0},
+	{"system.cpu.load15"	,SYSTEM_CPU_LOAD15,	0, 0},
+
+	{"system.hostname"	,0,			EXECUTE_STR, "hostname"},
+
+	{"system.swap.free"	,SYSTEM_SWAP_FREE,	0, 0},
+	{"system.swap.total"	,SYSTEM_SWAP_TOTAL, 	0, 0},
+
+	{"system.uname"		,0,			EXECUTE_STR, "uname -a"},
+	{"system.uptime"	,SYSTEM_UPTIME,		0, 0},
+	{"system.users.num"	,EXECUTE, 		0,"who|wc -l"},
+
+/****************************************
+  	All these perameters require more than 1 second to retrieve.
+
+  	{"swap[in]"		,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b37-40"},
+	{"swap[out]"		,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b41-44"},
+
+	{"system[interrupts]"	,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b57-61"},
+	{"system[switches]"	,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b62-67"},
+***************************************/
+
+	{"io[disk_io]"		,DISK_IO,  	0, 0},
+	{"io[disk_rio]"		,DISK_RIO, 	0, 0},
+	{"io[disk_wio]"		,DISK_WIO, 	0, 0},
+	{"io[disk_rblk]"	,DISK_RBLK, 	0, 0},
+	{"io[disk_wblk]"	,DISK_WBLK, 	0, 0},
+
+
+
+	{"system[proccount]"	,PROCCOUNT, 	0, 0},
+
+#ifdef HAVE_PROC_LOADAVG
+	{"system[procrunning]"	,EXECUTE, 	0, "cat /proc/loadavg|cut -f1 -d'/'|cut -f4 -d' '"},
+#endif
+
+/*	{"tcp_count"		,EXECUTE, 	0, "netstat -tn|grep EST|wc -l"}, */
+
+	{"net[listen_23]"	,TCP_LISTEN, 	0, "0017"},
+	{"net[listen_80]"	,TCP_LISTEN, 	0, "0050"},
+
+	{"check_port[*]"	,CHECK_PORT, 	0, "80"},
+
+	{"check_service[*]"	,CHECK_SERVICE, 	0, "ssh,127.0.0.1,22"},
+	{"dns[*]"		,CHECK_DNS,		0, "127.0.0.1,localhost"},
+	{"check_service_perf[*]",CHECK_SERVICE_PERF, 	0, "ssh,127.0.0.1,22"},
+
+	{0}
+	};
diff --git a/src/libs/zbxsysinfo/sysinfo.c b/src/libs/zbxsysinfo/sysinfo.c
index 3220eacc..7d8280cc 100644
--- a/src/libs/zbxsysinfo/sysinfo.c
+++ b/src/libs/zbxsysinfo/sysinfo.c
@@ -152,12 +152,14 @@ void	forward_request(char *proxy,char *command,int port,char *value);
 /*COMMAND	commands[AGENT_MAX_USER_COMMANDS]=*/
 COMMAND	*commands=NULL;
 
-COMMAND	agent_commands[]=
+COMMAND	parameters_common[]=
 /* 	KEY		FUNCTION (if double) FUNCTION (if string) PARAM*/
 	{
+	{"system.localtime"	,SYSTEM_LOCALTIME,	0, 0},
+	{0}
+	};
 
-/* Outdated */
-
+/*
 	{"cksum[*]"		,VFS_FILE_CKSUM, 	0, "/etc/services"},
 	{"cpu[idle1]"		,SYSTEM_CPU_IDLE1, 	0, 0},
 	{"cpu[idle5]"		,SYSTEM_CPU_IDLE5, 	0, 0},
@@ -207,7 +209,6 @@ COMMAND	agent_commands[]=
 	{"system[uptime]"	,SYSTEM_UPTIME,	0, 0},
 	{"system[users]"	,EXECUTE, 	0,"who|wc -l"},
 	{"version[zabbix_agent]",	0, 		AGENT_VERSION, 0},
-/* New naming  */
 
 	{"agent.ping"		,AGENT_PING, 		0, 0},
 	{"agent.version",		0, 		AGENT_VERSION, 0},
@@ -289,7 +290,6 @@ COMMAND	agent_commands[]=
 	{"system.cpu.load15"	,SYSTEM_CPU_LOAD15,	0, 0},
 
 	{"system.hostname"	,0,			EXECUTE_STR, "hostname"},
-	{"system.localtime"	,SYSTEM_LOCALTIME,	0, 0},
 
 	{"system.swap.free"	,SYSTEM_SWAP_FREE,	0, 0},
 	{"system.swap.total"	,SYSTEM_SWAP_TOTAL, 	0, 0},
@@ -298,16 +298,6 @@ COMMAND	agent_commands[]=
 	{"system.uptime"	,SYSTEM_UPTIME,		0, 0},
 	{"system.users.num"	,EXECUTE, 		0,"who|wc -l"},
 
-/****************************************
-  	All these perameters require more than 1 second to retrieve.
-
-  	{"swap[in]"		,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b37-40"},
-	{"swap[out]"		,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b41-44"},
-
-	{"system[interrupts]"	,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b57-61"},
-	{"system[switches]"	,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b62-67"},
-***************************************/
-
 	{"io[disk_io]"		,DISK_IO,  	0, 0},
 	{"io[disk_rio]"		,DISK_RIO, 	0, 0},
 	{"io[disk_wio]"		,DISK_WIO, 	0, 0},
@@ -322,8 +312,6 @@ COMMAND	agent_commands[]=
 	{"system[procrunning]"	,EXECUTE, 	0, "cat /proc/loadavg|cut -f1 -d'/'|cut -f4 -d' '"},
 #endif
 
-/*	{"tcp_count"		,EXECUTE, 	0, "netstat -tn|grep EST|wc -l"}, */
-
 	{"net[listen_23]"	,TCP_LISTEN, 	0, "0017"},
 	{"net[listen_80]"	,TCP_LISTEN, 	0, "0050"},
 
@@ -335,6 +323,7 @@ COMMAND	agent_commands[]=
 
 	{0}
 	};
+*/
 
 void	add_metric(char *key, int (*function)(),int (*function_str)(),char *parameter )
 {
@@ -406,9 +395,14 @@ void	init_metrics()
 	commands=malloc(sizeof(COMMAND));
 	commands[0].key=NULL;
 
-	for(i=0;agent_commands[i].key!=0;i++)
+	for(i=0;parameters_common[i].key!=0;i++)
+	{
+		add_metric(parameters_common[i].key, parameters_common[i].function, parameters_common[i].function_str, parameters_common[i].parameter);
+	}
+
+	for(i=0;parameters_specific[i].key!=0;i++)
 	{
-		add_metric(agent_commands[i].key, agent_commands[i].function, agent_commands[i].function_str, agent_commands[i].parameter);
+		add_metric(parameters_specific[i].key, parameters_specific[i].function, parameters_specific[i].function_str, parameters_specific[i].parameter);
 	}
 }