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
Gunnar Beutner
310edc1074
Re-enabled /MP (parallel builds) on Windows.
2012-07-15 13:15:51 +02:00
Gunnar Beutner
d703f80e62
Enabled pre-compiled headers for Windows builds.
2012-07-15 13:13:19 +02:00
Gunnar Beutner
3e472012d1
Implemented exception support for AsyncTasks.
2012-07-15 10:58:03 +02:00
Gunnar Beutner
fe237e0145
Bugfixes for the ScriptTask feature.
2012-07-14 16:49:21 +02:00
Gunnar Beutner
30aa16d9dc
Implemented script tasks.
2012-07-14 15:59:59 +02:00
Gunnar Beutner
6cbccdc91c
Cleaned up AsyncTask class.
2012-07-14 13:57:50 +02:00
Gunnar Beutner
656825701d
Removed unused code.
2012-07-14 13:33:04 +02:00
Gunnar Beutner
eb2e4ac205
Bugfixes for the Process/AsyncTask classes.
2012-07-14 12:44:37 +02:00
Gunnar Beutner
20dbad0131
Implemented Process class, cleaned up NagiosCheckTask.
2012-07-13 21:00:54 +02:00
Gunnar Beutner
a17c614d96
Fixed global macros.
2012-07-13 11:40:57 +02:00
Gunnar Beutner
1405d1961a
Cleaned up the Variant class.
2012-07-11 20:55:46 +02:00
Gunnar Beutner
a64c99c176
Implemented logging to files and made logging configurable.
2012-07-10 15:14:45 +02:00
Gunnar Beutner
7d859e2e18
Made logging more modular.
2012-07-10 12:21:19 +02:00
Gunnar Beutner
8dc5ba7632
Added missing GPL headers and Visual Studio filters.
2012-07-09 20:32:02 +02:00
Gunnar Beutner
0032e32026
Force compat module to write status.dat/objects.cache right after program start.
2012-07-09 16:22:38 +02:00
Gunnar Beutner
777f39c1ef
Renamed Dictionary::{Set,Get}Property -> Dictionary::{Set,Get}
2012-07-09 16:19:56 +02:00
Gunnar Beutner
8d27f66b83
Moved host reachability/state code into the cib library.
2012-07-09 13:27:59 +02:00
Gunnar Beutner
c8261fa8f2
Auto-detect host parents.
2012-07-09 12:44:31 +02:00
Gunnar Beutner
746d24c9a2
Distinguish between 'dependencies' (reachability) and 'hostchecks' (host status).
2012-07-09 10:28:49 +02:00
Gunnar Beutner
55ca6fd276
Implemented host dependencies
2012-07-09 10:09:53 +02:00
Gunnar Beutner
0f471683cd
Bugfixes for the 'convenience' component.
2012-07-08 11:37:15 +02:00
Gunnar Beutner
4ad1789e33
Implemented extended service template format.
2012-07-08 10:20:54 +02:00
Gunnar Beutner
28f88df37c
Fixed build on Win32.
2012-07-07 13:17:50 +02:00
Gunnar Beutner
de55b5d0d2
Don't instantiate service objects for host templates.
2012-07-06 15:52:13 +02:00
Gunnar Beutner
acf08b7a4e
Bugfix for the convenience component.
2012-07-06 14:36:58 +02:00
Gunnar Beutner
37cf22aaf0
Implemented ConfigItemBuilder class.
2012-07-06 14:33:10 +02:00
Gunnar Beutner
e0bf25e907
Removed ConfigVM class.
2012-07-06 11:35:20 +02:00
Gunnar Beutner
9b7251abb9
Implemented 'services' property for host definitions.
2012-07-06 11:22:38 +02:00
Gunnar Beutner
a11a36154f
Bugfix: Use service alias in service group definition.
2012-07-06 11:21:19 +02:00
Gunnar Beutner
8955f17c41
Undelegate services when their config objects are removed.
2012-07-04 16:50:25 +02:00
Gunnar Beutner
d26d8e7bb7
Re-designed reachability detection.
2012-07-03 15:11:54 +02:00
Gunnar Beutner
f9139a6f97
Bugfixes.
2012-07-03 15:01:09 +02:00
Gunnar Beutner
734ec2f5fb
Implemented service dependencies.
2012-07-03 14:18:46 +02:00
Gunnar Beutner
d577406a66
Implemented ServiceStatusMessage class.
2012-07-03 10:41:25 +02:00
Gunnar Beutner
5dc74ecf0e
Build fixes for *NIX.
2012-07-03 10:00:44 +02:00
Gunnar Beutner
a7be3a40c9
Ignore remote object updates when local object is newer.
2012-07-02 19:25:33 +02:00
Gunnar Beutner
512f46907e
Compilation fixes for Windows.
2012-07-02 19:09:45 +02:00
Gunnar Beutner
40350bfce8
Make checkers configurable.
2012-07-02 16:19:43 +02:00
Gunnar Beutner
45fef3573c
Disable freshness stuff in status.dat
2012-07-02 15:49:36 +02:00
Gunnar Beutner
1b421d0cc0
Bugfixes.
2012-07-02 15:48:49 +02:00
Gunnar Beutner
a1423371d0
Moved configrpc code into the cibsync module.
2012-07-02 15:08:15 +02:00
Gunnar Beutner
1db53b84e6
Bugfixes.
2012-07-02 14:43:51 +02:00
Gunnar Beutner
5e4a3eb181
Don't allow __local property for replicated objects.
2012-07-02 12:57:53 +02:00
Gunnar Beutner
f2420fb17a
Moved CIB stuff into a separate library and loadable component.
2012-07-02 12:34:54 +02:00
Gunnar Beutner
5649f3efb2
Renamed m_*Endpoint to m_Endpoint.
2012-07-02 11:07:54 +02:00
Gunnar Beutner
7d5ab3d890
Implemented support for the 'include' config directive.
2012-07-02 10:29:32 +02:00
Gunnar Beutner
334c247655
Win32 bugfixes.
2012-07-01 13:21:49 +02:00
Gunnar Beutner
338e2bcbb1
Renamed DictionaryIterator to Dictionary::Iterator.
2012-06-30 15:22:51 +02:00
Gunnar Beutner
b576bb5ecc
Implemented host and service groups.
2012-06-30 13:39:55 +02:00
Gunnar Beutner
80bec5fcd4
Performance fixes for the compat module.
...
Split plugin output/perfdata.
2012-06-29 14:14:51 +02:00
Gunnar Beutner
3ec746bd2f
Moved task stats to the CIB.
...
Refactored CheckResult class into a message-based class.
2012-06-29 12:18:50 +02:00
Gunnar Beutner
b54ebc56dc
Fixed configrpc module.
2012-06-29 11:59:53 +02:00
Gunnar Beutner
2272e410c2
Implement task statistics.
2012-06-28 15:43:49 +02:00
Gunnar Beutner
ab08736338
Bugfixes and config conversion script.
2012-06-28 14:24:41 +02:00
Gunnar Beutner
ccc5f0c61d
Fixed execution time calculation.
2012-06-27 23:57:46 +02:00
Gunnar Beutner
d11da74931
Fixed latency calculation.
2012-06-27 23:38:50 +02:00
Gunnar Beutner
5f0bec3936
Implemented compat module (WIP).
2012-06-27 18:43:34 +02:00
Gunnar Beutner
6f9342a261
Re-delegate services after config changes.
2012-06-27 10:59:08 +02:00
Gunnar Beutner
22f301073e
Implemented soft/hard states.
2012-06-25 15:42:46 +02:00
Gunnar Beutner
593e329248
Added serialization support for check results.
...
Bugfixes.
2012-06-25 14:13:24 +02:00
Gunnar Beutner
833ede8b3a
Get rid off threadpool for nagios checks.
2012-06-24 16:30:16 +02:00
Gunnar Beutner
34d26d424f
Made sockets multi-threaded.
2012-06-24 05:27:01 +02:00
Gunnar Beutner
d1f4d9b829
Performance improvements.
2012-06-22 23:19:10 +02:00
Gunnar Beutner
cae84e9827
Bugfixes.
2012-06-22 13:40:09 +02:00
Gunnar Beutner
69d3e71b03
Bugfix: use service identity rather than just their names.
2012-06-22 12:22:36 +02:00
Gunnar Beutner
e294cf6686
Bugfixes.
2012-06-22 12:05:25 +02:00
Gunnar Beutner
f585dc1b29
Re-assign services from dead endoints.
2012-06-22 08:30:36 +02:00
Gunnar Beutner
e8a44ad2fb
Bugfixes, additional output for delegations.
2012-06-22 07:24:50 +02:00
Gunnar Beutner
1d7a3f6c75
Fixed infinite loop.
2012-06-21 19:52:21 +02:00
Gunnar Beutner
7ed19cd533
Bugfixes.
2012-06-21 17:39:16 +02:00
Gunnar Beutner
d4fb11d427
Even more bugfixes.
2012-06-21 16:16:53 +02:00
Gunnar Beutner
77ce61d548
Bugfixes.
2012-06-21 15:01:54 +02:00
Gunnar Beutner
abd34bdaa0
More bugfixes.
2012-06-21 13:33:01 +02:00
Gunnar Beutner
628c782837
Bugfixes.
2012-06-21 13:12:16 +02:00
Gunnar Beutner
bbbaca130e
Bugfixes.
2012-06-21 13:08:26 +02:00
Gunnar Beutner
ddeda8c512
Delegation bugfixes.
2012-06-21 12:52:13 +02:00