tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,896 Commits 347 Branches 117 Tags 188 MiB
Commit Graph

1896 Commits

Author SHA1 Message Date
Michael Friedrich a5fe44b81f Config Conversion: Treat command arg macros directly as object macros 
- if detected, they will be replaced with their real name on the command
  line (instead of $ARGn$)
- if macro is resolvable, its value will be added to the macro
  dictionary
- if macro is not resolvable, it will be skipped and left for the core
  to resolve the macro on runtime.

caveat: getting host/service attributes requires lookups from the object
into the template tree, as well as host macros on services a search on
the host object itsself.

note: macro resolver is rudimentary implemented. there's space for more
detailed if-macro-name-is-then-return-attribute-abc. main problem are
the missing underscores in macro names, but not in attributes (what the
...?).

fixes #4700
 2013-09-12 20:13:28 +02:00
Michael Friedrich f1e1a716d3 Config Conversion: Update sample icinga2 config. 
refs #4701
 2013-09-12 18:42:01 +02:00
Michael Friedrich f91c64098b Config Conversion: Fix import removing inline comments after ';' and '#'. 
fixes #4499
 2013-09-12 18:41:18 +02:00
Michael Friedrich c9497367d2 Config Conversion: Make ADMIN/USER macros global again (in resource.conf) 
refs #4701
 2013-09-12 18:41:18 +02:00
Michael Friedrich 2e4a37b297 Config Conversion: s/user_macros/global_macros/g 2013-09-12 18:41:18 +02:00
Michael Friedrich c8b9fce0bc Config Conversion: introduce resource.conf with global macros 
refs #4701
 2013-09-12 18:41:18 +02:00
Gunnar Beutner 2b9568fbd5 cluster: Fix cleaning up old log files. 2013-09-12 18:08:06 +02:00
Gunnar Beutner b887b558bc Ignore check results if we have a local result that's newer. 2013-09-12 17:39:29 +02:00
Gunnar Beutner cbc53db5c1 checker: Fix incorrect wait time when first service is non-authoritative. 2013-09-12 16:36:18 +02:00
Gunnar Beutner eb7d9e96f8 Make sure the next check timestamp can't be in the past. 2013-09-12 15:47:45 +02:00
Gunnar Beutner 6698d09a72 cluster: More delegation bugfixes. 2013-09-12 15:38:01 +02:00
Gunnar Beutner 7bc99d3860 checker: Fix waiting for non-authoritative checks. 2013-09-12 15:31:07 +02:00
Gunnar Beutner 5cdf08c371 Fix crash in ClusterComponent::CheckAuthorityHandler. 2013-09-12 15:22:21 +02:00
Gunnar Beutner 91aad7c997 checker: Make sure non-authoritative cluster instances don't reschedule checks. 2013-09-12 15:20:01 +02:00
Gunnar Beutner b510545d4d Fix delegation bug. 2013-09-12 15:12:19 +02:00
Gunnar Beutner 4e54a96880 Add missing lock. 2013-09-12 15:07:37 +02:00
Gunnar Beutner 0c64ea7f88 Remove obsolete code. 2013-09-12 14:12:36 +02:00
Gunnar Beutner 102127fd5e config: Copy authority information into dependant services. 2013-09-12 13:08:37 +02:00
Gunnar Beutner e26e018df8 ido: Set m_Connected to false in Stop(). 2013-09-12 11:37:58 +02:00
Gunnar Beutner f418db79d7 Make sure the check latency can't be negative. 2013-09-12 11:36:31 +02:00
Gunnar Beutner eb20b7e33e Update test check output. 2013-09-12 10:36:50 +02:00
Gunnar Beutner 50d506dfd7 Add check output for NullCheck. 2013-09-12 10:31:41 +02:00
Michael Friedrich 66d00d25bc ido: Fix timeperioddbobject lock. 2013-09-12 10:30:28 +02:00
Gunnar Beutner 5ce38cbee6 cluster: Update endpoints' features for heartbeat messages. 2013-09-12 10:22:03 +02:00
Gunnar Beutner 3b1b9d1274 Refactor authority checks a bit. 2013-09-12 10:17:14 +02:00
Gunnar Beutner 95909d82fe cluster: Implement authority checks. 2013-09-12 10:04:04 +02:00
Gunnar Beutner 8a1293f750 Improve error messages for socket error. 2013-09-12 07:50:09 +02:00
Gunnar Beutner 2b23c66ac8 Fix bug which causes timeperiods not to be updated. 2013-09-12 07:13:36 +02:00
Gunnar Beutner 4c23245898 Re-enable TLS compression (again). 2013-09-11 17:12:28 +02:00
Gunnar Beutner a831a15f52 cluster: Prevent idle timeout during log replay. 2013-09-11 17:07:07 +02:00
Gunnar Beutner 7961dc4e78 Remove DynamicObject::Start call. 2013-09-11 15:38:04 +02:00
Gunnar Beutner e3dba08d6a Update example config. 2013-09-11 15:00:06 +02:00
Gunnar Beutner 4b6d8943fa Fix crash in MacroProcessor::ResolveMacros. 2013-09-11 14:59:49 +02:00
Gunnar Beutner 7f9fdde77e ido: Object map should not be static. 2013-09-11 12:47:49 +02:00
Gunnar Beutner 3261ad7106 ThreadPool: Add missing lock. 2013-09-11 10:42:36 +02:00
Gunnar Beutner 2ee657fb0c ido: Fix initialization order bug. 2013-09-11 10:28:47 +02:00
Gunnar Beutner a9b7cfb777 cluster: Fix another reconnect bug. 2013-09-11 10:21:43 +02:00
Gunnar Beutner 63941c5f40 cluster: Fix reconnect bug. 2013-09-11 10:15:59 +02:00
Gunnar Beutner 551f06c744 Fix crash in Endpoint::MessageThreadProc. 2013-09-11 09:44:23 +02:00
Gunnar Beutner 6351ee8fb3 Build fix. 2013-09-11 09:42:06 +02:00
Gunnar Beutner 05ba258500 cluster: Heartbeat messages should include the endpoint's features. 2013-09-11 09:40:29 +02:00
Gunnar Beutner 7fcde9eca8 cluster: Fix idle timeout. 2013-09-11 09:18:15 +02:00
Gunnar Beutner 2e6f7d3cdb cluster: Fix heartbeat messages. 2013-09-11 09:09:04 +02:00
Gunnar Beutner fe13be0e9c cluster: Don't try to reconnect while we're replaying the log. 2013-09-11 09:01:00 +02:00
Gunnar Beutner d4bb2102fb Revert "Revert "Enable TLS compression."" 
This reverts commit 1a9c4b6a37.
 2013-09-11 08:52:47 +02:00
Gunnar Beutner 1a9c4b6a37 Revert "Enable TLS compression." 
This reverts commit b95d0d3264.
 2013-09-11 07:53:41 +02:00
Gunnar Beutner b9ef225420 Revert "Revert "cluster: Disconnect timed out endpoints."" 
This reverts commit 0cab882731.
 2013-09-11 07:49:43 +02:00
Gunnar Beutner b95d0d3264 Enable TLS compression. 2013-09-11 07:48:47 +02:00
Gunnar Beutner 687f95b305 Another init fix. 2013-09-10 16:59:00 +02:00
Gunnar Beutner 183135dbce Fix object initialization order. 2013-09-10 16:55:41 +02:00