tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/2.11'

This commit is contained in:
Michael Friedrich 2019-07-25 10:00:42 +02:00
parent bfb8a048bc bb2ad99cf3
commit c630ae111c
5 changed files with 118 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.mailmap
View File

@ -6,9 +6,10 @@ Gunnar Beutner <gunnar.beutner@icinga.com> <icinga@net-icinga2.adm.netways.de>
<michael.friedrich@icinga.com> <Michael.Friedrich@netways.de>
Michael Insel <mcktr55@gmail.com> <mcktr55@gmail.com>
<tobias.vonderkrone@profitbricks.com> <tobias@vonderkrone.info>
Jean Flach <jean-marcel.flach@icinga.com> <jean-marcel.flach@netways.de>
Jean Flach <jean-marcel.flach@icinga.com> <Crunsher@users.noreply.github.com>
Jean Flach <jean-marcel.flach@icinga.com> Jean Flach <jean-marcel.flach@icinga.com>
Diana Flach <diana.flach@icinga.com> <jean-marcel.flach@netways.de>
Diana Flach <diana.flach@icinga.com> <Crunsher@users.noreply.github.com>
Diana Flach <diana.flach@icinga.com> Jean Flach <jean-marcel.flach@icinga.com>
Diana Flach <diana.flach@icinga.com> <crunsher@bamberg.ccc.de>
Dolf Schimmel <dolf@transip.nl> <dolf@dolfschimmel.nl>
Markus Waldmüller <markus.waldmueller@netways.de>
Claudio Kuenzler <ck@claudiokuenzler.com>
@ -36,3 +37,7 @@ Michael Insel <mcktr55@gmail.com> <michael@insel.email>
Marianne Spiller <github@spiller.me>
Robin O'Brien <robin@labs.epiuse.com> <robinjohnobrien@gmail.com>
<noah.hilverling@icinga.com> <noah@hilverling.com>
Jens Schanz <jens.schanz@mueller.de> <mail@jensschanz.de>
Jens Schanz <jens.schanz@mueller.de> Schanz, Jens <jens.schanz@mueller.de>
Henrik Triem <Henrik.Triem@icinga.com> Henrik Triem <43344334+htriem@users.noreply.github.com>
nemtrif <ntrifunovic@hotmail.com> <nemtrif@users.noreply.github.com>

40
AUTHORS
View File

@ -1,19 +1,27 @@
Aaron Bishop <erroneous@gmail.com>
Adam Bolte <abolte@systemsaviour.com>
Adam James <adam.james@transitiv.co.uk>
Alan Jenkins <alan.christopher.jenkins@gmail.com>
Alan Litster <alan.litster@twentyci.co.uk>
Alex <alexp710@hotmail.com>
Alex Merry <alexander.merry@nanoporetech.com>
Alexander A. Klimov <alexander.klimov@icinga.com>
Alexander Fuhr <alexander.fuhr@netways.de>
Alexander Schomburg <script.acc@alex.schomb.org>
Alexander Stoll <astoll@netways.de>
Alexander Wirt <formorer@debian.org>
Andrea Kao <eirinikos@gmail.com>
Andreas Scherbaum <andreas@scherbaum.biz>
Andres Ivanov <andres@andres.wtf>
Andrew Jaffie <ajaffie@gmail.com>
Andrew Meyer <ameyer+secure@nodnetwork.org>
Andy Grunwald <andygrunwald@gmail.com>
Arnd Hannemann <arnd@arndnet.de>
Assaf Flatto <assaf@aikilinux.com>
BarbUk <julien.virey@gmail.com>
Bas Couwenberg <sebastic@xs4all.nl>
Bastian Guse <bguse@nocopy.de>
Bauerheim, Marcus <mbauerheim@spirit21.com>
Benedikt Heine <bebe@bebehei.de>
Bernd Erk <bernd.erk@icinga.com>
Berthold Cogel <cogel@uni-koeln.de>
@ -40,7 +48,10 @@ Daniel Helgenberger <daniel.helgenberger@m-box.de>
Daniel Kesselberg <mail@danielkesselberg.de>
Daniil Yaroslavtsev <dyaroslavtsev@confyrm.com>
David Beck <techiscool@gmail.com>
David Lublink <github.com@spam.lublink.net>
Denis <zaharden@gmail.com>
Dennis Lichtenthäler <dennis.lichtenthaeler@stiftung-tannenhof.de>
Diana Flach <diana.flach@icinga.com>
Dinesh Majrekar <dinesh.majrekar@serverchoice.com>
Dirk Goetz <dirk.goetz@icinga.com>
Dirk Melchers <dirk@dirk-melchers.de>
@ -48,6 +59,7 @@ Dolf Schimmel <dolf@transip.nl>
Edgar Fuß <ef@math.uni-bonn.de>
Eduard Güldner <eduard.gueldner@gmail.com>
Edvin Seferovic <edvin@seferovic.net>
Elias Ohm <eohm@novomind.com>
Eric Lippmann <eric.lippmann@icinga.com>
Evgeni Golov <evgeni@golov.de>
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
@ -62,12 +74,14 @@ Georg Haas <hax404foogit@hax404.de>
Gerd von Egidy <gerd@egidy.de>
Gerhardt Roman <roman.gerhardt@cbc-x.com>
Glauco Vinicius <gl4uc0@gmail.com>
Greg Hewgill <greg@hewgill.com>
Gunnar Beutner <gunnar.beutner@icinga.com>
Hannes Happle <info@h2-it.de>
Hannes Van de Vel <h@nnes.be>
Harald Laabs <github@dasr.de>
Heike Jurzik <icinga@huhnix.org>
Hendrik Röder <hendrik.biz@gmail.com>
Henrik Triem <Henrik.Triem@icinga.com>
Ian Kelling <ian@iankelling.org>
Ildar Hizbulin <hizel@vyborg.ru>
Irina Kaprizkina <ikapriz@gmail.com>
@ -76,11 +90,11 @@ James Pharaoh <james@pharaoh.uk>
Jan Andres <jan.andres@berenberg.de>
Jan Beich <jbeich@FreeBSD.org>
Jan Wagner <waja@cyconet.org>
Janne Heß <janne@hess.ooo>
Jason Young <jason.young@velaspan.com>
Jean Flach <jean-marcel.flach@icinga.com>
Jean-Louis Dupond <jean-louis@dupond.be>
Jens Link <jenslink@quux.de>
Jens Schanz <mail@jensschanz.de>
Jens Schanz <jens.schanz@mueller.de>
Jeon Sang Wan <maxswjeon@naver.com>
Jeremy Armstrong <lepubel@gmail.com>
Jesse Morgan <morgajel@gmail.com>
@ -94,14 +108,19 @@ Jérôme Drouet <jerome.drouet@gmail.com>
Kai Goller <kai.goller@netways.de>
Konstantin Kelemen <konstantin@kel.mn>
Kálmán Szalai - KAMI <kami911@gmail.com>
Kálmán „KAMI” Szalai <kami911@gmail.com>
Lars Engels <lars.engels@0x20.net>
Lars Krüger <krueger-lars@web.de>
Leah Oswald <mail@leahoswald.de>
Lee Clemens <java@leeclemens.net>
Lee Garrett <lgarrett@rocketjump.eu>
Lennart Betz <lennart.betz@icinga.com>
Leon Stringer <leon@priorsvle.com>
Louis Sautier <sautier.louis@gmail.com>
Luca Lesinigo <luca@lm-net.it>
Lucas Bremgartner <breml@users.noreply.github.com>
Lucas Fairchild-Madar <lucas.madar@gmail.com>
Luiz Amaral <luiz.amaral@innogames.com>
Magnus Bäck <magnus@noun.se>
Malte Rabenseifner <mail@malte-rabenseifner.de>
Manuel Reiter <reiter@csc.uni-frankfurt.de>
@ -110,16 +129,21 @@ MarcusCaepio <MarcusCaepio@users.noreply.github.com>
Marianne Spiller <github@spiller.me>
Marius Bergmann <marius@yeai.de>
Marius Sturm <marius@graylog.com>
Mark Leary <mleary@mit.edu>
Markus Frosch <markus.frosch@icinga.com>
Markus Waldmüller <markus.waldmueller@netways.de>
Martijn van Duren <m.vanduren@itisit.nl>
Martin Neubert <martin.neubert@t-systems.com>
Martin Stiborsky <martin.stiborsky@gmail.com>
Mathieu Arnold <mat@mat.cc>
Mathieu Lutfy <mathieu@bidon.ca>
Matthaus Owens <matthaus@puppetlabs.com>
Matthias Schales <black-dragon131@web.de>
Maurice Meyer <morre@mor.re>
Max Deparade <max.deparade@netways.de>
Max Rosin <git@hackrid.de>
Max Zhang <zhenzhan@tibco.com>
Maximilian Falkenstein <maxf@njsm.de>
Mhd Sulhan <ms@kilabit.info>
Micha Ahrweiler <me@schnitzi.net>
Michael Friedrich <michael.friedrich@icinga.com>
@ -131,11 +155,15 @@ Michal Petko <michal.petko@jumpshot.com>
Mikesch-mp <mikesch-mp@koebbes.de>
Mirco Bauer <meebey@meebey.net>
Mirko Nardin <mirko.nardin@gmx.net>
Muhammad Mominul Huque <nahidbinbaten1995@gmail.com>
Nemanja Trifunovic <ntrifunovic@hotmail.com>
Nicolai <nbuchwitz@users.noreply.github.com>
Nicolas Limage <github@xephon.org>
Nicole Lang <nicole.lang@icinga.com>
Niflou <dubuscyr@gmail.com>
Noah Hilverling <noah.hilverling@icinga.com>
Obihörnchen <obihoernchende@gmail.com>
Oleg Artenii <oleg@artenii.email>
Pall Sigurdsson <palli-github@minor.is>
Paolo Schiro <paolo.schiro@kpnqwest.it>
Patrick Huy <frz@frz.cc>
@ -151,12 +179,14 @@ Ralph Breier <ralph.breier@roedl.com>
Reto Zeder <reto.zeder@arcade.ch>
Ricardo Bartels <ricardo@bitchbrothers.com>
Robert Lindgren <robert.lindgren@gmail.com>
Robert Scheck <robert@fedoraproject.org>
Robin O'Brien <robin@labs.epiuse.com>
Roland Hopferwieser <rhopfer@ica.jku.at>
Roman Gerhardt <roman.gerhardt@cbc-x.com>
Rudy Gevaert <rudy.gevaert@ugent.be>
Rune Darrud <theflyingcorpse@gmail.com>
Sam Kottler <shk@linux.com>
Sascha Westermann <sascha.westermann@hl-services.de>
Sebastian Brückner <mail@invlid.com>
Sebastian Chrostek <sebastian@chrostek.net>
Sebastian Eikenberg <eikese@mail.uni-paderborn.de>
@ -173,6 +203,7 @@ Steve McMaster <mcmaster@hurricanelabs.com>
Strajan Sebastian Ioan <strajan.sebastian@yahoo.com>
Strix <660956+MrStrix@users.noreply.github.com>
Sven Nierlein <sven@nierlein.de>
Sven Wegener <swegener@gentoo.org>
T. Mulyana <nothinux@gmail.com>
Thomas Forrer <thomas.forrer@wuerth-phoenix.com>
Thomas Gelf <thomas.gelf@icinga.com>
@ -188,6 +219,7 @@ Uwe Ebel <kobmaki@aol.com>
Valentin Hoebel <valentin@xenuser.org>
Vytenis Darulis <vytenis@uber.com>
Wenger Florian <wenger@unifox.at>
Will Frey <will.frey@digitalreasoning.com>
Winfried Angele <winfried.angele@gmail.com>
Wolfgang Nieder <wnd@gmx.net>
Yannick Charton <tontonitch-pro@yahoo.fr>
@ -202,11 +234,15 @@ ctrlaltca <ctrlaltca@gmail.com>
dh.harald <dh.harald@gmail.com>
dominik-r-s <43005480+dominik-r-s@users.noreply.github.com>
fbachmann <bachmann.f@gmail.com>
fluxX04 <alexp710@hotmail.com>
gitmopp <mopp@gmx.net>
htriem <henrik.triem@netways.de>
jre3brg <jorge.rebelo@pt.bosch.com>
krishna <gskrishna44@gmail.com>
lihan <tclh123@gmail.com>
marxin <mliska@suse.cz>
mocruz <mocruz@theworkshop.com>
nemtrif <ntrifunovic@hotmail.com>
noobahoi <20069422+noobahoi@users.noreply.github.com>
pv2b <pvz@pvz.pp.se>
ryanohnemus <ryan.ohnemus@tradingtechnologies.com>

62
CHANGELOG.md
View File

@ -6,6 +6,68 @@ documentation before switching to a new version.
Released closed milestones can be found [here](https://github.com/Icinga/icinga2/milestones?state=closed).
## 2.11.0 RC1 (2019-07-25)
[Issue and PRs](https://github.com/Icinga/icinga2/issues?utf8=%E2%9C%93&q=milestone%3A2.11.0)
### Notes
**This is the first release candidate for 2.11.**
Upgrading docs: https://icinga.com/docs/icinga2/snapshot/doc/16-upgrading-icinga-2/
Thanks to all contributors: [BarbUk](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3ABarbUk), [alanlitster](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Aalanlitster), [mcktr](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Amcktr), [KAMI911](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3AKAMI911), [peteeckel](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Apeteeckel), [breml](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Abreml), [episodeiv](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Aepisodeiv), [Crited](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3ACrited), [robert-scheck](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Arobert-scheck), [west0rmann](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Awest0rmann), [Napsty](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3ANapsty), [Elias481](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3AElias481), [uubk](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Auubk), [miso231](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Amiso231), [neubi4](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Aneubi4), [atj](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Aatj), [mvanduren-itisit](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Amvanduren-itisit), [jschanz](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Ajschanz), [MaBauMeBad](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3AMaBauMeBad), [markleary](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Amarkleary), [leeclemens](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Aleeclemens), [m4k5ym](https://github.com/Icinga/icinga2/pulls?q=is%3Apr+author%3Am4k5ym)
### Enhancements
* Core
* Rewrite Network Stack (cluster, REST API) based on Boost Asio, Beast, Coroutines
* Technical concept: #7041
* Requires package updates: Boost >1.66 (either from packages.icinga.com, EPEL or backports). SLES11 & Ubuntu 14 are EOL.
* Require TLS 1.2 and harden default cipher list
* Improved Reload Handling (umbrella process, now 3 processes at runtime)
* Support running Icinga 2 in (Docker) containers natively in foreground
* Quality: Use Modern JSON for C++ library instead of YAJL (dead project)
* Quality: Improve handling of invalid UTF8 strings
* API
* Fix crashes and problems with permission filters from recent Namespace introduction #6785 (thanks Elias Ohm) #6874 (backported to 2.10.5)
* Locks and stalled waits are fixed with the core rewrite in #7071
* schedule-downtime action supports `all_services` for host downtimes
* Improve storage handling for runtime created objects in the `_api` package
* Cluster
* HA aware features & improvements for failover handling #2941 #7062
* Improve cluster config sync with staging #6716
* Checks & Notifications
* Ensure that notifications during a restart are sent
* Immediately notify about a problem after leaving a downtime and still NOT-OK
* Improve reload handling and wait for features/metrics
* Store notification command results and sync them in HA enabled zones #6722
* DSL/Configuration
* Add getenv() function
* Fix TimePeriod range support over midnight
* `concurrent_checks` in the Checker feature has no effect, use the global MaxConcurrentChecks constant instead
* CLI
* Permissions: node wizard/setup, feature, api setup now run in the Icinga user context, not root
* `ca list` shows pending CSRs by default, `ca remove/restore` allow to delete signing requests
* ITL
* Add new commands and missing attributes - thanks to all contributors!
* Windows
* Update bundled NSClient++ to 0.5.2.39
* Update agent installer and OpenSSL
* Documentation
* Service Monitoring: How to create plugins by example, check commands and a modern version of the supported plugin API with best practices.
* Features: Better structure on metrics, and supported features.
* Basics: Rename `Custom Attributes` to `Custom Variables`.
* Basics: Refine explanation of command arguments.
* Distributed: Reword `Icinga client` into `Icinga agent` and add new images for scenarios and modes.
* Security: Add TLS v1.2+ requirement, hardened cipher lists
* Technical Concepts: TLS Network IO, Cluster Feature HA, Cluster Config Sync, Core Reload Handling.
* Development: Rewritten for better debugging and development experience for contributors including a style guide. Add nightly build setup instructions.
* Packaging: INSTALL.md was integrated into the Development chapter available at https://icinga.com/docs too.
## 2.10.5 (2019-05-23)
[Issues and PRs](https://github.com/Icinga/icinga2/milestone/81?closed=1)

18
RELEASE.md
View File

@ -26,7 +26,7 @@
Specify the release version.
```
VERSION=2.10.4
VERSION=2.11.0-rc1
```
Add your signing key to your Git configuration file, if not already there.
@ -102,18 +102,18 @@ git push --tags
git checkout master
git push
git checkout -b support/2.11
git push -u origin support/2.11
git checkout -b support/2.12
git push -u origin support/2.12
```
**For minor releases:** Push the support branch, cherry-pick the release commit
into master and merge the support branch:
```
git push -u origin support/2.10
git push -u origin support/2.11
git checkout master
git cherry-pick support/2.10
git merge --strategy=ours support/2.10
git cherry-pick support/2.11
git merge --strategy=ours support/2.11
git push origin master
```
@ -144,7 +144,7 @@ git checkout release && git pull
Set the `Version`, `Revision` and `changelog` inside the spec file.
```
VERSION=2.10.4
VERSION=2.11.0-rc1
sed -i "s/Version: .*/Version: $VERSION/g" icinga2.spec
@ -232,7 +232,7 @@ cd /mnt/packaging
git config --global user.name "Michael Friedrich"
git config --global user.email "michael.friedrich@icinga.com"
VERSION=2.10.4
VERSION=2.11.0-rc1
./dch $VERSION-1 "Update to $VERSION"
```
@ -309,7 +309,7 @@ command line.
```
choco apikey --key xxx --source https://push.chocolatey.org/
choco push Icinga2-v2.10.0.nupkg --source https://push.chocolatey.org/
choco push Icinga2-v2.11.0.nupkg --source https://push.chocolatey.org/
```

2
VERSION
View File

@ -1,2 +1,2 @@
Version: 2.10.5
Version: 2.11.0-rc1
Revision: 1