AUTHORS

@@ -71,6 +71,7 @@ Hendrik Röder <hendrik.biz@gmail.com>
 Ian Kelling <ian@iankelling.org>
 Ildar Hizbulin <hizel@vyborg.ru>
 Irina Kaprizkina <ikapriz@gmail.com>
+Jack <jackdev@mailbox.org>
 James Pharaoh <james@pharaoh.uk>
 Jan Andres <jan.andres@berenberg.de>
 Jan Beich <jbeich@FreeBSD.org>

CHANGELOG.md

 # Icinga 2.x CHANGELOG
 
+## 2.10.1 (2018-10-18)
+
+### Bug
+
+* [#6696](https://github.com/icinga/icinga2/issues/6696) (PR): Remove default environment, regression from e678fa1aa5
+* [#6694](https://github.com/icinga/icinga2/issues/6694): v2.10.0 sets a default environment "production" in SNI
+* [#6691](https://github.com/icinga/icinga2/issues/6691) (PR): Add missing shutdown/program state dumps for SIGUSR2 reload handler
+* [#6689](https://github.com/icinga/icinga2/issues/6689): State file not updated on reload
+* [#6685](https://github.com/icinga/icinga2/issues/6685) (API, PR): Fix regression with API permission filters and namespaces in v2.10
+* [#6682](https://github.com/icinga/icinga2/issues/6682) (API): API process-check-result fails in 2.10.0
+* [#6679](https://github.com/icinga/icinga2/issues/6679) (Windows, PR): Initialize Configuration::InitRunDir for Windows and writing the PID file
+* [#6624](https://github.com/icinga/icinga2/issues/6624) (Check Execution): Master Reload Causes Passive Check State Change
+* [#6592](https://github.com/icinga/icinga2/issues/6592): Reloads seem to reset the check atempt count. Also notifications go missing shortly after a reload.
+
+### Documentation
+
+* [#6701](https://github.com/icinga/icinga2/issues/6701) (Documentation, PR): Add GitHub release tag to README
+* [#6700](https://github.com/icinga/icinga2/issues/6700) (Documentation, PR): Enhance the addon chapter in the docs
+* [#6699](https://github.com/icinga/icinga2/issues/6699) (Documentation, PR): Update to https://icinga.com/
+* [#6692](https://github.com/icinga/icinga2/issues/6692) (Documentation, PR): Update release docs for Chocolatey
+* [#6690](https://github.com/icinga/icinga2/issues/6690) (Documentation, PR): Extend 09-object-types.md with argument array
+* [#6674](https://github.com/icinga/icinga2/issues/6674) (Documentation, PR): Add a note to the docs on \>2 endpoints in a zone
+* [#6673](https://github.com/icinga/icinga2/issues/6673) (Documentation, PR): Update RELEASE docs
+* [#6672](https://github.com/icinga/icinga2/issues/6672) (Documentation, PR): Extend upgrade docs
+* [#6671](https://github.com/icinga/icinga2/issues/6671) (Documentation): Zone requirements changed in 2.10 - Undocumented Change
+
+### Support
+
+* [#6681](https://github.com/icinga/icinga2/issues/6681) (code-quality, PR): Fix spelling errors.
+* [#6677](https://github.com/icinga/icinga2/issues/6677) (Packages, Windows): icinga does not start after Update to 2.10
+
 ## 2.10.0 (2018-10-11)
 
 ### Notes

CMakeLists.txt

 # Icinga 2
-# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)
+# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

INSTALL.md

@@ -7,7 +7,7 @@ of operating systems.
 Please check the documentation in the [doc/](doc/) directory for a current list
 of available packages and detailed installation instructions.
 
-The online documentation is available on [icinga.com/docs](https://www.icinga.com/docs/)
+The online documentation is available on [icinga.com/docs](https://icinga.com/docs/)
 and will guide you step by step.
 
 There are a number of known caveats when installing from source such as

NEWS

-News for this application can be found on the project website at https://www.icinga.com
+News for this application can be found on the project website at https://icinga.com

README.md

 [![Build Status](https://travis-ci.org/Icinga/icinga2.svg?branch=master)](https://travis-ci.org/Icinga/icinga2)
+[![Github Tag](https://img.shields.io/github/tag/Icinga/icinga2.svg)](https://github.com/Icinga/icinga2)
 
 # Icinga 2
 
-![Icinga Logo](https://www.icinga.com/wp-content/uploads/2014/06/icinga_logo.png)
+![Icinga Logo](https://icinga.com/wp-content/uploads/2014/06/icinga_logo.png)
 
 #### Table of Contents
 
@@ -21,11 +22,11 @@ network resources, notifies users of outages, and generates performance data for
 Scalable and extensible, Icinga 2 can monitor large, complex environments across
 multiple locations.
 
-Icinga 2 as monitoring core works best with [Icinga Web 2](https://www.icinga.com/products/icinga-web-2/)
+Icinga 2 as monitoring core works best with [Icinga Web 2](https://icinga.com/products/icinga-web-2/)
 as web interface.
 
-More information can be found at [www.icinga.com](https://www.icinga.com/products/icinga-2/)
-and inside the [documentation](https://www.icinga.com/docs/icinga2/latest/).
+More information can be found at [icinga.com](https://icinga.com/products/icinga-2/)
+and inside the [documentation](https://icinga.com/docs/icinga2/latest/).
 
 ## Licensing
 
@@ -58,9 +59,9 @@ is also available on https://docs.icinga.com
 
 ## Support
 
-Check the project website at https://www.icinga.com for status updates. Join the
-[community channels](https://www.icinga.com/community) for questions
-or ask an Icinga partner for [professional support](https://www.icinga.com/services/support/).
+Check the project website at https://icinga.com for status updates. Join the
+[community channels](https://icinga.com/community) for questions
+or ask an Icinga partner for [professional support](https://icinga.com/services/support/).
 
 ## Contributing
 

RELEASE.md

@@ -26,7 +26,7 @@
 Specify the release version.
 
 ```
-VERSION=2.10.0
+VERSION=2.10.1
 ```
 
 Add your signing key to your Git configuration file, if not already there.
@@ -70,6 +70,8 @@ sed -i "s/Version: .*/Version: $VERSION/g" VERSION
 
 Update the [CHANGELOG.md](CHANGELOG.md) file.
 
+### Requirements
+
 Export these environment variables:
 
 ```
@@ -78,6 +80,10 @@ export ICINGA_GITHUB_AUTH_TOKEN='token'
 export ICINGA_GITHUB_PROJECT='icinga/icinga2'
 ```
 
+### Generation
+
+**Close the version on [GitHub](https://github.com/Icinga/icinga2/milestones).**
+
 Run the script which updates the [CHANGELOG.md](CHANGELOG.md) file.
 
 ```
@@ -112,18 +118,20 @@ git push --tags
 
 ```
 git checkout master
-git checkout -b support/2.9
-git push -u origin support/2.9
+git push
+
+git checkout -b support/2.11
+git push -u origin support/2.11
 ```
 
 **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.8
+git push -u origin support/2.10
 git checkout master
-git cherry-pick support/2.8
-git merge --strategy=ours support/2.8
+git cherry-pick support/2.10
+git merge --strategy=ours support/2.10
 git push origin master
 ```
 
@@ -169,10 +177,16 @@ git push
 ```
 
 **Note for major releases**: Update release branch to latest.
-`git checkout release && git pull && git merge master && git push`
+
+```
+git checkout release && git pull && git merge master && git push
+```
 
 **Note for minor releases**: Cherry-pick the release commit into master.
-`git checkout master && git pull && git cherry-pick release && git push`
+
+```
+git checkout master && git pull && git cherry-pick release && git push
+```
 
 
 ### DEB Packages  <a id="deb-packages"></a>
@@ -213,25 +227,29 @@ git commit -av -m "Release 2.9.0-1"
 ```
 
 **Note for major releases**: Update release branch to latest.
-`git checkout release && git pull && git merge master && git push`
+
+```
+git checkout release && git pull && git merge master && git push
+```
 
 **Note for minor releases**: Cherry-pick the release commit into master.
-`git checkout master && git pull && git cherry-pick release && git push`
 
+```
+git checkout master && git pull && git cherry-pick release && git push
+```
 
 #### DEB with dch on macOS
 
 ```
 docker run -v `pwd`:/mnt/packaging -ti ubuntu:xenial bash
 
-apt-get update
-apt-get install git ubuntu-dev-tools vim
+apt-get update && apt-get install git ubuntu-dev-tools vim -y
 cd /mnt/packaging
 
 git config --global user.name "Michael Friedrich"
 git config --global user.email "michael.friedrich@icinga.com"
 
-./dch 2.9.0-1 "Update to 2.9.0"
+./dch 2.10.0-1 "Update to 2.10.0"
 ```
 
 
@@ -240,7 +258,8 @@ git config --global user.email "michael.friedrich@icinga.com"
 * Verify package build changes for this version.
 * Test the snapshot packages for all distributions beforehand.
 * Build the newly created Git tag for Debian/RHEL/SuSE.
-* Build the newly created Git tag for Windows.
+  * Wait until all jobs have passed and then publish them one by one with `allow_release`
+* Build the newly created Git tag for Windows: `refs/tags/v2.10.0` as source and `v2.10.0` as package name.
 
 ## Release Tests  <a id="release-tests"></a>
 
@@ -249,7 +268,7 @@ git config --global user.email "michael.friedrich@icinga.com"
 * Test the [setup wizard](https://packages.icinga.com/windows/) inside a Windows VM.
 * Start a new docker container and install/run icinga2.
 
-Example for CentOS7:
+### CentOS
 
 ```
 docker run -ti centos:latest bash
@@ -259,6 +278,24 @@ yum -y install icinga2
 icinga2 daemon -C
 ```
 
+### Debian
+
+```
+docker run -ti debian:stretch bash
+
+apt-get update && apt-get install -y wget curl gnupg apt-transport-https
+
+DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release); \
+ echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > \
+ /etc/apt/sources.list.d/${DIST}-icinga.list
+ echo "deb-src http://packages.icinga.com/debian icinga-${DIST} main" >> \
+ /etc/apt/sources.list.d/${DIST}-icinga.list
+
+curl https://packages.icinga.com/icinga.key | apt-key add -
+apt-get -y install icinga2
+icinga2 daemon
+```
+
 ## GitHub Release  <a id="github-release"></a>
 
 Create a new release for the newly created Git tag: https://github.com/Icinga/icinga2/releases
@@ -268,33 +305,67 @@ Create a new release for the newly created Git tag: https://github.com/Icinga/ic
 Navigate to the git repository on your Windows box which
 already has chocolatey installed. Pull/checkout the release.
 
-Create the nupkg package:
+Create the nupkg package (or use the one generated on https://packages.icinga.com/windows):
 
 ```
 cpack
 ```
 
-Install the created icinga2 package locally:
+Fetch the API key from https://chocolatey.org/account and use the `choco push`
+command line.
 
 ```
-choco install icinga2 -version 2.9.0 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
+choco apikey --key xxx --source https://push.chocolatey.org/
+
+choco push Icinga2-v2.10.0.nupkg --source https://push.chocolatey.org/
 ```
 
-Upload the package to [chocolatey](https://chocolatey.org/packages/upload).
 
 ## Post Release  <a id="post-release"></a>
 
 ### Online Documentation  <a id="online-documentation"></a>
 
-Ask @bobapple to update the documentation at docs.icinga.com.
+Navigate to `puppet-customer/icinga.git` and do the following steps:
+
+#### Testing
+
+```
+git checkout testing && git pull
+vim files/var/www/docs/config/icinga2-latest.yml
+
+git commit -av -m "icinga-web1: Update docs for Icinga 2"
+
+git push
+```
+
+SSH into icinga-web1 and do a manual Puppet dry run with the testing environment.
+
+```
+puppet agent -t --environment testing --noop
+```
+
+Once succeeded, continue with production deployment.
+
+#### Production
+
+```
+git checkout master && git pull
+git merge testing
+git push
+```
+
+SSH into icinga-web1 and do a manual Puppet run from the production environment (default).
+
+```
+puppet agent -t
+```
 
 ### Announcement  <a id="announcement"></a>
 
-* Create a new blog post on www.icinga.com/blog
-* Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.com/icinga), [G+](https://plus.google.com/+icinga), [Xing](https://www.xing.com/communities/groups/icinga-da4b-1060043), [LinkedIn](https://www.linkedin.com/groups/Icinga-1921830/about)
+* Create a new blog post on icinga.com/blog
+* Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.com/icinga), [Xing](https://www.xing.com/communities/groups/icinga-da4b-1060043), [LinkedIn](https://www.linkedin.com/groups/Icinga-1921830/about)
 * Update IRC channel topic
 
 ### Project Management  <a id="project-management"></a>
 
 * Add new minor version on [GitHub](https://github.com/Icinga/icinga2/milestones).
-* Close the released version on [GitHub](https://github.com/Icinga/icinga2/milestones).

VERSION

-Version: 2.10.0
+Version: 2.10.1
 Revision: 1

agent/CMakeLists.txt

 # Icinga 2
-# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)
+# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

choco/CMakeLists.txt

 # Icinga 2
-# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)
+# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

choco/icinga2.nuspec.cmake

@@ -11,16 +11,16 @@
     <owners>Icinga Development Team</owners>
     <summary>icinga2 - Monitoring Agent for Windows</summary>
     <description>Icinga 2 is an open source monitoring platform which notifies users about host and service outages.</description>
-    <projectUrl>https://www.icinga.com/</projectUrl>
+    <projectUrl>https://icinga.com/</projectUrl>
     <tags>icinga2 agent monitoring admin</tags>
-    <licenseUrl>https://www.icinga.com/resources/faq/</licenseUrl>
+    <licenseUrl>https://icinga.com/resources/faq/</licenseUrl>
     <releaseNotes>https://github.com/Icinga/icinga2/blob/master/ChangeLog</releaseNotes>
     <docsUrl>https://docs.icinga.com/icinga2/</docsUrl>
     <bugTrackerUrl>https://github.com/Icinga/icinga2/issues</bugTrackerUrl>
     <packageSourceUrl>https://github.com/Icinga/icinga2</packageSourceUrl>
     <projectSourceUrl>https://github.com/Icinga/icinga2</projectSourceUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>https://www.icinga.com/wp-content/uploads/2015/05/icinga_icon_128x128.png</iconUrl>
+    <iconUrl>https://icinga.com/wp-content/uploads/2015/05/icinga_icon_128x128.png</iconUrl>
   </metadata>
   <files>
     <file src="${CMAKE_CURRENT_BINARY_DIR}/chocolateyInstall.ps1" target="tools" />

cmake/InstallConfig.cmake

 # Icinga 2
-# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com)
+# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

cmake/SetFullDir.cmake

 # Icinga 2
-# Copyright (C) 2018 Icinga Development Team (https://www.icinga.com)
+# Copyright (C) 2018 Icinga Development Team (https://icinga.com)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

contrib/GPLHeader

 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *

contrib/discover-api.py

 #!/usr/bin/env python
 # Icinga 2
-# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)
+# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

contrib/discover.py

 #!/usr/bin/env python
 # Icinga 2
-# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)
+# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

debian/changelog

+icinga2 (2.10.1-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Update www.icinga.com URLs to icinga.com, and dev.icinga.com to GitHub.
+  * Drop spelling-errors.patch, applied upstream.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 20 Oct 2018 18:03:58 +0200
+
 icinga2 (2.10.0-1~exp1) experimental; urgency=medium
 
   * Team upload.

debian/classicui/cgi.cfg

 # Icinga 2 Classic UI configuration
 #
 # requires icinga-gui package
-# check https://www.icinga.com/docs/ for option details
+# check https://icinga.com/docs/ for option details
 standalone_installation=1
 physical_html_path=/usr/share/icinga
 url_html_path=/icinga2-classicui

debian/control

@@ -29,7 +29,7 @@ Build-Depends: bash-completion,
 Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-icinga2
 Vcs-Git: https://salsa.debian.org/nagios-team/pkg-icinga2.git
-Homepage: https://www.icinga.com
+Homepage: https://icinga.com
 
 Package: icinga2
 Architecture: any

debian/copyright

@@ -3,12 +3,12 @@ Upstream-Name: Icinga 2
 Source: https://github.com/Icinga/icinga2
 
 Files: *
-Copyright: 2012-2018, Icinga Development Team (https://www.icinga.com)
+Copyright: 2012-2018, Icinga Development Team (https://icinga.com)
 License: GPL-2+ with OpenSSL exception
 
 Files: etc/icinga2/scripts/mail-host-notification.sh
  etc/icinga2/scripts/mail-service-notification.sh
-Copyright: 2012-2018, Icinga Development Team (https://www.icinga.com/)
+Copyright: 2012-2018, Icinga Development Team (https://icinga.com/)
                       Brian White (brian@aljex.com)
 Comment: urlencode function by Brian White (brian@aljex.com) uses MIT license
 License: GPL-2+ with OpenSSL exception and Expat
@@ -57,7 +57,7 @@ License: ISC
 Files: debian/*
 Copyright: 2012-2014, Alexander Wirt <formorer@debian.org>
            2013-2014, Markus Frosch <lazyfrosch@debian.org>
-                2014, Icinga Development Team (https://www.icinga.com)
+                2014, Icinga Development Team (https://icinga.com)
 License: GPL-2+
 
 License: BSD-3-clause