--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec 2009/03/09 12:22:12 1.3 +++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec 2010/01/04 19:30:22 1.19 @@ -1,10 +1,10 @@ -# $Id: smeserver-zabbix-agent.spec,v 1.2 2009/03/02 23:53:30 slords Exp $ +# $Id: smeserver-zabbix-agent.spec,v 1.18 2009/12/06 19:05:19 vip-ire Exp $ # Authority: vip-ire # Name: Daniel Berteaud %define name smeserver-zabbix-agent %define version 0.1 -%define release 22 +%define release 38 Summary: sme server integration of zabbix agent Name: %{name} Version: %{version} @@ -13,37 +13,56 @@ 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 -Patch30: smeserver-zabbix-agent-0.1-sudoers_mysql.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 +Patch35: smeserver-zabbix-agent-0.1-userparam_yum_updates.patch +Patch36: smeserver-zabbix-agent-0.1-userparam_sensors.patch +Patch37: smeserver-zabbix-agent-0.1-sensors_fixes.patch +Patch38: smeserver-zabbix-agent-0.1-megaraid_parser.patch +Patch39: smeserver-zabbix-agent-0.1-mail_stats_via_cron.patch +Patch40: smeserver-zabbix-agent-0.1-mdstat_one_line.patch +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 BuildArchitectures: noarch BuildRequires: e-smith-devtools @@ -59,6 +78,73 @@ Zabbix is an entreprise-class open sourc solution %changelog +* Mon Jan 4 2010 Daniel B. 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. 0.1-37 +- Call megaraid-parser.pl scripts with sudo in zabbix_agentd.conf + +* Wed Dec 2 2009 Daniel B. 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. 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. 0.1-34 +- Add missing return after smart parameters (if several disks are monitored) + +* Mon Aug 31 2009 Daniel B. 0.1-33 +- Add system.smart UserParameter (monitor smart values for configured hard drives) + +* Wed Jul 08 2009 Daniel B. 0.1-32 +- Fix megaraid-parser script to support RAID-10 arrays + +* Mon Jun 08 2009 Daniel B. 0.1-31 +- Add cpu.number UserParameter (return the number of CPU on the host) + +* Wed May 06 2009 Daniel B. 0.1-30 +- Create missing tmp directory + +* Mon Apr 26 2009 Daniel B. 0.1-29 +- megaraid-parser.pl is now compatible with newer versions + of MegaCli +- Fix permission on megaraid-parser.pl script + +* Thu Apr 23 2009 Daniel B. 0.1-28 +- improvements in sensors script +- Add megaraid-parser.pl script to get more accurate MegaRaid + conrolers informations +- use a cronjob to parse mail logs so multiple zabbix server + can be used. Also, it won't repport false value if your host + has been unreachable for some time +- change output of mdstat-parser.pl to report everything in one + line (looks like megaraid-parser) + +* Mon Apr 20 2009 Daniel B. 0.1-27 +- Add updates.available to retrieve the number of updates available + with yum +- Added sensors[*] key to retrieve sensors informations. The value are retrieved + with the script /var/lib/zabbix/bin/sensors which can be customized. + +* 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 tabs 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) @@ -81,7 +167,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 @@ -173,11 +259,29 @@ solution %patch28 -p1 %patch29 -p1 %patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 +%patch46 -p1 +%patch47 -p1 +%patch48 -p1 +%patch49 -p1 %build +%{__mkdir_p} root/var/lib/zabbix/tmp perl ./createlinks -%{__mkdir_p} root/var/lib/zabbix/tmp/{smelog,qmail} - %install rm -rf $RPM_BUILD_ROOT @@ -185,14 +289,15 @@ 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)' \ - --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)' \ + --file /var/lib/zabbix/bin/logtail.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)' \ + --file /var/lib/zabbix/bin/megaraid-parser.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/sensors 'attr(0750,root,zabbix) %config(noreplace)' \ + --dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \ > %{name}-%{version}-filelist %files -f %{name}-%{version}-filelist