6 Feb
2014
6 Feb
'14
5:46 p.m.
Module: check_mk
Branch: master
Commit: bc2a9b336c675cfe2f82d6d32574a89cededb2e7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc2a9b336c675c…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Feb 6 16:02:53 2014 +0100
nagios4 livestatus support
It is now possible to compile livestatus for nagios4.
The <tt>setup.sh</tt> script from the check_mk tarball now autodetects
the nagios version and proposes it during the setup process.<br>
You can also choose the version manually (3 or 4).<br>
Depending on the chosen version livestatus includes the nagios headers from 3.2.0 or
4.0.2.<br><br>
If you just want to compile livestatus you can set the nagios version via an option in the
configure script.<br>
<tt>configure --with-nagios4<tt>
---
.werks/276 | 15 +
ChangeLog | 1 +
Makefile | 4 +-
agents/windows/check_mk_agent.exe | Bin 160768 -> 160768 bytes
agents/windows/crash.exe | Bin 20024 -> 20024 bytes
agents/windows/install_agent.exe | Bin 151693 -> 151690 bytes
agents/windows/nowin.exe | Bin 22511 -> 22511 bytes
livestatus/configure.ac | 7 +
livestatus/nagios4/README | 1 +
livestatus/nagios4/bitmap.h | 156 ++++++
livestatus/nagios4/broker.h | 213 +++++++
livestatus/nagios4/cgiauth.h | 70 +++
livestatus/nagios4/cgiutils.h | 479 ++++++++++++++++
livestatus/nagios4/comments.h | 118 ++++
livestatus/nagios4/common.h | 531 ++++++++++++++++++
livestatus/nagios4/config.h | 344 ++++++++++++
livestatus/nagios4/defaults.h | 94 ++++
livestatus/nagios4/dkhash.h | 134 +++++
livestatus/nagios4/downtime.h | 112 ++++
livestatus/nagios4/fanout.h | 73 +++
livestatus/nagios4/iobroker.h | 175 ++++++
livestatus/nagios4/iocache.h | 181 ++++++
livestatus/nagios4/kvvec.h | 207 +++++++
livestatus/nagios4/libnagios.h | 25 +
livestatus/nagios4/lnag-utils.h | 111 ++++
livestatus/nagios4/locations.h | 41 ++
livestatus/nagios4/logging.h | 90 +++
livestatus/nagios4/macros.h | 339 ++++++++++++
livestatus/nagios4/nagios.h | 756 +++++++++++++++++++++++++
livestatus/nagios4/nebcallbacks.h | 70 +++
livestatus/nagios4/neberrors.h | 67 +++
livestatus/nagios4/nebmods.h | 62 +++
livestatus/nagios4/nebmodules.h | 94 ++++
livestatus/nagios4/nebstructs.h | 525 ++++++++++++++++++
livestatus/nagios4/nsock.h | 76 +++
livestatus/nagios4/nspath.h | 91 +++
livestatus/nagios4/nsutils.h | 111 ++++
livestatus/nagios4/objects.h | 853 +++++++++++++++++++++++++++++
livestatus/nagios4/perfdata.h | 38 ++
livestatus/nagios4/pqueue.h | 185 +++++++
livestatus/nagios4/runcmd.h | 96 ++++
livestatus/nagios4/shared.h | 55 ++
livestatus/nagios4/skiplist.h | 162 ++++++
livestatus/nagios4/snprintf.h | 7 +
livestatus/nagios4/squeue.h | 161 ++++++
livestatus/nagios4/sretention.h | 31 ++
livestatus/nagios4/statusdata.h | 199 +++++++
livestatus/nagios4/worker.h | 132 +++++
livestatus/src/DownCommColumn.cc | 4 +-
livestatus/src/DownCommColumn.h | 1 +
livestatus/src/Makefile.am | 2 +-
livestatus/src/OffsetStringMacroColumn.cc | 10 +
livestatus/src/Store.cc | 4 +
livestatus/src/TableHosts.cc | 24 +
livestatus/src/TableServices.cc | 17 +
livestatus/src/TableStatus.cc | 24 +
livestatus/src/TimeperiodsCache.cc | 3 +
livestatus/src/logger.h | 3 +
livestatus/src/module.c | 4 +
livestatus/src/nagios.h | 29 +-
scripts/autodetect.py | 7 +
scripts/setup.sh | 14 +-
62 files changed, 7423 insertions(+), 15 deletions(-)
Diff:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bc2a9b336c…