%define _prefix /usr/local/zabbix
Name: zabbix
-Version: 1.6.1
+Version: 1.6.2
Release: 1
Group: System Environment/Daemons
License: GPL
Vendor: ZABBIX SIA
URL: http://www.zabbix.org
Packager: Eugene Grigorjev <eugene.grigorjev@zabbix.com>
-Source: zabbix-1.6.1.tar.gz
+Source: zabbix-%{version}.tar.gz
Autoreq: no
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
The ZABBIX gui frontend
%prep
-%setup -n zabbix-1.6.1
+%setup -n zabbix-%{version}
%build
# 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" \
-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
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
-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
#
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
%{zabbix_webdir}
%changelog
+* Tue Apr 28 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-3
+- same as 2.0-12 tag.
+
+* Mon Apr 27 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-2
+- merge from 2.0, remove more zabbix code, simplify install, etc.
+
+* Thu Apr 16 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - 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 <soltesz@cs.princeton.edu> - Monitor-2.0-9
+- added new models to db.
+- major updates throughout.
+- better unification. needs an install test.
+
+* Wed Apr 01 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - 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 <soltesz@cs.princeton.edu> - 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 <soltesz@cs.princeton.edu> - Monitor-2.0-6
+- added action view to gui
+- added penalty_applied bit to db model.
+
+* Fri Mar 20 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-2.0-5
+- tag for updates to 2.0 db model
+
+* Fri Mar 13 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - 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 <soltesz@cs.princeton.edu> - Monitor-2.0-3
+- add email exceptions
+- other bug fixes.
+
+* Tue Mar 10 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-2.0-2
+- getting the pcucontrol and findall.py scripts to work in an integrated
+- fashion.
+
+* Fri Feb 27 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-2.0-1
+- preparing to make a 2.0 branch for monitor.
+
+* Mon Jan 05 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-2.0-0
+- new changes are significantly different, that I'm upping the number for clarity.
+
* Tue Nov 11 2008 Stephen Soltesz <soltesz@cs.princeton.edu>
- 1.6.1
- initial re-packaging
- 1.1beta2
- initial packaging
+
+%define module_current_branch 2.0
+
+%define taglevel 3
+
+%define version 3.0