Commit c35f31cd authored by Alexander Wirt's avatar Alexander Wirt
Browse files

Imported Upstream version 1.11.0

parent 0ac07f7f

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
<michael.friedrich@netways.de> <michael.friedrich@gmail.com>
<michael.friedrich@netways.de> <Michael.Friedrich@netways.de>
<michael.friedrich@netways.de> <michael.friedrich@univie.ac.at>
<gunnar.beutner@netways.de> <gunnar@beutner.name>
<michael_luebben@web.de> <michael@luebben-home.de>
<lars.engels@0x20.net> <engels@NB011868.bk.fin.local>
<hir3npatel@gmail.com> <hirenp@firebird.(none)>
<cmr@financial.com> <cmr@HUB8071NC4.financial.com>
<icinga@flatto.net> <assaf@AikiLinux-laptop.(none)>
<forni.massimo@gmail.com> <massimo@mforni-laptop.(none)>
<formorer@debian.org> <formorer@grml.org>
......@@ -29,6 +29,7 @@ Opsera Ltd
Opsview Team
Michael Luebben
Christoph Maser
Philip Matuskiewicz
Bill McGonigle
Viranch Metha
Sean Millichamp
......
......@@ -13,6 +13,90 @@ UPGRADE NOTES
- idoutils: ${source}/module/idoutils/config/updates
* package locations may differ!
NEWS
* Releases are now hosted at GitHub. Please check https://www.icinga.org/download for details!
* Mailinglists have been migrated to icinga.org. Please check https://www.icinga.org/support for details!
1.11.0 - 13/03/2014
ENHANCEMENTS
* core: add commands for {en,dis}able freshness checks per host/service (Philip Matuskiewicz) #5422 #4430 - MF
* core: add statehistory entries for newly added services (checkresult with OK state) #3854 - MF
* core: add option to anonymize external command user in icinga log #5689 - RB
* classic ui: add status.cgi modifed_attributes filter parameter #4880 - RB
* classic ui: add "current_notification_number" to jsonoutput of hosts and services in status.cgi #5370 - RB
* classic ui: add groups Notes and Action URL links to status summary, overview and grid #5301 - RB
* classic ui: include more logos #4057 - CF/RB
* classic ui: add Support for gzip compressed logs #4519 - RB
* idoutils: ido2db should check db schema on startup, and bail early on errors #5272 - MF
* docs: Define SELinux contexts rather than using chcon command #3555 - WN
* docs: explain "Check results for service x on host y are stale by 0d 0h 0m 10s (threshold=0d 0h 10m 0s). Forcing an immediate check of the service..." #5252 - WN
* docs: addons: suggest nsca-ng as nsca alternative #5253 - WN
* docs: rename nagios plugins to monitoring plugins #5460 - WN/MF
FIXES
* core: allow exclude (!) to work for regexp matches for hosts (Franky Van Liedekerke) #5324 - MF
* core: fix retained host check attempts being 0/1 #5061 - MF
* core: fix passive check result processing for host checks is not working (Marco Hoyer) #5671 - MF
* core: fix service escalations with no host mapping are not accepted (Tomas Dubec) #5687 - MF
* classic ui: getcgivars() fails to produce proper key/value list causing a potential buffer-overflow condition #5276 - CF
* classic ui: fix vulnerability against CSRF attacks CVE-2013-7107 #5346 - RB
* classic ui: fix timepicker is resetting time in input field #5239 - RB
* classic ui: fix small buffer overflows when checking strlen against MAX_INPUT_BUFFER #5663
* idoutils: wait for child processes on exit preventing zombies (Laurent Bigonville) #4427 - MF
* idoutils: fix bad update performance with large commenthistory table (thx tgelf) #4985 - MF
* idoutils: fix errors in oracle.sql with timedevent sequences #5688 - TD
* idoutils: fix SEGV in ido2db in solaris #5687 - TD
* idoutils: allow agent_version to store more than 16 chars #5731 - MF
* idoutils: dump customvariable status by default (restore feature for icinga web (2)) #5732 - MF
* idoutils: fix SEGV in idomod syslog call on Solaris #5686 - CF
* docs: icinga web rest api updates #4970 - WN
* docs: add new cg.cfg option "disable_cmd_cgi_csrf_protection" #5377 - WN
* docs: clean mysql creation commands #5426 - MF
* docs: replace sourceforge download links with github releases #5429 - WN/MF
* initscript: handle binary return codes gracefully #5412 - MF
* spec: only add apache user to the icingacmd group if existing #5263 - MF
* contrib: remove legacy code #5406 - MF
SUPPORT
* core: merge xdata/x{c,d}ddefault.c back into common/{comment,downtime}.c #4815 - MF
* core: remove unused netutils.c #5195 - MF
* packages: fix gpl license text, wrong file encoding (Tim Hardeck) #5698 - MF
* initscript: refactor initscripts (Marco Hoyer) #5684 - MF
* install: fix --enable-debug overwrites CFLAG settings in Makefile #5691 - TD
CHANGES
* classic ui: fix vulnerability against CSRF attacks CVE-2013-7107 #5346
** If cmd.cgi get's executed from command line then you have to set
additionally HTTP_REFFERER="/icinga/cgi-bin/cmd.cgi" on command submission,
otherwise the command will be rejected if csrf protection is enabled.
* classic ui: added current_notification_number to host and service status in status.cgi #5370
* idoutils: dump customvariable status by default (restore feature for icinga web (2)) #5732
* docs: rename nagios plugins to monitoring plugins #5460
* docs: replace sourceforge download links with github releases #5429
1.10.3 - 11/02/2014
ENHANCEMENTS
......
......@@ -2,6 +2,9 @@
Classic-UI JSON Change Log
#######################
1.11.0 - only values added, no existing values changed
* added current_notification_number to host and service status in status.cgi #5370
1.10.0 - only values added, no existing values changed
* added custom vars to hosts and services in extinfo #4390
* added performance data to extinfo.cgi json #4723
......
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
......@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
......@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
......@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
......@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
......@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
......@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
......@@ -72,7 +72,6 @@ ENABLE_DEBUG=@ENABLE_DEBUG@
###############################
USE_EVENTBROKER=@USE_EVENTBROKER@
USE_IDOUTILS=@USE_IDOUTILS@
USE_ICINGAAPI=@USE_ICINGAAPI@
INSTALLPERLSTUFF=@INSTALLPERLSTUFF@
......@@ -91,7 +90,7 @@ MKDIR=/bin/mkdir
###############################
# Global
###############################
ICINGA_VERSION=1.10.3
ICINGA_VERSION=1.11.0
CP=@CP@
......@@ -504,14 +503,6 @@ install-idoutils:
echo "" ;\
echo "*** IDOUtils installed ***" ;\
echo "" ;\
echo "!!! ATTENTION !!!" ; \
echo " idomod.o was renamed to idomod.so, module extension is now .so" ;\
echo " idomod.so will now be installed to $(DESTDIR)$(LIBDIR) " ;\
echo " " ;\
echo " Check your config within wether icinga.cfg:broker_module OR" ;\
echo " module definition in modules/ and update to the new path!!!" ;\
echo "!!! ATTENTION !!!" ;\
echo "" ;\
echo "Please check Changelog - CHANGES for more information!" ;\
echo "Upgrade docs available at http://docs.icinga.org/latest/en/upgrading_idoutils.html " ;\
echo "" ;\
......
Introduction
------------
CHANGES for 1.7
* bindir/idomod.o => libdir/idomod.so
* /var/icinga => /var/spool/icinga
* icinga-idoutils => icinga-idoutils-libdbi-mysql and icinga-idoutils-libdbi-pgsql
The packages are made as little dependend on each other as possible, to get the
maximum flexibility in setting up distributed monitoring environments. This
means, that you may have to install some additional packages manually. Yum is
......
IDOUtils Notes for RHEL packages
================================
CHANGES for 1.7
* bindir/idomod.o => libdir/idomod.so
* /var/icinga => /var/spool/icinga
* icinga-idoutils => icinga-idoutils-libdbi-mysql and icinga-idoutils-libdbi-pgsql
* IDOMOD Setup
DO NOT EDIT icinga.cfg for broker_module entry!!! Icinga RPMs will use the
/etc/icinga/modules/idoutils.cfg with the module definition automatically.
Defining that twice can lead into unwanted errors!
......
Introduction
------------
CHANGES for 1.7
* bindir/idomod.o => libdir/idomod.so
* /var/icinga => /var/spool/icinga
* icinga-idoutils => icinga-idoutils-libdbi-mysql and icinga-idoutils-libdbi-pgsql
The packages are made as little dependend on each other as possible, to get the
maximum flexibility in setting up distributed monitoring environments. This
means, that you may have to install some additional packages manually. Yum is
......
IDOUtils Notes for SUSE packages
================================
CHANGES for 1.7
* bindir/idomod.o => libdir/idomod.so
* /var/icinga => /var/spool/icinga
* icinga-idoutils => icinga-idoutils-libdbi-mysql and icinga-idoutils-libdbi-pgsql
* IDOMOD Setup
......
......@@ -42,6 +42,7 @@ in various ways. If we missed your name, let us know.
* Lennart Betz
* Olivier Beytrison
* Christoph Biedl
* Laurent Bigonville
* Dennis Biringer
* Mike Bird
* Jason Blakey
......@@ -86,6 +87,7 @@ in various ways. If we missed your name, let us know.
* Thomas Dohl
* Mike Dorman
* Albrecht Dress
* Tomas Dubec
* Alok Dubey
* Jim Dumser
* Thomas Dunkel
......@@ -208,6 +210,7 @@ in various ways. If we missed your name, let us know.
* Christoph Maser
* Christian Masopust
* Emanuel Massano
* Philip Matuskiewicz
* Richard Mayhew
* Mike McHenry
* Gordon Messmer
......
......@@ -19,7 +19,7 @@ ENABLE_DEBUG=@ENABLE_DEBUG@
# Compiler flags for use with Valgrind - set when debug is enabled
ifeq ('$(ENABLE_DEBUG)', 'yes')
CFLAGS=-O0 -g -Wall -DHAVE_CONFIG_H -DNSCORE
CFLAGS+=-O0 -g -DHAVE_CONFIG_H -DNSCORE
endif
# Compiler flags for use with gprof
......@@ -27,10 +27,10 @@ endif
#CFLAGS += -pg -ftest-coverage
# Compiler flags for optimization (overrides default)
#CFLAGS=-O3 -Wall -fno-strict-aliasing -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H -DNSCORE
#CFLAGS=-O3 -fno-strict-aliasing -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H -DNSCORE
# Compiler flags for optimization (complements default)
#CFLAGS_WARN=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
#CFLAGS_WARN= -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
#CFLAGS_DEBUG=-ggdb3 -g3
#CFLAGS_GPROF=-pg
#CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG) $(CFLAGS_GPROF)
......@@ -68,16 +68,12 @@ CP=@CP@
# External data I/O code and headers
XSDC=@XSDC@
XSDH=@XSDH@
XCDC=@XCDC@
XCDH=@XCDH@
XRDC=@XRDC@
XRDH=@XRDH@
XODC=@XODC@
XODH=@XODH@
XPDC=@XPDC@
XPDH=@XPDH@
XDDC=@XDDC@
XDDH=@XDDH@
# Extra base code
BASEEXTRALIBS=@BASEEXTRALIBS@
......@@ -101,13 +97,6 @@ RDATALIBS=retention-base.o xretention-base.o
RDATAHDRS=
RDATADEPS=$(RDATALIBS)
# Comment data
#CDATALIBS=$(SRC_COMMON)/comments.c $(SRC_XDATA)/$(XCDC)
#CDATAHDRS=$(SRC_INCLUDE)/comments.h $(SRC_XDATA)/$(XCDH)
CDATALIBS=comments-base.o xcomments-base.o
CDATAHDRS=
CDATADEPS=$(CDATALIBS)
# Status data
#SDATALIBS=$(SRC_COMMON)/statusdata.c $(SRC_XDATA)/$(XSDC)
#SDATAHDRS=$(SRC_INCLUDE)/statusdata.h $(SRC_XDATA)/$(XSDH)
......@@ -122,16 +111,9 @@ PDATALIBS=perfdata-base.o xperfdata-base.o
PDATAHDRS=
PDATADEPS=$(PDATALIBS)
# Downtime data
#DDATALIBS=$(SRC_COMMON)/downtime.c $(SRC_XDATA)/$(XDDC)
#DDATAHDRS=$(SRC_INCLUDE)/downtime.h $(SRC_XDATA)/$(XDDH)
DDATALIBS=downtime-base.o xdowntime-base.o
DDATAHDRS=
DDATADEPS=$(DDATALIBS)
OBJS=$(BROKER_O) $(SRC_COMMON)/shared.o checks.o config.o commands.o events.o flapping.o logging.o macros-base.o netutils.o notifications.o sehandlers.o skiplist.o utils.o $(RDATALIBS) $(CDATALIBS) $(ODATALIBS) $(SDATALIBS) $(PDATALIBS) $(DDATALIBS) $(BASEEXTRALIBS) $(SNPRINTF_O) $(PERLXSI_O)
OBJDEPS=$(ODATADEPS) $(ODATADEPS) $(RDATADEPS) $(CDATADEPS) $(SDATADEPS) $(PDATADEPS) $(DDATADEPS) $(BROKER_H)
OBJS=$(BROKER_O) $(SRC_COMMON)/shared.o comments-base.o downtime-base.o checks.o config.o commands.o events.o flapping.o logging.o macros-base.o notifications.o sehandlers.o skiplist.o utils.o $(RDATALIBS) $(CDATALIBS) $(ODATALIBS) $(SDATALIBS) $(PDATALIBS) $(BASEEXTRALIBS) $(SNPRINTF_O) $(PERLXSI_O)
OBJDEPS=$(ODATADEPS) $(ODATADEPS) $(RDATADEPS) $(SDATADEPS) $(PDATADEPS) $(BROKER_H)
all: icinga icingastats
......@@ -159,15 +141,9 @@ xstatusdata-base.o: $(SRC_XDATA)/$(XSDC) $(SRC_XDATA)/$(XSDH)
comments-base.o: $(SRC_COMMON)/comments.c $(SRC_INCLUDE)/comments.h
$(CC) $(CFLAGS) -c -o $@ $(SRC_COMMON)/comments.c
xcomments-base.o: $(SRC_XDATA)/$(XCDC) $(SRC_XDATA)/$(XCDH)
$(CC) $(CFLAGS) -c -o $@ $(SRC_XDATA)/$(XCDC)
downtime-base.o: $(SRC_COMMON)/downtime.c $(SRC_INCLUDE)/downtime.h
$(CC) $(CFLAGS) -c -o $@ $(SRC_COMMON)/downtime.c
xdowntime-base.o: $(SRC_XDATA)/$(XDDC) $(SRC_XDATA)/$(XDDH)
$(CC) $(CFLAGS) -c -o $@ $(SRC_XDATA)/$(XDDC)
perfdata-base.o: perfdata.c $(SRC_INCLUDE)/perfdata.h
$(CC) $(CFLAGS) -c -o $@ perfdata.c
......
......@@ -4,7 +4,7 @@
*
* Copyright (c) 2002-2008 Ethan Galstad (egalstad@nagios.org)
* Copyright (c) 2009-2013 Nagios Core Development Team and Community Contributors
* Copyright (c) 2009-2013 Icinga Development Team (http://www.icinga.org)
* Copyright (c) 2009-present Icinga Development Team (http://www.icinga.org)
*
* License:
*
......
......@@ -4,7 +4,7 @@
*
* Copyright (c) 1999-2010 Ethan Galstad (egalstad@nagios.org)
* Copyright (c) 2009-2013 Nagios Core Development Team and Community Contributors
* Copyright (c) 2009-2013 Icinga Development Team (http://www.icinga.org)
* Copyright (c) 2009-present Icinga Development Team (http://www.icinga.org)
*
* License:
*
......@@ -1245,6 +1245,13 @@ int handle_async_service_check_result(service *temp_service, check_result *queue
else
run_async_host_check_3x(temp_host, CHECK_OPTION_NONE, 0.0, FALSE, FALSE, NULL, NULL);
}
/* if a new service has been added, it needs to
* be saved into statehistory. NOTOK states will
* be added in other sections.
*/
if (temp_service->has_been_checked == FALSE)
handle_service_event(temp_service);
}
......@@ -3636,17 +3643,21 @@ int handle_async_host_check_result_3x(host *temp_host, check_result *queued_chec
}
/* translate return code to basic UP/DOWN state - the DOWN/UNREACHABLE state determination is made later */
/* if we're not doing aggressive host checking, let WARNING states indicate the host is up (fake the result to be STATE_OK) */
if (use_aggressive_host_checking == FALSE && result == STATE_WARNING)
result = STATE_OK;
/* NOTE: only do this for active checks - passive check results already have the final state */
if (queued_check_result->check_type == HOST_CHECK_ACTIVE) {
/* OK states means the host is UP */
if (result == STATE_OK)
result = HOST_UP;
/* if we're not doing aggressive host checking, let WARNING states indicate the host is up (fake the result to be STATE_OK) */
if (use_aggressive_host_checking == FALSE && result == STATE_WARNING)
result = STATE_OK;
/* any problem state indicates the host is not UP */
else
result = HOST_DOWN;
/* OK states means the host is UP */
if (result == STATE_OK)
result = HOST_UP;
/* any problem state indicates the host is not UP */
else
result = HOST_DOWN;
}
/******************* PROCESS THE CHECK RESULTS ******************/
......
This diff is collapsed.
......@@ -4,7 +4,7 @@
*
* Copyright (c) 1999-2008 Ethan Galstad (egalstad@nagios.org)
* Copyright (c) 2009-2013 Nagios Core Development Team and Community Contributors
* Copyright (c) 2009-2013 Icinga Development Team
* Copyright (c) 2009-present Icinga Development Team
*
* License:
*
......@@ -77,6 +77,7 @@ extern int log_event_handlers;
extern int log_external_commands;
extern int log_passive_checks;
extern int log_long_plugin_output;
extern int log_anonymized_external_command_author;
extern int service_check_timeout;
extern int service_check_timeout_state;
......@@ -693,6 +694,17 @@ int read_main_config_file(char *main_config_file) {
log_current_states = (atoi(value) > 0) ? TRUE : FALSE;
}
else if (!strcmp(variable, "log_anonymized_external_command_author")) {
if (strlen(value) != 1 || value[0] < '0' || value[0] > '1') {
asprintf(&error_message, "Illegal value for log_anonymized_external_command_author");
error = TRUE;
break;
}
log_anonymized_external_command_author = (atoi(value) > 0) ? TRUE : FALSE;
}
else if (!strcmp(variable, "retain_state_information")) {
if (strlen(value) != 1 || value[0] < '0' || value[0] > '1') {
......@@ -1497,13 +1509,6 @@ int read_main_config_file(char *main_config_file) {
auth_file = (char *)strdup(value);
}
/* warn about old variables */
else if (!strcmp(variable, "comment_file") || !strcmp(variable, "xcddefault_comment_file")) {
logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: comment_file variable ignored. Comments are now stored in the status and retention files.");
} else if (!strcmp(variable, "downtime_file") || !strcmp(variable, "xdddefault_downtime_file")) {
logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: downtime_file variable ignored. Downtime entries are now stored in the status and retention files.");
}
/* skip external data directives */
else if (strstr(input, "x") == input)
continue;
......
......@@ -4,7 +4,7 @@
*
* Copyright (c) 1999-2010 Ethan Galstad (egalstad@nagios.org)
* Copyright (c) 2009-2013 Nagios Core Development Team and Community Contributors
* Copyright (c) 2009-2013 Icinga Development Team (http://www.icinga.org)
* Copyright (c) 2009-present Icinga Development Team (http://www.icinga.org)
*
* License:
*
......
......@@ -4,7 +4,7 @@
*
* Copyright (c) 2001-2009 Ethan Galstad (egalstad@nagios.org)
* Copyright (c) 2009-2013 Nagios Core Development Team and Community Contributors
* Copyright (c) 2009-2013 Icinga Development Team (http://www.icinga.org)
* Copyright (c) 2009-present Icinga Development Team (http://www.icinga.org)
*
* License:
*
......
......@@ -4,7 +4,7 @@
*
* Copyright (c) 1999-2009 Ethan Galstad (http://www.nagios.org)
* Copyright (c) 2009-2013 Nagios Core Development Team and Community Contributors
* Copyright (c) 2009-2013 Icinga Development Team (http://www.icinga.org)
* Copyright (c) 2009-present Icinga Development Team (http://www.icinga.org)
*
* Description:
*
......@@ -94,6 +94,7 @@ int log_current_states = DEFAULT_LOG_CURRENT_STATES;
int log_external_commands = DEFAULT_LOG_EXTERNAL_COMMANDS;
int log_passive_checks = DEFAULT_LOG_PASSIVE_CHECKS;
int log_long_plugin_output = DEFAULT_LOG_LONG_PLUGIN_OUTPUT;
int log_anonymized_external_command_author = DEFAULT_LOG_ANONYMIZED_EXTERNAL_COMMAND_AUTHOR;
unsigned long logging_options = 0;
unsigned long syslog_options = 0;
......@@ -395,7 +396,7 @@ int main(int argc, char **argv, char **env) {
if (daemon_mode == FALSE) {
printf("\n%s %s\n", PROGRAM_NAME , PROGRAM_VERSION);
printf("Copyright (c) 2009-2013 Icinga Development Team (http://www.icinga.org)\n");
printf("Copyright (c) 2009-present Icinga Development Team (http://www.icinga.org)\n");
printf("Copyright (c) 2009-2013 Nagios Core Development Team and Community Contributors\n");
printf("Copyright (c) 1999-2009 Ethan Galstad\n");
printf("Last Modified: %s\n", PROGRAM_MODIFICATION_DATE);
......@@ -718,6 +719,10 @@ int main(int argc, char **argv, char **env) {
exit(EXIT_FAILURE);
}
/* forcibly send a program status update
* for later updates of PROCESS_* */
broker_program_status(NEBTYPE_PROGRAMSTATUS_UPDATE, NEBFLAG_NONE, NEBATTR_NONE, NULL);
/* send program data to broker */
broker_program_state(NEBTYPE_PROCESS_PRELAUNCH, NEBFLAG_NONE, NEBATTR_NONE, NULL);
#endif
......
......@@ -4,7 +4,7 @@
*
* Copyright (c) 2003-2008 Ethan Galstad (egalstad@nagios.org)
* Copyright (c) 2009-2013 Nagios Core Development Team and Community Contributors
* Copyright (c) 2009-2013 Icinga Development Team (http://www.icinga.org)
* Copyright (c) 2009-present Icinga Development Team (http://www.icinga.org)
*
* License:
*
......
......@@ -4,7 +4,7 @@
*
* Copyright (c) 1999-2008 Ethan Galstad (egalstad@nagios.org)
* Copyright (c) 2009-2013 Nagios Core Development Team and Community Contributors
* Copyright (c) 2009-2013 Icinga Development Team (http://www.icinga.org)
* Copyright (c) 2009-present Icinga Development Team (http://www.icinga.org)
*
* License:
*
......
......@@ -4,7 +4,7 @@
*
* Copyright (c) 2002-2008 Ethan Galstad (egalstad@nagios.org)
* Copyright (c) 2009-2013 Nagios Core Development Team and Community Contributors
* Copyright (c) 2009-2013 Icinga Development Team (http://www.icinga.org)
* Copyright (c) 2009-present Icinga Development Team (http://www.icinga.org)
*
* License:
*
......@@ -243,15 +243,6 @@ int neb_load_module(nebmodule *mod) {
mod->dl_file = strdup(output_file);
}
/* add a compatibility check for 1.7 change of idomod.o -> idomod.so */
/* FIXME - drop in 1.8 */
if (strstr(mod->filename, "idomod.o") != NULL) {
logit(NSLOG_RUNTIME_ERROR, FALSE, "Error: trying to load module '%s' which has been moved to libdir/idomod.so in Icinga 1.7!\n", mod->filename);
logit(NSLOG_RUNTIME_ERROR, FALSE, "Check Changelog and upgrade docs to update the broker module entry!\n");
neb_unload_module(mod, NEBMODULE_FORCE_UNLOAD, NEBMODULE_ERROR_IDO_VERSION);
return ERROR;
}
/* find module API version */