Commit Graph

331 Commits

Author SHA1 Message Date
Gunnar Beutner 0785a082e9 Minor cleanups. 2012-11-23 11:04:08 +01:00
Gunnar Beutner 1bf945f367 Fixed indentation. 2012-11-22 13:16:38 +01:00
Gunnar Beutner 321d66023f Refactored the socket classes. 2012-11-22 12:04:32 +01:00
Gunnar Beutner e57bf22d82 Fix: Renaming temp files didn't work on Windows.
Fixes #3216
2012-10-17 11:35:06 +02:00
Gunnar Beutner 677d8e00bf Changed log level for debug message. 2012-10-15 18:25:56 +02:00
Gunnar Beutner 3fe13b3ad3 Fixed grammar mistake. 2012-10-15 08:54:08 +02:00
Gunnar Beutner ac11c84813 Only log check timer when we actually created any tasks. 2012-10-15 08:52:31 +02:00
Gunnar Beutner b740628042 Bugfix: Delegation didn't work for local-only instances. 2012-10-12 15:45:33 +02:00
Gunnar Beutner 26da51e071 Bugfix: The delegation component should use only non-local checker endpoints. 2012-10-12 10:33:11 +02:00
Gunnar Beutner a5046ae7bf Bugfix: Replicated objects weren't removed on peer instances when they were removed on the source instance. 2012-10-12 09:58:34 +02:00
Michael Friedrich 6db4f2c3bc Compat IDO: move some log msg to debug level 2012-10-09 00:59:43 +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 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 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 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 54ca22be04 compatido: now REALLY make those default config options static
refs #3158
2012-09-28 13:14:03 +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
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 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 c726adb550 Merge branch 'master' into mfriedrich/compatido 2012-09-25 15:18:15 +02:00
Gunnar Beutner b13e14d221 Changed header for the status.dat file. 2012-09-25 11:38:40 +02:00
Michael Friedrich 8886155fb0 Merge branch 'master' into mfriedrich/compatido 2012-09-25 11:07:17 +02:00
Gunnar Beutner f53f8e64fd Renamed NagiosCheckTask to PluginCheckTask.
Fixes #3146
2012-09-25 09:08:50 +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
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 454adc5a90 Merge branch 'master' into compatido 2012-09-22 15:07:43 +02:00
Gunnar Beutner b9b009b6da Build fix for Windows. 2012-09-21 16:28:14 +02:00
Gunnar Beutner bb8935fe9b Added Win64 build support. 2012-09-21 16:15:36 +02:00
Gunnar Beutner 5921337b46 Merged convenience component into libicinga. 2012-09-21 13:49:14 +02:00
Gunnar Beutner 97829fbfcd Cleaned up the code a bit. 2012-09-21 09:43:06 +02:00
Gunnar Beutner fa7879776c Report PID in the status.dat file. 2012-09-19 14:10:34 +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 340a0583bf compatido: cleanup idosocket build, works now with conninfo db hello handshake, still TODO 2012-09-15 14:59:55 +02:00
Michael Friedrich 2c9ac33a32 compatido: fix linux builds from previous renames 2012-09-15 13:38:39 +02:00
Michael Friedrich 7540cd82a6 WIP: compatido 2012-09-15 12:51:40 +02:00
Gunnar Beutner 7e0fa1ce13 Renamed component: cibsync -> replication 2012-09-14 10:52:57 +02:00
Gunnar Beutner 8e4bdf3872 Build fixes for Windows. 2012-09-10 14:35:01 +02:00
Gunnar Beutner 037e3d913b Refactored the libraries. 2012-09-10 14:07:32 +02:00
Gunnar Beutner c7b29c6b46 Build fix for Windows. 2012-09-07 11:46:38 +02:00
Gunnar Beutner 9bc93ce4a9 Renamed 'doc' to 'docs'.
Moved Doxygen files to docs/.
Removed cJSON directory.
Moved libraries into lib/.
Renamed 'config' to 'm4'.
Renamed 'dyn' library to 'config'.
2012-09-07 10:27:31 +02:00
Gunnar Beutner 8dcb8bdd2e Fixed notification for missed checks. 2012-09-04 10:45:00 +02:00
Gunnar Beutner 4f39e10a05 Log missed checks. 2012-09-03 12:36:35 +02:00
Gunnar Beutner dc6246642f Implemented replication for Endpoint objects. 2012-09-03 10:29:02 +02:00
Gunnar Beutner 8b87e30197 Removed roles/publications. 2012-08-14 10:53:04 +02:00
Gunnar Beutner 11fb9c541e Bugfix: Object source wasn't properly set. 2012-08-07 12:47:18 +02:00
Gunnar Beutner 6982656f2d Ignore service reachability for status.dat output. 2012-08-06 14:14:28 +02:00
Gunnar Beutner c0d02291a2 Removed incorrect assert(). 2012-08-06 10:01:45 +02:00
Gunnar Beutner d8be3f088f Bugfix for restoring objects from the retention.dat file. 2012-08-04 14:13:04 +02:00
Gunnar Beutner 1de42d08f2 Use boost::multi_index instead of a priority queue. 2012-08-04 13:49:25 +02:00
Gunnar Beutner 85d912feb5 Fixed scheduling bug. 2012-08-04 10:45:21 +02:00
Gunnar Beutner b9ee3b26eb Fixed remote replication of non-config attributes. 2012-08-04 10:23:18 +02:00
Gunnar Beutner d4c6824056 Fixed compiler warnings. 2012-08-04 09:58:31 +02:00
Gunnar Beutner 22dabfc60d Updated the checker and delegation components to use replication for the "checker" property. 2012-08-03 23:03:58 +02:00
Gunnar Beutner 5641e521b0 Build fixes for Windows. 2012-08-03 18:17:47 +02:00
Gunnar Beutner e795336611 Fixed incorrect object type. 2012-08-03 15:51:42 +02:00
Gunnar Beutner bb7e1e639d Code cleanup. 2012-08-03 15:35:27 +02:00
Gunnar Beutner 88776a4be8 Fixed task statistics. 2012-08-03 14:07:25 +02:00
Gunnar Beutner d789cee443 Build fixes and code cleanup. 2012-08-03 13:19:55 +02:00
Gunnar Beutner ea77ebe6da More bugfixes. 2012-08-02 12:21:44 +02:00
Gunnar Beutner 99b153e482 Bugfixes. 2012-08-02 12:12:59 +02:00
Gunnar Beutner a38379c56d Implemented support for replicating object tags [WIP - broken]. 2012-08-02 11:45:50 +02:00
Gunnar Beutner 8c185a38b0 Renamed ConfigObject to DynamicObject. 2012-07-30 10:17:29 +02:00
Gunnar Beutner 24a5a10e00 Refactored ConfigObject adapter classes. 2012-07-27 19:56:57 +02:00
Gunnar Beutner fcb4904446 Merged configfile component into the icinga library. 2012-07-26 12:41:57 +02:00
Gunnar Beutner a1a3cb7d0f Moved OnCheckResultReceived signal to the Service class. 2012-07-26 12:28:29 +02:00
Gunnar Beutner 1eb25ad4e9 Keep track of time using fractions of seconds. 2012-07-25 12:59:17 +02:00
Gunnar Beutner d1e7c15178 Removed delegation::ServiceStatus message (obsoleted by the domain concept) 2012-07-25 09:03:02 +02:00
Gunnar Beutner 0423f42d03 Cleaned up status calculation code. 2012-07-24 15:38:30 +02:00
Gunnar Beutner bcb1b23d9f Handle all exception types rather than just the ones inheriting from std::exception. 2012-07-23 08:57:19 +02:00
Gunnar Beutner 7d1ec0332d Removed CIB::RequireInformation. 2012-07-20 14:30:35 +02:00
Gunnar Beutner 24494a78bc Moved calculation of next check timestamp into the cibsync component. 2012-07-18 11:52:22 +02:00
Gunnar Beutner b162ca9bfb Added TcpClient::OnConnected event. 2012-07-18 11:15:39 +02:00
Gunnar Beutner 0ad6026f29 Cleaned up socket exception handling. 2012-07-17 20:41:06 +02:00
Gunnar Beutner a224c20a30 Revert 78215843 as it requires Boost version 1.43. 2012-07-17 19:19:03 +02:00
Gunnar Beutner f6c95efa45 Try to more uniformly distribute checks in their check interval. 2012-07-17 19:10:14 +02:00
Gunnar Beutner 6707bfeb26 Updated delegation/checker to use cibsync rather than sending service objects. 2012-07-17 12:57:21 +02:00
Gunnar Beutner 78215843cf Use Boost.Range instead of tie(). 2012-07-17 10:29:30 +02:00
Gunnar Beutner bc1ded140f Build fixes for *NIX. 2012-07-17 00:01:23 +02:00
Gunnar Beutner e2bf3bd56b Use BOOST_FOREACH for most for loops. 2012-07-16 22:00:50 +02:00
Gunnar Beutner 9c7c039365 Implemented native::NullCheck check method. 2012-07-16 15:10:42 +02:00
Gunnar Beutner 7270fb160c Renamed "hooks" to "methods". 2012-07-16 08:19:51 +02:00
Gunnar Beutner fd38babd98 More bugfixes for AsyncTask. 2012-07-15 17:29:59 +02:00