Skip to content

Commit

Permalink
Update documentation for v2.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Friedrich committed Jan 9, 2015
1 parent 0ee2a1c commit 5ddc602
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 9 deletions.
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
Gunnar Beutner <gunnar.beutner@netways.de> <icinga@net-icinga2.adm.netways.de>
<michael.friedrich@netways.de> <michael.friedrich@gmail.com>
<michael.friedrich@netways.de> <Michael.Friedrich@netways.de>
<tobias@vonderkrone.info> <tobias.vonderkrone@profitbricks.com>
20 changes: 20 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,26 @@ Please check [doc/1-about.md].

## What's New

### What's New in Version 2.2.3

#### Changes

* Bugfixes

#### Issues

* Bug #8063: Volatile checks trigger invalid notifications on OK->OK state changes
* Bug #8125: Incorrect ticket shouldn't cause "node wizard" to terminate
* Bug #8126: Icinga 2.2.2 doesn't build on i586 SUSE distributions
* Bug #8143: Windows plugin check_service.exe can't find service NTDS
* Bug #8144: Arguments without values are not used on plugin exec
* Bug #8147: check_interval must be greater than 0 error on update-config
* Bug #8152: DB IDO query queue limit reached on reload
* Bug #8171: Typo in example of StatusDataWriter
* Bug #8178: Icinga 2.2.2 segfaults on FreeBSD
* Bug #8181: icinga2 node update config shows hex instead of human readable names
* Bug #8182: Segfault on update-config old empty config

### What's New in Version 2.2.2

#### Changes
Expand Down
17 changes: 9 additions & 8 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files
$ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS

Bump the version in icinga2.spec.
Update the [ChangeLog](ChangeLog) and [doc/1-about.md](doc/1-about.md) files.
Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) and [INSTALL.md](INSTALL.md)
files.
Commit these changes to the "master" branch.

$ git commit -v -a -m "Release version <VERSION>"
Expand All @@ -89,11 +90,11 @@ GB:
MF:

$ git tag -u D14A1F16 -m "Version <VERSION>" v<VERSION>

Push the tag.

$ git push --tags

Merge the "master" branch into the "support/2.2" branch (using --ff-only).

$ git checkout support/2.2
Expand All @@ -111,12 +112,12 @@ disable the usage of `git describe`.

Use `git archive` to build the release tarball:

$ VERSION=2.2.2
$ VERSION=2.2.3
$ git archive --format=tar --prefix=icinga2-$VERSION/ tags/v$VERSION | gzip >icinga2-$VERSION.tar.gz

Finally you should verify that the tarball only contains the files it should contain:

$ VERSION=2.2.2
$ VERSION=2.2.3
$ tar ztf icinga2-$VERSION.tar.gz | less


Expand Down Expand Up @@ -145,12 +146,12 @@ variables are supported:
- `ICINGA2_PLUGINDIR`: The path for the Monitoring Plugins project binaries; defaults to `/usr/lib/nagios/plugins`
- `ICINGA2_RUNDIR`: The location of the "run" directory; defaults to `CMAKE_INSTALL_LOCALSTATEDIR/run`
- `CMAKE_INSTALL_SYSCONFDIR`: The configuration directory; defaults to `CMAKE_INSTALL_PREFIX/etc`
- `ICINGA2_SYSCONFIGFILE`: Where to put the config file the initscript/systemd pulls it's dirs from;
- `ICINGA2_SYSCONFIGFILE`: Where to put the config file the initscript/systemd pulls it's dirs from;
defaults to `CMAKE_INSTALL_PREFIX/etc/sysconfig/icinga2`
- `CMAKE_INSTALL_LOCALSTATEDIR`: The state directory; defaults to `CMAKE_INSTALL_PREFIX/var`
- `USE_SYSTEMD=ON|OFF`: Use systemd or a classic SysV initscript; defaults to `OFF`
- `INSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON|OFF` Force install both the systemd service definition file
and the SysV initscript in parallel, regardless of how `USE_SYSTEMD` is set.
- `INSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON|OFF` Force install both the systemd service definition file
and the SysV initscript in parallel, regardless of how `USE_SYSTEMD` is set.
Only use this for special packaging purposes and if you know what you are doing.
Defaults to `OFF`.
- `ICINGA2_WITH_MYSQL`: Determines whether the MySQL IDO module is built; defaults to `ON`
Expand Down
20 changes: 20 additions & 0 deletions doc/1-about.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,26 @@ Icinga 2 is available as [Vagrant Demo VM](#vagrant).

## <a id="whats-new"></a> What's new

### What's New in Version 2.2.3

#### Changes

* Bugfixes

#### Issues

* Bug #8063: Volatile checks trigger invalid notifications on OK->OK state changes
* Bug #8125: Incorrect ticket shouldn't cause "node wizard" to terminate
* Bug #8126: Icinga 2.2.2 doesn't build on i586 SUSE distributions
* Bug #8143: Windows plugin check_service.exe can't find service NTDS
* Bug #8144: Arguments without values are not used on plugin exec
* Bug #8147: check_interval must be greater than 0 error on update-config
* Bug #8152: DB IDO query queue limit reached on reload
* Bug #8171: Typo in example of StatusDataWriter
* Bug #8178: Icinga 2.2.2 segfaults on FreeBSD
* Bug #8181: icinga2 node update config shows hex instead of human readable names
* Bug #8182: Segfault on update-config old empty config

### What's New in Version 2.2.2

#### Changes
Expand Down
2 changes: 1 addition & 1 deletion icinga2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

Summary: Network monitoring application
Name: icinga2
Version: 2.2.2
Version: 2.2.3
Release: %{revision}%{?dist}
License: GPL-2.0+
Group: Applications/System
Expand Down

0 comments on commit 5ddc602

Please sign in to comment.