Commit Graph

21 Commits

Author SHA1 Message Date
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 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 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
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 37e0309c1d compatido: fix namespace for default config options
refs #3158
2012-09-28 12:33:40 +02:00
Michael Friedrich 550a7959d7 compatido: add config options: socket_{address, port}, instance_name
fixes #3158
2012-09-28 12:13:50 +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 e294afe7b4 compatido: general cleanup 2012-09-27 18:39:13 +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
Michael Friedrich a1e476e155 compatido: drop idoprotoapi.h, put hardcoded values with desc instead 2012-09-22 18:05:43 +02:00
Michael Friedrich 6aa01cacc6 compatido: make status update intervals some constants 2012-09-22 15:58:42 +02:00
Michael Friedrich 9b1c975328 compatido: cleanup, add programstatus cyclic updates 2012-09-15 20:17:37 +02:00
Michael Friedrich c0d3971792 compatido: fix config dump, add closesink, add host/service cyclic status dumps 2012-09-15 19:22:40 +02:00
Michael Friedrich ceb25ab1cc compatido: dump config data periodically, fix api syntax, rework code further 2012-09-15 17:05:42 +02:00
Michael Friedrich 7540cd82a6 WIP: compatido 2012-09-15 12:51:40 +02:00