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

10356 Commits

Author SHA1 Message Date
Michael Friedrich 76b9cd6786 Fix missing include in JSON tests 
Non-unity builds require the additional header.
 2019-03-18 17:02:12 +01:00
Alexander A. Klimov 0cf10c6306 Make buildable with VS 2017 2019-03-18 15:07:57 +01:00
Alexander A. Klimov c4333b49f5 Test Json{En,De}code() 2019-03-18 15:07:57 +01:00
Alexander A. Klimov 2a05b46431 Auto-sanitize data before en-/decoding JSON 2019-03-18 15:07:57 +01:00
Alexander A. Klimov 9daca0b216 Get rid of YAJL 2019-03-18 15:07:57 +01:00
Alexander A. Klimov 5882594b43 JsonEncode(): use nlohmann::json 2019-03-18 15:07:57 +01:00
Alexander A. Klimov 1b0367b740 JsonDecode(): use nlohmann::json::sax_parse() 2019-03-18 15:07:57 +01:00
Michael Friedrich 724b34c6f2 Integrate nlohmann_json into CMake 
Better integration into base/json.cpp

Signed-off-by: Alexander A. Klimov <alexander.klimov@icinga.com>
 2019-03-18 15:07:50 +01:00
Alexander A. Klimov 89b371813f Import "JSON for Modern C++" 2019-03-18 15:05:32 +01:00
Michael Friedrich 002f8e36f5
Merge pull request #7001 from Icinga/bugfix/doc-assignment-5430 
Assignment operators doc: tell what the { } are for
 2019-03-12 14:12:44 +01:00
Michael Friedrich 6d0431b0b2
Merge pull request #6979 from Icinga/bugfix/systemd-upper-case 
Doc: write systemd lower-case
 2019-03-11 11:44:21 +01:00
Michael Friedrich 69f073f903
Merge pull request #6991 from Icinga/bugfix/already-exist-critical 
PkiUtility::NewCa(): just warn if the CA files already exist
 2019-03-11 10:57:44 +01:00
Alexander A. Klimov 5e08e033ad Assignment operators doc: tell what the { } are for 
refs #5430
 2019-03-08 16:39:23 +01:00
Michael Insel 36fe6be4bf
Merge pull request #6995 from leegarrett/master 
Typo and link fix
 2019-03-06 19:14:42 +01:00
Lee Garrett 0a582905c5 Typo and link fix 2019-03-05 17:40:14 +01:00
Alexander A. Klimov 37b044ecda PkiUtility::NewCa(): just warn if the CA files already exist 2019-03-01 14:37:45 +01:00
Michael Friedrich e2df11520e
Merge pull request #6970 from Icinga/bugfix/perfdata-gaps 
Improve reload handling for features (metric & queue flush, activation priority)
 2019-02-26 15:38:15 +01:00
Alexander A. Klimov e7f2370ada Doc: write systemd lower-case 
See spelling chapter in https://freedesktop.org/wiki/Software/systemd/
 2019-02-26 14:46:22 +01:00
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
Michael Friedrich ab7a799369 Implement ReloadTimeout constant and wait for enqueued checks on Stop() 2019-02-25 09:03:47 +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 89634c2eb6 Re-add Defer functionality 2019-02-22 15:27:34 +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 53acb8f2db PerfdataWriter: Reset the rotation timer on Pause() 2019-02-22 09:34:16 +01: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 68e7027c93 GelfWriter: Ensure to join queue and execute queries on Pause/Shutdown/Reload 2019-02-20 17:18:24 +01:00
Michael Friedrich 24c3572b03 OpenTsdbWriter: Ensure to reset reconnect timer on Pause() 2019-02-20 17:17:45 +01:00
Michael Friedrich 301c48e9bc ElasticWriter: Ensure to flush buffers on Pause/Shutdown/Reload 2019-02-20 17:11:39 +01:00
Michael Friedrich 1bfe756cb1 DB IDO: Improve queue handling on Pause/Shutdown/Reload 2019-02-20 17:10:46 +01:00
Michael Friedrich d4bdebc795 InfluxdbWriter: Ensure to flush buffers after emptying the metrics queue on Pause/Shutdown/Reload 
Patch taken from @al2klimov but moved into Pause()
 2019-02-20 16:30:13 +01:00