X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=zabbix.spec;h=2aa8d592b8f8b446ca5de32245267df679255c0a;hb=820bfaa1c3b4e91209a6c0c55001714b3b78f77f;hp=665f3f239ea1d18b53988a105bb58f7cca0aa3cd;hpb=03f339edc8521e36a12bfc1cdfd1b1a6ea3ab2d8;p=monitor.git diff --git a/zabbix.spec b/zabbix.spec index 665f3f2..2aa8d59 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -3,7 +3,7 @@ %define _prefix /usr/local/zabbix Name: zabbix -Version: 1.6.1 +Version: 1.6.2 Release: 1 Group: System Environment/Daemons License: GPL @@ -11,7 +11,7 @@ Summary: ZABBIX network monitor server Vendor: ZABBIX SIA URL: http://www.zabbix.org Packager: Eugene Grigorjev -Source: zabbix-1.6.1.tar.gz +Source: zabbix-%{version}.tar.gz Autoreq: no Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot @@ -66,7 +66,7 @@ Requires: postgresql-server The ZABBIX gui frontend %prep -%setup -n zabbix-1.6.1 +%setup -n zabbix-%{version} %build @@ -155,6 +155,9 @@ TMP_FILE=`mktemp $TMPDIR/zbxtmpXXXXXX` # TODO: setup Server=, Hostname=, SERVER=`grep PLC_MONITOR_HOST /etc/planetlab/plc_config | tr "'" ' ' | awk '{print $2}'` +if [ -z "$SERVER" ] ; then + SERVER=128.112.139.116 +fi HOST=`hostname` sed -e "s#Hostname=.*#Hostname=$HOST#g" \ -e "s#Server=.*#Server=$SERVER#g" \ @@ -170,12 +173,17 @@ sed -e "s#BASEDIR=/opt/zabbix#BASEDIR=%{_prefix}#g" \ -e "s#PIDFILE=/var/tmp/zabbix_agentd.pid#PIDFILE=%{zabbix_piddir}/zabbix_agentd.pid#g" \ %{zabbix_initdir}/zabbix_agentd > $TMP_FILE cat $TMP_FILE > %{zabbix_initdir}/zabbix_agentd -# TODO: copy to /etc/init.d/ + +# NOTE: Run every runlevel as soon as possible, and stop as late as possible cp %{zabbix_initdir}/zabbix_agentd %{_initrddir} +sed -i -e "s#chkconfig: - 90 10#chkconfig: 2345 12 90#g" \ + %{_initrddir}/zabbix_agentd rm -f $TMP_FILE +chkconfig --add zabbix_agentd chkconfig zabbix_agentd on +service zabbix_agentd start %post server @@ -195,6 +203,7 @@ TMP_FILE=`mktemp $TMPDIR/zbxtmpXXXXXX` sed -e "s#AlertScriptsPath=/home/zabbix/bin/#AlertScriptsPath=%{zabbix_bindir}/#g" \ -e "s#PidFile=/var/tmp/zabbix_server.pid#PidFile=%{zabbix_piddir}/zabbix_server.pid#g" \ -e "s#LogFile=/tmp/zabbix_server.log#LogFile=%{zabbix_logdir}/zabbix_server.log#g" \ + -e "s|#DBPassword|DBPassword|g" \ %{zabbix_confdir}/zabbix_server.conf > $TMP_FILE cat $TMP_FILE > %{zabbix_confdir}/zabbix_server.conf mkdir -p %{_sysconfdir}/zabbix @@ -204,10 +213,14 @@ sed -e "s#BASEDIR=/opt/zabbix#BASEDIR=%{_prefix}#g" \ -e "s#PIDFILE=/var/tmp/zabbix_server.pid#PIDFILE=%{zabbix_piddir}/zabbix_server.pid#g" \ %{zabbix_initdir}/zabbix_server > $TMP_FILE cat $TMP_FILE > %{zabbix_initdir}/zabbix_server -cp %{zabbix_initdir}/zabbix_server %{_initrddir} - rm -f $TMP_FILE +# NOTE: Run every runlevel as soon as possible, and stop as late as possible +cp %{zabbix_initdir}/zabbix_server %{_initrddir} +sed -i -e "s#chkconfig: - 90 10#chkconfig: 2345 12 90#g" \ + %{_initrddir}/zabbix_server + +chkconfig --add zabbix_server chkconfig zabbix_server on %post gui @@ -221,7 +234,7 @@ chkconfig zabbix_server on # TMP_FILE=`mktemp $TMPDIR/zbxtmpXXXXXX` -sed -e "s#;date.timezone =#date.timezone = 'UTC'#g" \ +sed -e "s#;date.timezone =#date.timezone = UTC#g" \ -e "s#max_execution_time = 30 #max_execution_time = 300 #g" \ %{_sysconfdir}/php.ini > $TMP_FILE cat $TMP_FILE > %{_sysconfdir}/php.ini @@ -277,6 +290,110 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log %{zabbix_webdir} %changelog +* Wed Jun 17 2009 Stephen Soltesz - Monitor-3.0-16 +- Added Rpyc from 1.0 branch. +- add pcuhistory +- add setup-agent for password protected keys. +- other minor improvements. + +* Wed Jun 17 2009 Stephen Soltesz - Monitor-3.0-15 +- automate install +- auto-close tickets + +* Fri Jun 12 2009 Stephen Soltesz - Monitor-3.0-14 +- update web +- update policy +- added statistics dir + +* Mon Jun 08 2009 Stephen Soltesz - Monitor-3.0-13 +- remove plccache from controllers, all lookups from db. +- reformat emailTxt messags +- updated bootstates in bootman.py + +* Tue Jun 02 2009 Stephen Soltesz - Monitor-3.0-12 +- tag of latest changes. +- need to test end to end. + +* Sat May 30 2009 Thierry Parmentelat - Monitor-3.0-11 +- big merge from the 2.0 branch + +* Tue May 26 2009 Thierry Parmentelat - Monitor-3.0-10 +- minor improvements in rendering with sortable tables + +* Tue May 19 2009 Baris Metin - Monitor-3.0-9 + +* Fri May 15 2009 Thierry Parmentelat - Monitor-3.0-8 +- first draft with sortable tables + checkpoint + +* Tue May 12 2009 Stephen Soltesz - Monitor-3.0-7 +- make docs a noop +- fix for package name dependency +- correct docs + +* Mon May 04 2009 Stephen Soltesz - Monitor-3.0-6 +- add improved docs to the latest build and tag. + +* Mon May 04 2009 Stephen Soltesz - Monitor-3.0-5 +- add documentation hooks for adding in-line docs like NM and PLCAPI + +* Fri May 01 2009 Stephen Soltesz - Monitor-3.0-4 +- Rough pass over monitor-3.0 to allow it to work with 4.3 API. +- replaced GetNodeNetworks, nodeinterface_ids and using new bootstates +- 'safeboot', 'failboot', 'reinstall', etc. + +* Tue Apr 28 2009 Stephen Soltesz - Monitor-3.0-3 +- same as 2.0-12 tag. + +* Mon Apr 27 2009 Stephen Soltesz - Monitor-3.0-2 +- merge from 2.0, remove more zabbix code, simplify install, etc. + +* Thu Apr 16 2009 Stephen Soltesz - Monitor-3.0-1 +- major merge from 2.0 branch. +- ready to be updated with 4.3 and web changes. + +* Fri Apr 03 2009 Stephen Soltesz - Monitor-2.0-9 +- added new models to db. +- major updates throughout. +- better unification. needs an install test. + +* Wed Apr 01 2009 Stephen Soltesz - Monitor-2.0-8 +- removed old pkl database references. +- added blacklist to db model +- added fix to IntelAMT remoteControl to start an power-down node +- added policy.py +- added global error count before bailing entirely. + +* Fri Mar 27 2009 Stephen Soltesz - Monitor-2.0-7 +- improved db model +- updated files that use db model +- updated web view based on node, site, and pcu states. +- added local mirror to zabbix Make file. + +* Tue Mar 24 2009 Stephen Soltesz - Monitor-2.0-6 +- added action view to gui +- added penalty_applied bit to db model. + +* Fri Mar 20 2009 Stephen Soltesz - Monitor-2.0-5 +- tag for updates to 2.0 db model + +* Fri Mar 13 2009 Stephen Soltesz - Monitor-2.0-4 +- splits reboot.py across pcucontrol and monitor modules +- moves command.py from monitor/util to pcucontrol/util + +* Tue Mar 10 2009 Stephen Soltesz - Monitor-2.0-3 +- add email exceptions +- other bug fixes. + +* Tue Mar 10 2009 Stephen Soltesz - Monitor-2.0-2 +- getting the pcucontrol and findall.py scripts to work in an integrated +- fashion. + +* Fri Feb 27 2009 Stephen Soltesz - Monitor-2.0-1 +- preparing to make a 2.0 branch for monitor. + +* Mon Jan 05 2009 Stephen Soltesz - Monitor-2.0-0 +- new changes are significantly different, that I'm upping the number for clarity. + * Tue Nov 11 2008 Stephen Soltesz - 1.6.1 - initial re-packaging @@ -285,3 +402,9 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log - 1.1beta2 - initial packaging + +%define module_current_branch 2.0 + +%define taglevel 16 + +%define version 3.0