[Pkg-nagios-changes] [pkg-icinga2] 04/04: Merge branch 'master' into debmon-wheezy
Alexander Wirt
formorer at debian.org
Thu Aug 7 15:30:37 UTC 2014
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch debmon-wheezy
in repository pkg-icinga2.
commit f7dffe698b6cd956d49f46a944825bacbf1e550e
Merge: e1f21b7 9efd61c
Author: Alexander Wirt <formorer at debian.org>
Date: Thu Aug 7 15:19:07 2014 +0200
Merge branch 'master' into debmon-wheezy
Conflicts:
debian/changelog
AUTHORS | 4 +
CMakeLists.txt | 7 +-
ChangeLog | 62 +++++++
INSTALL | 16 +-
README => README.md | 0
components/compat/CMakeLists.txt | 2 +-
components/compat/externalcommandlistener.cpp | 85 +++++----
components/compat/externalcommandlistener.hpp | 1 +
components/compat/externalcommandlistener.ti | 2 +-
components/db_ido_mysql/idomysqlconnection.cpp | 21 ++-
components/db_ido_mysql/schema/mysql.sql | 6 +-
components/db_ido_mysql/schema/upgrade/.gitignore | 0
components/db_ido_mysql/schema/upgrade/2.0.2.sql | 20 ++
components/db_ido_pgsql/idopgsqlconnection.cpp | 21 ++-
components/db_ido_pgsql/schema/pgsql.sql | 2 +-
components/db_ido_pgsql/schema/upgrade/.gitignore | 0
components/db_ido_pgsql/schema/upgrade/2.0.2.sql | 17 ++
components/livestatus/avgaggregator.cpp | 6 +-
components/livestatus/invavgaggregator.cpp | 6 +-
components/livestatus/invsumaggregator.cpp | 6 +-
components/livestatus/livestatuslistener.ti | 2 +-
components/livestatus/maxaggregator.cpp | 6 +-
components/livestatus/minaggregator.cpp | 6 +-
components/livestatus/stdaggregator.cpp | 6 +-
components/livestatus/sumaggregator.cpp | 6 +-
components/perfdata/graphitewriter.cpp | 23 ++-
config.h.cmake | 1 +
debian/changelog | 25 ++-
debian/control | 6 +-
debian/docs | 2 +-
debian/icinga2-classicui.postinst | 2 +
debian/rules | 7 +-
doc/1-about.md | 104 +++++++----
doc/2-getting-started.md | 177 ++++++++++++++----
doc/3-monitoring-basics.md | 51 ++++--
doc/4-monitoring-remote-systems.md | 130 ++++++++++---
doc/5-addons-plugins.md | 3 +-
doc/6-configuring-icinga-2.md | 48 ++---
doc/7-troubleshooting.md | 51 +++++-
doc/8-migration.md | 10 +
etc/CMakeLists.txt | 3 +-
etc/icinga2/conf.d/commands.conf | 44 ++---
etc/icinga2/conf.d/hosts/localhost/disk.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/http.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/icinga.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/load.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/procs.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/ssh.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/swap.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/users.conf | 5 +
etc/icinga2/conf.d/services.conf | 6 +-
etc/icinga2/conf.d/templates.conf | 4 +
etc/icinga2/conf.d/timeperiods.conf | 4 +-
.../{constants.conf => constants.conf.cmake} | 2 +-
etc/icinga2/features-available/debuglog.conf | 2 +-
etc/icinga2/features-available/graphite.conf | 2 +-
etc/icinga2/features-available/ido-mysql.conf | 6 +-
etc/icinga2/features-available/ido-pgsql.conf | 6 +-
etc/icinga2/features-available/mainlog.conf | 2 +-
etc/initsystem/CMakeLists.txt | 2 -
etc/initsystem/icinga2-prepare-dirs | 6 +-
etc/initsystem/icinga2.service.cmake | 2 +-
etc/initsystem/icinga2.sysconfig.cmake | 3 +-
icinga-app/CMakeLists.txt | 2 +-
icinga-app/icinga.cpp | 32 +++-
icinga2.spec | 202 ++++++++++-----------
itl/command-plugins.conf | 81 ++++-----
lib/base/application.cpp | 139 +++++++++-----
lib/base/application.hpp | 8 +-
lib/base/logger.hpp | 2 +
lib/base/streamlogger.cpp | 8 +-
lib/base/streamlogger.hpp | 1 +
lib/base/sysloglogger.cpp | 5 +
lib/base/sysloglogger.hpp | 1 +
lib/base/tcpsocket.cpp | 4 +-
lib/base/threadpool.cpp | 3 +-
lib/base/tlsstream.cpp | 38 ++--
lib/base/tlsstream.hpp | 4 +-
lib/base/tlsutility.cpp | 59 +++++-
lib/base/tlsutility.hpp | 3 +-
lib/base/utility.cpp | 16 +-
lib/db_ido/dbconnection.cpp | 2 -
lib/icinga/apievents.cpp | 54 ++++--
lib/icinga/checkable-check.cpp | 12 +-
lib/icinga/command.cpp | 12 ++
lib/icinga/command.hpp | 2 +
lib/icinga/icinga-type.conf | 11 +-
lib/icinga/perfdatavalue.cpp | 1 +
lib/icinga/pluginutility.cpp | 14 +-
lib/methods/plugineventtask.cpp | 13 +-
lib/methods/plugineventtask.hpp | 3 +
lib/remote/apiclient.cpp | 5 +
lib/remote/apiclient.hpp | 1 +
lib/remote/apilistener.cpp | 46 +++--
lib/remote/apilistener.hpp | 2 +-
lib/remote/authority.cpp | 3 +
test/config/5927.conf | 46 +++++
test/config/5980.conf | 8 +
test/config/6105.conf | 2 +
test/config/6479.conf | 46 +++++
test/config/6608.conf | 16 ++
test/config/templates.conf | 67 +++++++
tools/syntax/nano/icinga2.nanorc | 2 +-
tools/syntax/vim/syntax/icinga2.vim | 2 +-
104 files changed, 1462 insertions(+), 600 deletions(-)
diff --cc debian/changelog
index 2b97e30,07aaa25..f66cd42
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,32 @@@
- icinga2 (2.0.1-1~debmon70+1) debmon-wheezy; urgency=medium
++icinga2 (2.0.2-1~debmon70+1) debmon-wheezy; urgency=medium
+
+ * Rebuild for debmon.
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 14 Jul 2014 21:19:46 +0200
+
+ icinga2 (2.0.2-1) unstable; urgency=medium
+
+ [ Jan Wagner ]
+ * [e6fec86] Adding me to the Uploaders
+
+ [ Alexander Wirt ]
+ * [aef20e1] Imported Upstream version 2.0.2
+ * [2b1d87f] README is now README.md
+ * [ac7b2ba] Reenable Make snippet for installing upgrade files
+ * [f66aa0e] Fix dep on icinga-cgi-bin
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 07 Aug 2014 14:42:05 +0200
+
+ icinga2 (2.0.1-2) unstable; urgency=medium
+
+ [ Alexander Wirt ]
+ * [93ca878] Fix dependency on apache2-utils and take care cgi is loaded
+
+ [ Jan Wagner ]
+ * [63fb799] Adding Vcs-headers
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 30 Jul 2014 19:36:09 +0200
+
icinga2 (2.0.1-1) unstable; urgency=medium
[ Alexander Wirt ]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git
More information about the Pkg-nagios-changes
mailing list