[Pkg-nagios-changes] [pkg-icinga2] 01/04: Merge branch 'master' into ubuntu
Alexander Wirt
formorer at debian.org
Sat Aug 5 06:40:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch ubuntu
in repository pkg-icinga2.
commit 920f4c3f5d9926f30969e5918cdce7e493fca508
Merge: 15f9077 7e84a00
Author: Alexander Wirt <alexander.wirt at credativ.de>
Date: Sat Aug 5 08:38:54 2017 +0200
Merge branch 'master' into ubuntu
.github/ISSUE_TEMPLATE.md | 49 +
.mailmap | 3 +
.travis.yml | 12 +-
AUTHORS | 32 +
CHANGELOG.md | 2721 ++++++++++++++++++++
CMakeLists.txt | 20 +-
CONTRIBUTING.md | 497 ++++
ChangeLog | 2252 ----------------
INSTALL.md | 104 +-
README.md | 33 +-
RELEASE.md | 31 +-
changelog.py | 171 --
choco/icinga2.nuspec.cmake | 11 +-
debian/changelog | 13 +-
debian/control | 2 +-
debian/icinga2-bin.install | 1 +
debian/icinga2-common.icinga2.service | 3 +-
debian/po/sv.po | 17 +-
doc/01-about.md | 43 +
...{2-getting-started.md => 02-getting-started.md} | 223 +-
...onitoring-basics.md => 03-monitoring-basics.md} | 767 ++++--
...ring-icinga-2.md => 04-configuring-icinga-2.md} | 225 +-
...vice-monitoring.md => 05-service-monitoring.md} | 73 +-
...-monitoring.md => 06-distributed-monitoring.md} | 417 +--
...-monitoring.md => 07-agent-based-monitoring.md} | 34 +-
...{8-advanced-topics.md => 08-advanced-topics.md} | 231 +-
doc/{9-object-types.md => 09-object-types.md} | 263 +-
doc/1-about.md | 262 --
doc/10-icinga-template-library.md | 1122 ++++----
doc/11-cli-commands.md | 99 +-
doc/12-icinga2-api.md | 231 +-
doc/13-addons.md | 48 +-
doc/14-features.md | 121 +-
doc/15-troubleshooting.md | 363 ++-
doc/16-upgrading-icinga-2.md | 6 +-
doc/17-language-reference.md | 144 +-
doc/18-library-reference.md | 301 ++-
doc/19-script-debugger.md | 8 +-
doc/20-development.md | 26 +-
doc/21-selinux.md | 74 +-
doc/22-migrating-from-icinga-1x.md | 160 +-
doc/23-appendix.md | 64 +-
doc/CMakeLists.txt | 5 +
...buted_windows_nscp_api_drivesize_icingaweb2.png | Bin 0 -> 38947 bytes
doc/images/getting-started/id-apache-centos7.png | Bin 21899 -> 0 bytes
etc/icinga/README | 3 +
etc/icinga/cgi.cfg | 4 +
etc/icinga/icinga-classic-apache.conf.cmake | 3 +
etc/icinga/icinga-classic.htpasswd | 2 +
etc/icinga2/conf.d/commands.conf | 153 +-
etc/icinga2/conf.d/notifications.conf | 10 +-
etc/icinga2/conf.d/templates.conf | 13 +-
etc/icinga2/features-available/influxdb.conf | 2 +
etc/icinga2/scripts/mail-host-notification.sh | 156 +-
etc/icinga2/scripts/mail-service-notification.sh | 163 +-
etc/icinga2/zones.conf | 24 +-
etc/initsystem/icinga2.init.d.cmake | 4 +-
etc/initsystem/icinga2.service.cmake | 2 +-
icinga-app/icinga.cpp | 49 +-
icinga2.spec | 123 +-
itl/command-nscp-local.conf | 18 +-
itl/command-plugins-manubulon.conf | 101 +-
itl/command-plugins-windows.conf | 45 +-
itl/command-plugins.conf | 1361 ++++++++--
itl/plugins-contrib.d/CMakeLists.txt | 2 +-
itl/plugins-contrib.d/databases.conf | 30 +-
itl/plugins-contrib.d/hardware.conf | 4 +-
itl/plugins-contrib.d/icingacli.conf | 10 +-
itl/plugins-contrib.d/ipmi.conf | 52 +-
itl/plugins-contrib.d/logmanagement.conf | 4 +-
itl/plugins-contrib.d/network-components.conf | 10 +-
itl/plugins-contrib.d/raid-controller.conf | 46 +
itl/plugins-contrib.d/smart-attributes.conf | 24 +
itl/plugins-contrib.d/vmware.conf | 3 +
itl/plugins-contrib.d/web.conf | 299 ++-
lib/base/CMakeLists.txt | 4 +-
lib/base/application.cpp | 206 +-
lib/base/application.hpp | 12 +
lib/base/array-script.cpp | 67 +-
lib/base/boolean-script.cpp | 2 +-
lib/base/configobject-script.cpp | 4 +-
lib/base/configobject.cpp | 23 +-
lib/base/configobject.hpp | 3 +
lib/base/configobject.ti | 5 +-
lib/base/configwriter.cpp | 2 +
lib/base/datetime-script.cpp | 2 +-
lib/base/dictionary-script.cpp | 27 +-
lib/base/function.cpp | 5 +-
lib/base/function.hpp | 35 +-
lib/base/function.ti | 7 +-
lib/base/json-script.cpp | 4 +-
lib/base/math-script.cpp | 42 +-
lib/base/netstring.hpp | 2 +-
lib/base/number-script.cpp | 2 +-
lib/base/object-script.cpp | 6 +-
lib/base/object.hpp | 4 +-
lib/{icinga => base}/perfdatavalue.cpp | 8 +-
lib/{icinga => base}/perfdatavalue.hpp | 11 +-
lib/{icinga => base}/perfdatavalue.ti | 4 +-
lib/base/process.cpp | 1 +
lib/base/scriptutils.cpp | 191 +-
lib/base/scriptutils.hpp | 5 +-
lib/base/string-script.cpp | 22 +-
lib/base/string.hpp | 8 +
lib/base/tlsutility.cpp | 54 +-
lib/base/tlsutility.hpp | 2 +-
lib/base/typetype-script.cpp | 2 +-
lib/base/utility.cpp | 21 +-
lib/base/workqueue.cpp | 57 +-
lib/base/workqueue.hpp | 11 +
lib/checker/checkercomponent.cpp | 9 +-
lib/cli/daemoncommand.cpp | 2 +-
lib/cli/daemonutility.cpp | 2 +-
lib/cli/featurelistcommand.cpp | 4 +-
lib/cli/featureutility.cpp | 5 +-
lib/cli/pkinewcertcommand.cpp | 2 +-
lib/compat/checkresultreader.cpp | 28 +-
lib/compat/checkresultreader.hpp | 1 +
lib/compat/compatlogger.cpp | 14 +
lib/compat/compatlogger.hpp | 1 +
lib/compat/externalcommandlistener.cpp | 18 +-
lib/compat/externalcommandlistener.hpp | 1 +
lib/compat/statusdatawriter.cpp | 16 +-
lib/compat/statusdatawriter.hpp | 1 +
lib/config/config_lexer.ll | 2 +
lib/config/config_parser.yy | 21 +-
lib/config/configcompiler.cpp | 18 +-
lib/config/configcompiler.hpp | 2 +
lib/config/configitem.cpp | 97 +-
lib/config/configitem.hpp | 16 +-
lib/config/configitembuilder.cpp | 13 +-
lib/config/configitembuilder.hpp | 4 +-
lib/config/expression.cpp | 24 +-
lib/config/expression.hpp | 25 +-
lib/config/vmops.hpp | 16 +-
lib/db_ido/dbconnection.cpp | 73 +-
lib/db_ido/dbconnection.hpp | 7 +-
lib/db_ido/dbconnection.ti | 7 +-
lib/db_ido/dbevents.cpp | 10 +-
lib/db_ido/idochecktask.cpp | 4 +-
lib/db_ido_mysql/idomysqlconnection.cpp | 26 +-
lib/db_ido_mysql/schema/upgrade/2.0.2.sql | 2 +-
lib/db_ido_mysql/schema/upgrade/2.1.0.sql | 2 +-
lib/db_ido_mysql/schema/upgrade/2.2.0.sql | 2 +-
lib/db_ido_mysql/schema/upgrade/2.3.0.sql | 2 +-
lib/db_ido_mysql/schema/upgrade/2.4.0.sql | 2 +-
lib/db_ido_mysql/schema/upgrade/2.5.0.sql | 2 +-
lib/db_ido_mysql/schema/upgrade/2.6.0.sql | 2 +-
lib/db_ido_pgsql/idopgsqlconnection.cpp | 26 +-
lib/db_ido_pgsql/schema/upgrade/2.0.2.sql | 2 +-
lib/db_ido_pgsql/schema/upgrade/2.1.0.sql | 2 +-
lib/db_ido_pgsql/schema/upgrade/2.2.0.sql | 2 +-
lib/db_ido_pgsql/schema/upgrade/2.3.0.sql | 2 +-
lib/db_ido_pgsql/schema/upgrade/2.4.0.sql | 2 +-
lib/db_ido_pgsql/schema/upgrade/2.5.0.sql | 2 +-
lib/db_ido_pgsql/schema/upgrade/2.6.0.sql | 2 +-
lib/icinga/CMakeLists.txt | 3 +-
lib/icinga/apiactions.cpp | 18 +-
lib/icinga/apievents.cpp | 3 +-
lib/icinga/apievents.hpp | 2 +-
lib/icinga/checkable-comment.cpp | 4 +
lib/icinga/checkable-script.cpp | 2 +-
lib/icinga/checkable.cpp | 24 +-
lib/icinga/checkable.hpp | 25 +-
lib/icinga/checkable.ti | 5 +
lib/icinga/cib.cpp | 2 +-
lib/icinga/clusterevents.cpp | 36 +-
lib/icinga/clusterevents.hpp | 2 +-
lib/icinga/comment.cpp | 14 +-
lib/icinga/comment.hpp | 2 +-
lib/icinga/comment.ti | 1 +
lib/icinga/dependency-apply.cpp | 2 +-
lib/icinga/downtime.cpp | 7 +-
lib/icinga/externalcommandprocessor.cpp | 30 +-
lib/icinga/host.cpp | 28 +
lib/icinga/host.hpp | 1 +
lib/icinga/host.ti | 2 +-
lib/icinga/hostgroup.cpp | 2 +-
lib/icinga/icingaapplication.cpp | 16 -
lib/icinga/legacytimeperiod.cpp | 2 +-
lib/icinga/macroprocessor.cpp | 2 +-
lib/icinga/notification-apply.cpp | 2 +-
lib/icinga/notification.cpp | 2 +-
lib/icinga/objectutils.cpp | 20 +-
lib/icinga/pluginutility.cpp | 2 +-
lib/icinga/scheduleddowntime-apply.cpp | 2 +-
lib/icinga/scheduleddowntime.cpp | 2 +
lib/icinga/service-apply.cpp | 2 +-
lib/icinga/service.cpp | 30 +
lib/icinga/service.hpp | 1 +
lib/icinga/service.ti | 2 +-
lib/icinga/servicegroup.cpp | 2 +-
lib/icinga/timeperiod.ti | 4 +-
lib/icinga/user.ti | 2 +-
lib/icinga/usergroup.cpp | 2 +-
lib/livestatus/hostgroupstable.cpp | 4 +-
lib/livestatus/hostgroupstable.hpp | 2 +-
lib/livestatus/livestatuslistener.cpp | 8 +-
lib/livestatus/minaggregator.cpp | 7 +-
lib/livestatus/minaggregator.hpp | 1 +
lib/methods/clrchecktask.cpp | 2 +-
lib/methods/clusterchecktask.cpp | 2 +-
lib/methods/clusterzonechecktask.cpp | 4 +-
lib/methods/exceptionchecktask.cpp | 2 +-
lib/methods/icingachecktask.cpp | 9 +-
lib/methods/nullchecktask.cpp | 4 +-
lib/methods/nulleventtask.cpp | 2 +-
lib/methods/pluginchecktask.cpp | 2 +-
lib/methods/plugineventtask.cpp | 2 +-
lib/methods/pluginnotificationtask.cpp | 2 +-
lib/methods/randomchecktask.cpp | 4 +-
lib/methods/timeperiodtask.cpp | 4 +-
lib/notification/notificationcomponent.cpp | 11 +
lib/notification/notificationcomponent.hpp | 1 +
lib/perfdata/gelfwriter.cpp | 265 +-
lib/perfdata/gelfwriter.hpp | 31 +-
lib/perfdata/gelfwriter.ti | 5 +
lib/perfdata/graphitewriter.cpp | 119 +-
lib/perfdata/graphitewriter.hpp | 14 +
lib/perfdata/graphitewriter.ti | 4 +
lib/perfdata/influxdbwriter.cpp | 217 +-
lib/perfdata/influxdbwriter.hpp | 21 +-
lib/perfdata/influxdbwriter.ti | 3 +
lib/perfdata/logstashwriter.cpp | 281 ++
lib/perfdata/opentsdbwriter.cpp | 13 +-
lib/perfdata/opentsdbwriter.hpp | 1 +
lib/perfdata/perfdatawriter.cpp | 11 +
lib/perfdata/perfdatawriter.hpp | 1 +
lib/remote/apilistener-filesync.cpp | 34 +-
lib/remote/apilistener.cpp | 69 +-
lib/remote/apilistener.hpp | 1 +
lib/remote/configobjectutility.cpp | 9 +-
lib/remote/configpackageutility.cpp | 4 +-
lib/remote/createobjecthandler.cpp | 1 +
lib/remote/filterutility.cpp | 6 +-
lib/remote/httpresponse.cpp | 16 +-
lib/remote/httpresponse.hpp | 1 +
lib/remote/httpserverconnection.cpp | 33 +-
lib/remote/infohandler.cpp | 4 +-
lib/remote/jsonrpcconnection.cpp | 32 +
lib/remote/jsonrpcconnection.hpp | 4 +
lib/remote/modifyobjecthandler.cpp | 10 +-
lib/remote/objectqueryhandler.cpp | 2 +-
lib/remote/templatequeryhandler.cpp | 10 +-
lib/remote/url.cpp | 4 +-
mkdocs.yml | 53 +-
pick.py | 114 -
plugins/CMakeLists.txt | 39 +-
plugins/check_disk.cpp | 105 +-
plugins/check_disk.h | 5 +-
plugins/check_nscp_api.cpp | 311 +++
plugins/check_perfmon.cpp | 11 +-
plugins/check_ping.cpp | 2 +-
plugins/check_update.cpp | 4 +-
test/base-json.cpp | 1 -
test/base-serialize.cpp | 2 +-
test/base-type.cpp | 2 +-
test/icinga-perfdata.cpp | 2 +-
third-party/cmake/GNUInstallDirs.cmake | 2 +-
third-party/execvpe/execvpe.c | 4 +-
tools/debug/gdb/README.md | 2 +-
tools/selinux/icinga2.fc | 3 +-
tools/selinux/icinga2.if | 18 +
tools/selinux/icinga2.sh | 5 +-
tools/selinux/icinga2.te | 25 +-
265 files changed, 11647 insertions(+), 6058 deletions(-)
diff --cc debian/changelog
index abb1aed,5589cbf..bffab60
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
- icinga2 (2.6.3-1~ppa1~trusty1) trusty; urgency=medium
++icinga2 (2.7.0-1~ppa1~trusty1) trusty; urgency=medium
+
+ * Rebuild for my ubuntu ppa
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 30 Mar 2017 00:40:19 +0200
+
+ icinga2 (2.7.0-1) unstable; urgency=medium
+
+ * [3f2f6e0] New upstream version 2.7.0
+ * [8861bd7] Improve systemd unit file
+ * [f25990d] fix linebreak
+ * [98b7e3f] Update debhelper dependency (Closes: #854349)
+ * [8c35696] Update swedish translation (Closes: #855364)
+ * [6f58b41] Install nsca_api plugin
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 02 Aug 2017 22:24:35 +0200
+
icinga2 (2.6.3-1) experimental; urgency=medium
* [83b389e] New upstream version 2.6.3
--
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