[Pkg-nagios-changes] [pkg-icinga2] 01/02: Merge branch 'master' into debmon-wheezy
Markus Frosch
lazyfrosch at moszumanska.debian.org
Fri Aug 29 12:57:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
lazyfrosch pushed a commit to branch debmon-wheezy
in repository pkg-icinga2.
commit 86cec6e019ef649a0853518f1c4e65613a608dab
Merge: f7dffe6 d14b9a8
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Fri Aug 29 14:24:52 2014 +0200
Merge branch 'master' into debmon-wheezy
Conflicts:
debian/changelog
CMakeLists.txt | 1 +
ChangeLog | 61 ++
INSTALL | 182 ------
INSTALL.md | 196 +++++++
components/compat/checkresultreader.hpp | 2 +-
components/compat/compatlogger.cpp | 62 +--
components/compat/compatlogger.hpp | 6 +-
components/compat/externalcommandlistener.cpp | 83 ++-
components/compat/externalcommandlistener.hpp | 5 +-
components/compat/statusdatawriter.cpp | 66 +--
components/db_ido_mysql/CMakeLists.txt | 12 +
components/db_ido_mysql/idomysqlconnection.cpp | 67 ++-
components/db_ido_mysql/idomysqlconnection.hpp | 2 +-
components/db_ido_mysql/schema/mysql.sql | 3 +-
components/db_ido_mysql/schema/upgrade/2.1.0.sql | 17 +
components/db_ido_pgsql/CMakeLists.txt | 12 +
components/db_ido_pgsql/idopgsqlconnection.cpp | 71 ++-
components/db_ido_pgsql/idopgsqlconnection.hpp | 6 +-
components/db_ido_pgsql/schema/pgsql.sql | 3 +-
components/db_ido_pgsql/schema/upgrade/2.1.0.sql | 17 +
components/livestatus/commandstable.hpp | 4 +-
components/livestatus/endpointstable.hpp | 6 +-
components/livestatus/historytable.hpp | 2 +-
components/livestatus/hoststable.cpp | 2 +-
components/livestatus/hoststable.hpp | 6 +-
components/livestatus/livestatus-type.conf | 2 +-
components/livestatus/livestatuslistener.hpp | 4 +-
components/livestatus/livestatuslogutility.cpp | 58 +-
components/livestatus/logtable.hpp | 20 +-
components/livestatus/servicestable.cpp | 2 +-
components/livestatus/servicestable.hpp | 6 +-
components/livestatus/statehisttable.hpp | 14 +-
components/livestatus/statustable.hpp | 10 +-
components/notification/notification-type.conf | 1 +
components/notification/notificationcomponent.cpp | 6 +
components/notification/notificationcomponent.hpp | 4 +-
components/notification/notificationcomponent.ti | 3 +
components/perfdata/graphitewriter.cpp | 3 +
components/perfdata/graphitewriter.hpp | 10 +-
components/perfdata/perfdata-type.conf | 4 +-
components/perfdata/perfdatawriter.hpp | 4 +-
debian/.gitignore | 1 +
debian/changelog | 17 +
debian/control | 46 +-
debian/copyright | 6 +-
debian/icinga2-bin.lintian-overrides | 2 +-
debian/icinga2-common.install | 1 +
debian/patches/21_config_changes | 17 +
debian/patches/series | 1 +
debian/python-icinga2.install | 1 +
debian/rules | 6 +-
doc/1-about.md | 114 ++--
doc/2-getting-started.md | 440 ++++++++++-----
doc/3-monitoring-basics.md | 69 ++-
doc/4-monitoring-remote-systems.md | 473 +++++++++++-----
doc/6-configuring-icinga-2.md | 236 +++++++-
doc/7-troubleshooting.md | 48 +-
doc/8-migration.md | 13 +-
etc/icinga2/constants.conf.cmake | 8 +-
etc/initsystem/icinga2-prepare-dirs | 2 +-
icinga-app/icinga.cpp | 16 +-
icinga2.spec | 73 ++-
itl/CMakeLists.txt | 2 +-
itl/command-plugins-manubulon.conf | 202 +++++++
.../notification-type.conf => itl/manubulon | 7 +-
lib/base/application.cpp | 30 +-
lib/base/application.hpp | 3 +
lib/base/array.hpp | 1 +
lib/base/convert.hpp | 4 +-
lib/base/dictionary.hpp | 1 +
lib/base/dynamicobject.ti | 7 +
lib/base/filelogger.hpp | 4 +-
lib/base/logger.cpp | 2 +-
lib/base/process.cpp | 39 +-
lib/base/process.hpp | 3 +
lib/base/qstring.hpp | 5 +-
lib/base/socket.cpp | 36 +-
lib/base/stacktrace.cpp | 2 +-
lib/base/streamlogger.cpp | 2 +-
lib/base/streamlogger.hpp | 2 +-
lib/base/sysloglogger.hpp | 4 +-
lib/base/tcpsocket.cpp | 4 +-
lib/base/tlsstream.cpp | 32 +-
lib/base/tlsutility.cpp | 2 +-
lib/base/tlsutility.hpp | 14 +-
lib/base/utility.cpp | 25 +-
lib/config/aexpression.cpp | 181 ++++--
lib/config/aexpression.hpp | 98 ++--
lib/config/configcompilercontext.hpp | 2 +-
lib/config/configitem.cpp | 63 ++-
lib/config/configitem.hpp | 6 +-
lib/db_ido/commanddbobject.hpp | 2 +-
lib/db_ido/db_ido-type.conf | 36 +-
lib/db_ido/dbconnection.cpp | 28 +-
lib/db_ido/dbconnection.hpp | 5 +-
lib/db_ido/dbconnection.ti | 8 +
lib/db_ido/dbevents.cpp | 22 +-
lib/db_ido/dbevents.hpp | 50 +-
lib/db_ido/endpointdbobject.hpp | 8 +-
lib/db_ido/userdbobject.hpp | 2 +-
lib/icinga/apievents.cpp | 616 +++++++++++++++++++--
lib/icinga/apievents.hpp | 33 +-
lib/icinga/checkable-check.cpp | 25 +-
lib/icinga/checkable-event.cpp | 10 +-
lib/icinga/checkable.cpp | 2 +-
lib/icinga/checkable.hpp | 25 +-
lib/icinga/cib.hpp | 42 +-
lib/icinga/command.cpp | 2 +-
lib/icinga/compatutility.cpp | 4 +-
lib/icinga/compatutility.hpp | 4 +-
lib/icinga/customvarobject.cpp | 6 +-
lib/icinga/customvarobject.hpp | 2 +-
lib/icinga/externalcommandprocessor.hpp | 24 +-
lib/icinga/hostgroup.cpp | 4 +-
lib/icinga/hostgroup.hpp | 8 +-
lib/icinga/icinga-type.conf | 4 +-
lib/icinga/icingaapplication.hpp | 4 +-
lib/icinga/icingastatuswriter.cpp | 28 +-
lib/icinga/pluginutility.cpp | 15 +-
lib/icinga/servicegroup.cpp | 4 +-
lib/icinga/servicegroup.hpp | 8 +-
lib/icinga/user.cpp | 2 +-
lib/icinga/usergroup.cpp | 4 +-
lib/icinga/usergroup.hpp | 8 +-
lib/methods/clusterchecktask.hpp | 2 +-
lib/methods/pluginchecktask.cpp | 8 +
lib/methods/pluginchecktask.hpp | 4 +-
lib/methods/plugineventtask.cpp | 12 +-
lib/methods/plugineventtask.hpp | 3 +-
lib/methods/pluginnotificationtask.cpp | 12 +-
lib/methods/pluginnotificationtask.hpp | 3 +-
lib/remote/apiclient.cpp | 6 +-
lib/remote/apilistener-sync.cpp | 6 +-
lib/remote/apilistener.cpp | 65 ++-
lib/remote/apilistener.hpp | 5 +-
lib/remote/authority.cpp | 3 +-
lib/remote/endpoint.cpp | 3 +
{itl => python}/CMakeLists.txt | 28 +-
{itl => python/icinga2}/CMakeLists.txt | 10 +-
python/icinga2/__init__.py | 0
{itl => python/icinga2/commands}/CMakeLists.txt | 7 +-
python/icinga2/commands/__init__.py | 0
python/icinga2/commands/list_objects.py | 74 +++
.../icinga2/config.py.cmake | 13 +-
{itl => python/icinga2/utils}/CMakeLists.txt | 8 +-
python/icinga2/utils/__init__.py | 0
python/icinga2/utils/debug.py | 126 +++++
python/icinga2/utils/netstring.py | 305 ++++++++++
python/setup.py.cmake | 20 +
test/config/6968.conf | 28 +
third-party/cmake/PythonSetup.cmake | 215 +++++++
tools/syntax/nano/icinga2.nanorc | 4 +-
tools/syntax/vim/syntax/icinga2.vim | 4 +-
153 files changed, 4172 insertions(+), 1265 deletions(-)
diff --cc debian/changelog
index f66cd42,e0ce5e5..4fd60ec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,26 @@@
+ icinga2 (2.1.0-1) unstable; urgency=medium
+
+ [ Alexander Wirt ]
+ * [e1b3b50] Prefer monitoring-plugins over nagios-plugins
+
+ [ Markus Frosch ]
+ * [e192c30] Imported Upstream version 2.1.0
+ * [4e08221] Added python-icinga2 and updates for list-objects
+ * [4bd22b4] Update maintainer mail and copyright
+ * [cd79431] Add missing Python dependency macros
+ * [63d5bfb] Update gitignore
+ * [42a8707] Update lintian ignores
+ * [33ca186] Add patch 21_config_changes to change default mail
+ (Closes: #759011)
+
+ -- Markus Frosch <lazyfrosch at debian.org> Fri, 29 Aug 2014 14:07:28 +0200
+
+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 ]
--
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