Skip to content

GitLab

univention-pkg-icinga
univention-pkg-icinga
Commit ec0f684e authored by Alexander Wirt's avatar Alexander Wirt
Browse files
Options

Imported Upstream version 1.6.0

parent 14d71348
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 15634 additions and 500887 deletions

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
Plain diff Email patch
Changelog
View file @ ec0f684e
......@@ -40,6 +40,8 @@ ENHANCEMENTS
* config: add config examples for local monitoring - check_procs for ido2db #1870
* icinga.spec: enable cmd.cgi logging by default #2124
FIXES
* core: fix downtime and comments delete with wrong loop pointers causing segfaults #1979
* core: fix $NOTIFICATIONRECIPIENTS$ macro contains all contacts assigned to host|service, not only notified contacts #2023
......@@ -59,6 +61,8 @@ FIXES
* install: rework the version updates in icinga and idoutils
* icinga.spec: --libexecdir does not point to possible location of nagios-plugins in resource.cfg:$USER1$ #2123
CHANGES
* package: complete remove icinga-api as module #1935
** Development is being discontinued for now, 1.5.0 was last combined release.
......@@ -93,6 +97,8 @@ CHANGES
** debug_readable_timestamp=0
** max_notifications_age, max_contactnotifications_age, max_contactnotificationmethods_age
* icinga.spec
** enable cmd.cgi logging by default in rpm
1.5.1 - 09/09/2011
......
Makefile.in
View file @ ec0f684e
......@@ -77,7 +77,7 @@ MKDIR=/bin/mkdir
###############################
# Global
###############################
ICINGA_VERSION=1.6.0-beta
ICINGA_VERSION=1.6.0
CP=@CP@
......@@ -456,10 +456,11 @@ install-idoutils:
fi
install-api:
echo "Sorry, Icinga PHP API was removed from package prior 1.6.0!" ;\
echo "Please keep in mind that Icinga-Web uses its own db layer starting with 1.5.0" ;\
echo "In case please look for a seperated package and/or icinga-api.git" ;\
echo "" ;\
@echo "Sorry, Icinga PHP API was removed from package prior 1.6.0!"
@echo "Please keep in mind that Icinga-Web uses its own db layer starting with 1.5.0"
@echo "In case please look for a seperated package and/or icinga-api.git"
@echo ""
install-init: install-daemoninit
......
configure
View file @ ec0f684e
......@@ -2421,9 +2421,9 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h"
PKG_NAME=icinga-core
PKG_VERSION="1.6.0-beta"
PKG_VERSION="1.6.0"
PKG_HOME_URL="http://www.icinga.org/"
PKG_REL_DATE="11-25-2011"
PKG_REL_DATE="11-30-2011"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
......
configure.in
View file @ ec0f684e
......@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h include/snprintf.h)
AC_PREFIX_DEFAULT(/usr/local/icinga)
PKG_NAME=icinga-core
PKG_VERSION="1.6.0-beta"
PKG_VERSION="1.6.0"
PKG_HOME_URL="http://www.icinga.org/"
PKG_REL_DATE="11-25-2011"
PKG_REL_DATE="11-30-2011"
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
......
docbook/de/Icinga.xml
View file @ ec0f684e
......@@ -70,11 +70,11 @@
<revhistory>
<revision>
<revnumber>1.5</revnumber>
<revnumber>1.6</revnumber>
<date>2011-08-24</date>
<date>2011-11-30</date>
<revremark>1.5 Icinga Dokumentation</revremark>
<revremark>1.6 Icinga Dokumentation</revremark>
</revision>
<revision>
<revnumber>1.x</revnumber>
......@@ -84,6 +84,13 @@
<revremark>1.x Icinga Dokumentation</revremark>
</revision>
<!--
<revision>
<revnumber>1.5</revnumber>
<date>2011-08-24</date>
<revremark>1.5 Icinga Dokumentation</revremark>
</revision>
<revision>
<revnumber>1.4</revnumber>
......@@ -270,8 +277,8 @@
<xi:include href="cgicmd.xml" />
<xi:include href="icinga-web-scratch.xml" />
<xi:include href="icinga-web-config.xml" />
<xi:include href="upgrading_icingaweb.xml" />
<xi:include href="icinga-web-config.xml" />
<xi:include href="upgrading_icingaweb.xml" />
<xi:include href="icinga-web-introduction.xml" />
......@@ -360,7 +367,8 @@
<xi:include href="int-tcpwrappers.xml" />
<xi:include href="int-mklivestatus.xml" />
<xi:include href="reporting.xml" />
<xi:include href="reporting_1.6.xml" />
</chapter>
<chapter version="5.0" xml:id="ch10">
......
docbook/de/icinga-web-config.xml
View file @ ec0f684e
This diff is collapsed.
docbook/de/icinga-web-intro_1.5.xml
View file @ ec0f684e
......@@ -574,6 +574,6 @@
<indexterm zone="icinga-web-intro_1.5">
<primary>&name-web;</primary>
<secondary>Überbick Version 1.5.x</secondary>
<secondary>Überblick Version 1.5.x</secondary>
</indexterm>
</section>
docbook/de/icinga-web-intro_1.6.xml 0 → 100644
View file @ ec0f684e
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE chapter [
<!ENTITY % all.entities SYSTEM "all-entities.ent">
%all.entities;
]>
<section version="5.0" xml:id="icinga-web-intro_1.6" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook">
<title>Einführung in &name-web; (&gt;= 1.6)</title>
<para>Wenn Sie den Schnellstart-Anleitungen (<link linkend="quickstart-idoutils">&name-idoutils;</link> und <link
linkend="icinga-web-scratch">&name-web;</link>) gefolgt sind, sollten Sie nun http://&lt;icinga server&gt;/icinga-web aufrufen können und
den Login-Bildschirm sehen</para>
<figure>
<title>&name-web; Login-Bildschirm</title>
<screenshot>
<mediaobject>
<imageobject>
<imagedata fileref="../images/icinga-web-login.png"></imagedata>
</imageobject>
</mediaobject>
</screenshot>
</figure>
<para>Sie können sich mittels "root" und "password" einloggen. Dies wird Sie auf eine Überblickseite weiterleiten, wo der Status von
überwachten Hosts und Services dargestellt wird.</para>
<figure>
<title>&name-web; Überblick</title>
<screenshot>
<mediaobject>
<imageobject>
<imagedata fileref="../images/icinga-web-overview_1.6.png"></imagedata>
</imageobject>
</mediaobject>
</screenshot>
</figure>
<para><emphasis>Oberes Menü</emphasis></para>
<para>Das obere Menü beherbergt generelle Informationen zu &name-icinga; sowie ein Benutzer-, Gruppen-, Log- sowie
Task-Administrierungsmenü. Die Live-Such öffnet sich, wenn Sie auf das Vergrößerungsglas neben der Uhrzeit klicken. Rechts oben können Sie
den gerade eingeloggten Benutzer bearbeiten oder sich aus &name-web; ausloggen.</para>
<figure>
<title>&name-web; Top-Menü</title>