From e07dab3fe23325ac73940ca09e6e25253ed44872 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 24 Jul 2019 11:54:29 +0200 Subject: [PATCH 1/5] Prepare changelog for 2.11 RC1 --- CHANGELOG.md | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc7f2ebdd..2928d2533 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,61 @@ 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/ + +### 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 +* Windows + * Update bundled NSClient++ to 0.5.2.39 +* 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 + * Technical Concepts: TLS Network IO, Cluster Feature HA, Cluster Config Sync + * 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, being 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) From 79f967e386575133e28414b41d2ece49135d1068 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 24 Jul 2019 12:13:34 +0200 Subject: [PATCH 2/5] Update AUTHORS for 2.11 --- .mailmap | 11 ++++++++--- AUTHORS | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/.mailmap b/.mailmap index bdb19d322..e37a5aca9 100644 --- a/.mailmap +++ b/.mailmap @@ -6,9 +6,10 @@ Gunnar Beutner Michael Insel -Jean Flach -Jean Flach -Jean Flach Jean Flach +Diana Flach +Diana Flach +Diana Flach Jean Flach +Diana Flach Dolf Schimmel Markus Waldmüller Claudio Kuenzler @@ -36,3 +37,7 @@ Michael Insel Marianne Spiller Robin O'Brien +Jens Schanz +Jens Schanz Schanz, Jens +Henrik Triem Henrik Triem <43344334+htriem@users.noreply.github.com> +nemtrif diff --git a/AUTHORS b/AUTHORS index f5c909682..6cc8fe442 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,19 +1,27 @@ +Aaron Bishop Adam Bolte Adam James Alan Jenkins +Alan Litster +Alex +Alex Merry Alexander A. Klimov Alexander Fuhr Alexander Schomburg +Alexander Stoll Alexander Wirt Andrea Kao Andreas Scherbaum Andres Ivanov +Andrew Jaffie Andrew Meyer Andy Grunwald Arnd Hannemann Assaf Flatto +BarbUk Bas Couwenberg Bastian Guse +Bauerheim, Marcus Benedikt Heine Bernd Erk Berthold Cogel @@ -40,7 +48,10 @@ Daniel Helgenberger Daniel Kesselberg Daniil Yaroslavtsev David Beck +David Lublink Denis +Dennis Lichtenthäler +Diana Flach Dinesh Majrekar Dirk Goetz Dirk Melchers @@ -48,6 +59,7 @@ Dolf Schimmel Edgar Fuß Eduard Güldner Edvin Seferovic +Elias Ohm Eric Lippmann Evgeni Golov Ewoud Kohl van Wijngaarden @@ -62,12 +74,14 @@ Georg Haas Gerd von Egidy Gerhardt Roman Glauco Vinicius +Greg Hewgill Gunnar Beutner Hannes Happle Hannes Van de Vel Harald Laabs Heike Jurzik Hendrik Röder +Henrik Triem Ian Kelling Ildar Hizbulin Irina Kaprizkina @@ -76,11 +90,11 @@ James Pharaoh Jan Andres Jan Beich Jan Wagner +Janne Heß Jason Young -Jean Flach Jean-Louis Dupond Jens Link -Jens Schanz +Jens Schanz Jeon Sang Wan Jeremy Armstrong Jesse Morgan @@ -94,14 +108,19 @@ Jérôme Drouet Kai Goller Konstantin Kelemen Kálmán Szalai - KAMI +Kálmán „KAMI” Szalai Lars Engels Lars Krüger Leah Oswald Lee Clemens +Lee Garrett Lennart Betz +Leon Stringer Louis Sautier Luca Lesinigo +Lucas Bremgartner Lucas Fairchild-Madar +Luiz Amaral Magnus Bäck Malte Rabenseifner Manuel Reiter @@ -110,16 +129,21 @@ MarcusCaepio Marianne Spiller Marius Bergmann Marius Sturm +Mark Leary Markus Frosch Markus Waldmüller +Martijn van Duren +Martin Neubert Martin Stiborsky Mathieu Arnold Mathieu Lutfy Matthaus Owens Matthias Schales Maurice Meyer +Max Deparade Max Rosin Max Zhang +Maximilian Falkenstein Mhd Sulhan Micha Ahrweiler Michael Friedrich @@ -131,11 +155,15 @@ Michal Petko Mikesch-mp Mirco Bauer Mirko Nardin +Muhammad Mominul Huque +Nemanja Trifunovic Nicolai Nicolas Limage Nicole Lang Niflou Noah Hilverling +Obihörnchen +Oleg Artenii Pall Sigurdsson Paolo Schiro Patrick Huy @@ -151,12 +179,14 @@ Ralph Breier Reto Zeder Ricardo Bartels Robert Lindgren +Robert Scheck Robin O'Brien Roland Hopferwieser Roman Gerhardt Rudy Gevaert Rune Darrud Sam Kottler +Sascha Westermann Sebastian Brückner Sebastian Chrostek Sebastian Eikenberg @@ -173,6 +203,7 @@ Steve McMaster Strajan Sebastian Ioan Strix <660956+MrStrix@users.noreply.github.com> Sven Nierlein +Sven Wegener T. Mulyana Thomas Forrer Thomas Gelf @@ -188,6 +219,7 @@ Uwe Ebel Valentin Hoebel Vytenis Darulis Wenger Florian +Will Frey Winfried Angele Wolfgang Nieder Yannick Charton @@ -202,11 +234,15 @@ ctrlaltca dh.harald dominik-r-s <43005480+dominik-r-s@users.noreply.github.com> fbachmann +fluxX04 gitmopp +htriem jre3brg krishna lihan +marxin mocruz +nemtrif noobahoi <20069422+noobahoi@users.noreply.github.com> pv2b ryanohnemus From 38f6b11011c979383c6efb232f350e917dabd2b0 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 25 Jul 2019 09:23:28 +0200 Subject: [PATCH 3/5] Update RELEASE docs --- RELEASE.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 34ce7281d..cbaed15bd 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -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/ ``` From 1c79c2b34c845d4cfd387e483d791fddfb59a960 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 25 Jul 2019 09:52:45 +0200 Subject: [PATCH 4/5] Update changelog and add contributors --- CHANGELOG.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2928d2533..02c3a47b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ Released closed milestones can be found [here](https://github.com/Icinga/icinga2 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 @@ -48,15 +50,20 @@ Upgrading docs: https://icinga.com/docs/icinga2/snapshot/doc/16-upgrading-icinga * 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 + * 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 - * Technical Concepts: TLS Network IO, Cluster Feature HA, Cluster Config Sync + * 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, being available at https://icinga.com/docs too. + * Packaging: INSTALL.md was integrated into the Development chapter available at https://icinga.com/docs too. From bb2ad99cf3e52dd4eed9bdb0add2a109b0ce1e10 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 25 Jul 2019 09:53:13 +0200 Subject: [PATCH 5/5] Release version 2.11.0-rc1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d13d363e1..fc15dfced 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -Version: 2.10.5 +Version: 2.11.0-rc1 Revision: 1