[Pkg-nagios-changes] [pkg-icinga2] 06/08: Merge tag 'upstream/2.6.0'
Alexander Wirt
formorer at debian.org
Tue Dec 13 12:25:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch master
in repository pkg-icinga2.
commit 1d2437f4c82c1a7c90fe8fdb8d5e9480e41bf4c2
Merge: faea75f 4e44b28
Author: Alexander Wirt <formorer at debian.org>
Date: Tue Dec 13 12:45:05 2016 +0100
Merge tag 'upstream/2.6.0'
Upstream version 2.6.0
.mailmap | 27 +-
.travis.yml | 4 +-
AUTHORS | 35 +-
CMakeLists.txt | 98 +-
ChangeLog | 148 +++
INSTALL.md | 24 +-
README.md | 66 +-
RELEASE.md | 4 +-
agent/windows-setup-agent/Program.cs | 85 +-
agent/windows-setup-agent/SetupWizard.Designer.cs | 1252 ++++++++++----------
agent/windows-setup-agent/SetupWizard.cs | 52 +-
changelog.py | 33 +-
{third-party/socketpair => choco}/CMakeLists.txt | 26 +-
.../chocolateyInstall.ps1.cmake | 4 +-
{tools => choco}/chocolateyUninstall.ps1 | 0
icinga2.nuspec => choco/icinga2.nuspec.cmake | 6 +-
config.h.cmake | 1 -
contrib/i2eval/Makefile | 2 +-
doc/1-about.md | 419 +++----
doc/10-icinga-template-library.md | 655 ++++++----
doc/11-cli-commands.md | 429 ++++---
doc/12-icinga2-api.md | 101 +-
doc/13-addons.md | 23 +-
doc/14-features.md | 6 +-
doc/15-troubleshooting.md | 51 +
doc/17-language-reference.md | 14 +-
doc/18-library-reference.md | 476 +++++++-
doc/2-getting-started.md | 51 +-
doc/20-development.md | 85 +-
doc/21-selinux.md | 6 +-
doc/22-migrating-from-icinga-1x.md | 37 +-
doc/23-appendix.md | 6 +-
doc/3-monitoring-basics.md | 47 +-
doc/4-configuring-icinga-2.md | 8 +-
doc/5-service-monitoring.md | 14 +-
doc/6-distributed-monitoring.md | 628 +++++++---
doc/7-agent-based-monitoring.md | 2 -
doc/8-advanced-topics.md | 38 +-
doc/9-object-types.md | 30 +-
...ributed_automation_docker_client_icingaweb2.png | Bin 102003 -> 0 bytes
...distributed_windows_nscp_counter_icingaweb2.png | Bin 0 -> 28292 bytes
.../icinga2_windows_running_service.png | Bin 279218 -> 72832 bytes
.../icinga2_windows_setup_wizard_01.png | Bin 20526 -> 22521 bytes
.../icinga2_windows_setup_wizard_02.png | Bin 28694 -> 29197 bytes
.../icinga2_windows_setup_wizard_03.png | Bin 21644 -> 23148 bytes
...cinga2_windows_setup_wizard_05_nsclient_01.png} | Bin
...icinga2_windows_setup_wizard_05_nsclient_02.png | Bin 0 -> 17894 bytes
...icinga2_windows_setup_wizard_05_nsclient_03.png | Bin 0 -> 15445 bytes
...icinga2_windows_setup_wizard_05_nsclient_04.png | Bin 0 -> 19891 bytes
...icinga2_windows_setup_wizard_05_nsclient_05.png | Bin 0 -> 18101 bytes
...icinga2_windows_setup_wizard_05_nsclient_06.png | Bin 0 -> 11510 bytes
...icinga2_windows_setup_wizard_05_nsclient_07.png | Bin 0 -> 32661 bytes
doc/update-links.py | 2 +-
etc/icinga2/conf.d/commands.conf | 4 -
icinga-app/icinga.cpp | 89 +-
icinga-installer/icinga-installer.cpp | 2 +-
icinga-spec-version.h.cmake | 1 +
icinga-studio/mainform.cpp | 19 +-
icinga2.spec | 3 +-
itl/CMakeLists.txt | 2 +-
itl/command-nscp-local.conf | 33 +-
itl/command-plugins-manubulon.conf | 5 +-
itl/command-plugins-windows.conf | 29 +-
itl/command-plugins.conf | 201 ++--
itl/command.conf | 20 -
itl/hangman | 34 +-
itl/itl | 1 -
itl/plugins-contrib.d/CMakeLists.txt | 2 +-
itl/plugins-contrib.d/databases.conf | 26 +-
itl/plugins-contrib.d/hardware.conf | 1 -
itl/plugins-contrib.d/icingacli.conf | 2 -
itl/plugins-contrib.d/ipmi.conf | 1 -
itl/plugins-contrib.d/logmanagement.conf | 72 ++
itl/plugins-contrib.d/metrics.conf | 21 +-
itl/plugins-contrib.d/network-components.conf | 6 -
itl/plugins-contrib.d/network-services.conf | 21 +-
itl/plugins-contrib.d/operating-system.conf | 46 +-
.../{icingacli.conf => storage.conf} | 55 +-
itl/plugins-contrib.d/virtualization.conf | 2 -
itl/plugins-contrib.d/vmware.conf | 12 +-
itl/plugins-contrib.d/web.conf | 295 +++--
itl/windows-plugins | 2 +-
lib/base/CMakeLists.txt | 3 +-
lib/base/application-version.cpp | 5 +
lib/base/application.cpp | 5 +-
lib/base/application.hpp | 1 +
lib/base/array-script.cpp | 9 +-
lib/base/array.cpp | 37 +-
lib/base/array.hpp | 27 +-
lib/base/configobject.cpp | 27 +-
lib/base/configobject.ti | 4 +-
lib/base/configtype.cpp | 4 +-
lib/base/configtype.hpp | 3 +-
lib/base/configwriter.cpp | 8 +-
lib/base/console.cpp | 28 +-
lib/base/context.cpp | 6 +-
lib/base/convert.cpp | 2 +-
lib/base/debuginfo.cpp | 5 +-
lib/base/dependencygraph.cpp | 9 +-
lib/base/dictionary-script.cpp | 3 +-
lib/base/dictionary.cpp | 32 +-
lib/base/dictionary.hpp | 25 +-
lib/base/exception.cpp | 122 +-
lib/base/exception.hpp | 2 +-
lib/base/filelogger.cpp | 2 +-
lib/base/function.hpp | 82 +-
lib/base/json-script.cpp | 8 +-
lib/base/json.cpp | 12 +-
lib/base/loader.cpp | 6 +-
lib/base/logger.cpp | 9 +-
lib/base/logger.hpp | 2 -
lib/base/math-script.cpp | 14 +-
lib/base/netstring.cpp | 13 +-
lib/base/netstring.hpp | 1 +
lib/base/object.cpp | 26 +-
lib/base/object.hpp | 1 +
lib/base/objecttype.cpp | 7 +-
lib/base/primitivetype.hpp | 30 +-
lib/base/process.cpp | 543 +++++++--
lib/base/process.hpp | 5 +-
lib/base/registry.hpp | 8 +-
lib/base/scriptframe.cpp | 13 +-
lib/base/scriptframe.hpp | 2 -
lib/base/scriptglobal.cpp | 3 +-
lib/base/scriptutils.cpp | 11 +-
lib/base/serializer.cpp | 11 +-
lib/base/socketevents-epoll.cpp | 5 +-
lib/base/socketevents-poll.cpp | 9 +-
lib/base/socketevents.cpp | 1 -
lib/base/stacktrace.cpp | 7 +-
lib/base/statsfunction.hpp | 12 +-
lib/base/string-script.cpp | 3 +-
lib/base/string.cpp | 17 +
lib/base/string.hpp | 87 +-
lib/base/sysloglogger.cpp | 5 +-
lib/base/timer.cpp | 7 +-
lib/base/tlsutility.cpp | 3 +-
lib/base/type.cpp | 13 +-
lib/base/type.hpp | 32 +-
lib/base/utility.cpp | 29 +-
lib/base/value-operators.cpp | 11 +-
lib/base/value.hpp | 47 +-
lib/base/visibility.hpp | 6 +-
lib/base/workqueue.cpp | 9 +-
lib/base/workqueue.hpp | 6 +-
lib/checker/CMakeLists.txt | 3 +-
lib/checker/checkercomponent.cpp | 12 +-
lib/cli/CMakeLists.txt | 3 +-
lib/cli/apisetuputility.cpp | 3 +-
lib/cli/clicommand.cpp | 59 +-
lib/cli/clicommand.hpp | 15 +-
lib/cli/consolecommand.cpp | 46 +-
lib/cli/consolecommand.hpp | 3 +-
lib/cli/daemoncommand.cpp | 1 -
lib/cli/daemonutility.cpp | 3 +-
lib/cli/featurelistcommand.cpp | 1 -
lib/cli/featureutility.cpp | 9 +-
lib/cli/nodeaddcommand.cpp | 6 +-
lib/cli/nodeaddcommand.hpp | 1 +
lib/cli/nodeblackandwhitelistcommand.cpp | 6 +-
lib/cli/nodeblackandwhitelistcommand.hpp | 31 +-
lib/cli/nodelistcommand.cpp | 6 +-
lib/cli/nodelistcommand.hpp | 1 +
lib/cli/noderemovecommand.cpp | 8 +-
lib/cli/noderemovecommand.hpp | 1 +
lib/cli/nodesetcommand.cpp | 6 +-
lib/cli/nodesetcommand.hpp | 1 +
lib/cli/nodesetupcommand.cpp | 3 +-
lib/cli/nodeupdateconfigcommand.cpp | 26 +-
lib/cli/nodeupdateconfigcommand.hpp | 1 +
lib/cli/nodeutility.cpp | 35 +-
lib/cli/nodewizardcommand.cpp | 5 +-
lib/cli/objectlistcommand.cpp | 3 +-
lib/cli/objectlistutility.cpp | 7 +-
lib/cli/repositoryclearchangescommand.cpp | 5 +
lib/cli/repositoryclearchangescommand.hpp | 1 +
lib/cli/repositorycommitcommand.cpp | 5 +
lib/cli/repositorycommitcommand.hpp | 1 +
lib/cli/repositoryobjectcommand.cpp | 8 +-
lib/cli/repositoryobjectcommand.hpp | 31 +-
lib/cli/repositoryutility.cpp | 21 +-
lib/cli/troubleshootcommand.cpp | 15 +-
lib/cli/variablegetcommand.cpp | 1 -
lib/cli/variablelistcommand.cpp | 1 -
lib/compat/CMakeLists.txt | 3 +-
lib/compat/checkresultreader.cpp | 2 +-
lib/compat/compatlogger.cpp | 7 +-
lib/compat/externalcommandlistener.cpp | 2 +-
lib/compat/statusdatawriter.cpp | 43 +-
lib/compat/statusdatawriter.hpp | 12 +-
lib/config/CMakeLists.txt | 7 +-
lib/config/applyrule.cpp | 19 +-
lib/config/applyrule.hpp | 1 -
lib/config/config_lexer.ll | 1 +
lib/config/config_parser.yy | 38 +-
lib/config/configcompiler.cpp | 7 +-
lib/config/configcompilercontext.cpp | 18 +-
lib/config/configcompilercontext.hpp | 6 +-
lib/config/configfragment.hpp | 29 +-
lib/config/configitem.cpp | 158 ++-
lib/config/configitem.hpp | 11 +-
lib/config/configitembuilder.cpp | 27 +-
lib/config/configitembuilder.hpp | 2 +
lib/config/expression.cpp | 45 +-
lib/config/expression.hpp | 102 +-
lib/config/objectrule.cpp | 1 -
lib/config/vmops.hpp | 17 +-
lib/db_ido/CMakeLists.txt | 3 +-
lib/db_ido/commanddbobject.cpp | 1 -
lib/db_ido/db_ido-itl.conf | 4 +-
lib/db_ido/dbconnection.cpp | 25 +-
lib/db_ido/dbconnection.hpp | 4 +-
lib/db_ido/dbevents.cpp | 9 +-
lib/db_ido/dbobject.cpp | 7 +-
lib/db_ido/dbtype.cpp | 16 +-
lib/db_ido/dbtype.hpp | 12 +-
lib/db_ido/endpointdbobject.cpp | 2 -
lib/db_ido/hostdbobject.cpp | 21 +-
lib/db_ido/hostdbobject.hpp | 2 +-
lib/db_ido/hostgroupdbobject.cpp | 1 -
lib/db_ido/idochecktask.cpp | 3 +-
lib/db_ido/servicedbobject.cpp | 17 +-
lib/db_ido/servicedbobject.hpp | 2 +-
lib/db_ido/servicegroupdbobject.cpp | 1 -
lib/db_ido/timeperioddbobject.cpp | 5 +-
lib/db_ido/userdbobject.cpp | 3 +-
lib/db_ido/userdbobject.hpp | 2 +-
lib/db_ido/usergroupdbobject.cpp | 1 -
lib/db_ido_mysql/CMakeLists.txt | 3 +-
lib/db_ido_mysql/idomysqlconnection.cpp | 19 +-
lib/db_ido_mysql/idomysqlconnection.hpp | 4 +-
lib/db_ido_mysql/schema/mysql.sql | 173 ++-
lib/db_ido_mysql/schema/upgrade/2.5.0.sql | 2 +
lib/db_ido_mysql/schema/upgrade/2.6.0.sql | 151 +++
lib/db_ido_pgsql/CMakeLists.txt | 3 +-
lib/db_ido_pgsql/idopgsqlconnection.cpp | 17 +-
lib/db_ido_pgsql/idopgsqlconnection.hpp | 2 +-
lib/db_ido_pgsql/schema/pgsql.sql | 178 +--
lib/db_ido_pgsql/schema/upgrade/2.6.0.sql | 161 +++
lib/demo/CMakeLists.txt | 3 +-
lib/demo/demo.hpp | 2 +-
lib/hello/CMakeLists.txt | 3 +-
lib/hello/helloapplication.cpp | 7 +-
lib/hello/helloapplication.hpp | 2 -
lib/icinga/CMakeLists.txt | 3 +-
lib/icinga/apiactions.cpp | 66 +-
lib/icinga/apievents.cpp | 45 +-
lib/icinga/apievents.hpp | 1 +
lib/icinga/checkable-check.cpp | 35 +-
lib/icinga/checkable-comment.cpp | 5 +-
lib/icinga/checkable-dependency.cpp | 39 +-
lib/icinga/checkable-downtime.cpp | 9 +-
lib/icinga/checkable-flapping.cpp | 1 -
lib/icinga/checkable-notification.cpp | 9 +-
lib/icinga/checkable.cpp | 6 +-
lib/icinga/checkable.hpp | 3 +
lib/icinga/checkable.ti | 1 -
lib/icinga/cib.cpp | 22 +-
lib/icinga/clusterevents.cpp | 97 +-
lib/icinga/command.cpp | 5 +-
lib/icinga/comment.cpp | 11 +-
lib/icinga/compatutility.cpp | 36 +-
lib/icinga/customvarobject.cpp | 6 +-
lib/icinga/dependency-apply.cpp | 25 +-
lib/icinga/dependency.cpp | 19 +-
lib/icinga/dependency.hpp | 2 -
lib/icinga/downtime.cpp | 79 +-
lib/icinga/downtime.hpp | 4 +
lib/icinga/downtime.ti | 2 +-
lib/icinga/externalcommandprocessor.cpp | 176 ++-
lib/icinga/externalcommandprocessor.hpp | 2 +
lib/icinga/host.cpp | 19 +-
lib/icinga/hostgroup.cpp | 12 +-
lib/icinga/hostgroup.hpp | 2 -
lib/icinga/icinga-itl.conf | 2 +-
lib/icinga/icingaapplication.cpp | 5 +-
lib/icinga/legacytimeperiod.cpp | 9 +-
lib/icinga/macroprocessor.cpp | 27 +-
lib/icinga/notification-apply.cpp | 20 +-
lib/icinga/notification.cpp | 25 +-
lib/icinga/notification.hpp | 2 -
lib/icinga/notification.ti | 2 +-
lib/icinga/pluginutility.cpp | 7 +-
lib/icinga/scheduleddowntime-apply.cpp | 23 +-
lib/icinga/scheduleddowntime.cpp | 9 +-
lib/icinga/scheduleddowntime.hpp | 2 -
lib/icinga/service-apply.cpp | 21 +-
lib/icinga/service.cpp | 10 +-
lib/icinga/service.hpp | 2 -
lib/icinga/servicegroup.cpp | 12 +-
lib/icinga/servicegroup.hpp | 2 -
lib/icinga/timeperiod.cpp | 34 +-
lib/icinga/user.cpp | 5 +-
lib/icinga/usergroup.cpp | 12 +-
lib/icinga/usergroup.hpp | 2 -
lib/livestatus/CMakeLists.txt | 3 +-
lib/livestatus/andfilter.cpp | 3 +-
lib/livestatus/attributefilter.cpp | 3 +-
lib/livestatus/commandstable.cpp | 46 +-
lib/livestatus/commentstable.cpp | 3 +-
lib/livestatus/contactgroupstable.cpp | 5 +-
lib/livestatus/contactstable.cpp | 11 +-
lib/livestatus/downtimestable.cpp | 3 +-
lib/livestatus/endpointstable.cpp | 3 +-
lib/livestatus/hostgroupstable.cpp | 63 +-
lib/livestatus/hoststable.cpp | 61 +-
lib/livestatus/livestatuslistener.cpp | 2 +-
lib/livestatus/livestatuslogutility.cpp | 6 +-
lib/livestatus/livestatusquery.cpp | 25 +-
lib/livestatus/logtable.cpp | 1 -
lib/livestatus/orfilter.cpp | 3 +-
lib/livestatus/servicegroupstable.cpp | 27 +-
lib/livestatus/servicestable.cpp | 35 +-
lib/livestatus/statehisttable.cpp | 7 +-
lib/livestatus/statustable.cpp | 34 +-
lib/livestatus/table.cpp | 12 +-
lib/livestatus/timeperiodstable.cpp | 3 +-
lib/livestatus/zonestable.cpp | 5 +-
lib/methods/CMakeLists.txt | 3 +-
lib/methods/clrchecktask.cpp | 9 +-
lib/methods/clusterchecktask.cpp | 5 +-
lib/methods/clusterzonechecktask.cpp | 5 +-
lib/methods/exceptionchecktask.cpp | 2 +-
lib/methods/icingachecktask.cpp | 2 +-
lib/methods/methods-itl.conf | 6 +-
lib/methods/nullchecktask.cpp | 2 +-
lib/methods/nulleventtask.cpp | 2 +-
lib/methods/pluginchecktask.cpp | 3 +-
lib/methods/plugineventtask.cpp | 3 +-
lib/methods/pluginnotificationtask.cpp | 3 +-
lib/methods/randomchecktask.cpp | 2 +-
lib/methods/timeperiodtask.cpp | 4 +-
lib/notification/CMakeLists.txt | 3 +-
lib/notification/notificationcomponent.cpp | 5 +-
lib/perfdata/CMakeLists.txt | 3 +-
lib/perfdata/gelfwriter.cpp | 3 +-
lib/perfdata/graphitewriter.cpp | 7 +-
lib/perfdata/influxdbwriter.cpp | 122 +-
lib/perfdata/opentsdbwriter.cpp | 7 +-
lib/perfdata/perfdatawriter.cpp | 2 +-
lib/remote/CMakeLists.txt | 3 +-
lib/remote/actionshandler.cpp | 2 +-
lib/remote/apiaction.hpp | 24 +-
lib/remote/apiclient.cpp | 19 +-
lib/remote/apifunction.hpp | 12 +-
lib/remote/apilistener-configsync.cpp | 66 +-
lib/remote/apilistener-filesync.cpp | 19 +-
lib/remote/apilistener.cpp | 70 +-
lib/remote/apilistener.hpp | 3 +-
lib/remote/apiuser.cpp | 2 +-
lib/remote/authority.cpp | 18 +-
lib/remote/configobjectutility.cpp | 12 +-
lib/remote/configpackageshandler.cpp | 2 +-
lib/remote/configpackageutility.cpp | 5 +-
lib/remote/configstageshandler.cpp | 3 +-
lib/remote/consolehandler.cpp | 25 +-
lib/remote/createobjecthandler.cpp | 20 +-
lib/remote/deleteobjecthandler.cpp | 2 +-
lib/remote/endpoint.cpp | 1 -
lib/remote/eventqueue.cpp | 22 +-
lib/remote/eventqueue.hpp | 5 +-
lib/remote/eventshandler.cpp | 5 +-
lib/remote/filterutility.cpp | 13 +-
lib/remote/httphandler.cpp | 8 +-
lib/remote/httphandler.hpp | 14 +-
lib/remote/httprequest.cpp | 6 +-
lib/remote/httpserverconnection.cpp | 4 +-
lib/remote/httputility.cpp | 3 +-
lib/remote/infohandler.cpp | 4 +-
lib/remote/jsonrpcconnection-heartbeat.cpp | 12 +-
lib/remote/jsonrpcconnection.cpp | 8 +-
lib/remote/modifyobjecthandler.cpp | 4 +-
lib/remote/objectqueryhandler.cpp | 25 +-
lib/remote/statushandler.cpp | 2 +-
lib/remote/templatequeryhandler.cpp | 14 +-
lib/remote/typequeryhandler.cpp | 6 +-
lib/remote/url.cpp | 38 +-
lib/remote/variablequeryhandler.cpp | 4 +-
lib/remote/zone.cpp | 13 +-
plugins/check_load.cpp | 4 +
plugins/check_network.cpp | 19 +-
plugins/check_perfmon.cpp | 18 +-
plugins/check_ping.cpp | 81 +-
plugins/check_ping.h | 5 +-
test/CMakeLists.txt | 41 +-
test/base-array.cpp | 5 +-
test/base-convert.cpp | 2 +-
test/base-dictionary.cpp | 5 +-
test/base-fifo.cpp | 3 +-
test/base-json.cpp | 3 +-
test/base-match.cpp | 2 +-
test/base-netstring.cpp | 2 +-
test/base-object.cpp | 2 +-
test/base-serialize.cpp | 3 +-
test/base-shellescape.cpp | 2 +-
test/base-stacktrace.cpp | 2 +-
test/base-stream.cpp | 3 +-
test/base-string.cpp | 5 +-
test/base-timer.cpp | 3 +-
test/base-type.cpp | 3 +-
test/base-value.cpp | 2 +-
test/config-ops.cpp | 2 +-
test/config/2742.conf | 1 -
test/config/5926.conf | 1 -
test/config/5927.conf | 2 -
test/config/6479.conf | 2 -
test/config/6968.conf | 3 +-
test/config/8063.conf | 2 -
test/config/templates.conf | 3 +-
test/icinga-checkresult.cpp | 485 ++++++++
test/icinga-macros.cpp | 2 +-
test/icinga-notification.cpp | 106 ++
test/icinga-perfdata.cpp | 2 +-
test/{base-test.cpp => livestatus-fixture.cpp} | 44 +-
test/livestatus-test.cpp | 114 --
test/livestatus.cpp | 2 +-
test/remote-base64.cpp | 7 +-
test/remote-url.cpp | 4 +-
test/test-runner.cpp | 45 +
third-party/cmake/BoostTestTargets.cmake | 4 +-
third-party/cmake/FindMySQL.cmake | 21 +-
third-party/execvpe/CMakeLists.txt | 1 +
third-party/mmatch/CMakeLists.txt | 1 +
third-party/socketpair/CMakeLists.txt | 1 +
tools/mkclass/CMakeLists.txt | 2 +-
tools/mkclass/class_parser.yy | 8 +-
tools/mkclass/classcompiler.cpp | 366 +++---
tools/mkembedconfig/mkembedconfig.c | 32 +-
tools/mkunity/CMakeLists.txt | 4 +-
429 files changed, 7987 insertions(+), 4865 deletions(-)
--
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