[Pkg-nagios-changes] [pkg-icinga2] 01/08: Merge branch 'master' into ubuntu
Alexander Wirt
formorer at debian.org
Mon Jan 12 19:43:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch ubuntu
in repository pkg-icinga2.
commit d95f6d3d9ee66fb6e811de00f8dccf6b03c72c03
Merge: 5c38fed fbc719e
Author: Alexander Wirt <formorer at debian.org>
Date: Thu Sep 18 08:05:12 2014 +0200
Merge branch 'master' into ubuntu
Conflicts:
debian/changelog
AUTHORS | 3 +
CMakeLists.txt | 19 +
ChangeLog | 102 ++++
INSTALL | 182 ------
INSTALL.md | 197 +++++++
components/checker/CMakeLists.txt | 10 +-
components/checker/checkercomponent.cpp | 2 +-
components/compat/CMakeLists.txt | 12 +-
components/compat/checkresultreader.cpp | 2 +-
components/compat/checkresultreader.hpp | 2 +-
components/compat/compatlogger.cpp | 68 +--
components/compat/compatlogger.hpp | 6 +-
components/compat/externalcommandlistener.cpp | 83 ++-
components/compat/externalcommandlistener.hpp | 5 +-
components/compat/statusdatawriter.cpp | 90 +--
components/db_ido_mysql/CMakeLists.txt | 22 +-
components/db_ido_mysql/idomysqlconnection.cpp | 69 ++-
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 | 22 +-
components/db_ido_pgsql/idopgsqlconnection.cpp | 77 ++-
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/demo/CMakeLists.txt | 10 +-
components/livestatus/CMakeLists.txt | 12 +-
components/livestatus/commandstable.cpp | 6 +-
components/livestatus/commandstable.hpp | 4 +-
components/livestatus/commentstable.cpp | 4 +-
components/livestatus/contactgroupstable.cpp | 2 +-
components/livestatus/contactstable.cpp | 2 +-
components/livestatus/downtimestable.cpp | 2 +-
components/livestatus/endpointstable.cpp | 2 +-
components/livestatus/endpointstable.hpp | 6 +-
components/livestatus/historytable.hpp | 2 +-
components/livestatus/hostgroupstable.cpp | 2 +-
components/livestatus/hoststable.cpp | 4 +-
components/livestatus/hoststable.hpp | 6 +-
components/livestatus/livestatus-type.conf | 2 +-
components/livestatus/livestatuslistener.cpp | 4 +-
components/livestatus/livestatuslistener.hpp | 4 +-
components/livestatus/livestatuslogutility.cpp | 58 +-
components/livestatus/logtable.hpp | 20 +-
components/livestatus/servicegroupstable.cpp | 2 +-
components/livestatus/servicestable.cpp | 4 +-
components/livestatus/servicestable.hpp | 6 +-
components/livestatus/statehisttable.hpp | 14 +-
components/livestatus/statustable.cpp | 4 +-
components/livestatus/statustable.hpp | 10 +-
components/livestatus/timeperiodstable.cpp | 2 +-
components/notification/CMakeLists.txt | 10 +-
components/notification/notification-type.conf | 1 +
components/notification/notificationcomponent.cpp | 10 +-
components/notification/notificationcomponent.hpp | 4 +-
components/notification/notificationcomponent.ti | 3 +
components/perfdata/CMakeLists.txt | 10 +-
components/perfdata/graphitewriter.cpp | 8 +-
components/perfdata/graphitewriter.hpp | 10 +-
components/perfdata/perfdata-type.conf | 4 +-
components/perfdata/perfdatawriter.cpp | 2 +-
components/perfdata/perfdatawriter.hpp | 4 +-
config.h.cmake | 5 +
debian/.gitignore | 1 +
debian/changelog | 62 ++-
debian/control | 271 +++++----
debian/copyright | 51 +-
debian/icinga2-bin.lintian-overrides | 2 +-
debian/icinga2-common.install | 1 +
debian/icinga2-common.manpages | 6 +
debian/icinga2-ido-mysql.templates | 18 +-
debian/icinga2-ido-pgsql.templates | 18 +-
debian/patches/21_config_changes | 17 +
debian/patches/series | 1 +
debian/po/POTFILES.in | 2 +
debian/po/cs.po | 115 ++++
debian/po/da.po | 117 ++++
debian/po/de.po | 119 ++++
debian/po/es.po | 137 +++++
debian/po/fr.po | 117 ++++
debian/po/it.po | 116 ++++
debian/po/ja.po | 114 ++++
debian/po/pl.po | 119 ++++
debian/po/pt.po | 118 ++++
debian/po/pt_BR.po | 117 ++++
debian/po/ru.po | 116 ++++
debian/po/templates.pot | 42 +-
debian/po/tr.po | 115 ++++
debian/python-icinga2.install | 1 +
debian/rules | 16 +-
doc/1-about.md | 103 ++--
doc/2-getting-started.md | 588 +++++++++++++++-----
doc/3-monitoring-basics.md | 234 ++++++--
doc/4-monitoring-remote-systems.md | 473 +++++++++++-----
doc/6-configuring-icinga-2.md | 268 ++++++++-
doc/7-troubleshooting.md | 48 +-
doc/8-migration.md | 13 +-
etc/icinga2/constants.conf.cmake | 8 +-
etc/initsystem/icinga2-prepare-dirs | 2 +-
etc/initsystem/icinga2.init.d.cmake | 23 +-
icinga-app/icinga.cpp | 16 +-
icinga2.spec | 78 ++-
itl/CMakeLists.txt | 2 +-
itl/command-plugins-manubulon.conf | 202 +++++++
itl/command-plugins.conf | 10 +-
.../notification-type.conf => itl/manubulon | 7 +-
lib/base/CMakeLists.txt | 12 +-
lib/base/application.cpp | 42 +-
lib/base/application.hpp | 3 +
lib/base/array.hpp | 1 +
lib/base/convert.hpp | 4 +-
lib/base/debug.hpp | 2 +-
lib/{config => base}/debuginfo.cpp | 11 +-
lib/{config => base}/debuginfo.hpp | 14 +-
lib/base/dictionary.hpp | 1 +
lib/base/dynamicobject.cpp | 10 +
lib/base/dynamicobject.hpp | 6 +
lib/base/dynamicobject.ti | 9 +-
lib/base/dynamictype.cpp | 5 +-
lib/base/dynamictype.hpp | 2 +-
lib/base/exception.cpp | 33 +-
lib/base/exception.hpp | 12 +-
lib/base/fifo.cpp | 6 +-
lib/base/filelogger.cpp | 2 +-
lib/base/filelogger.hpp | 4 +-
lib/base/i2-base.hpp | 4 +-
lib/base/initialize.hpp | 4 +-
lib/base/logger.cpp | 2 +-
lib/base/process.cpp | 100 ++--
lib/base/process.hpp | 3 +
lib/base/qstring.hpp | 5 +-
lib/base/scriptfunctionwrapper.hpp | 2 +-
lib/base/socket.cpp | 36 +-
lib/base/stacktrace.cpp | 4 +-
lib/base/streamlogger.cpp | 2 +-
lib/base/streamlogger.hpp | 2 +-
lib/base/sysloglogger.cpp | 2 +-
lib/base/sysloglogger.hpp | 4 +-
lib/base/tcpsocket.cpp | 4 +-
lib/base/threadpool.cpp | 12 +-
lib/base/threadpool.hpp | 8 +-
lib/base/tlsstream.cpp | 50 +-
lib/base/tlsstream.hpp | 3 +-
lib/base/tlsutility.cpp | 2 +-
lib/base/tlsutility.hpp | 16 +-
lib/base/type.hpp | 5 +-
lib/base/unix.hpp | 11 +
lib/base/utility.cpp | 49 +-
lib/base/utility.hpp | 14 +-
lib/base/value-operators.cpp | 2 +-
lib/config/CMakeLists.txt | 14 +-
lib/config/aexpression.cpp | 181 ++++--
lib/config/aexpression.hpp | 100 ++--
lib/config/applyrule.hpp | 2 +-
lib/config/base-type.conf | 8 -
lib/config/configcompiler.hpp | 2 +-
lib/config/configcompilercontext.hpp | 4 +-
lib/config/configerror.cpp | 17 +-
lib/config/configerror.hpp | 13 +-
lib/config/configitem.cpp | 68 ++-
lib/config/configitem.hpp | 6 +-
lib/config/configitembuilder.hpp | 2 +-
lib/config/objectrule.hpp | 2 +-
lib/config/typerule.hpp | 2 +-
lib/db_ido/CMakeLists.txt | 8 +-
lib/db_ido/commanddbobject.hpp | 2 +-
lib/db_ido/db_ido-type.conf | 36 +-
lib/db_ido/dbconnection.cpp | 36 +-
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/hello/CMakeLists.txt | 8 +-
lib/icinga/CMakeLists.txt | 8 +-
lib/icinga/apievents.cpp | 618 +++++++++++++++++++--
lib/icinga/apievents.hpp | 33 +-
lib/icinga/checkable-check.cpp | 25 +-
lib/icinga/checkable-comment.cpp | 4 +-
lib/icinga/checkable-downtime.cpp | 4 +-
lib/icinga/checkable-event.cpp | 10 +-
lib/icinga/checkable-notification.cpp | 2 +-
lib/icinga/checkable.cpp | 2 +-
lib/icinga/checkable.hpp | 25 +-
lib/icinga/cib.cpp | 8 +-
lib/icinga/cib.hpp | 42 +-
lib/icinga/command.cpp | 2 +-
lib/icinga/compatutility.cpp | 8 +-
lib/icinga/compatutility.hpp | 6 +-
lib/icinga/customvarobject.cpp | 6 +-
lib/icinga/customvarobject.hpp | 2 +-
lib/icinga/dependency-apply.cpp | 4 +-
lib/icinga/dependency.cpp | 2 +-
lib/icinga/dependency.ti | 2 +-
lib/icinga/externalcommandprocessor.cpp | 20 +-
lib/icinga/externalcommandprocessor.hpp | 24 +-
lib/icinga/hostgroup.cpp | 6 +-
lib/icinga/hostgroup.hpp | 8 +-
lib/icinga/icinga-type.conf | 4 +-
lib/icinga/icingaapplication.cpp | 2 +-
lib/icinga/icingaapplication.hpp | 4 +-
lib/icinga/icingastatuswriter.cpp | 30 +-
lib/icinga/notification-apply.cpp | 4 +-
lib/icinga/notification.cpp | 2 +-
lib/icinga/notification.ti | 2 +-
lib/icinga/pluginutility.cpp | 21 +-
lib/icinga/pluginutility.hpp | 2 +-
lib/icinga/scheduleddowntime-apply.cpp | 4 +-
lib/icinga/scheduleddowntime.cpp | 4 +-
lib/icinga/scheduleddowntime.ti | 2 +-
lib/icinga/service-apply.cpp | 2 +-
lib/icinga/service.cpp | 2 +-
lib/icinga/service.ti | 2 +-
lib/icinga/servicegroup.cpp | 6 +-
lib/icinga/servicegroup.hpp | 8 +-
lib/icinga/timeperiod.cpp | 2 +-
lib/icinga/user.cpp | 2 +-
lib/icinga/usergroup.cpp | 6 +-
lib/icinga/usergroup.hpp | 8 +-
lib/methods/CMakeLists.txt | 8 +-
lib/methods/clusterchecktask.hpp | 2 +-
lib/methods/pluginchecktask.cpp | 18 +-
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/CMakeLists.txt | 8 +-
lib/remote/apiclient.cpp | 26 +-
lib/remote/apilistener-sync.cpp | 10 +-
lib/remote/apilistener.cpp | 83 ++-
lib/remote/apilistener.hpp | 5 +-
lib/remote/authority.cpp | 3 +-
lib/remote/endpoint.cpp | 5 +-
{components/checker => python}/CMakeLists.txt | 34 +-
{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 | 20 +-
{itl => python/icinga2/utils}/CMakeLists.txt | 8 +-
python/icinga2/utils/__init__.py | 0
python/icinga2/utils/debug.py | 136 +++++
python/icinga2/utils/netstring.py | 305 ++++++++++
python/setup.py.cmake | 21 +
test/CMakeLists.txt | 20 +-
test/config/6968.conf | 28 +
third-party/cJSON/CMakeLists.txt | 4 +
third-party/cmake/GNUInstallDirs.cmake | 68 ++-
third-party/cmake/PythonSetup.cmake | 215 +++++++
third-party/execvpe/execvpe.c | 7 +-
tools/CMakeLists.txt | 1 +
tools/mkclass/CMakeLists.txt | 5 +
tools/mkclass/class_parser.yy | 29 +-
tools/mkclass/classcompiler.cpp | 46 ++
tools/mkclass/classcompiler.hpp | 2 +
tools/mkunity/CMakeLists.txt | 56 ++
.../mkunity/mkunity.c | 21 +-
tools/syntax/nano/icinga2.nanorc | 4 +-
tools/syntax/vim/syntax/icinga2.vim | 4 +-
262 files changed, 6958 insertions(+), 1780 deletions(-)
diff --cc debian/changelog
index fdc1ecc,af4ec3b..60eb1d7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,63 +1,69 @@@
- icinga2 (2.0.2-1~ppa1~trusty1) trusty; urgency=medium
++icinga2 (2.1.1-1~ppa1~trusty1) trusty; urgency=medium
+
+ * Rebuild for my ubuntu ppa
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 16 Jun 2014 16:52:55 +0200
+
+ icinga2 (2.1.1-1) unstable; urgency=medium
+
+ * [4a0350e] Imported Upstream version 2.1.1
+ * [81a704c] gnu_hurd.patch is now upstream
+ * [e5709e4] pipe_ENOSYS.patch is now upstream
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 18 Sep 2014 08:00:44 +0200
+
+ icinga2 (2.1.0-3) unstable; urgency=medium
+
+ * [dd04e8c] Fix build problem with CMake libdir on Hurd and kFreeBSD
+ Using dist version of GNUInstallDirs.cmake
+
+ -- Markus Frosch <lazyfrosch at debian.org> Mon, 08 Sep 2014 16:39:23 +0200
+
+ icinga2 (2.1.0-2) unstable; urgency=medium
+
+ [ Markus Frosch ]
+ * [26e4092] Update copyright for python embed
+ * [f9dd427] Fixed typo in copyright
+ * [f236eb4] Include all existing manpages
+ * [280f892] Adding patches for arch problems on Hurd and FreeBSD
+ * [ba59e9c] Fix lintian warning in copyright
+
+ [ Christian Perrier ]
+ * Debconf templates and debian/control reviewed by the debian-l10n-
+ english team as part of the Smith review project. Closes: #755248
+ * [Debconf translation updates]
+ * Portuguese (Américo Monteiro). Closes: #758573
+ * Russian (Yuri Kozlov). Closes: #758790
+ * German (Chris Leick). Closes: #759364
+ * Brazilian Portuguese (). Closes: #759599
+ * Danish (Joe Hansen). Closes: #759778
+ * Japanese (victory). Closes: #760094
+ * Spanish; (Matías A. Bellone). Closes: #760115
+ * Czech (Michal Simunek). Closes: #760145
+ * Polish (Michał Kułach). Closes: #760180
+ * Italian (Beatrice Torracca). Closes: #760300
+ * Turkish (Mert Dirik). Closes: #760329
+ * French (Steve Petruzzello). Closes: #760600
+
+ -- Markus Frosch <lazyfrosch at debian.org> Mon, 08 Sep 2014 14:03:13 +0200
+
+ 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) 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