Hello community,
here is the log from the commit of package icinga for openSUSE:Factory checked in at 2013-09-12 14:28:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icinga (Old)
and /work/SRC/openSUSE:Factory/.icinga.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga"
Changes:
--------
--- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2013-09-07 12:32:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2013-09-12 14:28:23.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Sep 11 13:08:44 UTC 2013 - lars@linux-schulserver.de
+
+- Remove conflicts: nagios for new subpackage monitoring-tools and
+ remove the (identical) binaries in Nagios package instead, so
+ nagios can recommend the new subpackage as icinga does
+- added log2ido manpage
+
+-------------------------------------------------------------------
New:
----
log2ido.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icinga.spec ++++++
--- /var/tmp/diff_new_pack.NYtyu1/_old 2013-09-12 14:28:24.000000000 +0200
+++ /var/tmp/diff_new_pack.NYtyu1/_new 2013-09-12 14:28:24.000000000 +0200
@@ -40,6 +40,7 @@
Source13: convertcfg.8
Source14: new_mini_epn.8
Source15: mini_epn.8
+Source16: log2ido.8
# PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
Patch0: icinga-add-ifdefine-to-apache.patch
# PATCH-FIX-OPENSUSE icinga-fix-create-mysql-script.patch
@@ -80,7 +81,7 @@
%endif
%{?libperl_requires}
Requires: mailx
-Recommends: %{name}-monitoring-tools
+Recommends: monitoring-tools
Recommends: %{name}-plugins-eventhandlers
Recommends: %{name}-www
Recommends: cron
@@ -147,7 +148,7 @@
This package provides include files that Icinga-related applications
may compile against.
-%package monitoring-tools
+%package -n monitoring-tools
Summary: Provides convertcfg and mini_epn for Icinga and Nagios
Group: System/Monitoring
Requires: monitoring_daemon
@@ -156,9 +157,8 @@
%else
%{perl_requires}
%endif
-Conflicts: nagios
-%description monitoring-tools
+%description -n monitoring-tools
This package provides the programs convertcfg, mini_epn and new_mini_epn
for Icinga and Nagios.
@@ -423,6 +423,7 @@
install -m644 %{SOURCE13} "%{buildroot}%{_mandir}/man8/"
install -m644 %{SOURCE14} "%{buildroot}%{_mandir}/man8/"
install -m644 %{SOURCE15} "%{buildroot}%{_mandir}/man8/"
+install -m644 %{SOURCE16} "%{buildroot}%{_mandir}/man8/"
%pre
# add icinga user and groups
@@ -553,7 +554,7 @@
%dir %{icinga_spooldir}/checkresults
%ghost %{icinga_cmd_filedir}
-%files monitoring-tools
+%files -n monitoring-tools
%defattr(-,root,root)
%{_sbindir}/convertcfg
%{_sbindir}/mini_epn
@@ -604,6 +605,7 @@
%defattr(-,root,root)
%doc module/idoutils/db/queries UPGRADING module/idoutils/db/README module/idoutils/config README.SUSE.idoutils
%{_mandir}/man8/ido2db.8*
+%{_mandir}/man8/log2ido.8*
%{_initrddir}/ido2db
%config(noreplace) %{icinga_sysconfdir}/ido2db.cfg
%config(noreplace) %{icinga_sysconfdir}/idomod.cfg
++++++ log2ido.8 ++++++
'\" t
.\" Title: log2ido
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 http://docbook.sf.net/
.\" Date: 09/11/2013
.\" Manual: log2ido
.\" Source: Icinga
.\" Language: English
.\"
.TH LOG2IDO 8 "September 11, 2013" "Icinga" "log2ido"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH NAME
log2ido \- sends the contents of an archived Icinga log file to ido2db daemon
.SH SYNOPSIS
.B \fBlog2ido\fR
\-s <source> \-d <dest> \-i <instance> [\-t <type>] [\-p <port>]
.SH DESCRIPTION
.sp
Sends the contents of an archived Icinga log file to STDOUT, a TCP socket, or a Unix domain socket in a format that is understood by the \fBIDO2DB\fR daemon.
.SH OPTIONS
.TP
.B \-s <source>
Name of the Icinga log file to read from.
.TP
.B \-d <dest>
If destination is a TCP socket, the address/hostname to connect to.
If destination is a Unix domain socket, the path to the socket.
If destination is STDOUT (for redirection, etc), a single dash (-).
.TP
.B \-i <instance>
This option identifies the "name" associated with this particular
instance of Icinga and is used to seperate data coming from multiple
instances. Defaults to 'default' (without quotes).
.TP
.B \-t <type>
Specifies the type of destination socket. Valid values include:
tcp
unix (default)
.TP
.B \-p <port>
Port number to connect to if destination is TCP socket.
.SH AUTHOR
.sp
This manpage was written by Lars Vogdt