--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2009/09/25 08:28:06	1.16
+++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2010/09/02 15:21:09	1.27
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-agent.spec,v 1.15 2009/09/01 09:41:19 vip-ire Exp $
+# $Id: smeserver-zabbix-agent.spec,v 1.26 2010/08/04 14:19:32 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-agent
 %define version 0.1
-%define release 35
+%define release 45
 Summary: sme server integration of zabbix agent
 Name: %{name}
 Version: %{version}
@@ -60,6 +60,19 @@ Patch43: smeserver-zabbix-agent-0.1-mega
 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
+Patch57: smeserver-zabbix-agent-0.1-userparam_diskio.patch
+Patch58: smeserver-zabbix-agent-0.1-userparam_asterisk.patch
+Patch59: smeserver-zabbix-agent-0.1-userparam_lvm.patch
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -75,6 +88,43 @@ Zabbix is an entreprise-class open sourc
 solution
 
 %changelog
+* Thu Sep 02 2010 Daniel B. <daniel@firewall-services.com> 0.1-45
+- Add basic asterisk monitoring support
+- Add basic LVM monitoring support
+
+* Wed Aug 04 2010 Daniel B. <daniel@firewall-services.com> 0.1-44
+- Support up to 8 disks for I/O monitoring. Report valid 0 value
+  for non existing ones to prevent errors in server's log
+
+* 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
@@ -261,6 +311,19 @@ solution
 %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
+%patch57 -p1
+%patch58 -p1
+%patch59 -p1
 
 %build
 %{__mkdir_p} root/var/lib/zabbix/tmp
@@ -280,6 +343,8 @@ rm -f %{name}-%{version}-filelist
 	--file /var/lib/zabbix/bin/parse_mail_in.pl 'attr(0755,root,root)' \
 	--file /var/lib/zabbix/bin/parse_mail_out.pl 'attr(0755,root,root)' \
 	--file /var/lib/zabbix/bin/sensors 'attr(0750,root,zabbix) %config(noreplace)' \
+	--file /var/lib/zabbix/bin/check_asterisk 'attr(0755,root,root)' \
+	--file /var/lib/zabbix/bin/check_lvm 'attr(0755,root,root)' \
 	--dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \
 	> %{name}-%{version}-filelist