Skip to content

GitLab

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

Imported Upstream version 1.8.1

parent b6d6bc11
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 24 deletions
Changelog
View file @ fb9c4cb8
......@@ -12,6 +12,10 @@ UPGRADE NOTES
- core, classic ui: sample-config/updates/
- idoutils: module/idoutils/config/updates
1.8.1 - 25/10/2012
FIXES
* core: fix faulty macro cleaning, replacing spaces with pluses where they shouldn't be cleaned #3397 - MF
1.8.0 - 18/10/2012
......
Makefile.in
View file @ fb9c4cb8
......@@ -78,7 +78,7 @@ MKDIR=/bin/mkdir
###############################
# Global
###############################
ICINGA_VERSION=1.8.0
ICINGA_VERSION=1.8.1
CP=@CP@
......
common/macros.c
View file @ fb9c4cb8
......@@ -204,7 +204,7 @@ int process_macros_r(icinga_macros *mac, char *input_buffer, char **output_buffe
/* an error occurred - we couldn't parse the macro, so continue on */
if (result == ERROR) {
log_debug_info(DEBUGL_MACROS, 0, " WARNING: An error occurred processing macro '%s'!\n", temp_buffer);
logit(NSLOG_RUNTIME_WARNING, TRUE, "Warning: An error occurred processing macro '%s'!\n", temp_buffer);
if (free_macro == TRUE)
my_free(selected_macro);
}
......@@ -2700,13 +2700,39 @@ int init_macros(void) {
macro_keys[x].code = x;
macro_keys[x].name = macro_x_names[x];
/* host/service output/perfdata and author/comment macros should get cleaned */
if ((x >= 16 && x <= 19) || (x >= 49 && x <= 52) || (x >= 99 && x <= 100) || (x >= 124 && x <= 127)) {
macro_keys[x].clean_options = (STRIP_ILLEGAL_MACRO_CHARS | ESCAPE_MACRO_CHARS);
}
/* url macros should get cleaned */
if ((x >= 125 && x <= 126) || (x >= 128 && x <= 129) || (x >= 77 && x <= 78) || (x >= 74 && x <= 75)) {
macro_keys[x].clean_options = URL_ENCODE_MACRO_CHARS;
switch (x) {
/* host/service output/perfdata and author/comment macros should get cleaned */
case MACRO_HOSTOUTPUT:
case MACRO_SERVICEOUTPUT:
case MACRO_HOSTPERFDATA:
case MACRO_SERVICEPERFDATA:
case MACRO_HOSTACKAUTHOR:
case MACRO_HOSTACKCOMMENT:
case MACRO_SERVICEACKAUTHOR:
case MACRO_SERVICEACKCOMMENT:
case MACRO_LONGHOSTOUTPUT:
case MACRO_LONGSERVICEOUTPUT:
case MACRO_HOSTGROUPNOTES:
case MACRO_SERVICEGROUPNOTES:
macro_keys[x].clean_options = (STRIP_ILLEGAL_MACRO_CHARS | ESCAPE_MACRO_CHARS);
break;
/* url macros should get cleaned */
case MACRO_HOSTACTIONURL:
case MACRO_HOSTNOTESURL:
case MACRO_SERVICEACTIONURL:
case MACRO_SERVICENOTESURL:
case MACRO_HOSTGROUPNOTESURL:
case MACRO_HOSTGROUPACTIONURL:
case MACRO_SERVICEGROUPNOTESURL:
case MACRO_SERVICEGROUPACTIONURL:
macro_keys[x].clean_options = URL_ENCODE_MACRO_CHARS;
break;
/* by default, we do not clean anything */
default:
macro_keys[x].clean_options = 0;
break;
}
}
......
configure
View file @ fb9c4cb8
......@@ -2456,9 +2456,9 @@ ac_config_headers="$ac_config_headers include/config.h"
PKG_NAME=icinga-core
PKG_VERSION="1.8.0"
PKG_VERSION="1.8.1"
PKG_HOME_URL="http://www.icinga.org/"
PKG_REL_DATE="10-18-2012"
PKG_REL_DATE="10-25-2012"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
......
configure.in
View file @ fb9c4cb8
......@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
AC_PREFIX_DEFAULT(/usr/local/icinga)
PKG_NAME=icinga-core
PKG_VERSION="1.8.0"
PKG_VERSION="1.8.1"
PKG_HOME_URL="http://www.icinga.org/"
PKG_REL_DATE="10-18-2012"
PKG_REL_DATE="10-25-2012"
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
......
html/main.html
View file @ fb9c4cb8
......@@ -18,9 +18,9 @@
</div>
<div id="currentversioninfo">
<div class="version">Version 1.8.0</div>
<div class="releasedate">October 18, 2012</div>
<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.8.0</a></div>
<div class="version">Version 1.8.1</div>
<div class="releasedate">October 25, 2012</div>
<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.8.1</a></div>
</div>
<div id="developer">
......
icinga.spec
View file @ fb9c4cb8
......@@ -20,7 +20,7 @@
Summary: Open Source host, service and network monitoring program
Name: icinga
Version: 1.8.0
Version: 1.8.1
Release: %{revision}%{?dist}
License: GPLv2
Group: Applications/System
......@@ -408,7 +408,10 @@ fi
%changelog
* Fri Jul 06 2012 Michael Friedrich <michael.friedrich@univie.ac.at> - 1.8.0-1
* Thu Oct 25 2012 Michael Friedrich <michael.friedrich@gmail.com> - 1.8.1-1
- 1.8.1 release with a quickfix for faulty macros
* Thu Oct 18 2012 Michael Friedrich <michael.friedrich@univie.ac.at> - 1.8.0-1
- bump version
- add devel package, installing header files to include/
- use --with-mainurl from upstream to set the default to /icinga/cgi-bin/status.cgi?host=all&type=detail&servicestatustypes=29
......@@ -417,6 +420,15 @@ fi
- drop unsupported configure options causing warnings #3037
- fix new jquery-ui files from icinga-gui datetime picker #3009
* Thu Aug 30 2012 Michael Friedrich <michael.friedrich@univie.ac.at> - 1.7.2-2
- include a fix for epn failure from upstream
* Tue Aug 21 2012 Michael Friedrich <michael.friedrich@univie.ac.at> - 1.7.2-1
- bump version
* Mon Jun 18 2012 Michael Friedrich <michael.friedrich@univie.ac.at> - 1.7.1-1
- bump to 1.7.1
* Sun May 06 2012 Michael Friedrich <michael.friedrich@univie.ac.at> - 1.7.0-1
- drop idoutils, add idoutils-libdbi-mysql and idoutils-libdbi-pgsql
- add requires for libdbi drivers mysql and pgsql
......
include/common.h
View file @ fb9c4cb8
......@@ -27,8 +27,8 @@
#define PROGRAM_NAME "Icinga"
#define PROGRAM_NAME_UC "ICINGA"
#define PROGRAM_NAME_LC "icinga"
#define PROGRAM_VERSION "1.8.0"
#define PROGRAM_MODIFICATION_DATE "10-18-2012"
#define PROGRAM_VERSION "1.8.1"
#define PROGRAM_MODIFICATION_DATE "10-25-2012"
/*#define DEBUG_CHECK_IPC 1 */
/*#define DEBUG_CHECK_IPC2 1*/
......
module/idoutils/include/common.h
View file @ fb9c4cb8
......@@ -22,8 +22,8 @@
#define LOG2IDO_NAME "LOG2IDO"
/* only one space for update-version matching */
#define IDO_DATE "10-18-2012"
#define IDO_VERSION "1.8.0"
#define IDO_DATE "10-25-2012"
#define IDO_VERSION "1.8.1"
#define IDO_SCHEMA_VERSION "1.8.0"
......
tests/etc/3397.cfg 0 → 100644
View file @ fb9c4cb8
#############################################################################################
# ICINGA TEST CONFIG BY ISSUES
# (c) 2009-2012 Icinga Development Team and Community Contributors
#
# #3397
# faulty macro cleaning, replacing spaces with pluses where they shouldn't be cleaned
#############################################################################################
define command {
command_name 3397check_macro_clean
command_line /bin/echo "svc: $SERVICEDESC$ dur: $SERVICEDURATION$"
}
define host{
name 3397linux-server
use generic-host
check_period 24x7
check_interval 5
retry_interval 1
max_check_attempts 10
check_command testconfig-check-host-alive
notification_period workhours
notification_interval 120
notification_options d,u,r
contact_groups testconfig-group-admin
register 0
}
define host{
use 3397linux-server
host_name 3397localhost
alias 3397localhost
address 127.0.0.1
address6 ::1
}
define service {
name 3397generic-macro-check
is_volatile 0
check_command 3397check_macro_clean
max_check_attempts 2
normal_check_interval 2
retry_check_interval 1
active_checks_enabled 1
passive_checks_enabled 1
check_period 24x7
parallelize_check 1
obsess_over_service 1
check_freshness 0
event_handler_enabled 1
flap_detection_enabled 1
process_perf_data 1
retain_status_information 1
retain_nonstatus_information 1
contact_groups abc
notification_interval 120
notification_period 24x7
notification_options w,u,c,r,f
notifications_enabled 1
register 0
}
define service {
use 3397generic-macro-check
host_name 3397localhost
contact_groups testconfig-group-admin
service_description 3397 macro clean
}
update-version
View file @ fb9c4cb8
......@@ -10,10 +10,10 @@ else
fi
# Current version number
CURRENTVERSION=1.8.0
CURRENTVERSION=1.8.1
# Last date
LASTDATE=10-18-2012
LASTDATE=10-25-2012
if [ "x$1" = "x" ]
then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment