--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2010/03/12 17:09:27	1.22
+++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2010/05/03 16:42:06	1.24
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-agent.spec,v 1.21 2010/02/17 18:45:50 vip-ire Exp $
+# $Id: smeserver-zabbix-agent.spec,v 1.23 2010/03/17 09:10:41 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-agent
 %define version 0.1
-%define release 40
+%define release 42
 Summary: sme server integration of zabbix agent
 Name: %{name}
 Version: %{version}
@@ -65,6 +65,10 @@ Patch48: smeserver-zabbix-agent-0.1-run_
 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
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -80,6 +84,15 @@ Zabbix is an entreprise-class open sourc
 solution
 
 %changelog
+* 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
 
@@ -288,6 +301,10 @@ solution
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
+%patch52 -p1
+%patch53 -p1
+%patch54 -p1
+%patch55 -p1
 
 %build
 %{__mkdir_p} root/var/lib/zabbix/tmp