Michael Friedrich
37e0309c1d
compatido: fix namespace for default config options
...
refs #3158
2012-09-28 12:33:40 +02:00
Michael Friedrich
71cbfe8fea
Merge branch 'mfriedrich/compatido'
2012-09-28 12:15:23 +02:00
Gunnar Beutner
f305610ed3
Added README file for the contrib dir.
...
Fixes #3197
2012-09-28 12:16:19 +02:00
Michael Friedrich
550a7959d7
compatido: add config options: socket_{address, port}, instance_name
...
fixes #3158
2012-09-28 12:13:50 +02:00
Gunnar Beutner
7db1591393
Fixed Windows build dependencies for compatido.
2012-09-28 12:09:00 +02:00
Michael Friedrich
eaf74cad8f
Merge branch 'master' of git.icinga.org:icinga2
2012-09-28 10:37:58 +02:00
Gunnar Beutner
e55aa712b5
Made IComponent::GetConfig() usable in IComponent::Start().
...
Fixes #3200
2012-09-28 10:40:12 +02:00
Michael Friedrich
1a78a0b5e1
compatido: remove CompatIdoComponent::GetName()
...
fixes #3205
2012-09-28 10:35:42 +02:00
Michael Friedrich
faf741e3b9
compatido: replace gettimeofday with Utility::GetTime()
...
* fixes build on windows
* only timestamp (4) of idomod requires seconds.useconds as output,
which needs proper formatting within a stringstream -
std::precision(17) is required.
* all other timestamps are just unix seconds, so we require static casts
to integer here
2012-09-27 22:12:59 +02:00
Michael Friedrich
edc2d74a70
compatido: fix for Win32 and Win64 builds
2012-09-27 19:57:36 +02:00
Michael Friedrich
213fa632e0
compatido: add a note about ourselves to the config
2012-09-27 18:54:09 +02:00
Michael Friedrich
e294afe7b4
compatido: general cleanup
2012-09-27 18:39:13 +02:00
Michael Friedrich
ea9309096c
Merge branch 'master' into mfriedrich/compatido
2012-09-27 15:10:04 +02:00
Gunnar Beutner
bd37c357d1
Build fix for Windows.
2012-09-27 10:14:45 +02:00
Gunnar Beutner
5ff640fd14
Fixed Utility::Sleep on Windows.
2012-09-27 10:05:54 +02:00
Gunnar Beutner
0cb232f494
Handle some exceptions that previously caused crashes.
2012-09-27 09:58:16 +02:00
Gunnar Beutner
c5479057f7
Make exception messages more verbose.
2012-09-27 09:38:28 +02:00
Gunnar Beutner
74a3bca0f6
Fixed crash in Utility::Daemonize().
...
Fixes #3194
2012-09-27 08:21:07 +02:00
Gunnar Beutner
5157853af9
Add right lib dir to the search path.
2012-09-26 12:08:07 +02:00
Gunnar Beutner
d6874052c6
Removed example certificates.
...
Fixes #3180
2012-09-26 10:49:40 +02:00
Gunnar Beutner
4d7d40bce0
Unset ax_lib when we're done (as this would cause the next AC_BOOST_* call to fail).
2012-09-26 10:29:55 +02:00
Gunnar Beutner
45bfe2762e
Fixed detection of the Boost Unit Test Framework.
2012-09-26 10:20:22 +02:00
Gunnar Beutner
ca5593eb66
Install icinga2 binary in $PREFIX/sbin rather than $PREFIX/bin.
2012-09-26 09:56:28 +02:00
Gunnar Beutner
719f7b58be
Use AC_PROG_LEX instead of AM_PROG_LEX.
2012-09-26 09:54:11 +02:00
Gunnar Beutner
e8fb5c735e
Updated autogen.sh to detect lex/yacc.
2012-09-26 09:51:40 +02:00
Gunnar Beutner
426ff0b706
Added missing GPL header in scripttask.cpp.
2012-09-25 15:46:24 +02:00
Gunnar Beutner
2f0f1dcd64
Removed win32.cpp / unix.cpp files as they were no longer needed.
2012-09-25 15:45:19 +02:00
Gunnar Beutner
edf812b6b5
Removed ::Sleep and implemented Utility::Sleep.
2012-09-25 15:41:43 +02:00
Gunnar Beutner
e1fc41e735
Sleep for 5 seconds rather than 5 milliseconds.
2012-09-25 15:35:46 +02:00
Gunnar Beutner
f8aa5f67a2
Fixed grammar mistakes.
2012-09-25 15:33:51 +02:00
Gunnar Beutner
8114cb7f1c
Rephrased the description for check_command.
2012-09-25 15:31:19 +02:00
Michael Friedrich
e9f8f6c768
Merge branch 'master' into mfriedrich/compatido
2012-09-25 15:29:49 +02:00
Michael Friedrich
d0ed2a4840
Merge branch 'master' into mfriedrich/compatido
2012-09-25 15:27:14 +02:00
Gunnar Beutner
0d77919057
Removed references to Nagios from the example config.
2012-09-25 15:26:06 +02:00
Gunnar Beutner
980913d980
Properly deal with time changes (2nd attempt).
2012-09-25 15:24:14 +02:00
Michael Friedrich
a96a77c87c
compatidio: add a comment sample component to icinga2.conf.dist
2012-09-25 15:21:33 +02:00
Michael Friedrich
c726adb550
Merge branch 'master' into mfriedrich/compatido
2012-09-25 15:18:15 +02:00
Gunnar Beutner
c81fd071e6
Detect local time changes.
2012-09-25 14:03:41 +02:00
Gunnar Beutner
8c491cb545
Added documentation for the example config file.
2012-09-25 13:46:28 +02:00
Gunnar Beutner
b13e14d221
Changed header for the status.dat file.
2012-09-25 11:38:40 +02:00
Gunnar Beutner
a4fa8950c4
Implemented lexer rules for time durations.
...
Fixes #3073
2012-09-25 11:17:04 +02:00
Michael Friedrich
8886155fb0
Merge branch 'master' into mfriedrich/compatido
2012-09-25 11:07:17 +02:00
Gunnar Beutner
57ed16b4f1
Documentation: renamed native::NagiosCheck to native::PluginCheck
2012-09-25 09:42:57 +02:00
Gunnar Beutner
f53f8e64fd
Renamed NagiosCheckTask to PluginCheckTask.
...
Fixes #3146
2012-09-25 09:08:50 +02:00
Gunnar Beutner
345ebe8061
Changed timestamp format (again).
...
Fixes #3153
2012-09-25 09:02:28 +02:00
Michael Friedrich
6932258b56
compatido: apply x64 fixes, and renaming stuff to included vs files - tests required
2012-09-24 18:01:42 +02:00
Michael Friedrich
f5d2924452
Merge branch 'master' into mfriedrich/compatido
...
Conflicts:
components/Makefile.am
configure.ac
icinga2.sln
2012-09-24 17:48:46 +02:00
Michael Friedrich
35d3bbd50e
compatido: dump RETAINED config types only, quickfix, now icinga web shows some stuff
2012-09-24 17:41:05 +02:00
Gunnar Beutner
e83592582a
Changed shutdown message.
...
Fixes #3160
2012-09-24 08:36:39 +02:00
Michael Friedrich
81c3f07f13
compatido: add commented component example to icinga-standalone.conf
2012-09-22 18:17:37 +02:00