Skip to content

GitLab

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

Imported Upstream version 1.10.1

parent e1883146
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 33472 additions and 22148 deletions
AUTHORS
View file @ 85b59ef3
......@@ -23,12 +23,14 @@ Alexander Hofmann
Matthieu Kermagoret
Petya Kohts
Julius Kriukas
Ondra 'Kepi' Kudlík
Joerg Linge
Opsera Ltd
Opsview Team
Michael Luebben
Christoph Maser
Bill McGonigle
Viranch Metha
Sean Millichamp
Chris Moates
Steven D. Morrey
......
Changelog
View file @ 85b59ef3
......@@ -13,6 +13,141 @@ UPGRADE NOTES
- idoutils: ${source}/module/idoutils/config/updates
* package locations may differ!
1.10.1 - 04/11/2013
ENHANCEMENTS
* core: add line number information to config verification error messages #4967 - GB
FIXES
* core/idoutils: revert check_source attribute due to mod_gearman manipulating in-memory checkresult list #4958 - MF
** classic ui/idoutils schema: functionality is kept only for Icinga 2 support
* classic ui: fix context help on mouseover in cmd.cgi (Marc-Christian Petersen) #4971 - MF
* classic ui: correction of colspan value in status.cgi (Bernd Arnold) #4961 - MF
* idoutils: fix pgsql update script #4953 - AW/MF
* idoutils: fix logentry_type being integer, not unsigned long (thx David Mikulksi) #4953 - MF
1.10.0 - 24/10/2013
* idoutils: slahistory table must be removed manually after enable_sla removal #4363
- DROP TABLE icinga_slahistory
* idoutils: timedevents & timedeventqueue tables are deprecated and removed #4482
ENHANCEMENTS
* core: allow exclude (!) to work for regexp matches as well (Matthias Kerk) #3720 - MF
* core: make logging of external command errors more verbose (Anton Lofgren, op5 team) #4402 - MF
* core: avoid unnecessary ctime() calls when debugging is disabled, increase performance (Opsview Team) #4681 - MF
* core: add check source to checkresult/status data #4709 - MF
* core: fix check fails when using environment variables (Sven Nierlein) #2647 - MF
* classic ui: add display filter modification for status.cgi #852 - RB
* classic ui: log errors into cgi log (use_logging=1) #4389 - MF
* classic ui: show custom variables in extended info #4390 - MF
* classic ui: allow to exclude custom variable name/value based on pattern #4390 - MF
* classic ui: add make install-classicui-standalone-conf as seperated config installation #4664 - MF
* classic ui: added performance data to extinfo json output #4728 - RB
* classic ui: show backend version info from status file (1.x or 2.x) #4737 - MF
* classic ui: added option for partial servicegroups #2740 - RB
* classic ui: show check source in extinfo #4709 - MF
* classic ui: added live search #1657 - Kepi/RB
* idoutils: add a table trimming option for 'downtime history' #3989 - MF
* idoutils: allow to disable customvar status updates with dump_customvar_status=0|1 in idomod.cfg #4479 - MF
* idoutils: add check_source to status tables #4709 - MF
* idoutils: add object_id (host, service) to logentries status updates/state changes #4754 - MF
* docs: add samples files for reference #4422 - WN
* docs: update pnp screenshots #4288 - WN
* docs: explain icinga web expander icon #4527 - WN
* docs: add hint to views.xml config file #4690 - WN
* docs: add "show_partial_servicegroups" to cgi.cfg #4730 - WN
* docs: add "dump_customvar_status" to idomod.cfg #4705 - WN
* install: allow enable perfdata config switch via configure #3996 - MF
* install: add --enable-debug=yes/no to set specific compiler flags for gdb, valgrind #4387 - MF
* install: detect /etc/apache2/conf-available on debian with apache2.4 #4509 - MF
* install: add manpages from debian upstream #4055 - MF
* contrib: add vim highlight script for Icinga syntax #4150 - LE
FIXES
* core: multiple idomod modules: only first gets data from registered callback functions #4199 - MF
* core: fix services with no host mappings are not accepted (Viranch Metha) #3961 - MF
* core: remove event_profiling_enabled functionality causing core dumps #2244 - MF
* core: fix init script status exit codes on not running daemon and present pid file #4243 - MF
* core: replace localtime() with reentrant localtime_r() (Opsview Team) #4682 - MF
* core: fix config parser ignores errors on non-existing templates used in multiple templates levels #4702 - MF
* core: add colon to illegal_object_name_chars #4227 - MF
* core: fix umask after reset for cmd pipe #4771 - MF
* core: dump host/service initial states on event loop initialization again #3838 - MF
* core: fix scheduling a downtime should preserve the author's name if provided, not setting "(Icinga Process)" (thx Eric Stanley) #4822 - MF
* core: fix external commands for CHANGE_*_INTERVAL don't accept floating point values #4897 - MF
* classic ui: fixed Generated HTML code partly invalid #3608 - RB/Dakon
* classic ui: fix empty REMOTE_ADDR env var causes sigsegv in cmd.cgi (use_logging=1) #4445 - MF
* classic ui: fixed disapearing scheduled downtime for down hosts in tac.cgi #4260 - RB
* classic ui: Hostgroup/Servicegroup Overview: hosts not sorted alphabetical #4404 - RB
* idoutils: remove enable_sla functionality (deprecated in 1.9) #4363
* idoutils: fix duration integer columns could run out of range (William Epler) #4420 #4939 - MF
* idoutils: remove timedevent support and tables #4482 - MF
* idoutils: fix comments(history) UK misses object_id, not allowing the same comment on host AND service #4544 - MF
* idoutils: fix contact_notificationcommands contain garbage and insert faulty command object ids (thx mhein/mjentsch) #4799 - MF
* idoutils: deprecate clean_{config,realtime}_tables_on_core_startup #4791 - MF
* idoutils: fix ido2db does not clear scheduleddowntime table on instance startup #4808 - MF
* docs: quickstart guides / default changed to compilation of IDOUtils #4203 - WN
* docs: update icinga web troubleshooting for timezones #4554 - WN
* docs: remove enable_sla, timedevent* from idoutils docs #4487 - MF
* docs: add colon to illegal_object_name_chars #4704 - MF
* install: fix initscripts exit-code 1 on start when service is already started (thx Marco Hoyer) #4393 - MF
* install: fix ido2db initscript: kill fails on stop() on debian wheezy #4504 - MF
* icinga.spec: remove commandgrp/user flags for configure (INSTALL_OPTS useless on package build) #4394 - MF
SUPPORT
* fixed gcc warnings about unused vars and unused return values #3984 - RB
* fixed gcc errors in extinfo.c and ido2db.c #4392 - CF
* fix warnings with CLANG compiler #4159 - MF
* added cgi JSON output tests #3203 - RB
* classic ui: javascript cleanup and common.lib added #4324 - RB
CHANGES
* core: multiple neb modules from same bin are copied to tmp with random name (again) #4199
** trick dlopen() to register callbacks for every neb module with different instance_name
** no need to manually copy binaries around
* core: drop event_profiling_enabled functionality #2244
* core: add colon to illegal_object_name_chars #4227
** reason are on-demand macros not working in #4005
* core: broker_{host,service}_data accept check_source parameter #4709
* core: dump_retained_host_service_states_to_neb is now disabled (re-enabled timing loop updates instead) #3838
* classic ui: added custom vars to json_output in extinfo.cgi #4390
* classic ui: add exclude_customvar_name and exclude_customvar_value to cfg.cfg #4390
** patterns to be excluded, comma seperated list
* classic ui: make install-classicui-standalone does not install configs anymore #4664
** use make install-classicui-standalone-conf instead
* idoutils: add max_downtimhistory_age to ido2db.cfg #3989
* idoutils: remove enable_sla functionality (deprecated in 1.9) #4363
* idoutils: remove timedevents functionality, drop tables #4482
* idoutils: unique constraint on comments/commenthistory tables #4544
* idoutils: customvariablestatus table not updated by default (dump_customvar_status=0) #4479
* idoutils: dump_customvar_status=0|1 in idomod.cfg #4479
* idoutils: add 'check_source' column to {host,service}_status tables #4709
* idoutils: clean_{config,realtime}_tables_on_core_startup are now DEPRECATED #4791
* idoutils: add 'object_id' to logentries table (NULL if not provided) #4754
* install: configure --enable-perfdata sets icinga.cfg:process_performance_data #3996
1.9.3 - 07/07/2013
FIXES
......@@ -143,9 +278,6 @@ FIXES
* install: drop unused daemon-init-readhat script (spec uses daemon-init) #3402 - MF
* install: fix broken configure ssl detection for idoutils on ubuntu/debian (Oliver Skibbe) #3413 - MF
* install: fix ido2db initscript uses same chkconfig line as icinga (Dirk Götz) #3490 - MF
* install: fix configure does not detect AIX6/7 properly #3895 - MF
* install: fix STATEDIR creation during make install #3869 - MF
* docs: add missing cmd_mod description in cgi params #3438 - MF
* docs: search_string as cgi GET param works also for status.cgi #3451 - MF
......
Changelog_json
View file @ 85b59ef3
......@@ -2,6 +2,10 @@
Classic-UI JSON Change Log
#######################
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
1.9.0 - only values added, no existing values changed
* added icinga_status to every json response #3172
* added disable_notifications_expire_time to extinfo/processinfo #3482
......
Makefile.in
View file @ 85b59ef3
......@@ -10,6 +10,7 @@ SRC_BASE=@srcdir@/base
SRC_CGI=@srcdir@/cgi
SRC_HTM=@srcdir@/html
SRC_DOCS=@srcdir@/html/docs
SRC_DOCS_IMAGES=@srcdir@/html/docs/images
SRC_MODULE=@srcdir@/module
SRC_INCLUDE=@srcdir@/include
SRC_COMMON=@srcdir@/common
......@@ -20,6 +21,7 @@ SRC_TTAP=@srcdir@/t-tap
SRC_TAP=@srcdir@/tools/libtap
SRC_T=@srcdir@/t
SRC_DOCBOOK=@srcdir@/docbook
SRC_DOCBOOK_IMAGES=@srcdir@/docbook/images
SRC_DOCBOOK_DE=@srcdir@/docbook/de
SRC_DOCBOOK_EN=@srcdir@/docbook/en
......@@ -49,14 +51,22 @@ INSTALL_OPTS=@INSTALL_OPTS@
INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
COMMAND_OPTS=@COMMAND_OPTS@
HTTPD_CONF=@HTTPD_CONF@
APACHE24_DEBIAN=@APACHE24_DEBIAN@
HTTPDCONFFILE=@HTTPDCONFFILE@
HTTPAUTHFILE=@HTTPAUTHFILE@
INIT_DIR=@init_dir@
INIT_OPTS=@INIT_OPTS@
SYSTEMD_UNIT_DIR=@systemd_unit_dir@
SYSTEMD_SYSCONFIG_DIR=@systemd_sysconfig_dir@
CGICFGDIR=$(CGIDIR)
PERLDIR=@PERLDIR@
STATEDIR=@STATEDIR@
###############################
# Debug
###############################
ENABLE_DEBUG=@ENABLE_DEBUG@
###############################
# Modules
###############################
......@@ -81,7 +91,7 @@ MKDIR=/bin/mkdir
###############################
# Global
###############################
ICINGA_VERSION=1.9.3
ICINGA_VERSION=1.10.1
CP=@CP@
......@@ -121,9 +131,10 @@ none:
@printf "\t%-23s - %s\n" "install-dev-docu" "install doxygen development documentation"
@printf "\t%-23s - %s\n" "install-testconfig" "install test config"
@printf "\t%-23s - %s\n" "install-classicui-standalone" "install standalone classic ui"
@printf "\t%-23s - %s\n" "install-classicui-standalone-conf" "install standalone classic ui config"
# FreeBSD make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999)
# Solaris make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999)
###############################
# Compile
......@@ -279,7 +290,7 @@ distclean: clean
cd $(SRC_TAP) && $(MAKE) $@; \
rm -f sample-config/*.cfg sample-config/*.conf sample-config/template-object/*.cfg
rm -f daemon-init pkginfo rc.ido2db
rm -f daemon-init pkginfo rc.ido2db ido2db-systemd icinga-systemd sysconfig-env
rm -f include/dh.h
rm -f Makefile subst p1.pl
rm -f config.log config.status config.cache
......@@ -319,6 +330,7 @@ create-docs: copy-docs-style
#${MAKE} submodule-update-latest
cd ${SRC_DOCBOOK_EN} && make en
cd ${SRC_DOCBOOK_DE} && make de
cp ${SRC_DOCBOOK_IMAGES}/*.png ${SRC_DOCS_IMAGES}/
@echo "updated docs :)"
create-tarball:
......@@ -465,6 +477,10 @@ install-testconfig:
install-webconf:
$(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE)
@if [ x$(APACHE24_DEBIAN) = xyes ]; then \
echo " Debian Apache 2.4 detected. " ;\
echo " Run 'a2enconf icinga' and 'service apache2 reload'" ;\
fi
@echo ""
@echo "*** Icinga/Apache conf file installed ***"
......@@ -472,6 +488,7 @@ install-webconf:
install-webconf-auth:
$(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
$(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)
@echo ""
......@@ -519,6 +536,15 @@ install-daemoninit:
@echo "*** Init script installed ***"
@echo ""
install-systemd:
$(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
$(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(SYSTEMD_SYSCONFIG_DIR)
$(INSTALL) -m 644 $(INIT_OPTS) icinga-systemd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/icinga.service
$(INSTALL) -m 644 $(INIT_OPTS) sysconfig-env $(DESTDIR)$(SYSTEMD_SYSCONFIG_DIR)/icinga
@if [ x$(USE_IDOUTILS) = xyes ]; then \
$(INSTALL) -m 644 $(INIT_OPTS) ido2db-systemd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ido2db.service ;\
fi
install-commandmode:
$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
......@@ -546,8 +572,13 @@ install-eventhandlers:
@echo "*** Sample Eventhandlers installed ***"
@echo ""
install-classicui-standalone-conf: install-cgiconf install-webconf
@echo ""
@echo "*** Icinga Classic UI Standalone configuration installed. ***"
@echo ""
install-classicui-standalone: install-cgis install-html install-cgiconf install-webconf
install-classicui-standalone: install-cgis install-html
# make sure we keep all the needed dirs for data
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR)
......@@ -556,7 +587,9 @@ install-classicui-standalone: install-cgis install-html install-cgiconf install-
$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
@echo ""
@echo "*** Icinga Classic UI Standalone installed ***"
@echo "*** Icinga Classic UI Standalone installed. ***"
@echo ""
@echo "*** Now use 'make install-classicui-standalone-conf to install the configuration ***"
@echo ""
fullinstall:
......@@ -593,13 +626,13 @@ Prototype:
cd sample-config; \
for file in *.cfg; \
do \
$(INSTALL) -m 644 $$file $(PACKDIR)/$(CFGDIR)/$$file.$(VERSION); \
../$(INSTALL) -m 644 $$file $(PACKDIR)/$(CFGDIR)/$$file.$(VERSION); \
done
chmod 640 $(PACKDIR)/$(CFGDIR)/resource.cfg.$(VERSION)
cd sample-config/template-object; \
for file in *.cfg; \
do \
$(INSTALL) -m 644 $$file $(PACKDIR)/$(CFGDIR)/objects/$$file.$(VERSION); \
../../$(INSTALL) -m 644 $$file $(PACKDIR)/$(CFGDIR)/objects/$$file.$(VERSION); \
done
mkdir -p $(PACKDIR)/lib/svc/method/
$(INSTALL) -o root -g bin -m 555 daemon-init $(PACKDIR)/lib/svc/method/icinga
......@@ -614,7 +647,7 @@ Prototype:
do \
if [ -f $$file ] ; then echo i $$file >> Prototype; fi ; \
done
pkgproto $(PACKDIR)=/ | sed -e "s|$(LOGNAME) $(GROUP)$$|root root|" | egrep -v "(s|d) none (/ |/var|/usr|/etc|/lib)" >> solaris/Prototype
pkgproto $(PACKDIR)=/ | egrep -v "(s|d) none (/|/var|/usr|/etc|/lib) " >> solaris/Prototype
pkg/icinga/pkgmap: Prototype
mkdir $(PACKDIR)/$(SOL_PKG_NAME)
......
README.RHEL.idoutils
View file @ 85b59ef3
......@@ -67,7 +67,7 @@ mysql> quit
Import database schema
----------------------
# cd /usr/share/doc/icinga-idoutils/db/mysql
# cd /usr/share/doc/icinga-idoutils-libdbi-mysql-*/db/mysql
# mysql -u root -p icinga < mysql.sql
......@@ -95,7 +95,7 @@ postgres=# \q
Import database schema
----------------------
postgres:~$ cd /usr/share/doc/icinga-idoutils/db/pgsql
postgres:~$ cd /usr/share/doc/icinga-idoutils-libdbi-pgsql-*/db/pgsql
postgres:~$ psql -U icinga -d icinga < pgsql.sql
Setup trusted local icinga user
......@@ -149,7 +149,7 @@ Make sure to stop ido2db before applying the db upgrade!
# service ido2db stop
# cd /usr/share/doc/icinga-idoutils/db/mysql/upgrade/
# cd /usr/share/doc/icinga-idoutils-libdbi-mysql-*/db/mysql/upgrade/
# mysql -u root -p icinga < mysql-upgrade-1.9.0.sql
# service ido2db start
......
README.SUSE 0 → 100644
View file @ 85b59ef3
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
your friend.
Recommended OS Installation
---------------------------
Repositories:
https://build.opensuse.org/package/show?package=icinga&project=server%3Amonitoring
Order of Installation
---------------------
Keeping a certain order of installation will lead you to a working monitoring
setup in a relatively short time. Use yum to pull the proper dependencies
automatically.
1. Install icinga
2. Install the needed nagios-plugins (either Fedora EPEL repository or Repoforge
"yum search nagios-plugins" gives you a list)
3. If you need or want the classic gui, install icinga-gui. If you want plain