]> granicus.if.org Git - icinga2/log
icinga2
11 years agoConfig Conversion: Refactor hostcheck service as new object, add stats.
Michael Friedrich [Wed, 18 Sep 2013 14:18:16 +0000 (16:18 +0200)]
Config Conversion: Refactor hostcheck service as new object, add stats.

now the service template objects get the custom tmpl too.

refs #4715

11 years agoConfig Conversion: Allow to define external global templates referenced by all objects.
Michael Friedrich [Wed, 18 Sep 2013 09:39:38 +0000 (11:39 +0200)]
Config Conversion: Allow to define external global templates referenced by all objects.

tests:

$ ./icinga2_convert_v1_v2.pl -c /etc/icinga/icinga.cfg -o conf/
--hosttmpl="hostbumstitmpl"
--servicetmpl="servicebumstitmpl"
--usertmpl="userbumstitmpl"
--timeperiodtmpl="timeperiodbumstitmpl"
--notificationtmpl="notificationbumstitmpl"
--checkcommandtmpl="checkcommandbumstitmpl"
--eventcommandtmpl="eventcommandbumstitmpl"
--notificationcommandtmpl="notificationcommandbumstitmpl"

refs #4697

11 years agoFix lock contention in ThreadPool::Post.
Gunnar Beutner [Wed, 18 Sep 2013 09:22:52 +0000 (11:22 +0200)]
Fix lock contention in ThreadPool::Post.

11 years agoFix uninitialized variable.
Gunnar Beutner [Wed, 18 Sep 2013 08:43:23 +0000 (10:43 +0200)]
Fix uninitialized variable.

11 years agoRemove unnecessary check.
Gunnar Beutner [Wed, 18 Sep 2013 08:30:20 +0000 (10:30 +0200)]
Remove unnecessary check.

11 years agoChange log level for some messages.
Gunnar Beutner [Wed, 18 Sep 2013 08:30:11 +0000 (10:30 +0200)]
Change log level for some messages.

11 years agoRemove unused variables.
Gunnar Beutner [Wed, 18 Sep 2013 08:08:28 +0000 (10:08 +0200)]
Remove unused variables.

11 years agoFix parameter type for Service::RemoveDowntime.
Gunnar Beutner [Wed, 18 Sep 2013 08:06:31 +0000 (10:06 +0200)]
Fix parameter type for Service::RemoveDowntime.

11 years agoUse short name for threadpool worker threads.
Gunnar Beutner [Wed, 18 Sep 2013 07:32:16 +0000 (09:32 +0200)]
Use short name for threadpool worker threads.

11 years agocluster: Refactor method names.
Gunnar Beutner [Wed, 18 Sep 2013 07:16:29 +0000 (09:16 +0200)]
cluster: Refactor method names.

11 years agoImplement support for work queues.
Gunnar Beutner [Wed, 18 Sep 2013 07:09:16 +0000 (09:09 +0200)]
Implement support for work queues.

11 years agoFix memory leaks in the config parser.
Gunnar Beutner [Wed, 18 Sep 2013 05:46:07 +0000 (07:46 +0200)]
Fix memory leaks in the config parser.

11 years agoFix memory leak in NetString::ReadStringFromStream.
Gunnar Beutner [Wed, 18 Sep 2013 05:32:40 +0000 (07:32 +0200)]
Fix memory leak in NetString::ReadStringFromStream.

11 years agoAdd missing DowntimesExpireTimer.
Michael Friedrich [Tue, 17 Sep 2013 18:11:29 +0000 (20:11 +0200)]
Add missing DowntimesExpireTimer.

now the expired downtimes will get deleted every 60 seconds.

fixes #4711

11 years agoCompatLog: Fix downtimes.
Michael Friedrich [Tue, 17 Sep 2013 17:40:23 +0000 (19:40 +0200)]
CompatLog: Fix downtimes.

fixes #4652

11 years agoAdd RemoveDowntime() cancelled parameter, check for expired/triggered downtimes.
Michael Friedrich [Tue, 17 Sep 2013 17:37:10 +0000 (19:37 +0200)]
Add RemoveDowntime() cancelled parameter, check for expired/triggered downtimes.

refs #4652
refs #4710

11 years agoRemove obsolete comment.
Michael Friedrich [Tue, 17 Sep 2013 14:55:29 +0000 (16:55 +0200)]
Remove obsolete comment.

11 years agoido: Fix missing TriggerDowntime() queries.
Michael Friedrich [Tue, 17 Sep 2013 14:51:55 +0000 (16:51 +0200)]
ido: Fix missing TriggerDowntime() queries.

fixes #4651

11 years agocluster: Fix default privileges.
Gunnar Beutner [Tue, 17 Sep 2013 13:56:54 +0000 (15:56 +0200)]
cluster: Fix default privileges.

11 years agoido: Fix downtimes/comments removal.
Michael Friedrich [Tue, 17 Sep 2013 13:30:21 +0000 (15:30 +0200)]
ido: Fix downtimes/comments removal.

fixes #4651

11 years agocluster: Log ignored messages.
Gunnar Beutner [Tue, 17 Sep 2013 12:58:52 +0000 (14:58 +0200)]
cluster: Log ignored messages.

11 years agoUpdate log level for a debug message.
Gunnar Beutner [Tue, 17 Sep 2013 12:39:43 +0000 (14:39 +0200)]
Update log level for a debug message.

11 years agoRemove debug code
Gunnar Beutner [Tue, 17 Sep 2013 12:38:27 +0000 (14:38 +0200)]
Remove debug code

11 years agocluster: Fix deadlock.
Gunnar Beutner [Tue, 17 Sep 2013 12:32:37 +0000 (14:32 +0200)]
cluster: Fix deadlock.

11 years agoEnable cluster debugging.
Gunnar Beutner [Tue, 17 Sep 2013 12:21:45 +0000 (14:21 +0200)]
Enable cluster debugging.

11 years agocluster: Implement domain ACL checks.
Gunnar Beutner [Tue, 17 Sep 2013 11:24:08 +0000 (13:24 +0200)]
cluster: Implement domain ACL checks.

11 years agocluster: Implement domain support.
Gunnar Beutner [Tue, 17 Sep 2013 11:18:26 +0000 (13:18 +0200)]
cluster: Implement domain support.

11 years agoConfig Conversion: Detect hosts w/o services and properly add hostcheck.
Michael Friedrich [Mon, 16 Sep 2013 12:57:12 +0000 (14:57 +0200)]
Config Conversion: Detect hosts w/o services and properly add hostcheck.

it's ugly but it works. requires code refactoring.

11 years agoConfig Conversion: Add proper check_command detection in templates.
Michael Friedrich [Mon, 16 Sep 2013 12:05:41 +0000 (14:05 +0200)]
Config Conversion: Add proper check_command detection in templates.

11 years agocluster: Remove old logs before reconnecting.
Gunnar Beutner [Mon, 16 Sep 2013 12:01:24 +0000 (14:01 +0200)]
cluster: Remove old logs before reconnecting.

11 years agoChange log level for a debug message.
Gunnar Beutner [Mon, 16 Sep 2013 10:27:25 +0000 (12:27 +0200)]
Change log level for a debug message.

11 years agoFix: Cluster log files were not properly removed when an instance has no peers.
Gunnar Beutner [Mon, 16 Sep 2013 09:08:13 +0000 (11:08 +0200)]
Fix: Cluster log files were not properly removed when an instance has no peers.

11 years agoAdd debug message.
Gunnar Beutner [Mon, 16 Sep 2013 09:06:21 +0000 (11:06 +0200)]
Add debug message.

11 years agocluster: Re-open logfile after log replay.
Gunnar Beutner [Mon, 16 Sep 2013 08:06:09 +0000 (10:06 +0200)]
cluster: Re-open logfile after log replay.

11 years agocluster: Yet another fix.
Gunnar Beutner [Mon, 16 Sep 2013 08:00:06 +0000 (10:00 +0200)]
cluster: Yet another fix.

11 years agocluster: Another log replay fix.
Gunnar Beutner [Mon, 16 Sep 2013 07:57:30 +0000 (09:57 +0200)]
cluster: Another log replay fix.

11 years agocluster: Don't replay log messages twice.
Gunnar Beutner [Mon, 16 Sep 2013 07:49:28 +0000 (09:49 +0200)]
cluster: Don't replay log messages twice.

11 years agocluster: Make log replays non-blocking.
Gunnar Beutner [Mon, 16 Sep 2013 07:30:31 +0000 (09:30 +0200)]
cluster: Make log replays non-blocking.

11 years agoFix logging performance problem.
Gunnar Beutner [Mon, 16 Sep 2013 06:59:28 +0000 (08:59 +0200)]
Fix logging performance problem.

11 years agoSet group before user.
Gunnar Beutner [Sun, 15 Sep 2013 08:32:55 +0000 (10:32 +0200)]
Set group before user.

11 years agoImplement setgid/setuid support.
Gunnar Beutner [Sun, 15 Sep 2013 08:28:54 +0000 (10:28 +0200)]
Implement setgid/setuid support.

Fixes #3841

11 years agoconfig: Fix arguments for hostchecks.
Gunnar Beutner [Fri, 13 Sep 2013 11:48:41 +0000 (13:48 +0200)]
config: Fix arguments for hostchecks.

11 years agoconfig: Fix attribute lookup functions.
Gunnar Beutner [Fri, 13 Sep 2013 11:32:42 +0000 (13:32 +0200)]
config: Fix attribute lookup functions.

11 years agoconfig: Temporarily set hostname for services.
Gunnar Beutner [Fri, 13 Sep 2013 11:05:55 +0000 (13:05 +0200)]
config: Temporarily set hostname for services.

11 years agoconfig: Fix looking up host custom attributes.
Gunnar Beutner [Fri, 13 Sep 2013 10:36:49 +0000 (12:36 +0200)]
config: Fix looking up host custom attributes.

11 years agoconfig: Fix resolving macros in command arguments.
Gunnar Beutner [Fri, 13 Sep 2013 10:32:38 +0000 (12:32 +0200)]
config: Fix resolving macros in command arguments.

11 years agocluster: Make the feature checks more robust.
Gunnar Beutner [Fri, 13 Sep 2013 07:58:16 +0000 (09:58 +0200)]
cluster: Make the feature checks more robust.

11 years agoConfig Conversion: Fix global macros requiring escape_str() call.
Michael Friedrich [Fri, 13 Sep 2013 07:56:25 +0000 (09:56 +0200)]
Config Conversion: Fix global macros requiring escape_str() call.

fixes #4703

11 years agoconfig: Fix += { }.
Gunnar Beutner [Fri, 13 Sep 2013 07:51:13 +0000 (09:51 +0200)]
config: Fix += { }.

11 years agoFix custom macros.
Gunnar Beutner [Fri, 13 Sep 2013 07:45:24 +0000 (09:45 +0200)]
Fix custom macros.

11 years agoConvert custom attributes to macros.
Gunnar Beutner [Fri, 13 Sep 2013 07:28:32 +0000 (09:28 +0200)]
Convert custom attributes to macros.

11 years agocluster: Another fix for authority checks.
Gunnar Beutner [Fri, 13 Sep 2013 05:49:12 +0000 (07:49 +0200)]
cluster: Another fix for authority checks.

11 years agoConfig Conversion: Object macros start with name.
Michael Friedrich [Thu, 12 Sep 2013 18:24:13 +0000 (20:24 +0200)]
Config Conversion: Object macros start with name.

refs #4700

11 years agoConfig Conversion: Treat command arg macros directly as object macros
Michael Friedrich [Thu, 12 Sep 2013 18:07:41 +0000 (20:07 +0200)]
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

11 years agoConfig Conversion: Update sample icinga2 config.
Michael Friedrich [Thu, 12 Sep 2013 16:42:01 +0000 (18:42 +0200)]
Config Conversion: Update sample icinga2 config.

refs #4701

11 years agoConfig Conversion: Fix import removing inline comments after ';' and '#'.
Michael Friedrich [Thu, 12 Sep 2013 16:40:16 +0000 (18:40 +0200)]
Config Conversion: Fix import removing inline comments after ';' and '#'.

fixes #4499

11 years agoConfig Conversion: Make ADMIN/USER macros global again (in resource.conf)
Michael Friedrich [Thu, 12 Sep 2013 16:15:37 +0000 (18:15 +0200)]
Config Conversion: Make ADMIN/USER macros global again (in resource.conf)

refs #4701

11 years agoConfig Conversion: s/user_macros/global_macros/g
Michael Friedrich [Thu, 12 Sep 2013 16:10:40 +0000 (18:10 +0200)]
Config Conversion: s/user_macros/global_macros/g

11 years agoConfig Conversion: introduce resource.conf with global macros
Michael Friedrich [Thu, 12 Sep 2013 16:08:07 +0000 (18:08 +0200)]
Config Conversion: introduce resource.conf with global macros

refs #4701

11 years agocluster: Fix cleaning up old log files.
Gunnar Beutner [Thu, 12 Sep 2013 16:08:06 +0000 (18:08 +0200)]
cluster: Fix cleaning up old log files.

11 years agoIgnore check results if we have a local result that's newer.
Gunnar Beutner [Thu, 12 Sep 2013 15:39:29 +0000 (17:39 +0200)]
Ignore check results if we have a local result that's newer.

11 years agochecker: Fix incorrect wait time when first service is non-authoritative.
Gunnar Beutner [Thu, 12 Sep 2013 14:36:18 +0000 (16:36 +0200)]
checker: Fix incorrect wait time when first service is non-authoritative.

11 years agoMake sure the next check timestamp can't be in the past.
Gunnar Beutner [Thu, 12 Sep 2013 13:47:45 +0000 (15:47 +0200)]
Make sure the next check timestamp can't be in the past.

11 years agocluster: More delegation bugfixes.
Gunnar Beutner [Thu, 12 Sep 2013 13:38:01 +0000 (15:38 +0200)]
cluster: More delegation bugfixes.

11 years agochecker: Fix waiting for non-authoritative checks.
Gunnar Beutner [Thu, 12 Sep 2013 13:31:07 +0000 (15:31 +0200)]
checker: Fix waiting for non-authoritative checks.

11 years agoFix crash in ClusterComponent::CheckAuthorityHandler.
Gunnar Beutner [Thu, 12 Sep 2013 13:22:21 +0000 (15:22 +0200)]
Fix crash in ClusterComponent::CheckAuthorityHandler.

11 years agochecker: Make sure non-authoritative cluster instances don't reschedule checks.
Gunnar Beutner [Thu, 12 Sep 2013 13:20:01 +0000 (15:20 +0200)]
checker: Make sure non-authoritative cluster instances don't reschedule checks.

11 years agoFix delegation bug.
Gunnar Beutner [Thu, 12 Sep 2013 13:12:19 +0000 (15:12 +0200)]
Fix delegation bug.

11 years agoAdd missing lock.
Gunnar Beutner [Thu, 12 Sep 2013 13:07:37 +0000 (15:07 +0200)]
Add missing lock.

11 years agoRemove obsolete code.
Gunnar Beutner [Thu, 12 Sep 2013 12:12:36 +0000 (14:12 +0200)]
Remove obsolete code.

11 years agoconfig: Copy authority information into dependant services.
Gunnar Beutner [Thu, 12 Sep 2013 11:08:37 +0000 (13:08 +0200)]
config: Copy authority information into dependant services.

11 years agoido: Set m_Connected to false in Stop().
Gunnar Beutner [Thu, 12 Sep 2013 09:37:58 +0000 (11:37 +0200)]
ido: Set m_Connected to false in Stop().

11 years agoMake sure the check latency can't be negative.
Gunnar Beutner [Thu, 12 Sep 2013 09:36:31 +0000 (11:36 +0200)]
Make sure the check latency can't be negative.

11 years agoUpdate test check output.
Gunnar Beutner [Thu, 12 Sep 2013 08:36:50 +0000 (10:36 +0200)]
Update test check output.

11 years agoAdd check output for NullCheck.
Gunnar Beutner [Thu, 12 Sep 2013 08:31:41 +0000 (10:31 +0200)]
Add check output for NullCheck.

11 years agoido: Fix timeperioddbobject lock.
Michael Friedrich [Thu, 12 Sep 2013 08:30:28 +0000 (10:30 +0200)]
ido: Fix timeperioddbobject lock.

11 years agocluster: Update endpoints' features for heartbeat messages.
Gunnar Beutner [Thu, 12 Sep 2013 08:22:03 +0000 (10:22 +0200)]
cluster: Update endpoints' features for heartbeat messages.

11 years agoRefactor authority checks a bit.
Gunnar Beutner [Thu, 12 Sep 2013 08:17:14 +0000 (10:17 +0200)]
Refactor authority checks a bit.

11 years agocluster: Implement authority checks.
Gunnar Beutner [Thu, 12 Sep 2013 08:03:48 +0000 (10:03 +0200)]
cluster: Implement authority checks.

11 years agoImprove error messages for socket error.
Gunnar Beutner [Thu, 12 Sep 2013 05:50:09 +0000 (07:50 +0200)]
Improve error messages for socket error.

11 years agoFix bug which causes timeperiods not to be updated.
Gunnar Beutner [Thu, 12 Sep 2013 05:13:36 +0000 (07:13 +0200)]
Fix bug which causes timeperiods not to be updated.

11 years agoRe-enable TLS compression (again).
Gunnar Beutner [Wed, 11 Sep 2013 15:12:28 +0000 (17:12 +0200)]
Re-enable TLS compression (again).

11 years agocluster: Prevent idle timeout during log replay.
Gunnar Beutner [Wed, 11 Sep 2013 15:07:07 +0000 (17:07 +0200)]
cluster: Prevent idle timeout during log replay.

11 years agoRemove DynamicObject::Start call.
Gunnar Beutner [Wed, 11 Sep 2013 13:38:04 +0000 (15:38 +0200)]
Remove DynamicObject::Start call.

11 years agoUpdate example config.
Gunnar Beutner [Wed, 11 Sep 2013 13:00:06 +0000 (15:00 +0200)]
Update example config.

11 years agoFix crash in MacroProcessor::ResolveMacros.
Gunnar Beutner [Wed, 11 Sep 2013 12:59:49 +0000 (14:59 +0200)]
Fix crash in MacroProcessor::ResolveMacros.

11 years agoido: Object map should not be static.
Gunnar Beutner [Wed, 11 Sep 2013 10:47:49 +0000 (12:47 +0200)]
ido: Object map should not be static.

11 years agoThreadPool: Add missing lock.
Gunnar Beutner [Wed, 11 Sep 2013 08:42:36 +0000 (10:42 +0200)]
ThreadPool: Add missing lock.

11 years agoido: Fix initialization order bug.
Gunnar Beutner [Wed, 11 Sep 2013 08:28:47 +0000 (10:28 +0200)]
ido: Fix initialization order bug.

11 years agocluster: Fix another reconnect bug.
Gunnar Beutner [Wed, 11 Sep 2013 08:21:43 +0000 (10:21 +0200)]
cluster: Fix another reconnect bug.

11 years agocluster: Fix reconnect bug.
Gunnar Beutner [Wed, 11 Sep 2013 08:15:59 +0000 (10:15 +0200)]
cluster: Fix reconnect bug.

11 years agoFix crash in Endpoint::MessageThreadProc.
Gunnar Beutner [Wed, 11 Sep 2013 07:44:23 +0000 (09:44 +0200)]
Fix crash in Endpoint::MessageThreadProc.

11 years agoBuild fix.
Gunnar Beutner [Wed, 11 Sep 2013 07:42:06 +0000 (09:42 +0200)]
Build fix.

11 years agocluster: Heartbeat messages should include the endpoint's features.
Gunnar Beutner [Wed, 11 Sep 2013 07:40:29 +0000 (09:40 +0200)]
cluster: Heartbeat messages should include the endpoint's features.

11 years agocluster: Fix idle timeout.
Gunnar Beutner [Wed, 11 Sep 2013 07:18:15 +0000 (09:18 +0200)]
cluster: Fix idle timeout.

11 years agocluster: Fix heartbeat messages.
Gunnar Beutner [Wed, 11 Sep 2013 07:09:04 +0000 (09:09 +0200)]
cluster: Fix heartbeat messages.

11 years agocluster: Don't try to reconnect while we're replaying the log.
Gunnar Beutner [Wed, 11 Sep 2013 07:01:00 +0000 (09:01 +0200)]
cluster: Don't try to reconnect while we're replaying the log.

11 years agoRevert "Revert "Enable TLS compression.""
Gunnar Beutner [Wed, 11 Sep 2013 06:52:47 +0000 (08:52 +0200)]
Revert "Revert "Enable TLS compression.""

This reverts commit 1a9c4b6a37feaf4ed9569589b3f51d43766a6784.

11 years agoRevert "Enable TLS compression."
Gunnar Beutner [Wed, 11 Sep 2013 05:53:41 +0000 (07:53 +0200)]
Revert "Enable TLS compression."

This reverts commit b95d0d326464609efc2cf2f502afad5e3250a2f8.

11 years agoRevert "Revert "cluster: Disconnect timed out endpoints.""
Gunnar Beutner [Wed, 11 Sep 2013 05:49:43 +0000 (07:49 +0200)]
Revert "Revert "cluster: Disconnect timed out endpoints.""

This reverts commit 0cab8827311db265a8458236ef97b3f9640e9ca8.