--- rpms/smeserver-zabbix-agent/contribs10/smeserver-zabbix-agent.spec 2020/12/04 18:34:21 1.1 +++ rpms/smeserver-zabbix-agent/contribs10/smeserver-zabbix-agent.spec 2021/04/01 15:12:34 1.2 @@ -1,94 +1,24 @@ -# $Id: smeserver-zabbix-agent.spec,v 1.2 2016/02/09 23:21:05 stephdl Exp $ -# Authority: vip-ire -# Name: Daniel Berteaud - -%define name smeserver-zabbix-agent -%define version 0.1 -%define release 53 Summary: sme server integration of zabbix agent -Name: %{name} -Version: %{version} -Release: %{release}%{?dist} +Name: smeserver-zabbix-agent +Version: 0.4.8 +Release: 1%{?dist} 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 -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 -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 BuildRoot: /var/tmp/%{name}-%{version} Requires: e-smith-release >= 7.0 -Requires: zabbix-agent +Requires: zabbix-agent => 2.0.0 +Requires: zabbix-agent-addons => 0.1.15 Requires: smeserver-remoteuseraccess +Requires: qmqtool Requires: perl(IO::Socket) Requires: perl(Net::SSLeay) Requires: perl(Date::Parse) +Requires: perl(Crypt::OpenSSL::X509) AutoReqProv: no %description @@ -97,8 +27,81 @@ Zabbix is an entreprise-class open sourc solution %changelog -* Wed Feb 10 2016 stephane de Labrusse - 0.1-53.sme -- New rpm for sme9 +* Fri May 29 2020 Daniel Berteaud 0.4.8-1 +- Adapt regex to match queued emails when spam filtering is disabled + (daniel@firewall-services.com) + +* Thu Feb 27 2020 Daniel Berteaud 0.4.7-1 +- Rewrite util_send_status_mail to go through the SMTP server (daniel@firewall- + services.com) +- Remove useless var in spec file (daniel@firewall-services.com) + +* Wed Nov 27 2019 Daniel Berteaud 0.4.6-1 +- Remove the git CHANGELOG as it's not generated anymore (daniel@firewall- + services.com) + +* Wed Nov 27 2019 Daniel Berteaud 0.4.5-1 +- Adapt spec file for tito (daniel@firewall-services.com) +- Detect if running >= 4.4, and remove vfs.dev.discovery UserParameter in this + case (daniel@firewall-services.com) + +* Wed Nov 27 2019 Daniel Berteaud +- Detect if running >= 4.4, and remove vfs.dev.discovery UserParameter in this + case (daniel@firewall-services.com) + +* Tue Nov 26 2019 Daniel Berteaud 0.4.3-1 +- new package built with tito + +* Tue May 3 2016 Daniel Berteaud - 0.4.3-1.sme +- Add dmarc regex in util_parse_mail_in and add support for spf_deny plugin + +* Wed Apr 27 2016 Daniel Berteaud - 0.4.2-1.sme +- Adapt qpsmtpd parser regex to match naughty rejects against the original + plugin + +* Tue Apr 19 2016 Daniel Berteaud - 0.4.1-1.sme +- Adapt util_parse_mail_in and util_count_mail_in to work with qpsmtpd 0.96 +- Define %clean before %files so epel-macros don't try to add a default + buggy %clean on el5 + +* Mon Mar 21 2016 Daniel Berteaud - 0.4.0-1.sme +- Add support for new encryption features of zabbix 3.0 + +* Wed Jun 10 2015 Daniel B. - 0.3.8-1.sme +- Add a random delay before sending the status email + +* Mon Jan 5 2015 Daniel B. - 0.3.7-1.sme +- Requires qmqtool to monitor qmail queue + +* Wed Jun 25 2014 Daniel B. - 0.3.6-1.sme +- Fix a warning in util_send_mail.pl script on EL6 + +* Wed Jun 11 2014 Daniel B. - 0.3.5-1.sme +- Fix exec perm on certs check scripts + +* Tue May 6 2014 Daniel B. - 0.3.4-1.sme +- Add support for nmb lookup script + +* Wed Feb 19 2014 Daniel B. - 0.3.3-1.sme +- Fix a typo in dependency + +* Wed Feb 19 2014 Daniel B. - 0.3.2-1.sme +- Add script to monitor PHPki certificates + +* Tue Feb 18 2014 Daniel B. - 0.3.1-1.sme +- Fix a syntaxe error in check_asterisk + +* Tue Apr 16 2013 Daniel B. - 0.3.0-1.sme +- Huge cleanup +- Requires zabbix-agent-addons + +* Thu Apr 11 2013 Daniel B. - 0.2.1-1.sme +- Improvement in mdstat-parser.pl + +* Thu Jun 14 2012 Daniel B. - 0.2.0-1.sme +- Import to GIT +- Remove certificate expiration script +- Make it 2.0 compatible * Thu Jun 7 2012 Daniel B. - 0.1-52.sme - Add missing perl module in dependency @@ -177,7 +180,7 @@ solution * Wed May 06 2009 Daniel B. 0.1-30 - Create missing tmp directory -* Mon Apr 26 2009 Daniel B. 0.1-29 +* Mon Apr 27 2009 Daniel B. 0.1-29 - megaraid-parser.pl is now compatible with newer versions of MegaCli - Fix permission on megaraid-parser.pl script @@ -292,77 +295,11 @@ solution * Fri Feb 6 2009 Daniel B. 0.1-1 - add Hostname directive in zabbix_agentd.conf -* Mon Feb 04 2009 Daniel B. 0.1-0 +* Wed Feb 04 2009 Daniel B. 0.1-0 - initial release %prep %setup -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%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 -%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 @@ -373,33 +310,28 @@ rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $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,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)' \ + --file /var/lib/zabbix/bin/check_mysqladmin_status_sudo 'attr(0750,root,zabbix)' \ + --file /var/lib/zabbix/bin/util_logtail 'attr(0755,root,root)' \ + --file /var/lib/zabbix/bin/util_count_mail_in 'attr(0755,root,root)' \ + --file /var/lib/zabbix/bin/util_count_mail_out 'attr(0755,root,root)' \ + --file /var/lib/zabbix/bin/util_parse_mail_in 'attr(0755,root,root)' \ + --file /var/lib/zabbix/bin/util_parse_mail_out 'attr(0755,root,root)' \ --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)' \ + --file /var/lib/zabbix/bin/util_send_status_mail 'attr(0755,root,root)' \ + --file /var/lib/zabbix/bin/disco_certs_sudo 'attr(0750,root,zabbix)' \ + --file /var/lib/zabbix/bin/check_certs_sudo 'attr(0750,root,zabbix)' \ --dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \ > %{name}-%{version}-filelist -%files -f %{name}-%{version}-filelist -%defattr(-,root,root) - %clean rm -rf $RPM_BUILD_ROOT +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) %postun #uninstall if [ $1 = 0 ] ; then - /sbin/e-smith/db configuration setprop zabbix-agent status disabled /etc/init.d/zabbix-agent stop fi