Changes - j0ke.net Open Build Service

Difference Between Revision 5 and server:monitoring / icinga

[-] [+]	Changed	icinga.changes
@@ -1,59 +1,4 @@ ------------------------------------------------------------------- -Sat Feb 15 17:51:47 UTC 2014 - cs@linux-administrator.com - -- update to release 1.8.6 - -------------------------------------------------------------------- -Mon Jan 14 19:14:30 UTC 2013 - cs@linux-administrator.com - -- update to release 1.8.4 - -------------------------------------------------------------------- -Sun Dec 2 14:59:02 UTC 2012 - cs@linux-administrator.com - -- update to release 1.8.2 - -------------------------------------------------------------------- -Sat Nov 3 11:36:26 UTC 2012 - cs@linux-administrator.com - -- update to release 1.8.1 - -------------------------------------------------------------------- -Sun Oct 21 10:09:12 UTC 2012 - cs@linux-administrator.com - -- update to release 1.8.0 - -------------------------------------------------------------------- -Tue Jun 19 08:24:47 UTC 2012 - cs@linux-administrator.com - -- update to release 1.7.1 - -------------------------------------------------------------------- -Tue May 15 19:57:36 UTC 2012 - cs@linux-administrator.com - -- update to release 1.7.0 - -------------------------------------------------------------------- -Fri Dec 2 21:09:39 UTC 2011 - cs@linux-administrator.com - -- update to release 1.6.1 - -------------------------------------------------------------------- -Fri Sep 9 20:46:07 UTC 2011 - cs@linux-administrator.com - -- update to release 1.5.1 - -------------------------------------------------------------------- -Thu Aug 25 20:49:52 UTC 2011 - cs@linux-administrator.com - -- update to release 1.5.0 - -------------------------------------------------------------------- -Mon Aug 15 20:09:56 UTC 2011 - cs@linux-administrator.com - -- update to release 1.5.0 beta - -------------------------------------------------------------------- Wed Jun 29 20:54:43 UTC 2011 - cs@linux-administrator.com - update to release 1.4.2
[-] [+]	Changed	icinga.spec ^
@@ -1,7 +1,6 @@ #!BuildIgnore: post-build-checks %define name icinga -%define version 1.8.6 -%define pkgversion 1.8.6 +%define version 1.4.2 %define release 1 %define nsusr icinga %define nsgrp icinga @@ -9,8 +8,6 @@ %define wwwusr wwwrun %define wwwgrp www -%define logdir /var/log/%{name} - %ifarch x86_64 %define arch x86_64 %else @@ -19,7 +16,6 @@ # Macro that print mesages to syslog at package (un)install time %define nnmmsg logger -t %{name}/rpm -Provides: monitoring_daemon Summary: Host/service/network monitoring program Name: %{name} @@ -27,7 +23,7 @@ Release: %{release} License: GPL Group: Application/System -Source0: %{name}-%{pkgversion}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-buildroot Requires: gd > 1.8 zlib libpng libjpeg bash grep perl libdbi-drivers @@ -63,7 +59,7 @@ Summary: Provides the HTML and CGI files for the Nagios web interface Requires: %{name} = %{version} Requires: http_daemon -#Provides: icinga-api = %{version} +Provides: icinga-api = %{version} %description www Nagios is a program that will monitor hosts and services on your @@ -98,7 +94,7 @@ %prep -%setup -q -n %{name}-%{pkgversion} +%setup -q %pre # Create `icinga' user on the system if necessary @@ -206,9 +202,8 @@ --with-icinga-group=%{nsgrp} \ --prefix=%{_prefix} \ --exec-prefix=%{_prefix}/sbin \ - --bindir=%{_sbindir} \ + --bindir=%{_prefix}/sbin \ --sbindir=%{_prefix}/lib/icinga/cgi \ - --libdir=%{_libdir}/icinga \ --libexecdir=%{_prefix}/lib/icinga/plugins \ --datarootdir=%{_prefix}/share/icinga \ --datadir=%{_prefix}/share/icinga \ @@ -216,14 +211,10 @@ --docdir=%{_docdir}/%{name} \ --sysconfdir=/etc/icinga \ --localstatedir=/var/log/icinga \ - --with-log-dir=%{logdir} \ - --with-cgi-log-dir=%{logdir}/cgi \ - --with-phpapi-log-dir=%{logdir}/api \ --with-gd-lib=%{_libdir} \ --with-gd-inc=/usr/include \ --with-dbi-lib=%{_libdir} \ --with-dbi-inc=%{_includedir}/db \ - --with-libdbi-driver-dir=%{_libdir}/dbd \ --with-oci-lib=%{_libdir} \ --with-oci-inc=%{_includedir} \ --with-ssl-dir=%{_prefix} \ @@ -237,6 +228,13 @@ %__make all +# make sample configs +###cd sample-config +###F=`mktemp temp.XXXXXX` +###sed -e 's=/var/log/icinga/rw/=/var/spool/icinga/=;s=@sysconfdir@/resource.cfg=@sysconfdir@/private/resource.cfg=' icinga.cfg > ${F} +###mv ${F} icinga.cfg +###cd .. + # make daemonchk.cgi and event handlers cd contrib %__make @@ -250,7 +248,32 @@ done cd ../.. +cd module/icinga-api +./configure \ + --host=%{arch}-suse-linux-gnu \ + --build=%{arch}-suse-linux-gnu \ + --target=%{arch}-suse-linux \ + --prefix=%{_prefix} \ + --exec-prefix=%{_prefix}/sbin \ + --bindir=%{_prefix}/sbin \ + --sbindir=%{_prefix}/lib/icinga/cgi \ + --libexecdir=%{_prefix}/lib/icinga/plugins \ + --datarootdir=%{_prefix}/share/icinga \ + --datadir=%{_prefix}/share/icinga \ + --mandir=%{_mandir} \ + --docdir=%{_docdir}/%{name} \ + --sysconfdir=/etc/icinga \ + --localstatedir=/var/log/icinga \ + --with-icinga-user=%{nsusr} \ + --with-icinga-group=%{nsgrp} \ + --with-command-user=%{nsusr} \ + --with-command-group=%{cmdgrp} \ + --with-web-user=%{wwwusr} \ + --with-web-group=%{wwwgrp} +%__make all + %install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT install -d -m 0775 ${RPM_BUILD_ROOT}/var/spool/icinga install -d -m 0775 ${RPM_BUILD_ROOT}/var/spool/icinga/checkresults install -d -m 0755 ${RPM_BUILD_ROOT}%{_prefix}/include/icinga @@ -258,9 +281,10 @@ install -d -m 0755 ${RPM_BUILD_ROOT}/etc/logrotate.d install -d -m 0755 ${RPM_BUILD_ROOT}/etc/apache2/conf.d install -d -m 0755 ${RPM_BUILD_ROOT}/etc/icinga -make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install -make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" INIT_OPTS="" install-daemoninit -make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install-idoutils +### install -d -m 0755 ${RPM_BUILD_ROOT}/etc/icinga/private +make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" COMMAND_OPTS="" install +make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" COMMAND_OPTS="" INIT_OPTS="" install-daemoninit +make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" COMMAND_OPTS="" install-idoutils mv %{buildroot}/etc/icinga/ido2db.cfg-sample %{buildroot}/etc/icinga/ido2db.cfg mv %{buildroot}/etc/icinga/idomod.cfg-sample %{buildroot}/etc/icinga/idomod.cfg @@ -290,6 +314,8 @@ # install CGIs cd contrib make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" COMMAND_OPTS="" CGIDIR=%{_prefix}/lib/icinga/cgi install +#mv ${RPM_BUILD_ROOT}%{_prefix}/lib/icinga/cgi/convertcfg ${RPM_BUILD_ROOT}%{_prefix}/lib/icinga/ +#mv ${RPM_BUILD_ROOT}%{_prefix}/lib/icinga/cgi/mini_epn ${RPM_BUILD_ROOT}%{_prefix}/sbin/ cd .. # install event handlers @@ -300,14 +326,15 @@ done cd ../.. +cd module/icinga-api +make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install + install -d -m 0755 ${RPM_BUILD_ROOT}/var/log/icinga/rw chmod +x %{buildroot}/etc/init.d/ido2db cd %{buildroot}%{_sbindir} ln -sf /etc/init.d/icinga rcicinga ln -sf /etc/init.d/ido2db rcido2db -# remove placeholder files -find %{buildroot} -name PLACEHOLDER -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT @@ -322,10 +349,10 @@ %{_sbindir}/mini_epn %{_sbindir}/new_mini_epn %{_sbindir}/ido2db +%{_sbindir}/idomod.o %{_sbindir}/log2ido %{_sbindir}/rcicinga %{_sbindir}/rcido2db -%{_libdir}/icinga/idomod.so %dir %{_prefix}/lib/icinga/eventhandlers %{_prefix}/lib/icinga/eventhandlers/* %{_sbindir}/convertcfg @@ -334,10 +361,10 @@ %config(noreplace) /etc/icinga/*.cfg %dir /etc/icinga/modules %config /etc/icinga/modules/idoutils.cfg-sample -%dir /etc/icinga/objects -%config /etc/icinga/objects/ido2db_check_proc.cfg %defattr(750,root,%{nsgrp}) +###%dir /etc/icinga/private %defattr(640,root,%{nsgrp}) +### %config(noreplace) /etc/icinga/private/resource.cfg %defattr(755,%{nsusr},%{nsgrp}) %dir /var/log/icinga %dir /var/log/icinga/rw @@ -350,10 +377,6 @@ %doc module/idoutils/db/mysql/mysql.sql %doc module/idoutils/db/oracle/oracle.sql %doc module/idoutils/db/pgsql/pgsql.sql -%doc sample-config/updates/ -%doc module/idoutils/config/updates/ -%defattr(-,%{nsusr},%{nsgrp}) -%dir %{logdir}
[-] [+]	Added	icinga-ido2db-init-lsb.patch ^
@@ -0,0 +1,13 @@ +--- rc.ido2db.in.orig 2009-09-27 12:10:57.000000000 +0200 ++++ rc.ido2db.in 2009-09-27 12:11:15.000000000 +0200 +@@ -2,8 +2,8 @@ + # + ### BEGIN INIT INFO + # Provides: ido2db +-# Required-Start: +-# Required-Stop: ++# Required-Start: $syslog $remote_fs ++# Required-Stop: $syslog $remote_fs + # Default-Start: 2 3 4 5 + # Default-Stop: 0 1 6 + # Short-Description: Icinga IDO2DB Initscript
[-] [+]	Added	icinga-init-lsb.patch ^
@@ -0,0 +1,22 @@ +--- daemon-init.in.orig 2009-06-16 23:28:56.000000000 +0200 ++++ daemon-init.in 2009-07-19 13:56:01.000000000 +0200 +@@ -28,7 +28,18 @@ + # Description: Starts and stops the Icinga monitor + # used to provide network services status. + # +- ++### BEGIN INIT INFO ++# Provides: icinga ++# Required-Start: $syslog $remote_fs ++# Should-Start: $time sendmail ++# Required-Stop: $syslog $remote_fs ++# Should-Stop: $time sendmail ++# Default-Start: 3 5 ++# Default-Stop: 0 1 2 6 ++# Short-Description: Icinga network monitor ++# Description: Icinga network monitor ++### END INIT INFO ++ + status_icinga () + { +
	Changed	icinga-1.4.2.tar.bz2 ^