Commit Graph

10318 Commits

Author SHA1 Message Date
Michael Friedrich bee909866b Merge branch 'support/2.10' 2019-02-26 10:31:50 +01:00
Michael Friedrich a7ea886f8f Release version 2.10.3 2019-02-26 10:31:47 +01:00
Michael Friedrich 87ae58f13d
Merge pull request #6974 from Icinga/feature/copyright-generic
Update to generic copyright header
2019-02-26 09:07:35 +01:00
Michael Friedrich c477018313
Merge pull request #6975 from sebastic/patch-1
Fix nested hostgroup example
2019-02-26 09:06:58 +01:00
Bas Couwenberg 8d3c8fd107
Fix nested hostgroup example
In Icinga 1.x the list of members was set on the group object, in Icinga 2 the list of groups is set on the member objects.
2019-02-26 08:49:36 +01:00
Michael Friedrich 101783d7ef Release version 2.10.3 2019-02-25 16:53:13 +01:00
Michael Friedrich 47c969eadc Dynamically print current copyright year in `--version` output
(cherry picked from commit c1fedab7ae)
2019-02-25 16:41:39 +01:00
Michael Friedrich 37b715baf1 Replace a few more copyright strings 2019-02-25 16:30:40 +01:00
Michael Friedrich 458f997a18 Replace Copyright header with a short version, part II 2019-02-25 15:09:36 +01:00
Michael Friedrich d14a88235d Replace Copyright header with a short version, part I
CLion -> replace in path
2019-02-25 14:48:22 +01:00
Michael Friedrich c1fedab7ae Dynamically print current copyright year in `--version` output 2019-02-25 14:25:56 +01:00
Michael Friedrich 14ef7cbc1f Fix formatting in development docs
(cherry picked from commit 710e4fa55e)
2019-02-25 13:49:19 +01:00
Michael Friedrich cf0209efd2
Merge pull request #6972 from Icinga/bugfix/dev-docs
Fix formatting in development docs
2019-02-25 13:48:51 +01:00
Michael Friedrich 710e4fa55e Fix formatting in development docs 2019-02-25 13:47:13 +01:00
Alexander A. Klimov a4f774aa94 Test Utility::ComparePasswords()
(cherry picked from commit 1b00331a88)
2019-02-25 13:34:59 +01:00
Alexander A. Klimov f98e40d880 Secure ApiUser::GetByAuthHeader() against timing attacks
(cherry picked from commit 9558ebc0f4)
2019-02-25 13:34:51 +01:00
Michael Friedrich dc623ad255
Merge pull request #6968 from Icinga/bugfix/timing-attack
Secure ApiUser::GetByAuthHeader() against timing attacks
2019-02-25 13:34:21 +01:00
Michael Friedrich 51b637fc19
Merge pull request #6971 from Icinga/bugfix/downtime-acti
Activate downtimes before any checkable object
2019-02-25 10:14:30 +01:00
Michael Friedrich 82c0197aae Activate downtimes before any checkable object
(cherry picked from commit 7936a147ba)
2019-02-25 09:49:19 +01:00
Alexander A. Klimov 1b00331a88 Test Utility::ComparePasswords() 2019-02-22 16:59:36 +01:00
Alexander A. Klimov 9558ebc0f4 Secure ApiUser::GetByAuthHeader() against timing attacks 2019-02-22 16:59:36 +01:00
Michael Friedrich 856d3a1b42
Merge pull request #6963 from akrus/master
Add missing args for apache-status and fix a few typos
2019-02-22 11:43:41 +01:00
akrus b8043c06c8 Add missing args for apache-status and fix a few typos 2019-02-22 10:57:41 +02:00
Michael Friedrich 30d98b49eb
Merge pull request #6896 from Icinga/bugfix/notification-delay-5561
Notification#BeginExecuteNotification(): SetNextNotification() correctly
2019-02-22 09:27:59 +01:00
Michael Friedrich 819594e7b4
Merge pull request #6953 from Icinga/bugfix/style
Fix indent in configcompiler.cpp
2019-02-20 11:32:29 +01:00
Michael Friedrich 466096a6a4 Debug: Log calls to ConfigObject::Deactivate()
Only available in debug builds.

(cherry picked from commit d98c0704c4)
2019-02-19 13:53:09 +01:00
Michael Friedrich 7d3f60f561
Merge pull request #6958 from Icinga/feature/debug-log-stop
Debug: Log calls to ConfigObject::Deactivate()
2019-02-19 13:52:39 +01:00
Michael Friedrich d98c0704c4 Debug: Log calls to ConfigObject::Deactivate()
Only available in debug builds.
2019-02-19 13:49:52 +01:00
Michael Friedrich 01befd7e32
Merge pull request #6956 from Icinga/bugfix/doc-escape-pipe-symbol
Escape pipe symbol in api documentation
2019-02-19 09:39:45 +01:00
Michael Insel 0042b54298 Escape pipe symbol in api documentation
This escapes the pipe symbol in the api documentation.

refs #6955
2019-02-18 16:22:34 +01:00
Michael Friedrich 3ad911a57c Fix indent in configcompiler.cpp 2019-02-15 12:24:49 +01:00
Michael Insel 4238b61185
Merge pull request #6949 from fluxX04/patch-1
Doc fix: update check_rbl parameter
2019-02-13 08:13:02 +01:00
Alex 71bc184de0
fixes check_rbl parameter typo 2019-02-13 07:44:20 +01:00
Michael Friedrich b08d485a41
Merge pull request #6857 from Icinga/bugfix/check_nscp_api-query-sorted-6536
Url#m_Query: preserve order
2019-02-11 17:57:32 +01:00
Michael Friedrich 845c72f656
Merge pull request #6882 from Icinga/bugfix/influxdb-gaps-6841
InfluxdbWriter#Stop(): flush buffer
2019-02-11 17:32:05 +01:00
Michael Friedrich 0467c488e9
Merge pull request #6908 from Icinga/bugfix/perfdata-gaps
Ensure all perfdata to be written
2019-02-11 17:27:44 +01:00
Michael Friedrich 7a865aefd9
Merge pull request #6854 from Icinga/bugfix/unamehelper-inefficient-6452
Make UnameHelper() efficient
2019-02-11 16:57:17 +01:00
Michael Friedrich 53981ec86f
Merge pull request #6934 from Icinga/bugfix/boost-version-6933
Raise required Boost version to 1.53
2019-02-11 16:53:27 +01:00
Michael Friedrich b81f7a7415
Merge pull request #6577 from Icinga/fix/setup-api-including-users-file
Include api user configuration file during api setup
2019-02-11 16:41:46 +01:00
Michael Friedrich 4c1a54073c
Merge pull request #6748 from Icinga/bugfix/api-setup-fails-missing-confd
Fix api setup to automatically create the conf.d directory
2019-02-11 16:35:57 +01:00
Michael Friedrich 5180bb3a24
Merge pull request #6943 from peteeckel/bugfix/apilistener-duplicate-log-entries-6942
Avoid duplicating non-zero count message replay messages in the debug log
2019-02-11 15:32:50 +01:00
Michael Friedrich 4f494b9a91 Troubleshooting: Add notes on ephemeral port range blocking on Windows agents
(cherry picked from commit 6558287da0)
2019-02-11 15:04:35 +01:00
Michael Friedrich 24dd6dcf0c
Merge pull request #6944 from Icinga/feature/docs-windows-agent-throubleshooting
Troubleshooting: Add notes on ephemeral port range blocking on Windows agents
2019-02-11 14:38:33 +01:00
Michael Friedrich 6558287da0 Troubleshooting: Add notes on ephemeral port range blocking on Windows agents 2019-02-11 14:32:02 +01:00
Peter Eckel 5d59863725 Avoid duplicating non-zero count message replay messages in the debug log 2019-02-11 13:54:17 +01:00
Michael Friedrich c770920818 Refactor conditions and add debug log messages for future crs and skipped crs
(cherry picked from commit d1fb1a8eda)
2019-02-11 13:32:46 +01:00
Jean Flach dc27bcc8a3 Fix checkresults from the future breaking checks
(cherry picked from commit c97f3c80f5)
2019-02-11 13:32:39 +01:00
Michael Insel 9259e7adfd Doc: Add .NET 3.5 to the windows build stack
The Windows Agent Wizard is currently build on .NET Framework 2.0, which
is not installed by default on Windows 10. This adds a note to the
development documentation to install the .NET Framework 3.5 (which
includes .NET Framework 2.0) component on Windows 10.

(cherry picked from commit 52d81d0af5)
2019-02-11 13:32:16 +01:00
Michael Friedrich 92fba8c64f Don't allow retry_interval <= 0
(cherry picked from commit 8cbd482072)
2019-02-11 13:31:55 +01:00
Alexander A. Klimov fb72633c5e Downtime::AddDowntime(): place Downtimes in the same zone as the origin ScheduledDowntimes
(cherry picked from commit ce847324bc)
2019-02-11 13:31:22 +01:00