--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec 2009/03/02 23:53:30 1.2 +++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec 2009/03/27 12:56:38 1.7 @@ -1,10 +1,10 @@ -# $Id$ +# $Id: smeserver-zabbix-agent.spec,v 1.6 2009/03/24 22:29:10 vip-ire Exp $ # Authority: vip-ire # Name: Daniel Berteaud %define name smeserver-zabbix-agent %define version 0.1 -%define release 21 +%define release 26 Summary: sme server integration of zabbix agent Name: %{name} Version: %{version} @@ -13,36 +13,41 @@ License: GNU GPL version 2 URL: http://www.zabbix.com/ Group: SMEserver/addon Source: %{name}-%{version}.tar.gz -Patch0: smeserver-zabbix-agent-0.1-hostname.patch -Patch1: smeserver-zabbix-agent-0.1-template_rename.patch -Patch2: smeserver-zabbix-agent-0.1-userparam_ext_ip.patch -Patch3: smeserver-zabbix-agent-0.1-userparam_ups.patch -Patch4: smeserver-zabbix-agent-0.1-userparam_mysql.patch -Patch5: smeserver-zabbix-agent-0.1-userparam_usedMem.patch -Patch6: smeserver-zabbix-agent-0.1-userparam_usedMem_brackets.patch -Patch7: smeserver-zabbix-agent-0.1-userparam_usedMem_key.patch -Patch8: smeserver-zabbix-agent-0.1-userparam_usedMem_Used.patch -Patch9: smeserver-zabbix-agent-0.1-userparam_usedMem_Used2.patch -Patch10: smeserver-zabbix-agent-0.1-userparam_MemStats.patch -Patch11: smeserver-zabbix-agent-0.1-userparam_MemStatsTypo.patch -Patch12: smeserver-zabbix-agent-0.1-userparam_Swap.patch -Patch13: smeserver-zabbix-agent-0.1-userparam_Swap_key.patch -Patch14: smeserver-zabbix-agent-0.1-userparam_removeUselessMemStats.patch -Patch15: smeserver-zabbix-agent-0.1-userparam_pusedMem.patch -Patch16: smeserver-zabbix-agent-0.1-userparam_upsCharge.patch -Patch17: smeserver-zabbix-agent-0.1-disable_passive_mode.patch -Patch18: smeserver-zabbix-agent-0.1-mail_in_stats.patch -Patch19: smeserver-zabbix-agent-0.1-event_zabbix_agent_update.patch -Patch20: smeserver-zabbix-agent-0.1-mail_in_stats_other_denied.patch -Patch21: smeserver-zabbix-agent-0.1-fix_expand_sudoers.patch -Patch22: smeserver-zabbix-agent-0.1-mail_out_stats.patch -Patch23: smeserver-zabbix-agent-0.1-mail_out_stats_typo.patch -Patch24: smeserver-zabbix-agent-0.1-mail_out_stats_ignore_local.patch -Patch25: smeserver-zabbix-agent-0.1-net_stats.patch -Patch26: smeserver-zabbix-agent-0.1-userparam_mysql_size.patch -Patch27: smeserver-zabbix-agent-0.1-adjust_masq.patch -Patch28: smeserver-zabbix-agent-0.1-timeout_comment.patch -Patch29: smeserver-zabbix-agent-0.1-buffers.patch +Patch0: smeserver-zabbix-agent-0.1-hostname.patch +Patch1: smeserver-zabbix-agent-0.1-template_rename.patch +Patch2: smeserver-zabbix-agent-0.1-userparam_ext_ip.patch +Patch3: smeserver-zabbix-agent-0.1-userparam_ups.patch +Patch4: smeserver-zabbix-agent-0.1-userparam_mysql.patch +Patch5: smeserver-zabbix-agent-0.1-userparam_usedMem.patch +Patch6: smeserver-zabbix-agent-0.1-userparam_usedMem_brackets.patch +Patch7: smeserver-zabbix-agent-0.1-userparam_usedMem_key.patch +Patch8: smeserver-zabbix-agent-0.1-userparam_usedMem_Used.patch +Patch9: smeserver-zabbix-agent-0.1-userparam_usedMem_Used2.patch +Patch10: smeserver-zabbix-agent-0.1-userparam_MemStats.patch +Patch11: smeserver-zabbix-agent-0.1-userparam_MemStatsTypo.patch +Patch12: smeserver-zabbix-agent-0.1-userparam_Swap.patch +Patch13: smeserver-zabbix-agent-0.1-userparam_Swap_key.patch +Patch14: smeserver-zabbix-agent-0.1-userparam_removeUselessMemStats.patch +Patch15: smeserver-zabbix-agent-0.1-userparam_pusedMem.patch +Patch16: smeserver-zabbix-agent-0.1-userparam_upsCharge.patch +Patch17: smeserver-zabbix-agent-0.1-disable_passive_mode.patch +Patch18: smeserver-zabbix-agent-0.1-mail_in_stats.patch +Patch19: smeserver-zabbix-agent-0.1-event_zabbix_agent_update.patch +Patch20: smeserver-zabbix-agent-0.1-mail_in_stats_other_denied.patch +Patch21: smeserver-zabbix-agent-0.1-fix_expand_sudoers.patch +Patch22: smeserver-zabbix-agent-0.1-mail_out_stats.patch +Patch23: smeserver-zabbix-agent-0.1-mail_out_stats_typo.patch +Patch24: smeserver-zabbix-agent-0.1-mail_out_stats_ignore_local.patch +Patch25: smeserver-zabbix-agent-0.1-net_stats.patch +Patch26: smeserver-zabbix-agent-0.1-userparam_mysql_size.patch +Patch27: smeserver-zabbix-agent-0.1-adjust_masq.patch +Patch28: smeserver-zabbix-agent-0.1-timeout_comment.patch +Patch29: smeserver-zabbix-agent-0.1-buffers.patch +Patch30: smeserver-zabbix-agent-0.1-sudoers_mysql.patch +Patch31: smeserver-zabbix-agent-0.1-mysql_size_fixe.patch +Patch32: smeserver-zabbix-agent-0.1-userparam_swRaid_status.patch +Patch33: smeserver-zabbix-agent-0.1-userparam_comment.patch +Patch34: smeserver-zabbix-agent-0.1-userparam_megaraid.patch BuildArchitectures: noarch BuildRequires: e-smith-devtools @@ -58,6 +63,25 @@ Zabbix is an entreprise-class open sourc solution %changelog +* Fri Mar 27 2009 Daniel B. 0.1-26 +- Add raid.mega.status UserParameters to monitor status of MegaRaid based + raid array + +* Tue Mar 24 2009 Daniel B. 0.1-25 +- Add comments for each UserParameter for configuration on the server side + (Type of information, unit, etc...) + +* Tue Mar 24 2009 Daniel B. 0.1-24 +- Add raid.sw.status userparameter to report software raid array status +- Remove rabs from spec +- Permission cleanup on scripts + +* Wed Mar 18 2009 Daniel B. 0.1-23 +- Correct mysql.size parameter (sudo -u mysql) + +* Mon Mar 09 2009 Daniel B. 0.1-22 +- Fix typo in sudoers template (ZABBIX_AGENT_MYSQL) + * Mon Mar 02 2009 Daniel B. 0.1-21 - Add smeserver-remoteuseraccess as a dependencie (sudoer templates issue) @@ -77,7 +101,7 @@ solution - Ignore local delivery from outgoing mail stats * Tue Feb 17 2009 Daniel B. 0.1-16 -- Fix a type in mail.out.failure UserParameters +- Fix a typo in mail.out.failure UserParameters * Tue Feb 17 2009 Daniel B. 0.1-15 - Add UserParameters for outhoing mails statistics @@ -168,6 +192,11 @@ solution %patch27 -p1 %patch28 -p1 %patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 %build perl ./createlinks @@ -180,11 +209,12 @@ rm -rf $RPM_BUILD_ROOT rm -f %{name}-%{version}-filelist /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ --file /var/lib/zabbix/bin/mysqladmin_status 'attr(0750,root,zabbix)' \ - --file /var/lib/zabbix/bin/logtail.pl 'attr(0755,root,zabbix)' \ - --file /var/lib/zabbix/bin/parse_mail_in.pl 'attr(0755,root,zabbix)' \ - --file /var/lib/zabbix/bin/parse_mail_out.pl 'attr(0755,root,zabbix)' \ - --file /var/lib/zabbix/bin/mail_in.sh 'attr(0755,root,zabbix)' \ - --file /var/lib/zabbix/bin/mail_out.sh 'attr(0755,root,zabbix)' \ + --file /var/lib/zabbix/bin/logtail.pl 'attr(0755,root,root)' \ + --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/mail_in.sh 'attr(0755,root,root)' \ + --file /var/lib/zabbix/bin/mail_out.sh 'attr(0755,root,root)' \ + --file /var/lib/zabbix/bin/mdstat-parser.pl 'attr(0755,root,root)' \ --dir /var/lib/zabbix/tmp 'attr(0755,zabbix,zabbix)' \ --dir /var/lib/zabbix/tmp/smelog 'attr(0770,zabbix,smelog)' \ --dir /var/lib/zabbix/tmp/qmail 'attr(0770,zabbix,nofiles)' \