Commit Graph

970 Commits

Author SHA1 Message Date
Michael Friedrich 6db4f2c3bc Compat IDO: move some log msg to debug level 2012-10-09 00:59:43 +02:00
Michael Friedrich 9b9d4903ee Config: add a demo service example (since #3250 is now fixed) 2012-10-09 00:27:35 +02:00
Michael Friedrich 0f19f24843 Config: add Logger with debug severity by default 2012-10-09 00:24:58 +02:00
Gunnar Beutner ab5f57ea17 Fixed double-free in libpopen_noshell.
Fixes #3250.
2012-10-08 13:02:33 +02:00
Michael Friedrich c63a9da326 Merge branch 'master' of git.icinga.org:icinga2
Conflicts:
	components/compatido/compatidocomponent.cpp
2012-10-08 10:33:25 +02:00
Michael Friedrich f9c4543112 Compat IDO: remove more hardcoded values, prepare setting the socket 2012-10-08 10:26:07 +02:00
Gunnar Beutner 4f450a464c Wrapped VERSION in #ifndef and moved it to the top of the file. 2012-10-08 10:14:43 +02:00
Michael Friedrich ad1207166c Compat IDO: hardcode program version for now, fixes windoze 2012-10-08 09:58:28 +02:00
Michael Friedrich 836bc067cd Config: add more example config for an icinga2 localhost (fixes #3256) 2012-10-08 00:21:56 +02:00
Michael Friedrich 208cceaf27 Compat IDO: serialize dumps (refs #3257)
- dump config once, protect it from status dumps
- send process start to ido2db to allow deletion of inactive objects
2012-10-07 23:45:55 +02:00
Michael Friedrich 19faa2a755 Compat IDO: update documentation for reconnect_interval (refs #3207) 2012-10-07 22:24:54 +02:00
Michael Friedrich 87ae4f4642 Compat IDO: make sending of data serialized (refs #3257), always send hello 2012-10-07 22:20:54 +02:00
Michael Friedrich d42dd6e03f Compat IDO: add reconnect to ido2db, if not connected (refs #3207) 2012-10-07 22:02:44 +02:00
Michael Friedrich 7c45e460e6 CompatIDO: cleanup, add more default values with their correct type 2012-10-05 22:28:06 +02:00
Gunnar Beutner 2a8e8468e7 Revert "Fixed build problems on FreeBSD."
This reverts commit a6f572071d.
2012-10-05 13:17:58 +02:00
Michael Friedrich f24376fbfd Contrib: remove the broken config conversion script for now 2012-10-05 12:47:17 +02:00
Gunnar Beutner a6f572071d Fixed build problems on FreeBSD.
Fixes #3247
2012-10-05 11:34:01 +02:00
Gunnar Beutner 9df719f8b6 Merge branch 'master' of git.icinga.org:icinga2 2012-10-05 11:30:43 +02:00
Michael Friedrich b9342442e7 Configuration: add windows based sample config file #3233
the first sample, with files in the same dir where icinga-app.exe will
be started. furthermore, this requires winping.exe to be put into
C:\Plugins (from https://www.itefix.no/i2/check_winping)

fixes #3233
2012-10-04 16:00:36 +02:00
Gunnar Beutner 01b8141c30 configure.ac: Use $PACKAGE instead of $PACKAGE_NAME. 2012-10-04 08:55:05 +02:00
Gunnar Beutner 1ab11564e3 Moved GPLHeader file to the contrib dir. 2012-10-04 08:54:47 +02:00
Michael Friedrich 1b0a482742 CompatIDO: implement first draft of {en,dis}able objects supported in ido2db 1.8 refs #3157 2012-10-03 01:25:44 +02:00
Michael Friedrich 3c36a3c0fb do not include created runtime dirs in make dist* 2012-10-02 17:57:28 +02:00
Michael Friedrich 98fe75fd45 Documentation: add modeline for vim syntax highlighting to icinga2-config.txt 2012-10-02 17:47:13 +02:00
Michael Friedrich 3d04e31f27 Documentation: remove icinga2-config.odt 2012-10-02 15:36:59 +02:00
Michael Friedrich bb50720843 Configuration: add _path suffix to IcingaApplication attributes "ca" and "cert"
refs #3222
2012-10-02 15:04:17 +02:00
Michael Friedrich c2bad406ef Configuration: use underscore in attributes, document all using new locations
... from #3228

fixes #3222
2012-10-02 14:44:57 +02:00
Michael Friedrich 4609f7d980 install: create all dirs needed by automake install
refs #3228
2012-10-02 14:44:22 +02:00
Michael Friedrich 4b768c2680 Compat: default localstatedir mkdir will be $prefix/var/icinga2 2012-10-02 13:23:35 +02:00
Michael Friedrich c271cc9401 s/component/Component/ in docs 2012-10-02 11:27:14 +02:00
Michael Friedrich 516a6cf6d4 Configuration: update type components, add compat(ido) examples and attributes
refs #3158
refs #2796
2012-10-02 11:23:11 +02:00
Gunnar Beutner f505934bdb Fixed detection of flex/bison on FreeBSD. 2012-10-02 11:17:08 +02:00
Gunnar Beutner 115489a531 Fixed loading components when using a custom --libdir. 2012-10-02 09:26:17 +02:00
Gunnar Beutner e6254baea3 Fixed linking against compatido when using --disable-shared. 2012-09-28 15:30:42 +02:00
Michael Friedrich edb9a47c97 compat: add config options: {status,objects}path
requires automake target for localstatedir as default, if not set.

refs #2796
2012-09-28 14:26:01 +02:00
Michael Friedrich b48ff35348 Merge branch 'master' of git.icinga.org:icinga2 2012-09-28 13:15:33 +02:00
Gunnar Beutner d24bc71418 Merge branch 'master' of git.icinga.org:icinga2 2012-09-28 13:17:40 +02:00
Gunnar Beutner 47fa56a805 Added methods for retrieving the installation prefix and local state dir. 2012-09-28 13:16:08 +02:00
Michael Friedrich 54ca22be04 compatido: now REALLY make those default config options static
refs #3158
2012-09-28 13:14:03 +02:00
Gunnar Beutner 23cd92803b Removed obsolete config files. 2012-09-28 12:37:18 +02:00
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