--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec 2009/04/20 10:51:35 1.8 +++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec 2012/06/07 16:23:16 1.33 @@ -1,10 +1,10 @@ -# $Id: smeserver-zabbix-agent.spec,v 1.7 2009/03/27 12:56:38 vip-ire Exp $ +# $Id: smeserver-zabbix-agent.spec,v 1.32 2011/10/28 11:06:39 vip-ire Exp $ # Authority: vip-ire # Name: Daniel Berteaud %define name smeserver-zabbix-agent %define version 0.1 -%define release 27 +%define release 51 Summary: sme server integration of zabbix agent Name: %{name} Version: %{version} @@ -50,6 +50,35 @@ Patch33: smeserver-zabbix-agent-0.1-user 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 +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 +Patch60: smeserver-zabbix-agent-0.1-add_usr_sbin_in_path.patch +Patch61: smeserver-zabbix-agent-0.1-statusmail.patch +Patch62: smeserver-zabbix-agent-0.1-configure_timeout.patch +Patch63: smeserver-zabbix-agent-0.1-better_asterisk_monitoring.patch +Patch64: smeserver-zabbix-agent-0.1-fix_closing_bracket.patch +Patch65: smeserver-zabbix-agent-0.1-check_crt_expiration.patch BuildArchitectures: noarch BuildRequires: e-smith-devtools @@ -65,6 +94,95 @@ Zabbix is an entreprise-class open sourc solution %changelog +* Thu Jun 7 2012 Daniel B. - 0.1-51.sme +- Add certificate expiration script + +* Fri Oct 28 2011 Daniel B. - 0.1-50.sme +- Fix a closing bracket in templates + +* Wed Oct 26 2011 Daniel B. - 0.1-49.sme +- Add better asterisk monitoring capabilities + +* Fri Jul 08 2011 Daniel B. - 0.1-48.sme +- Configure timeout from the DB (prop TimeOut) + +* Wed May 04 2011 Daniel B. 0.1-47 +- Send status mail with some logs and active connexions (StatusMail prop) + +* Thu Sep 02 2010 Daniel B. 0.1-46 +- Add /usr/sbin in path for check_lvm and check_asterisk + +* Thu Sep 02 2010 Daniel B. 0.1-45 +- Add basic asterisk monitoring support +- Add basic LVM monitoring support + +* Wed Aug 04 2010 Daniel B. 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. 0.1-43 +- Possibility to set Hostname from the DB [SME: 6083] + +* Mon May 03 2010 Daniel B. 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. 0.1-41 +- read megaraid options from the DB (number of spares, number of + error to ignore) + +* Fri Mar 12 2010 Daniel B. 0.1-40 +- update regex for incomming mail stats for newer qpsmtpd + +* Wed Feb 17 2010 Daniel B. 0.1-39 +- update megaraid-parser.pl script with options to ignore some errors + +* 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 @@ -81,7 +199,7 @@ solution * Tue Mar 24 2009 Daniel B. 0.1-24 - Add raid.sw.status userparameter to report software raid array status -- Remove rabs from spec +- Remove tabs from spec - Permission cleanup on scripts * Wed Mar 18 2009 Daniel B. 0.1-23 @@ -207,11 +325,39 @@ solution %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 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 +%patch58 -p1 +%patch59 -p1 +%patch60 -p1 +%patch61 -p1 +%patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -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 @@ -220,15 +366,18 @@ 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,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)' \ + --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(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/check_asterisk 'attr(0750,root,zabbix)' \ + --file /var/lib/zabbix/bin/check_lvm 'attr(0755,root,root)' \ + --file /var/lib/zabbix/bin/mailstatus.pl 'attr(0755,root,root)' \ + --file /var/lib/zabbix/bin/cert_expire.pl 'attr(0755,root,root)' \ + --dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \ > %{name}-%{version}-filelist %files -f %{name}-%{version}-filelist