- added support of UserParameter(s) returning non-numeric values (Alexei)

 - doc/manual.lyx will not be included in Zabbix release (Alexei)


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

7 files changed, 72 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 92c8cacd..5a8ad2c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
 Not ready yet:
 
-[ CORE. Support for automake ]
-
+[ HB. Authorisation without user name/password ]
 [ CORE. Support for Service Tree ] 
+[ CORE. If Zabbix is restarted change triggers status to UNKNOWN ]
+[ CORE. Change trigger status in case if host/item status is changed ]
+[ PHP. Navigation by time period for graphs and trends ]
 
-[ CORE. Make Zabbix compile by cc ]
+[ CORE. Support for automake ]
+
+[ TESTING. Define procedure for regression testing ]
 
-[ CORE. Change trigger status in case if host/item status is changed ]
 [ CORE. Get rid of all numerics constants in the code ]
 
 [ PHP. Show triggers by userid ]
@@ -18,17 +21,18 @@ Not ready yet:
 
 [ DOCS. All parameters should contain section "How can be used" in the Manual ]
 
-[ HB. Authorisation without user name/password ]
 [ HB. zabbix_suckerd core dumps occasionally ]
 [ HB. SNMP code core dumps occasionally ]
 
 [ DOCS. SNMP with missing MIB files can be used by:
 snmpget -On localhost public enterprises.ucdavis.memory.memTotalSwap.0]
 
-[ DITRIB. Exclude LyX from Zabbix distribution ]
+[ CORE. All errors and warnings must be numbered and documented ]
 
 Changes for 1.0beta4:
 
+ - added support of UserParameter(s) returning non-numeric values (Alexei) 
+ - doc/manual.lyx will not be included in Zabbix release (Alexei)
  - chnages to make Zabbix compile in non-GCC environments (Alexei)
  - unreachable hosts will be clickable in system maps (Alexei)
  - fixed double posting of the same trigger status into alarms (Alexei) 
@@ -39,7 +43,6 @@ Changes for 1.0beta4:
  - improvements in SNMP handling for zabbix_suckerd (Alexei)
  - fixed check for SNMP library in configure.in (Alexei)
  - template host set to empty in Host definition form (Alexei)
- - changes in the Manual (Alexei)
  - support for DisableHousekeeping for zabbix_suckerd (Alexei)
  - protection from items.delay set to 0 (Alexei)
  - values provided by an agent can be less than zero (Alexei)
diff --git a/doc/manual.lyx b/doc/manual.lyx
index c0b5a6de..bad2221c 100644
--- a/doc/manual.lyx
+++ b/doc/manual.lyx
@@ -24,13 +24,13 @@
 
 \layout Title
 \added_space_top vfill 
-Zabbix Reference Manual for version 1.0 (draft v1.18)
+Zabbix Reference Manual for version 1.0 (draft v1.19)
 \layout Author
 
 ALEXEI VLADISHEV
 \layout Date
 
-24 May 2002
+25 May 2002
 \layout Abstract
 
 The document is Reference Manual for Zabbix version 1.0.
@@ -2200,6 +2200,27 @@ Parameter Server is comma-delimited list of Zabbix servers
 \layout Subsubsection
 
 Zabbix 1.0beta4
+\layout Itemize
+
+support for processing of negative values
+\layout Itemize
+
+Parameter 
+\emph on 
+DisableHousekeeping
+\emph default 
+ for 
+\series bold 
+zabbix_suckerd
+\layout Itemize
+
+improvements in SNMP handling
+\layout Itemize
+
+supports for non-numeric SNMP values
+\layout Itemize
+
+can be compiled by standard Unix compiler (CC)
 \layout Subsection
 
 ChangeLog
@@ -4025,7 +4046,8 @@ NULL
 
 \layout Standard
 
-User's password
+User's password.
+ If password is not used, then this parameter must be commented.
 \end_inset 
 </cell>
 </row>
@@ -4911,7 +4933,8 @@ NULL
 
 \layout Standard
 
-User's password
+User's password.
+ If password is not used, this parameter must be commented.
 \end_inset 
 </cell>
 </row>
@@ -5322,7 +5345,8 @@ NULL
 
 \layout Standard
 
-User's password
+User's password.
+ If password is not used, this parameter must be commented.
 \end_inset 
 </cell>
 </row>
@@ -13428,6 +13452,9 @@ all information (configuration, gathered data) is stored in SQL database
 high-level service tree
 \layout Itemize
 
+tested using regression tests
+\layout Itemize
+
 very easy setup
 \layout Itemize
 
@@ -15944,4 +15971,10 @@ The Zabbix home page at
 \end_inset 
 
 
+\layout Part
+
+Appendix
+\layout Section
+
+Warnings and Errors
 \the_end
diff --git a/frontends/php/srv_status.php b/frontends/php/srv_status.php
index 61199e31..571e13bd 100644
--- a/frontends/php/srv_status.php
+++ b/frontends/php/srv_status.php
@@ -20,8 +20,8 @@
 	echo "\n";
 	echo "<tr>";
 	echo "<td><b>Service</b></td>";
-	echo "<td><b>Status</b></td>";
-	echo "<td><b>Actions</b></td>";
+	echo "<td width=\"10%\"><b>Status</b></td>";
+	echo "<td width=\"10%\"><b>Actions</b></td>";
 	echo "</tr>";
 	echo "\n";
 	$col=0;
diff --git a/misc/conf/zabbix_agent.conf b/misc/conf/zabbix_agent.conf
index 2dde2dee..f625d2c3 100644
--- a/misc/conf/zabbix_agent.conf
+++ b/misc/conf/zabbix_agent.conf
@@ -11,3 +11,17 @@ Server=127.0.0.1
 # Must be between 1 and 30
 
 Timeout=3
+
+####### USER-DEFINED MONITORED PARAMETERS #######
+# Format: UserParameter=<key>,<shell command>
+# Note that shell command should return numeric value
+#UserParameter=system[test],who|wc -l
+### Set of parameter for monitoring MySQL server (v3.23.42 and later)
+### Change -u<username> and add -p<password> if required
+#UserParameter=mysql[ping],mysqladmin -uroot ping|grep alive|wc -l
+#UserParameter=mysql[uptime],mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
+#UserParameter=mysql[threads],mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
+#UserParameter=mysql[questions],mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
+#UserParameter=mysql[slowqueries],mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
+#UserParameter=mysql[qps],mysqladmin -uroot status|cut -f9 -d":"
+#UserParameter=version[mysql],mysql -V
diff --git a/misc/conf/zabbix_agentd.conf b/misc/conf/zabbix_agentd.conf
index f5234424..442cf0fa 100644
--- a/misc/conf/zabbix_agentd.conf
+++ b/misc/conf/zabbix_agentd.conf
@@ -64,3 +64,4 @@ NoTimeWait=1
 #UserParameter=mysql[questions],mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
 #UserParameter=mysql[slowqueries],mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
 #UserParameter=mysql[qps],mysqladmin -uroot status|cut -f9 -d":"
+#UserParameter=version[mysql],mysql -V
diff --git a/src/zabbix_agent/sysinfo.c b/src/zabbix_agent/sysinfo.c
index 9cffd38f..6d97d9e1 100644
--- a/src/zabbix_agent/sysinfo.c
+++ b/src/zabbix_agent/sysinfo.c
@@ -167,7 +167,9 @@ void	add_user_parameter(char *key,char *command)
 		{
 			commands[i].key=strdup(key);
 
-			commands[i].function=&EXECUTE;
+			commands[i].function=0;
+
+			commands[i].function_str=&EXECUTE_STR;
 
 			commands[i].parameter=strdup(command);
 
diff --git a/src/zabbix_sucker/zabbix_sucker.c b/src/zabbix_sucker/zabbix_sucker.c
index 816f5129..c6fe3a85 100644
--- a/src/zabbix_sucker/zabbix_sucker.c
+++ b/src/zabbix_sucker/zabbix_sucker.c
@@ -524,12 +524,14 @@ int	get_value(double *result,char *result_str,DB_ITEM *item)
 	{
 		res=get_value_zabbix(result,result_str,item);
 	}
-#ifdef HAVE_UCD_SNMP_UCD_SNMP_CONFIG_H
 	else if(item->type == ITEM_TYPE_SNMP)
 	{
+#ifdef HAVE_UCD_SNMP_UCD_SNMP_CONFIG_H
 		res=get_value_SNMPv1(result,result_str,item);
-	}
+#else
+		zabbix_log(LOG_LEVEL_WARNING, "Support of SNMP parameters was no compiled in");
 #endif
+	}
 	else
 	{
 		zabbix_log(LOG_LEVEL_WARNING, "Not supported item type:%d",item->type);