--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2009/07/08 12:39:31	1.13
+++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2010/06/23 15:17:20	1.25
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-agent.spec,v 1.12 2009/06/08 08:38:27 vip-ire Exp $
+# $Id: smeserver-zabbix-agent.spec,v 1.24 2010/05/03 16:42:06 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-agent
 %define version 0.1
-%define release 32
+%define release 43
 Summary: sme server integration of zabbix agent
 Name: %{name}
 Version: %{version}
@@ -57,6 +57,19 @@ Patch40: smeserver-zabbix-agent-0.1-mdst
 Patch41: smeserver-zabbix-agent-0.1-megaraid_parser_fix.patch
 Patch42: smeserver-zabbix-agent-0.1-cpu_num.patch
 Patch43: smeserver-zabbix-agent-0.1-megaraid_fix_raid10.patch
+Patch44: smeserver-zabbix-agent-0.1-userparam_smart.patch
+Patch45: smeserver-zabbix-agent-0.1-smart_missing_return.patch
+Patch46: smeserver-zabbix-agent-0.1-report_0_for_non_existing_drives.patch
+Patch47: smeserver-zabbix-agent-0.1-run_megaraid_parser_as_root.patch
+Patch48: smeserver-zabbix-agent-0.1-run_megaraid_parser_as_root2.patch
+Patch49: smeserver-zabbix-agent-0.1-several_ups.patch
+Patch50: smeserver-zabbix-agent-0.1-megaraid_options.patch
+Patch51: smeserver-zabbix-agent-0.1-new_qpsmtpd.patch
+Patch52: smeserver-zabbix-agent-0.1-megaraid_options_from_db.patch
+Patch53: smeserver-zabbix-agent-0.1-disable_megaraid_log.patch
+Patch54: smeserver-zabbix-agent-0.1-critical_vs_warning.patch
+Patch55: smeserver-zabbix-agent-0.1-userparam_squid.patch
+Patch56: smeserver-zabbix-agent-0.1-hostname_from_db.patch
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -72,6 +85,45 @@ Zabbix is an entreprise-class open sourc
 solution
 
 %changelog
+* Wed Jun 23 2010 Daniel B. <daniel@firewall-services.com> 0.1-43
+- Possibility to set Hostname from the DB [SME: 6083]
+
+* Mon May 03 2010 Daniel B. <daniel@firewall-services.com> 0.1-42
+- disable MegaCli log (which can break monitoring if log file reaches 2GB)
+- report CRITICAL if both CRITICAL and WARNING are found
+- add Squid UserParameters (hit ratio, cache size, req per minute)
+
+* Wed Mar 17 2010 Daniel B. <daniel@firewall-services.com> 0.1-41
+- read megaraid options from the DB (number of spares, number of 
+  error to ignore)
+
+* Fri Mar 12 2010 Daniel B. <daniel@firewall-services.com> 0.1-40
+- update regex for incomming mail stats for newer qpsmtpd
+
+* Wed Feb 17 2010 Daniel B. <daniel@firewall-services.com> 0.1-39
+- update megaraid-parser.pl script with options to ignore some errors
+
+* Mon Jan 4 2010 Daniel B. <daniel@firewall-services.com> 0.1-38
+- Change UPS UserParameters to use wildcard, so you can monitor several UPS
+  easily (require changes in the templates on the server side)
+
+* Sun Dec 6 2009 Daniel B. <daniel@firewall-services.com> 0.1-37
+- Call megaraid-parser.pl scripts with sudo in zabbix_agentd.conf
+
+* Wed Dec 2 2009 Daniel B. <daniel@firewall-services.com> 0.1-36
+- Run megaraid-parser.pl as root (with sudo) instead of granting 
+  zabbix user unrestricted access to MegaCli
+
+* Fri Sep 25 2009 Daniel B. <daniel@firewall-services.com> 0.1-35
+- Support up to 8 disks for smart monitoring. Report valid 0 value 
+  for non existing ones to prevent errors in server's log
+
+* Tue Sep 01 2009 Daniel B. <daniel@firewall-services.com> 0.1-34
+- Add missing return after smart parameters (if several disks are monitored)
+
+* Mon Aug 31 2009 Daniel B. <daniel@firewall-services.com> 0.1-33
+- Add system.smart UserParameter (monitor smart values for configured hard drives)
+
 * Wed Jul 08 2009 Daniel B. <daniel@firewall-services.com> 0.1-32
 - Fix megaraid-parser script to support RAID-10 arrays
 
@@ -245,6 +297,19 @@ solution
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
+%patch53 -p1
+%patch54 -p1
+%patch55 -p1
+%patch56 -p1
 
 %build
 %{__mkdir_p} root/var/lib/zabbix/tmp