X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=zabbix.spec;h=35e95cff063f53a41dc80470faf938629404b1d3;hp=e32fcff038b42f3b0a35ba2a2723114adc1728bc;hb=HEAD;hpb=50f748a465f7c5da3bfbc6523ad9a079006c7861 diff --git a/zabbix.spec b/zabbix.spec index e32fcff..35e95cf 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.5 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 @@ -78,7 +78,12 @@ mkdir server cp -r client/* server pushd client +# quick and dirty fix for f12; loader would fail b/c of the lack of /lib/libm.a +%if "%{distro}" == "Fedora" && %{distrorelease} >= 12 +./configure --enable-agent +%else ./configure --enable-static --enable-agent +%endif make popd @@ -155,6 +160,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" \ @@ -180,6 +188,7 @@ rm -f $TMP_FILE chkconfig --add zabbix_agentd chkconfig zabbix_agentd on +service zabbix_agentd start %post server @@ -286,6 +295,229 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log %{zabbix_webdir} %changelog +* Wed Aug 31 2011 Stephen Soltesz - monitor-3.1-6 +- Minor updates to work with pcucontrol. +- Added action for some fprobe no-space errors. + +* Wed Aug 31 2011 Stephen Soltesz - monitor-3.1-5 +- account for new ok status type in PCUs +- include a percentage of nodes up as well as raw node-count + +* Fri May 27 2011 s s - monitor-3.1-4 +- Fixes to spec file for monitor building + +* Fri May 27 2011 s s - monitor-3.1-3 +- fixing syntax errors + +* Fri May 27 2011 s s - monitor-3.1-2 +- Add better requirements list, work with TurboGears packaged by fedora, +- Remove some zabbix files +- Add a controllers_local.py for custom extensions + +* Fri May 06 2011 s s - monitor-3.1-1 +- last tag before some more major changes + +* Thu May 20 2010 Stephen Soltesz - Monitor-3.0-35 +- Add CSV link on Advanced query +- Preparing to branch + +* Wed May 12 2010 Talip Baris Metin - Monitor-3.0-34 +- * copy selections to clipbord on Advanced Query page +- * RPM Pattern as regexp +- * scan ipmi port + +* Tue Apr 27 2010 Talip Baris Metin - Monitor-3.0-33 +- handle hostname changes + +* Tue Apr 20 2010 Thierry Parmentelat - Monitor-3.0-32 +- from this version, suitable for 5.0 +- requires bootcd with the new 5.0 naming style 3-part nodefamily + +* Mon Apr 12 2010 Stephen Soltesz - Monitor-3.0-31 +- added fix for node delete/add causing conflicts in MyOps db. +- added statistics scripts + +* Thu Jan 21 2010 Talip Baris Metin - Monitor-3.0-30 +- * fix paths for automate script + +* Tue Dec 22 2009 Baris Metin - Monitor-3.0-29 +- - separate pcucontrol as an svn module +- - restore easy_instal back into post install stage of server-deps +- - template imporovements for web interface + +* Thu Dec 17 2009 Baris Metin - Monitor-3.0-28 +- do not need buildrequires. a new tag to fix centos builds + +* Thu Dec 17 2009 Baris Metin - Monitor-3.0-27 +- fix rpm build issues + +* Wed Dec 16 2009 Baris Metin - Monitor-3.0-26 +- to many changes, but mostly moved stuff around. there are some small fixes here and there. + +* Fri Nov 20 2009 Stephen Soltesz - Monitor-3.0-25 +- add option for site status to include both node & pcu status +- improve ticket handling +- template gadget.xml for a site-specific google-gadget summary + +* Thu Oct 22 2009 Baris Metin - Monitor-3.0-24 +- - add install_date + +* Mon Oct 19 2009 Baris Metin - Monitor-3.0-23 +- - remove monitor-client.cron +- - remove unused monitor-client init script +- - fix UP/DOWN summary on nodes page. +- - make node page display all nodes by default +- - add boot_server field +- - add myops_ssh_key to the keychain +- - use ext_consortium_id to distinguish pending sites. + +* Fri Oct 09 2009 Baris Metin - Monitor-3.0-22 +- show/hide advance query form. + +* Thu Sep 24 2009 Stephen Soltesz - Monitor-3.0-21 +- fixed pause_penalty bug. +- fixed IPAL pcucontrol bug +- fixed bootman tunnel setup bug (occurred in rare cases) +- deprecated pcuview +- added BootmanSequenceRecords to separate config data from source code +- added get/setBootmanSequence(s) to xmlrpc API + +* Fri Sep 04 2009 Stephen Soltesz - Monitor-3.0-20 +- Major Features: +- added bm log collection and optional integration with BootManager's log Upload() +- added iptables_status +- expanded advanced query +- added differentiated bootmanager_restore actions so that actionsummary displays +- counts for each kind of bootmanager action +- added pcuerror notices (for mis-configurations) in addition to pcufailed notices +- added plain-text options for query page by adding tg_format=plain to URL +- fixed cross-module reference that prevented pcucontrol for working with RebootNodeWithPCU() api call. +- fixed a bug in determining whether comon's dir was running on a node + +* Mon Aug 17 2009 Stephen Soltesz - Monitor-3.0-19 +- Major increment - +- adds multiple features and web changes +- adds new fields to db +- improved layout +- general improvements otherwise + +* Sun Jun 28 2009 Stephen Soltesz - Monitor-3.0-18 +- bug fixes. +- improved templates and views +- cleaned controller code for web +- added IPMI requirement to pcucontrol package. + +* Thu Jun 18 2009 Stephen Soltesz - Monitor-3.0-17 +- added bootmanager log links +- addressed root cause of IntegrityErrors ; big deal +- adjusted templates to accomodate fix for IntegrityErrors +- added session.flush() to bootman.py to write out ActionsRecords +- fixed policy to either pause penalties or apply them ; not both. + +* 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 @@ -294,3 +526,9 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log - 1.1beta2 - initial packaging + +%define module_current_branch 3.0 + +%define taglevel 6 + +%define version 3.1