Commit e522c868 authored by Alexander Wirt's avatar Alexander Wirt

Imported Upstream version 1.4.1

parent 5fa88c75
pkg
subst
pkginfo
Prototype
icinga.SPARC.pkg.tar.gz
autom4te.cache
config.log
config.status
daemon-init
daemon-init-redhat
rc.ido2db
Makefile
Debug
.cproject
.project
.settings
tags
*.dSYM
:2*
.Apple*
._*
.DS_Store
.deps/
.libs/
*.la
*.lo
[submodule "module/icinga-api"]
path = module/icinga-api
url = git://git.icinga.org/icinga-api.git
[submodule "docbook"]
path = docbook
url = git://git.icinga.org/icinga-doc.git
......@@ -2,6 +2,21 @@
Icinga 1.4.x Change Log
#######################
1.4.1 - ??/06/2011
ENHANCEMENTS
FIXES
* core: fix retain status file over an init script reload #1579
* classic ui: fix cross site scripting vulnerability in config.cgi on config expander arguments #1605
* classic ui: better handling of writing to cgi.log in cmd.cgi #1161
* classic ui: fixing tac.cgi header problems with counting and adding pending and descritptions #1505 #1506 #1508
* classic ui: corrected behaviour of pending states in tac header #1508
* install: fix event handlers cmd file location in contrib #1501
1.4.0 - 11/05/2011
ENHANCEMENTS
......
......@@ -75,7 +75,7 @@ MKDIR=/bin/mkdir
###############################
# Global
###############################
ICINGA_VERSION=1.4.0
ICINGA_VERSION=1.4.1
CP=@CP@
......
......@@ -284,6 +284,7 @@ in various ways. If we missed your name, let us know.
* Lou Sneddon
* Mark Spieth
* Stig Sandbeck
* Stefan Schurtz
* Tim Starling
* Thomas Stolle
* Kevin Stone
......
*.o
Makefile
icinga
icingastats
perlxsi.c
......@@ -3,7 +3,7 @@
* ICINGA.C - Core Program Code For Icinga
*
* Program: Icinga
* Version: 1.4.0
* Version: 1.4.1
* License: GPL
* Copyright (c) 1999-2009 Ethan Galstad (http://www.nagios.org)
* Copyright (c) 2009-2011 Nagios Core Development Team and Community Contributors
......
......@@ -3,7 +3,7 @@
* ICINGASTATS.C - Displays Icinga Statistics
*
* Program: Icingastats
* Version: 1.4.0
* Version: 1.4.1
* License: GPL
* Copyright (c) 2003-2008 Ethan Galstad (egalstad@nagios.org)
* Copyright (c) 2009-2011 Nagios Core Development Team and Community Contributors
......
*.o
*.cgi
Makefile
......@@ -132,6 +132,7 @@ int color_transparency_index_b=255;
int status_show_long_plugin_output=FALSE;
int tac_show_only_hard_state=FALSE;
int show_tac_header=TRUE;
int show_tac_header_pending=TRUE;
int showlog_initial_states=TRUE;
int showlog_current_states=TRUE;
int tab_friendly_titles=FALSE;
......@@ -558,6 +559,9 @@ int read_cgi_config_file(char *filename){
else if(!strcmp(var,"show_tac_header"))
show_tac_header=(atoi(val)>0)?TRUE:FALSE;
else if(!strcmp(var,"show_tac_header_pending"))
show_tac_header_pending=(atoi(val)>0)?TRUE:FALSE;
else if(!strcmp(var,"showlog_initial_state") || !strcmp(var,"showlog_initial_states"))
showlog_initial_states=(atoi(val)>0)?TRUE:FALSE;
......
......@@ -60,6 +60,7 @@ extern int daemon_check;
extern int enforce_comments_on_actions;
extern int date_format;
extern int use_logging;
extern scheduled_downtime *scheduled_downtime_list;
extern comment *comment_list;
......@@ -2809,8 +2810,9 @@ int commit_command(int cmd){
}
int write_command_to_file(char *cmd){
char buffer[MAX_INPUT_BUFFER];
char ip_address[16];
char *buffer;
char *ip_address;
int dummy;
char *p;
FILE *fp;
struct stat statbuf;
......@@ -2845,23 +2847,31 @@ int write_command_to_file(char *cmd){
return ERROR;
}
// get remote address
sprintf(ip_address,"%s",getenv("REMOTE_ADDR"));
if(use_logging==TRUE) {
// find closing bracket in cmd line
p = strchr(cmd, ']');
// if found get everything after closing bracket
if (p!=NULL)
p+=2;
else // get complete command line
p=&cmd[0];
/* write command to cgi log */
sprintf(buffer, "EXTERNAL COMMAND: %s;%s;", current_authdata.username,(ip_address!=NULL)?ip_address:"unknown remote address");
p = index(cmd, ']');
if (p!=NULL)
p+=2;
else
p=&cmd[0];
strncat(buffer, p, sizeof(buffer)-strlen(buffer)-1);
write_to_cgi_log(buffer);
/* get remote address */
ip_address=strdup(getenv("REMOTE_ADDR"));
/* construct log entry */
dummy=asprintf(&buffer, "EXTERNAL COMMAND: %s;%s;%s", current_authdata.username,(ip_address!=NULL)?ip_address:"unknown remote address",p);
/* log comments if forced */
if(enforce_comments_on_actions==TRUE) {
sprintf(buffer, "FORCED COMMENT: %s;%s;%s;%s", current_authdata.username,(ip_address!=NULL)?ip_address:"unknown remote address",comment_author,comment_data);
/* write command to cgi log */
write_to_cgi_log(buffer);
/* log comments if forced */
if(enforce_comments_on_actions==TRUE) {
my_free(buffer);
dummy=asprintf(&buffer, "FORCED COMMENT: %s;%s;%s;%s", current_authdata.username,(ip_address!=NULL)?ip_address:"unknown remote address",comment_author,comment_data);
write_to_cgi_log(buffer);
}
my_free(buffer);
}
/* write the command to file */
......
......@@ -429,7 +429,7 @@ int process_cgivars(void){
error=TRUE;
break;
}
strncpy(to_expand,variables[x],MAX_COMMAND_BUFFER);
strncpy(to_expand,escape_string(variables[x]),MAX_COMMAND_BUFFER);
to_expand[MAX_COMMAND_BUFFER-1]='\0';
}
......
This diff is collapsed.
......@@ -2399,7 +2399,7 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h"
PKG_NAME=icinga-core
PKG_VERSION="1.4.0"
PKG_VERSION="1.4.1"
PKG_HOME_URL="http://www.icinga.org/"
PKG_REL_DATE="05-11-2011"
......@@ -8273,7 +8273,13 @@ fi
perl subst $srcdir/include/locations.h
perl subst $srcdir/contrib/eventhandlers/submit_check_result
perl subst $srcdir/contrib/eventhandlers/disable_active_service_checks
perl subst $srcdir/contrib/eventhandlers/disable_notifications
perl subst $srcdir/contrib/eventhandlers/enable_active_service_checks
perl subst $srcdir/contrib/eventhandlers/enable_notifications
perl subst $srcdir/html/index.html
perl subst $srcdir/html/menu.html
......
......@@ -9,7 +9,7 @@ AC_CONFIG_HEADER(include/config.h include/snprintf.h)
AC_PREFIX_DEFAULT(/usr/local/icinga)
PKG_NAME=icinga-core
PKG_VERSION="1.4.0"
PKG_VERSION="1.4.1"
PKG_HOME_URL="http://www.icinga.org/"
PKG_REL_DATE="05-11-2011"
......@@ -1171,7 +1171,13 @@ AC_OUTPUT(Makefile subst solaris/pkginfo base/Makefile common/Makefile contrib/M
perl subst $srcdir/include/locations.h
perl subst $srcdir/contrib/eventhandlers/submit_check_result
perl subst $srcdir/contrib/eventhandlers/disable_active_service_checks
perl subst $srcdir/contrib/eventhandlers/disable_notifications
perl subst $srcdir/contrib/eventhandlers/enable_active_service_checks
perl subst $srcdir/contrib/eventhandlers/enable_notifications
perl subst $srcdir/html/index.html
perl subst $srcdir/html/menu.html
......
perlxsi.c
Makefile
convertcfg
mini_epn
mini_epn.o
new_mini_epn
new_mini_epn.o
perlxsi.o
daemonchk.cgi
daemonchk.o
......@@ -16,7 +16,7 @@
printfcmd="/usr/bin/printf"
CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
CommandFile="@EXTCMDFILEDIR@/icinga.cmd"
# get the current date/time in seconds since UNIX epoch
datetime=`date +%s`
......
......@@ -14,7 +14,7 @@
printfcmd="/usr/bin/printf"
CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
CommandFile="@EXTCMDFILEDIR@/icinga.cmd"
# get the current date/time in seconds since UNIX epoch
datetime=`date +%s`
......
......@@ -16,7 +16,7 @@
printfcmd="/usr/bin/printf"
CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
CommandFile="@EXTCMDFILEDIR@/icinga.cmd"
# get the current date/time in seconds since UNIX epoch
datetime=`date +%s`
......
......@@ -14,7 +14,7 @@
printfcmd="/usr/bin/printf"
CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
CommandFile="@EXTCMDFILEDIR@/icinga.cmd"
# get the current date/time in seconds since UNIX epoch
datetime=`date +%s`
......
......@@ -130,7 +130,7 @@ start(){
exit 1
else
echo "Icinga PID $IcingaPID not running. Removing lockfile."
rm -f $IcingaStatusFile $IcingaRunFile $IcingaLockDir/$IcingaLockFile $IcingaCommandFile
rm -f $IcingaRunFile $IcingaLockDir/$IcingaLockFile
fi
fi
......@@ -180,7 +180,7 @@ case "$1" in
echo 'Warning - icinga did not exit in a timely manner. Please try again.'
else
echo 'Stopping icinga done.'
rm -f $IcingaStatusFile $IcingaRunFile $IcingaLockDir/$IcingaLockFile $IcingaCommandFile
rm -f $IcingaRunFile $IcingaLockDir/$IcingaLockFile
fi
;;
......
/home/croft/icinga-doc/html
/home/croft/icinga-doc/de/*.xml~
/home/croft/icinga-doc/en/*.xml~
/home/croft/icinga-doc/en/*.xml~~
/home/croft/icinga-doc/de/*.xml~~
/home/croft/icinga-doc/en/*.old
/home/croft/icinga-doc/de/*.old
......@@ -1564,7 +1564,7 @@
</row>
<row>
<entry align="left" valign="top"><para>Example:</para></entry>
<entry align="left" valign="top"><para>Beispiel:</para></entry>
<entry><para> <emphasis condition="red" role="color"> <emphasis role="bold">show_tac_header=0</emphasis> </emphasis>
</para></entry>
......@@ -1630,6 +1630,39 @@
<para>Diese Option ist verfügbar ab &name-icinga; 1.4.</para>
</note>
<para><anchor xml:id="configcgi-show_tac_header_pending" /> <emphasis role="bold">Pending-Anzahlen in Tactical Overview-Header anzeigen</emphasis></para>
<informaltable frame="none">
<tgroup cols="2">
<colspec colname="c1" colwidth="5*" />
<colspec colname="c2" colwidth="50*" />
<tbody>
<row>
<entry align="left" valign="top"><para>Format:</para></entry>
<entry><para> <emphasis role="bold">show_tac_header_pending=&lt;0|1&gt;</emphasis> </para></entry>
</row>
<row>
<entry align="left" valign="top"><para>Beispiel:</para></entry>
<entry><para> <emphasis condition="red" role="color"> <emphasis role="bold">show_tac_header_pending=0</emphasis> </emphasis>
</para></entry>
</row>
</tbody>
</tgroup>
</informaltable>
<para>Diese Option aktiviert die Anzeige von Pending-Anzahlen im Tactical-Overview-Header. Wenn Ihre Auflösung kleiner als 1024x768 und
diese Option aktiviert ist, dann passen die taktischen Informationen ggf. nicht in den verfügbaren Platz. Diese Option ist per Default
deaktiviert.</para>
<note>
<para>Diese Option ist verfügbar ab &name-icinga; 1.4.1.</para>
</note>
<indexterm zone="configcgi">
<primary>CGI-Konfiguration</primary>
......@@ -1861,4 +1894,10 @@
<secondary>Tactical Overview-Header anzeigen</secondary>
</indexterm>
<indexterm zone="configcgi-show_tac_header_pending">
<primary>show_tac_header_pending=</primary>
<secondary>Pending-Anzahlen in Tactical Overview-Header anzeigen</secondary>
</indexterm>
</section>
......@@ -178,13 +178,25 @@
<para>Führen Sie das &name-icinga;-configure-Script aus. Durch die Nutzung des --help-Flags erhalten Sie Hilfe zu den Optionen.</para>
<programlisting> #&gt; ./configure --with-command-group=icinga-cmd \
--enable-idoutils CPPFLAGS=-I/usr/local/include
--enable-idoutils CPPFLAGS=-I/usr/local/include \
CFLAGS="-I/usr/local/include -L/usr/local/lib" \
--with-dbi-lib=/usr/local/lib --with-dbi-inc=/usr/local/include</programlisting>
<important>
<para>Das angehängte <emphasis>CPPFLAGS=-I/usr/local/include</emphasis> ist wichtig für die &name-idoutils; bzw. das
Broker-Modul.</para>
</important>
<note>
<para>Sie sollten <literal>CFLAGS=..."</literal> wie oben angegeben benutzen. Anderenfalls finden Sie ggf. später folgende Zeilen in
<filename>icinga.log</filename>:
<screen> Error: Module ‘/usr/local/icinga/bin/idomod.o’ is using an old or unspecified version of the event broker API. Module will
be unloaded.
Event broker module ‘/usr/local/icinga/bin/idomod.o’ deinitialized successfully.</screen>
Mehr Informationen zu diesem Fehler finden Sie <link xlink:href="http://www.mazej.net/icinga-idomod-o-is-using-an-old-or-unspecified-version-of-the-event-broker-api/">
hier</link>.
</para>
</note>
<para><emphasis role="bold">Mit SSL-Verschlüsselung:</emphasis></para>
......
......@@ -234,6 +234,10 @@
<listitem>
<para><link linkend="configcgi-show_tac_header">Show Header with Tactical Information</link></para>
</listitem>
<listitem>
<para><link linkend="configcgi-show_tac_header_pending">Show Header with Pending Counts</link></para>
</listitem>
</itemizedlist>
<para><anchor xml:id="configcgi-main_cfg_file" /> <emphasis role="bold">Main Configuration File Location</emphasis></para>
......@@ -1279,7 +1283,7 @@
</tgroup>
</informaltable>
<para>This options allows you to specify if the tactical overview should only show hard states on hosts and services. If you set this
<para>This option allows you to specify if the tactical overview should only show hard states on hosts and services. If you set this
option to 1 the tactical overview shows only states on hosts and services. By default disabled, all states will be shown.</para>
<para><anchor xml:id="configcgi-enable_splunk_integration" /> <emphasis role="bold">Splunk Integration Option</emphasis></para>
......@@ -1905,6 +1909,38 @@
<para>This option is available starting with &name-icinga; 1.4.</para>
</note>
<para><anchor xml:id="configcgi-show_tac_header_pending" /> <emphasis role="bold">Show header including pending counts</emphasis></para>
<informaltable frame="none">
<tgroup cols="2">
<colspec colname="c1" colwidth="5*" />
<colspec colname="c2" colwidth="50*" />
<tbody>
<row>
<entry align="left" valign="top"><para>Format:</para></entry>
<entry><para> <emphasis role="bold">show_tac_header_pending=&lt;0|1&gt;</emphasis> </para></entry>
</row>
<row>
<entry align="left" valign="top"><para>Example:</para></entry>
<entry><para> <emphasis condition="red" role="color"> <emphasis role="bold">show_tac_header_pending=0</emphasis> </emphasis>
</para></entry>
</row>
</tbody>
</tgroup>
</informaltable>
<para>This option enables the display of pending counts in the tac header. If your display is less than 1024x768 and this is enabled,
the tactical information may not fit well in the top frame. By default it is disabled.</para>
<note>
<para>This option is available starting with &name-icinga; 1.4.1</para>
</note>
<indexterm zone="config_cgi">
<primary>CGI Configuration File Options</primary>
</indexterm>
......@@ -2134,4 +2170,10 @@
<secondary>Show header with tactical information</secondary>
</indexterm>
<indexterm zone="configcgi-show_tac_header_pending">
<primary>show_tac_header_pending=</primary>
<secondary>Show header including pending counts</secondary>
</indexterm>
</section>
......@@ -176,12 +176,23 @@
<programlisting> #&gt; ./configure --with-command-group=icinga-cmd \
--enable-idoutils CPPFLAGS=-I/usr/local/include \
CFLAGS="-I/usr/local/include -L/usr/local/lib" \
--with-dbi-lib=/usr/local/lib --with-dbi-inc=/usr/local/include</programlisting>
<important>
<para>Appending <emphasis>CPPFLAGS=-I/usr/local/include</emphasis> is important for the &name-idoutils; and the broker modul
respectively.</para>
</important>
<note>
<para>You should include <literal>CFLAGS=..."</literal> like specified above. Otherwise you might get the following lines in
<filename>icinga.log</filename>:
<screen> Error: Module ‘/usr/local/icinga/bin/idomod.o’ is using an old or unspecified version of the event broker API. Module will
be unloaded.
Event broker module ‘/usr/local/icinga/bin/idomod.o’ deinitialized successfully.</screen>
More details on this error can be found <link xlink:href="http://www.mazej.net/icinga-idomod-o-is-using-an-old-or-unspecified-version-of-the-event-broker-api/">
here</link>.
</para>
</note>
<para><emphasis role="bold">With SSL-encryption:</emphasis></para>
......
docbook/images/distributed.png

24 KB | W: | H:

docbook/images/distributed.png

54.4 KB | W: | H:

docbook/images/distributed.png
docbook/images/distributed.png
docbook/images/distributed.png
docbook/images/distributed.png
  • 2-up
  • Swipe
  • Onion skin
Makefile
side.html
config.inc.php
index.html
menu.html
top.html
icinga-api/parser/Ido2dbParser.php
search.html