Commit Graph

2063 Commits

Author SHA1 Message Date
Gunnar Beutner a2c5887e51 Fix crash when daemonizing Icinga
refs #7648
2014-11-12 12:44:14 +01:00
Gunnar Beutner c5a5d1833b Add missing barriers for Object::m_LockOwner
refs #7648
2014-11-12 12:32:14 +01:00
Gunnar Beutner dfd24e6359 Fix _DEBUG define on *NIX 2014-11-12 11:34:59 +01:00
Gunnar Beutner b3aa2eb0c8 Fix validator for dependency filters
fixes #7650
2014-11-12 09:40:45 +01:00
Gunnar Beutner 02c559eff9 Fix crash in the unit tests
fixes #7648
2014-11-12 09:33:13 +01:00
Gunnar Beutner e4bfb5f922 Fix static initializers for Utility::AddDeferredInitializer
fixes #7646
2014-11-12 08:00:56 +01:00
Gunnar Beutner 83a2e4c350 Allow thin mutex calls to be inlined
refs #7622
2014-11-12 06:50:52 +01:00
Gunnar Beutner 02a7d97b17 Allow locks to be inlined
refs #7622
2014-11-12 06:33:20 +01:00
Gunnar Beutner ecd31b86ad Remove debug code
refs #7622
2014-11-12 00:06:51 +01:00
Gunnar Beutner 2d7ce62438 Add missing default arguments
refs #7622
2014-11-11 23:48:17 +01:00
Gunnar Beutner ca75584d88 Allow String class members to be inlined 2014-11-11 23:46:06 +01:00
Gunnar Beutner 36d108528f Allow Value class members to be inlined 2014-11-11 23:28:53 +01:00
Gunnar Beutner ee980a788b Clean up the code a bit 2014-11-11 23:06:47 +01:00
Gunnar Beutner 9932f60522 Fix _DEBUG define
refs #7634
2014-11-11 16:40:27 +01:00
Gunnar Beutner e52b2b6509 Fix incorrect IDO queries
fixes #7634
2014-11-11 16:36:20 +01:00
Gunnar Beutner a5a869f390 Enable ASSERT() for *NIX debug builds
refs #7634
2014-11-11 16:36:20 +01:00
Michael Friedrich 5ac03849d2 GelfWriter: Add 'source' configuration attribute
refs #7619
2014-11-11 14:16:48 +01:00
Michael Friedrich 3211756656 Rebase against master changes, fix indent
refs #7619
2014-11-11 14:16:48 +01:00
Michael Friedrich 721483e0b2 Add a type validafor for GelfWriter
refs #7619
2014-11-11 14:16:48 +01:00
Marius Sturm 6055cd194a Add GelfWriter
refs #7619
2014-11-11 14:16:48 +01:00
Gunnar Beutner 11710ef683 Fix static initializers
refs #7634
2014-11-11 13:24:44 +01:00
Jean Flach 0ba2efe97f Fix some Ido initialization bugs
refs #7625
2014-11-11 10:04:37 +01:00
Gunnar Beutner 4a8effa673 Remove unused include
refs #7622
2014-11-11 05:46:25 +01:00
Gunnar Beutner 65be09215f Avoid unnecessary type lookups
refs #7622
2014-11-10 20:07:07 +01:00
Gunnar Beutner 4df3fd4451 Add missing category type for some IDO queries
fixes #7625
2014-11-10 13:21:33 +01:00
Gunnar Beutner 3cc79a6005 Optimize apply/object filters
refs #7622
2014-11-10 12:06:29 +01:00
Gunnar Beutner ec109b04dd Refactor the AST
refs #7622
2014-11-10 12:06:25 +01:00
Gunnar Beutner e3c5063aff Remove unused fields from the ObjectRule class
refs #7622
2014-11-10 09:52:27 +01:00
Michael Friedrich 885e7704a2 Only notify users on recovery who have been notified on not-OK before
Also ensure that type NotificationRecovery always
passes the state filter (missing `OK` is totally fine).

Also fix that notification delays set the correct
next notification time to the begin time window.

fixes #7579
fixes #7623
fixes #6547
2014-11-09 19:47:24 +01:00
Gunnar Beutner 478f03b49a Replace boost::shared_ptr with boost::intrusive_ptr
refs #7622
2014-11-09 16:54:41 +01:00
Gunnar Beutner 187d443447 Implement support for thin mutexes
refs #7622
2014-11-09 16:54:33 +01:00
Gunnar Beutner 684ad2641a Fix GetInstance() methods for the DbType and config validator registry classes 2014-11-09 13:06:25 +01:00
Gunnar Beutner 4bb535fc47 Discard unnamed config items as early as possible 2014-11-09 04:17:34 +01:00
Michael Friedrich a362b5c14c Fix Zone::IsGlobal() 2014-11-08 22:57:09 +01:00
Gunnar Beutner e1287cb7a5 Fix: Adding/Removing multiple services fails
fixes #7616
2014-11-08 15:17:00 +01:00
Gunnar Beutner fd8eed93e0 Remove unnecessary use of boost::ref() 2014-11-08 14:54:36 +01:00
Gunnar Beutner 25ee5dd1fd Fix problem with missing config items 2014-11-08 14:24:17 +01:00
Gunnar Beutner e1c95d4fa0 Improve config compiler's memory usage 2014-11-08 13:21:51 +01:00
Gunnar Beutner ade12dc27a Remove unused attributes 2014-11-07 21:43:00 +01:00
Gunnar Beutner 9e2aa4c5ed Fix problem with unresolved symbols
refs #7561
2014-11-07 18:37:28 +01:00
Gunnar Beutner 266b1754c7 Speed up type lookups
refs #7561
2014-11-07 12:39:32 +01:00
Gunnar Beutner 3cf08ad050 Properly report errors when CreateProcess() fails
fixes #7599
2014-11-07 10:01:44 +01:00
Gunnar Beutner 60114d4b5d Fix crash in CompatUtility::GetCheckableCommandArgs
refs #7599
2014-11-07 09:26:44 +01:00
Gunnar Beutner f69f7d61f2 Fix variable scope for object rules 2014-11-06 19:26:44 +01:00
Jean Flach fd0436689c windows build fix
refs #7597
2014-11-06 15:13:44 +01:00
Gunnar Beutner 61e090595e Fix build problem on Windows
fixes #7597
2014-11-06 14:21:22 +01:00
Gunnar Beutner 064407d3c9 Fix dynamic_cast problem
fixes #7586
2014-11-06 09:05:12 +01:00
Gunnar Beutner 8bbb2bfb7b Fix compiler warnings for the lexers 2014-11-06 06:23:45 +01:00
Michael Friedrich 5b5f92e57b Cli: Fix missing single quote in 'object list' output
fixes #7584
2014-11-05 18:23:40 +01:00
Gunnar Beutner 9e16e1d395 Remove some obsolete references to cJSON
refs #7452
2014-11-05 16:47:11 +01:00
Gunnar Beutner cfc418c9eb Fix operator shared_ptr<T> for the Value class
fixes #7586
2014-11-05 16:09:22 +01:00
Gunnar Beutner 32b0429904 Fix templates field
fixes #7585
2014-11-05 15:40:13 +01:00
Gunnar Beutner 18d317faf9 Fix crash in ApiEvents::CheckResultAPIHandler
fixes #7577
2014-11-05 09:58:43 +01:00
Gunnar Beutner ad14ff6d6b Fix memory leak in the config parser
refs #7566
2014-11-05 09:29:15 +01:00
Gunnar Beutner 4eb37563b4 Improve memory usage for the config compiler 2014-11-05 08:55:00 +01:00
Michael Friedrich c4ba3f6691 StatusDataWriter: Encode custom attr arrays&dictionaries as json string
refs #7560
2014-11-04 18:08:26 +01:00
Michael Friedrich eeb6facdac Livestatus: Add 'cv_is_json' and encode CV arrays/dicts as json
refs #7560
2014-11-04 17:39:28 +01:00
Gunnar Beutner de080e4928 Fix incorrect field name
refs #7566
2014-11-04 15:24:57 +01:00
Gunnar Beutner c1cbe157db Allow strings as indexers
refs #7566
2014-11-04 15:22:10 +01:00
Gunnar Beutner a6f20c7a22 Implement support for arbitrarily complex indexers
fixes #7566
2014-11-04 15:20:33 +01:00
Michael Friedrich 58d5c42d9c DB IDO: Dump custom attributes as json encoded arrays/dictionaries; add 'is_json' column
refs #7560
2014-11-04 13:47:45 +01:00
Gunnar Beutner 6cafce5d7e Build fix for RHEL 5 2014-11-04 11:18:35 +01:00
Gunnar Beutner a1c905bf62 Implement dictionary support for apply+for
fixes #7561
2014-11-04 11:02:10 +01:00
Gunnar Beutner 19a6a65aad Implement the random() function 2014-11-03 17:21:33 +01:00
Gunnar Beutner aa94563eb5 Implement the keys() function
fixes #7557
2014-11-03 13:05:14 +01:00
Gunnar Beutner e4a1572c9b Use double-quotes in "object list"
refs #7251
2014-11-03 12:39:59 +01:00
Gunnar Beutner 60859043c8 Fix non-unity builds 2014-11-03 07:07:54 +01:00
Gunnar Beutner 170c5a59e4 Implement typeof() function 2014-11-03 00:45:14 +01:00
Michael Friedrich db856a0eee Cli: Disable notifications on remote client 'node setup/wizard'
fixes #7547
2014-11-02 20:17:57 +01:00
Michael Friedrich f69527599f Cli: Fix serial.txt permissions for 'node setup/wizard'
fixes #7546
2014-11-02 19:38:35 +01:00
Michael Friedrich 30718813c9 Cli: Fix error message for clearing repository commit changes 2014-11-02 18:22:51 +01:00
Michael Friedrich a751dc0353 Cli: Better output formatting for 'node wizard' 2014-11-02 17:45:51 +01:00
Gunnar Beutner 46b149dd7d Implement support for formatting arrays in macro strings
fixes #7262
2014-11-02 07:35:43 +01:00
Gunnar Beutner 4677014b6d Implement support for arrays in custom variables
fixes #6544
2014-11-02 07:27:50 +01:00
Gunnar Beutner db3887d09e Make the 'name' attribute available in object definitions
fixes #7538
2014-11-01 06:39:21 +01:00
Gunnar Beutner d300ceaaf7 Fix: Nesting an object in a template causes the template to become non-abstract
fixes #7537
2014-11-01 06:25:58 +01:00
Gunnar Beutner 93b66a0c4a Clean up the config parser a bit 2014-11-01 05:23:14 +01:00
Gunnar Beutner 1811f8689b Make sure templates are never evaluated on their own
fixes #7536
2014-11-01 05:12:13 +01:00
Michael Friedrich 6bc2938996 Cli: Require --zone for 'node setup'
refs #7522
2014-10-31 22:21:36 +01:00
Michael Friedrich bc83c9a698 CLI Commands: Remove timestamp prefix when logging output
fixes #7376
2014-10-31 22:01:36 +01:00
Michael Friedrich 78140fa1c8 Cli: Repository should validate if object exists before add/remove
fixes #7461
2014-10-31 21:08:11 +01:00
Michael Friedrich 7c1cd4c506 Cli: Fix incorrect error message in 'node update-config'
fixes #7529
2014-10-31 20:35:05 +01:00
Michael Friedrich b60adade1a Cli: Fix confusing error messages in repository <type> add
fixes #7530
2014-10-31 20:27:10 +01:00
Michael Friedrich 6596192f2c Cli: Fix black/whitelist remove command
refs #7526
2014-10-31 20:22:24 +01:00
Michael Friedrich ce4dcea21f Change blacklist/whitelist backend
fixes #7526
2014-10-31 16:21:34 +01:00
Gunnar Beutner 6f160eda47 Remove static_cast optimization for Value's operator shared_ptr<T> 2014-10-31 14:34:28 +01:00
Gunnar Beutner 95b5e1d67b Move the "repository commit --clear" functionality into a separate command
fixes #7499
2014-10-31 13:27:29 +01:00
Gunnar Beutner 2ab43a63cb Rename templates "agent-{host,service}" to "satellite-{host,service}"
refs #7525
2014-10-31 13:15:51 +01:00
Gunnar Beutner 5aa392fa37 Update variable names
refs #7516
2014-10-31 11:55:38 +01:00
Gunnar Beutner 5d7e30bb81 Rename --agent to --zone (for blacklist/whitelist)
fixes #7516
2014-10-31 11:53:44 +01:00
Gunnar Beutner 79f1711a61 Rename CLI command "agent" to "node"
fixes #7525
2014-10-31 11:38:16 +01:00
Michael Friedrich 5eefda8b85 Cli: Fix import description for 'repository <type> add' 2014-10-31 11:20:14 +01:00
Gunnar Beutner f8799f0252 Use ScriptVariable::Get for "agent wizard" and "agent setup"
fixes #7520
2014-10-31 10:35:03 +01:00
Gunnar Beutner 3fc3f05bb4 Implement field attribute to hide fields in command auto-completion
fixes #7403
2014-10-31 08:53:25 +01:00
Gunnar Beutner 9f7c97051e Hide attributes in command auto-completion which cannot be set
refs #7403
2014-10-31 08:49:14 +01:00
Gunnar Beutner 00cb1ca971 Agent health check must not have zone attribute
fixes #7519
2014-10-31 06:27:22 +01:00
Michael Friedrich a4697b61c6 Cli: Chown certificate dirs/files to the icinga user in agent setup/wizard
fixes #7476
refs #7465
refs #7423
2014-10-30 20:34:33 +01:00
Michael Friedrich 3709ec73ea Add Utility::SetFileOwnership() on Linux
refs #7476
2014-10-30 19:52:22 +01:00
Michael Friedrich fb2bc5efbf Cli: Fix choices in agent setup wizard
refs #7465
2014-10-30 18:22:05 +01:00
Michael Friedrich b863c7fde0 Cli Agent Setup: Provide hint with actual CN for master ticket cmd
refs #7465
2014-10-30 18:07:00 +01:00
Michael Friedrich 43d3878207 Cli: Add 'agent wizard' command
refs #7465
2014-10-30 17:55:34 +01:00
Gunnar Beutner c2270445d3 Use VariableUtility for "pki ticket"
fixes #7443
2014-10-30 15:25:34 +01:00
Michael Friedrich cde4f9a700 Cli: Fix log for CA copy in 'agent setup --master'
refs #7248
2014-10-30 15:19:09 +01:00
Gunnar Beutner ff12522a62 Fix operator== for Value and String comparisons
refs #7472
2014-10-30 13:04:00 +01:00
Gunnar Beutner f8f89cef6d Fix scoping rules for apply rules
fixes #7503
2014-10-30 09:20:42 +01:00
Gunnar Beutner bfcf1b3eb8 Build fix
fixes #7502
2014-10-30 09:20:25 +01:00
Michael Friedrich 0ff5cf51b8 Cli: 'agent update-config' checks against black/whitelist filters on add/remove
fixes #7501
refs #7253
2014-10-30 00:29:09 +01:00
Michael Friedrich 4fe486c4dd Cli: Fix overwriting api.conf; Move black/whitelist functionality into AgentUtility class
refs #7253
fixes #7481
2014-10-29 19:21:52 +01:00
Gunnar Beutner ceca27e25b Fix Utility::GetFQDN() on OS X
fixes #7495
2014-10-29 16:54:33 +01:00
Michael Friedrich 7eb7e72750 Cli: Generate a health check host if agent != host for dependencies
refs #7249
2014-10-29 12:03:26 +01:00
Michael Friedrich 6866bd0dec Cli: 'agent update-config': Don't skip service creation if host already exists
refs #7249
2014-10-29 11:53:24 +01:00
Michael Friedrich e7c07fb66b Cli: Ignore 'localhost' from agent repository on 'update-config'
refs #7249
2014-10-29 11:35:47 +01:00
Gunnar Beutner 8251a60044 Make sure that OnStateLoaded is called for all objects
fixes #7482
2014-10-29 11:14:32 +01:00
Michael Friedrich f72f7d87c7 Cli: Always generate an agent master zone parent (setup & update-config)
refs #7423
refs #7249
2014-10-29 11:09:55 +01:00
Gunnar Beutner 57747ccdb1 Hosts/services should not have themselves as parents
fixes #7483
2014-10-29 10:47:26 +01:00
Gunnar Beutner 75b599c801 Set host/service variable in apply rules
fixes #7479
2014-10-29 10:09:40 +01:00
Gunnar Beutner 93da4baf8f Use "cluster-zone" command to check agent hosts
refs #7248
2014-10-29 07:58:34 +01:00
Michael Friedrich 70fe95bbba Cli: Add blacklist/whitelist commands for agent commands
refs #7253
2014-10-28 22:03:55 +01:00
Michael Friedrich b344743a9f Cli: Write ApiListener config in 'agent setup' command
fixes #7438
refs #7248
2014-10-28 21:13:15 +01:00
Michael Friedrich 2e6a604706 Cli: Don't allow to override existing repository objects
refs #7255
2014-10-28 19:55:46 +01:00
Michael Friedrich 64298c35ef Cli: Add agents.conf w/ default agent templates for 'agent update-config'
refs #7248
2014-10-28 19:46:10 +01:00
Michael Friedrich 20a176680a Cli: Bail early on 'repository commit' if changelog dir does not exist
refs #7255
2014-10-28 19:43:37 +01:00
Michael Friedrich 16069a7368 Cli: Don't overwrite existing objects; delete old agent objects on 'agent update-config'
refs #7248
2014-10-28 19:28:38 +01:00
Michael Friedrich d92dc8539d Cli: Make sure that ChangeLog directory exists on 'repository commit'
refs #7255
2014-10-28 19:28:38 +01:00
Gunnar Beutner 4cb3d5b1f0 Fix "assign where" for nested groups
fixes #7475
2014-10-28 18:58:22 +01:00
Gunnar Beutner c10da708ff Fix incorrect locks 2014-10-28 18:57:30 +01:00
Gunnar Beutner a5684ea2ac Build fix for Windows 2014-10-28 18:09:52 +01:00
Gunnar Beutner 8fdb2835e5 Fix code style 2014-10-28 18:04:51 +01:00
Michael Friedrich 6dd342f46a Cli: Check path before removing any object from repository
refs #7255
2014-10-28 15:45:01 +01:00
Michael Friedrich ab5a55d754 Cli: Fix 'repository host remove' for hosts w/o services
refs #7255
2014-10-28 15:27:17 +01:00
Gunnar Beutner 29ad90a469 Fix performance data for API events
fixes #7473
2014-10-28 15:24:35 +01:00
Gunnar Beutner 2d6c3e8d5b Remove localhost virtual name thingie from apievents.cpp
refs #7467
2014-10-28 14:44:55 +01:00
Gunnar Beutner 0cff9314f9 Remove virtual name feature for agent hosts
fixes #7467
2014-10-28 14:05:17 +01:00
Gunnar Beutner 76444027e9 Fix: Don't validate templates
refs #7458
2014-10-28 12:20:35 +01:00
Michael Friedrich cb6a4f1c76 Cli: Ignore 'import' attribute on repository add validation
refs #7458
2014-10-28 12:17:09 +01:00
Michael Friedrich 2db549d976 Cli: Don't suggest '--import' on 'repository <type> remove'
refs #7255
2014-10-28 12:08:31 +01:00
Gunnar Beutner 3dc2f82345 Implement validation for "repository add"
fixes #7458
2014-10-28 11:55:25 +01:00
Michael Friedrich 00652f603c Cli: Add endpoint & zone repository object for 'agent update-config'
refs #7248
2014-10-28 10:54:29 +01:00
Michael Friedrich 3c5645c730 Cli: Add zone attribute for 'agent update-config' command
refs #7248
2014-10-28 10:24:19 +01:00
Gunnar Beutner 028186e7f0 Remove support for partial type validators
refs #7458
2014-10-28 08:22:41 +01:00
Gunnar Beutner 7cca2d275f Fix incorrect #ifdef
refs #7454
2014-10-28 08:12:54 +01:00
Gunnar Beutner b0179cc1fe 64-bit build fix for YAJL < 2.0
refs #7454
2014-10-28 06:33:40 +01:00
Gunnar Beutner 65e2e636ea Fix compatibility with older versions of the YAJL library
refs #7454
2014-10-28 05:59:29 +01:00
Michael Friedrich 185f9b4080 Cli: Fix formatting of 'repository <type> list' command
refs #7255
2014-10-27 20:18:47 +01:00
Michael Friedrich 034cd9c140 Cli: Don't run 'agent update-config' if there are uncommitted changes
refs #7249
2014-10-27 19:15:34 +01:00
Michael Friedrich 7e73533ad4 Cli: 'repository host remove' cleans service directory, add pending changes helper
refs #7249
fixes #7460
2014-10-27 19:13:33 +01:00
Michael Friedrich dfd7741a1d Cli: Add implementation for 'agent update-config' command
refs #7249
2014-10-27 18:01:51 +01:00
Michael Friedrich ad99d022ed Cli: Add 'repository commit --clear' clearing pending changes
refs #7455
2014-10-27 17:55:58 +01:00
Michael Friedrich 4554b70a97 Cli: Fix repository remove auto-complete suggestions
refs #7255
2014-10-27 15:48:52 +01:00
Michael Friedrich 44d961f119 Cli: Fix integer formatting in repository command
refs #7255
2014-10-27 15:33:36 +01:00