[Pkg-nagios-changes] [pkg-icinga2] 01/01: Merge branch 'master' into debmon-wheezy
Alexander Wirt
formorer at debian.org
Mon Nov 16 11:55:11 UTC 2015
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 7f9a0c4c5d461d8d9a3e54223e0b0d2cb6691cce
Merge: cc52c5c 83a4a76
Author: Alexander Wirt <formorer at debian.org>
Date: Mon Nov 16 11:58:47 2015 +0100
Merge branch 'master' into debmon-wheezy
.travis.yml | 2 +
AUTHORS | 10 +
CMakeLists.txt | 48 +-
ChangeLog | 270 +++
INSTALL.md | 16 +-
RELEASE.md | 26 +-
agent/windows-setup-agent/SetupWizard.cs | 11 -
changelog.py | 50 +-
config.h.cmake | 1 +
contrib/{discover.py => discover-api.py} | 52 +-
contrib/discover.py | 4 +-
contrib/i2eval/Makefile | 3 +
contrib/i2eval/README | 1 +
contrib/i2eval/i2tcl.cpp | 176 ++
contrib/i2eval/i2tcl.hpp | 23 +
contrib/i2eval/i2tcl.tcl | 110 +
debian/.gitignore | 1 +
debian/changelog | 20 +-
debian/control | 59 +-
debian/icinga2-bin.install | 2 +-
debian/icinga2-studio.desktop | 11 +
debian/icinga2-studio.install | 3 +
debian/icinga2-studio.menu | 3 +
debian/libicinga2.install | 1 +
debian/rules | 5 +-
doc/1-about.md | 908 +++------
...-systems.md => 10-monitoring-remote-systems.md} | 2 +-
doc/{10-icinga2-client.md => 11-icinga2-client.md} | 88 +-
...nt-based-checks.md => 12-agent-based-checks.md} | 8 +-
...oring-ha.md => 13-distributed-monitoring-ha.md} | 105 +-
doc/{13-addons-plugins.md => 14-addons-plugins.md} | 22 +-
doc/14-alternative-frontends.md | 175 --
doc/15-features.md | 679 +++++++
doc/15-livestatus.md | 197 --
doc/16-troubleshooting.md | 78 +-
...guage-reference.md => 18-language-reference.md} | 123 +-
...ibrary-reference.md => 19-library-reference.md} | 100 +-
doc/2-getting-started.md | 9 +-
doc/20-script-debugger.md | 105 +
doc/{21-debug.md => 21-development.md} | 5 +-
...icinga-1x.md => 22-migrating-from-icinga-1x.md} | 34 +-
doc/{22-appendix.md => 23-appendix.md} | 33 +-
doc/3-monitoring-basics.md | 91 +-
doc/4-configuring-icinga-2.md | 45 +-
doc/5-advanced-topics.md | 398 +---
doc/6-object-types.md | 282 ++-
doc/7-icinga-template-library.md | 690 ++++---
doc/8-cli-commands.md | 131 +-
doc/9-icinga2-api.md | 1702 ++++++++++++++++
doc/icinga2.8 | 111 +-
.../icinga2_api_icinga_studio_connect.png | Bin 0 -> 45497 bytes
.../icinga2_api_icinga_studio_overview.png | Bin 0 -> 155144 bytes
etc/CMakeLists.txt | 1 +
etc/icinga2/conf.d/app.conf | 1 +
etc/icinga2/conf.d/notifications.conf | 2 +
etc/icinga2/conf.d/services.conf | 1 -
etc/icinga2/features-available/icingastatus.conf | 2 +
etc/icinga2/icinga2.conf | 1 -
etc/initsystem/prepare-dirs | 3 +
etc/initsystem/safe-reload | 17 +-
icinga-app/CMakeLists.txt | 16 +-
icinga-app/icinga.cpp | 36 +-
icinga-app/icinga2.cmake | 29 +
icinga-studio/CMakeLists.txt | 65 +
icinga-studio/IcingaStudio.fbp | 2128 ++++++++++++++++++++
icinga-studio/MacOSXBundleInfo.plist.in | 38 +
.../aboutform.cpp | 9 +-
.../aboutform.hpp | 14 +-
.../connectform.cpp | 53 +-
.../hello.hpp => icinga-studio/connectform.hpp | 21 +-
icinga-studio/forms.cpp | 239 +++
icinga-studio/forms.h | 108 +
.../icinga-studio.cpp | 45 +-
icinga-studio/icinga.icns | Bin 0 -> 215406 bytes
icinga-studio/icinga.ico | Bin 0 -> 766 bytes
icinga-studio/icinga.rc | 34 +
icinga-studio/icinga.xpm | 40 +
icinga-studio/mainform.cpp | 321 +++
.../mainform.hpp | 34 +-
icinga2.nuspec | 2 +-
icinga2.spec | 101 +-
itl/command-plugins-windows.conf | 3 +-
itl/command-plugins.conf | 159 +-
itl/command.conf | 32 -
itl/plugins-contrib.d/operating-system.conf | 8 +
itl/plugins-contrib.d/web.conf | 83 +
lib/base/CMakeLists.txt | 37 +-
lib/base/application-version.cpp | 2 +-
lib/base/application.cpp | 252 ++-
lib/base/application.hpp | 22 +-
lib/base/application.ti | 6 +-
lib/base/array-script.cpp | 14 +-
lib/base/array.cpp | 69 +-
lib/base/array.hpp | 57 +-
lib/base/boolean-script.cpp | 2 +-
.../{object-script.cpp => configobject-script.cpp} | 20 +-
lib/base/configobject.cpp | 686 +++++++
lib/base/{dynamicobject.hpp => configobject.hpp} | 49 +-
lib/base/{dynamicobject.ti => configobject.ti} | 65 +-
lib/base/{dynamictype.cpp => configtype.cpp} | 60 +-
lib/base/{dynamictype.hpp => configtype.hpp} | 49 +-
lib/base/configwriter.cpp | 262 +++
lib/base/{scriptutils.hpp => configwriter.hpp} | 53 +-
lib/base/console.cpp | 4 -
lib/base/console.hpp | 5 +-
lib/base/debuginfo.cpp | 4 +-
lib/base/debuginfo.hpp | 2 +-
test/base-type.cpp => lib/base/dependencygraph.cpp | 51 +-
lib/base/{filelogger.hpp => dependencygraph.hpp} | 30 +-
lib/base/dictionary-script.cpp | 11 +-
lib/base/dictionary.cpp | 92 +-
lib/base/dictionary.hpp | 53 +-
lib/base/dynamicobject.cpp | 373 ----
lib/base/exception.cpp | 117 +-
lib/base/exception.hpp | 46 +-
lib/base/fifo.cpp | 6 +-
lib/base/fifo.hpp | 16 +-
lib/base/filelogger.cpp | 11 +-
lib/base/filelogger.hpp | 2 +-
lib/base/filelogger.ti | 4 +-
lib/base/function.cpp | 15 +-
lib/base/function.hpp | 15 +-
lib/base/i2-base.hpp | 2 +-
lib/base/initialize.cpp | 6 +-
lib/base/initialize.hpp | 12 +-
lib/base/json-script.cpp | 4 +-
lib/base/json.cpp | 1 +
lib/base/loader.cpp | 91 +
lib/base/{function.hpp => loader.hpp} | 62 +-
lib/base/logger.cpp | 13 +-
lib/base/logger.hpp | 4 +-
lib/base/logger.ti | 6 +-
lib/base/math-script.cpp | 42 +-
lib/base/networkstream.cpp | 2 +
lib/base/networkstream.hpp | 8 +-
lib/base/number-script.cpp | 2 +-
lib/base/object-script.cpp | 18 +-
lib/base/object.cpp | 43 +-
lib/base/object.hpp | 43 +-
lib/base/objectlock.hpp | 5 +-
lib/base/{primitivetype.cpp => objecttype.cpp} | 47 +-
lib/base/{sysloglogger.hpp => objecttype.hpp} | 31 +-
lib/base/primitivetype.cpp | 32 +-
lib/base/primitivetype.hpp | 34 +-
lib/base/process.cpp | 8 +-
lib/base/scriptframe.cpp | 54 +-
lib/base/scriptframe.hpp | 9 +-
lib/base/scriptutils.cpp | 88 +-
lib/base/scriptutils.hpp | 5 +-
lib/base/serializer.cpp | 2 +-
lib/base/socket.cpp | 16 +-
lib/base/socket.hpp | 4 -
lib/base/socketevents.cpp | 10 +
lib/base/socketevents.hpp | 3 +
lib/base/stdiostream.cpp | 2 +
lib/base/stdiostream.hpp | 10 +-
lib/base/stream.cpp | 27 +-
lib/base/stream.hpp | 23 +-
lib/base/streamlogger.cpp | 5 +-
lib/base/streamlogger.hpp | 6 +-
lib/base/streamlogger.ti | 4 +-
lib/base/string-script.cpp | 20 +-
lib/base/string.cpp | 5 -
lib/base/string.hpp | 58 +-
lib/base/sysloglogger.cpp | 8 +-
lib/base/sysloglogger.hpp | 4 +-
lib/base/sysloglogger.ti | 2 +
lib/base/thinmutex.cpp | 66 -
lib/base/thinmutex.hpp | 128 --
lib/base/threadpool.cpp | 12 +-
lib/base/timer.cpp | 14 -
lib/base/tlsstream.cpp | 70 +-
lib/base/tlsstream.hpp | 19 +-
lib/base/tlsutility.cpp | 47 +-
lib/base/tlsutility.hpp | 2 +-
lib/base/type.cpp | 67 +-
lib/base/type.hpp | 71 +-
.../{object-script.cpp => typetype-script.cpp} | 24 +-
lib/base/utility.cpp | 169 +-
lib/base/utility.hpp | 26 +-
lib/base/value-operators.cpp | 4 +-
lib/base/value.cpp | 16 +-
lib/base/value.hpp | 4 +-
lib/base/win32.hpp | 4 +-
lib/base/workqueue.cpp | 3 +-
lib/base/workqueue.hpp | 2 +-
lib/checker/CMakeLists.txt | 7 +-
lib/checker/checker-type.conf | 21 -
lib/checker/checkercomponent.cpp | 29 +-
lib/checker/checkercomponent.hpp | 10 +-
lib/checker/checkercomponent.ti | 6 +-
lib/cli/CMakeLists.txt | 11 +
lib/{hello/hello.cpp => cli/apisetupcommand.cpp} | 35 +-
.../{nodewizardcommand.hpp => apisetupcommand.hpp} | 22 +-
lib/cli/apisetuputility.cpp | 213 ++
lib/{icinga/api.hpp => cli/apisetuputility.hpp} | 28 +-
lib/cli/clicommand.cpp | 17 +-
lib/cli/consolecommand.cpp | 407 +++-
lib/cli/consolecommand.hpp | 35 +-
lib/cli/daemoncommand.cpp | 46 +-
lib/cli/daemoncommand.hpp | 10 +-
lib/cli/daemonutility.cpp | 69 +-
lib/cli/daemonutility.hpp | 2 +-
lib/{hello/hello.cpp => cli/editline.hpp} | 24 +-
lib/cli/featuredisablecommand.hpp | 14 +-
lib/cli/featureenablecommand.hpp | 14 +-
lib/cli/featurelistcommand.hpp | 6 +-
lib/cli/featureutility.cpp | 25 +
lib/cli/featureutility.hpp | 3 +
lib/cli/nodeaddcommand.hpp | 8 +-
lib/cli/nodeblackandwhitelistcommand.hpp | 8 +-
lib/cli/nodelistcommand.hpp | 8 +-
lib/cli/noderemovecommand.hpp | 12 +-
lib/cli/nodesetcommand.hpp | 10 +-
lib/cli/nodesetupcommand.cpp | 120 +-
lib/cli/nodesetupcommand.hpp | 12 +-
lib/cli/nodeupdateconfigcommand.cpp | 20 +-
lib/cli/nodeupdateconfigcommand.hpp | 8 +-
lib/cli/nodeutility.cpp | 13 +-
lib/cli/nodewizardcommand.cpp | 143 +-
lib/cli/nodewizardcommand.hpp | 10 +-
lib/cli/objectlistcommand.cpp | 6 +-
lib/cli/objectlistcommand.hpp | 8 +-
lib/cli/objectlistutility.cpp | 2 +-
lib/cli/pkinewcacommand.hpp | 6 +-
lib/cli/pkinewcertcommand.hpp | 10 +-
lib/cli/pkirequestcommand.hpp | 10 +-
lib/cli/pkisavecertcommand.hpp | 10 +-
lib/cli/pkisigncsrcommand.hpp | 10 +-
lib/cli/pkiticketcommand.hpp | 8 +-
lib/cli/pkiutility.cpp | 6 +-
lib/cli/repositoryclearchangescommand.hpp | 8 +-
lib/cli/repositorycommitcommand.hpp | 10 +-
lib/cli/repositoryobjectcommand.cpp | 3 -
lib/cli/repositoryobjectcommand.hpp | 14 +-
lib/cli/repositoryutility.cpp | 58 +-
lib/cli/troubleshootcommand.cpp | 17 +-
lib/cli/troubleshootcommand.hpp | 10 +-
lib/cli/variablegetcommand.cpp | 4 +-
lib/cli/variablegetcommand.hpp | 10 +-
lib/cli/variablelistcommand.cpp | 2 +-
lib/cli/variablelistcommand.hpp | 6 +-
lib/compat/CMakeLists.txt | 13 +-
lib/compat/checkresultreader.cpp | 11 +-
lib/compat/checkresultreader.hpp | 2 +-
lib/compat/checkresultreader.ti | 6 +-
lib/compat/compat-type.conf | 39 -
lib/compat/compatlogger.cpp | 107 +-
lib/compat/compatlogger.hpp | 11 +-
lib/compat/compatlogger.ti | 6 +-
lib/compat/externalcommandlistener.cpp | 65 +-
lib/compat/externalcommandlistener.hpp | 2 +-
lib/compat/externalcommandlistener.ti | 6 +-
lib/compat/statusdatawriter.cpp | 91 +-
lib/compat/statusdatawriter.hpp | 4 +-
lib/compat/statusdatawriter.ti | 6 +-
lib/config/CMakeLists.txt | 18 +-
lib/config/applyrule.cpp | 24 +-
lib/config/applyrule.hpp | 11 +-
lib/config/config_lexer.ll | 32 +-
lib/config/config_parser.yy | 288 +--
lib/config/configcompiler.cpp | 130 +-
lib/config/configcompiler.hpp | 62 +-
.../initialize.cpp => config/configfragment.hpp} | 27 +-
lib/config/configitem.cpp | 262 ++-
lib/config/configitem.hpp | 31 +-
lib/config/configitembuilder.cpp | 32 +-
lib/config/configitembuilder.hpp | 4 +
lib/config/configtype.cpp | 271 ---
lib/config/configtype.hpp | 90 -
lib/config/expression.cpp | 217 +-
lib/config/expression.hpp | 182 +-
lib/config/typerule.cpp | 108 -
lib/config/typerule.hpp | 85 -
lib/config/typerulelist.cpp | 140 --
lib/config/typerulelist.hpp | 76 -
lib/config/vmops.hpp | 101 +-
lib/db_ido/CMakeLists.txt | 15 +-
lib/db_ido/commanddbobject.hpp | 8 +-
.../sysloglogger.ti => db_ido/db_ido-itl.conf} | 13 +-
lib/db_ido/db_ido-type.conf | 48 -
lib/db_ido/dbconnection.cpp | 90 +-
lib/db_ido/dbconnection.hpp | 26 +-
lib/db_ido/dbconnection.ti | 33 +-
lib/db_ido/dbevents.cpp | 345 ++--
lib/db_ido/dbevents.hpp | 60 +-
lib/db_ido/dbobject.cpp | 57 +-
lib/db_ido/dbobject.hpp | 15 +-
lib/db_ido/dbquery.hpp | 2 +-
lib/db_ido/dbtype.cpp | 2 -
lib/db_ido/endpointdbobject.cpp | 6 +-
lib/db_ido/endpointdbobject.hpp | 6 +-
lib/db_ido/hostdbobject.cpp | 35 +-
lib/db_ido/hostdbobject.hpp | 10 +-
lib/db_ido/hostgroupdbobject.cpp | 19 +-
lib/db_ido/hostgroupdbobject.hpp | 9 +-
.../idochecktask.cpp} | 85 +-
.../negatefilter.hpp => db_ido/idochecktask.hpp} | 26 +-
lib/db_ido/servicedbobject.cpp | 37 +-
lib/db_ido/servicedbobject.hpp | 12 +-
lib/db_ido/servicegroupdbobject.cpp | 17 -
lib/db_ido/servicegroupdbobject.hpp | 9 +-
lib/db_ido/timeperioddbobject.hpp | 8 +-
lib/db_ido/userdbobject.cpp | 34 +-
lib/db_ido/userdbobject.hpp | 10 +-
lib/db_ido/usergroupdbobject.cpp | 28 +-
lib/db_ido/usergroupdbobject.hpp | 9 +-
lib/{icinga/api.cpp => db_ido/zonedbobject.cpp} | 37 +-
.../{commanddbobject.hpp => zonedbobject.hpp} | 24 +-
lib/db_ido_mysql/CMakeLists.txt | 7 +-
lib/db_ido_mysql/db_ido_mysql-type.conf | 33 -
lib/db_ido_mysql/idomysqlconnection.cpp | 504 +++--
lib/db_ido_mysql/idomysqlconnection.hpp | 40 +-
lib/db_ido_mysql/idomysqlconnection.ti | 2 +
lib/db_ido_mysql/schema/mysql.sql | 51 +-
lib/db_ido_mysql/schema/upgrade/2.4.0.sql | 75 +
lib/db_ido_pgsql/CMakeLists.txt | 7 +-
lib/db_ido_pgsql/db_ido_pgsql-type.conf | 31 -
lib/db_ido_pgsql/idopgsqlconnection.cpp | 126 +-
lib/db_ido_pgsql/idopgsqlconnection.hpp | 26 +-
lib/db_ido_pgsql/idopgsqlconnection.ti | 2 +
lib/db_ido_pgsql/schema/pgsql.sql | 239 ++-
lib/db_ido_pgsql/schema/upgrade/2.4.0.sql | 185 ++
lib/demo/CMakeLists.txt | 7 +-
lib/demo/demo-type.conf | 21 -
lib/demo/demo.cpp | 14 +-
lib/demo/demo.hpp | 4 +-
lib/demo/demo.ti | 6 +-
lib/hello/CMakeLists.txt | 7 +-
lib/hello/hello-type.conf | 21 -
lib/{icinga/api.cpp => hello/helloapplication.cpp} | 30 +-
lib/hello/{hello.hpp => helloapplication.hpp} | 20 +-
lib/hello/{hello.ti => helloapplication.ti} | 4 +-
lib/icinga/CMakeLists.txt | 62 +-
lib/icinga/apiactions.cpp | 372 ++++
lib/icinga/{api.hpp => apiactions.hpp} | 25 +-
lib/icinga/apievents.cpp | 1894 ++---------------
lib/icinga/apievents.hpp | 92 +-
lib/icinga/checkable-check.cpp | 188 +-
lib/icinga/checkable-comment.cpp | 215 +-
lib/icinga/checkable-downtime.cpp | 333 +--
lib/icinga/checkable-event.cpp | 33 +-
lib/icinga/checkable-flapping.cpp | 16 -
lib/icinga/checkable-notification.cpp | 31 +-
lib/icinga/checkable.cpp | 181 +-
lib/icinga/checkable.hpp | 155 +-
lib/icinga/checkable.ti | 87 +-
lib/icinga/checkcommand.cpp | 3 +-
lib/icinga/checkcommand.ti | 2 +
lib/icinga/checkresult.cpp | 14 +
lib/icinga/checkresult.hpp | 2 +
lib/icinga/checkresult.ti | 2 +
lib/icinga/cib.cpp | 70 +-
lib/icinga/cib.hpp | 2 +
lib/icinga/clusterevents.cpp | 754 +++++++
lib/icinga/clusterevents.hpp | 73 +
lib/icinga/command.cpp | 113 +-
lib/icinga/command.hpp | 7 +-
lib/icinga/command.ti | 37 +-
lib/icinga/comment.cpp | 216 +-
lib/icinga/comment.hpp | 32 +-
lib/icinga/comment.ti | 61 +-
lib/icinga/compatutility.cpp | 64 +-
lib/icinga/compatutility.hpp | 2 -
lib/icinga/customvarobject.cpp | 94 +-
lib/icinga/customvarobject.hpp | 35 +-
lib/icinga/customvarobject.ti | 10 +-
lib/icinga/dependency-apply.cpp | 13 +-
lib/icinga/dependency.cpp | 51 +-
lib/icinga/dependency.hpp | 8 +-
lib/icinga/dependency.ti | 68 +-
lib/icinga/downtime.cpp | 317 +++
lib/icinga/downtime.hpp | 39 +-
lib/icinga/downtime.ti | 76 +-
lib/icinga/eventcommand.cpp | 1 +
lib/icinga/eventcommand.ti | 3 +
lib/icinga/externalcommandprocessor.cpp | 703 ++-----
lib/icinga/externalcommandprocessor.hpp | 8 -
lib/icinga/host.cpp | 30 +-
lib/icinga/host.hpp | 20 +-
lib/icinga/host.ti | 9 +-
lib/icinga/hostgroup.cpp | 3 +-
lib/icinga/hostgroup.ti | 4 +-
lib/icinga/icinga-type.conf | 294 ---
lib/icinga/icingaapplication.cpp | 214 +-
lib/icinga/icingaapplication.hpp | 32 +-
lib/icinga/icingaapplication.ti | 27 +-
lib/icinga/icingastatuswriter.cpp | 14 +-
lib/icinga/icingastatuswriter.hpp | 2 +-
lib/icinga/icingastatuswriter.ti | 4 +-
lib/icinga/legacytimeperiod.cpp | 9 +-
lib/icinga/macroprocessor.cpp | 48 +-
lib/icinga/macroprocessor.hpp | 1 +
lib/icinga/notification-apply.cpp | 11 +-
lib/icinga/notification.cpp | 137 +-
lib/icinga/notification.hpp | 23 +-
lib/icinga/notification.ti | 69 +-
lib/icinga/notificationcommand.cpp | 1 +
lib/icinga/notificationcommand.ti | 2 +
lib/icinga/perfdatavalue.cpp | 17 +-
lib/icinga/perfdatavalue.ti | 2 +
lib/icinga/scheduleddowntime-apply.cpp | 11 +-
lib/icinga/scheduleddowntime.cpp | 80 +-
lib/icinga/scheduleddowntime.hpp | 6 +-
lib/icinga/scheduleddowntime.ti | 43 +-
lib/icinga/service-apply.cpp | 11 +-
lib/icinga/service.cpp | 32 +-
lib/icinga/service.hpp | 10 +-
lib/icinga/service.ti | 19 +-
lib/icinga/servicegroup.cpp | 3 +-
lib/icinga/servicegroup.ti | 4 +-
lib/icinga/timeperiod.cpp | 26 +-
lib/icinga/timeperiod.hpp | 6 +-
lib/icinga/timeperiod.ti | 16 +-
lib/icinga/user.cpp | 64 +-
lib/icinga/user.hpp | 17 +-
lib/icinga/user.ti | 18 +-
lib/icinga/usergroup.cpp | 3 +-
lib/icinga/usergroup.ti | 4 +-
lib/livestatus/CMakeLists.txt | 6 +-
lib/livestatus/andfilter.hpp | 2 +-
lib/livestatus/attributefilter.hpp | 2 +-
lib/livestatus/avgaggregator.hpp | 4 +-
lib/livestatus/commandstable.cpp | 33 +-
lib/livestatus/commandstable.hpp | 8 +-
lib/livestatus/commentstable.cpp | 41 +-
lib/livestatus/commentstable.hpp | 6 +-
lib/livestatus/contactgroupstable.cpp | 4 +-
lib/livestatus/contactgroupstable.hpp | 6 +-
lib/livestatus/contactstable.cpp | 29 +-
lib/livestatus/contactstable.hpp | 8 +-
lib/livestatus/countaggregator.hpp | 4 +-
lib/livestatus/downtimestable.cpp | 48 +-
lib/livestatus/downtimestable.hpp | 6 +-
lib/livestatus/endpointstable.cpp | 23 +-
lib/livestatus/endpointstable.hpp | 7 +-
lib/livestatus/hostgroupstable.cpp | 4 +-
lib/livestatus/hostgroupstable.hpp | 6 +-
lib/livestatus/hoststable.cpp | 147 +-
lib/livestatus/hoststable.hpp | 9 +-
lib/livestatus/invavgaggregator.hpp | 4 +-
lib/livestatus/invsumaggregator.hpp | 4 +-
lib/livestatus/livestatus-type.conf | 30 -
lib/livestatus/livestatuslistener.cpp | 28 +-
lib/livestatus/livestatuslistener.hpp | 6 +-
lib/livestatus/livestatuslistener.ti | 6 +-
lib/livestatus/livestatuslogutility.cpp | 7 +-
lib/livestatus/livestatusquery.cpp | 171 +-
lib/livestatus/livestatusquery.hpp | 21 +-
lib/livestatus/logtable.hpp | 8 +-
lib/livestatus/maxaggregator.hpp | 4 +-
lib/livestatus/minaggregator.hpp | 4 +-
lib/livestatus/negatefilter.hpp | 2 +-
lib/livestatus/orfilter.hpp | 2 +-
lib/livestatus/servicegroupstable.cpp | 4 +-
lib/livestatus/servicegroupstable.hpp | 6 +-
lib/livestatus/servicestable.cpp | 133 +-
lib/livestatus/servicestable.hpp | 9 +-
lib/livestatus/statehisttable.hpp | 8 +-
lib/livestatus/statustable.cpp | 10 +-
lib/livestatus/statustable.hpp | 6 +-
lib/livestatus/stdaggregator.hpp | 4 +-
lib/livestatus/sumaggregator.hpp | 4 +-
lib/livestatus/table.cpp | 3 +
lib/livestatus/timeperiodstable.cpp | 4 +-
lib/livestatus/timeperiodstable.hpp | 6 +-
lib/livestatus/zonestable.cpp | 113 ++
.../{contactgroupstable.hpp => zonestable.hpp} | 23 +-
lib/methods/CMakeLists.txt | 4 +-
lib/methods/clrchecktask.cpp | 2 +-
lib/methods/clusterchecktask.cpp | 2 +-
lib/methods/clusterzonechecktask.cpp | 2 +-
lib/methods/icingachecktask.cpp | 4 +-
.../base-type.conf => methods/methods-itl.conf} | 36 +-
lib/methods/pluginchecktask.cpp | 6 +-
lib/methods/plugineventtask.cpp | 2 +-
lib/notification/CMakeLists.txt | 7 +-
lib/notification/notification-type.conf | 22 -
lib/notification/notificationcomponent.cpp | 13 +-
lib/notification/notificationcomponent.hpp | 4 +-
lib/notification/notificationcomponent.ti | 6 +-
lib/perfdata/CMakeLists.txt | 13 +-
lib/perfdata/gelfwriter.cpp | 7 +-
lib/perfdata/gelfwriter.hpp | 4 +-
lib/perfdata/gelfwriter.ti | 6 +-
lib/perfdata/graphitewriter.cpp | 159 +-
lib/perfdata/graphitewriter.hpp | 12 +-
lib/perfdata/graphitewriter.ti | 14 +-
lib/perfdata/opentsdbwriter.cpp | 11 +-
lib/perfdata/opentsdbwriter.hpp | 4 +-
lib/perfdata/opentsdbwriter.ti | 25 +-
lib/perfdata/perfdata-type.conf | 50 -
lib/perfdata/perfdatawriter.cpp | 33 +-
lib/perfdata/perfdatawriter.hpp | 7 +-
lib/perfdata/perfdatawriter.ti | 6 +-
lib/remote/CMakeLists.txt | 29 +-
lib/remote/actionshandler.cpp | 103 +
lib/{hello/hello.hpp => remote/actionshandler.hpp} | 20 +-
lib/remote/{apifunction.cpp => apiaction.cpp} | 31 +-
lib/remote/{apifunction.hpp => apiaction.hpp} | 69 +-
lib/remote/apiclient.cpp | 487 +++--
lib/remote/apiclient.hpp | 133 +-
lib/remote/apifunction.cpp | 2 +-
lib/remote/apifunction.hpp | 15 +-
lib/remote/apilistener-configsync.cpp | 410 ++++
...ilistener-sync.cpp => apilistener-filesync.cpp} | 53 +-
lib/remote/apilistener.cpp | 348 +++-
lib/remote/apilistener.hpp | 60 +-
lib/remote/apilistener.ti | 17 +-
.../mkclass/mkclass.cpp => lib/remote/apiuser.cpp | 17 +-
lib/remote/{messageorigin.hpp => apiuser.hpp} | 19 +-
lib/{icinga/command.ti => remote/apiuser.ti} | 25 +-
lib/remote/authority.cpp | 10 +-
lib/{base/socket.hpp => remote/base64.cpp} | 82 +-
lib/remote/{messageorigin.hpp => base64.hpp} | 20 +-
lib/remote/configfileshandler.cpp | 100 +
.../hello.hpp => remote/configfileshandler.hpp} | 20 +-
lib/remote/configobjectutility.cpp | 234 +++
.../{jsonrpc.hpp => configobjectutility.hpp} | 32 +-
lib/remote/configpackageshandler.cpp | 152 ++
.../configpackageshandler.hpp} | 28 +-
lib/remote/configpackageutility.cpp | 316 +++
lib/remote/configpackageutility.hpp | 73 +
lib/remote/configstageshandler.cpp | 184 ++
.../configstageshandler.hpp} | 28 +-
lib/remote/consolehandler.cpp | 289 +++
.../scriptframe.hpp => remote/consolehandler.hpp} | 41 +-
lib/remote/createobjecthandler.cpp | 100 +
.../hello.hpp => remote/createobjecthandler.hpp} | 20 +-
lib/remote/deleteobjecthandler.cpp | 96 +
.../hello.hpp => remote/deleteobjecthandler.hpp} | 20 +-
lib/remote/endpoint.cpp | 27 +-
lib/remote/endpoint.hpp | 18 +-
lib/remote/endpoint.ti | 16 +-
lib/remote/eventqueue.cpp | 150 ++
lib/{base/workqueue.hpp => remote/eventqueue.hpp} | 89 +-
lib/remote/eventshandler.cpp | 119 ++
lib/{hello/hello.hpp => remote/eventshandler.hpp} | 21 +-
lib/remote/filterutility.cpp | 281 +++
lib/remote/filterutility.hpp | 79 +
lib/remote/httpchunkedencoding.cpp | 81 +
.../{jsonrpc.hpp => httpchunkedencoding.hpp} | 31 +-
lib/remote/httpclientconnection.cpp | 172 ++
.../{apiclient.hpp => httpclientconnection.hpp} | 70 +-
lib/remote/httphandler.cpp | 111 +
lib/{base/function.hpp => remote/httphandler.hpp} | 58 +-
lib/remote/httprequest.cpp | 234 +++
lib/remote/{jsonrpc.hpp => httprequest.hpp} | 54 +-
lib/remote/httpresponse.cpp | 247 +++
lib/remote/{jsonrpc.hpp => httpresponse.hpp} | 51 +-
lib/remote/httpserverconnection.cpp | 229 +++
.../{apiclient.hpp => httpserverconnection.hpp} | 49 +-
lib/remote/httputility.cpp | 120 ++
lib/remote/{jsonrpc.hpp => httputility.hpp} | 25 +-
lib/remote/infohandler.cpp | 85 +
lib/{icinga/api.hpp => remote/infohandler.hpp} | 20 +-
lib/remote/jsonrpc.cpp | 8 +-
lib/remote/jsonrpc.hpp | 2 +-
...artbeat.cpp => jsonrpcconnection-heartbeat.cpp} | 25 +-
.../{apiclient.cpp => jsonrpcconnection.cpp} | 116 +-
.../{apiclient.hpp => jsonrpcconnection.hpp} | 26 +-
lib/remote/messageorigin.hpp | 9 +-
lib/remote/modifyobjecthandler.cpp | 102 +
.../hello.hpp => remote/modifyobjecthandler.hpp} | 20 +-
lib/remote/objectqueryhandler.cpp | 257 +++
.../objectqueryhandler.hpp} | 36 +-
lib/remote/remote-type.conf | 58 -
lib/remote/statushandler.cpp | 107 +
lib/{hello/hello.hpp => remote/statushandler.hpp} | 20 +-
lib/remote/typequeryhandler.cpp | 166 ++
.../{messageorigin.hpp => typequeryhandler.hpp} | 20 +-
itl/command.conf => lib/remote/url-characters.hpp | 45 +-
lib/remote/url.cpp | 423 ++++
lib/remote/url.hpp | 95 +
lib/remote/zone.cpp | 6 +-
lib/remote/zone.hpp | 2 +-
lib/remote/zone.ti | 15 +-
mkdocs.yml | 25 +-
plugins/check_load.cpp | 2 +-
plugins/check_memory.cpp | 2 +-
plugins/check_perfmon.cpp | 2 +-
plugins/check_ping.cpp | 2 +-
plugins/check_swap.cpp | 2 +-
plugins/check_update.cpp | 2 +-
plugins/check_uptime.cpp | 2 +-
plugins/check_users.cpp | 2 +-
plugins/thresholds.cpp | 2 +-
test/CMakeLists.txt | 44 +-
test/base-string.cpp | 12 +-
test/base-type.cpp | 2 +-
test/config-ops.cpp | 1 +
test/livestatus.cpp | 19 +-
test/livestatus/queries/hosts/modattr | 2 +-
test/livestatus/queries/services/modattr | 2 +-
test/livestatus/run_queries | 3 +-
test/remote-url.cpp | 117 ++
third-party/cmake/FindEditline.cmake | 86 +
third-party/cmake/FindTermcap.cmake | 68 +
third-party/execvpe/CMakeLists.txt | 6 +
third-party/mmatch/CMakeLists.txt | 7 +
third-party/socketpair/CMakeLists.txt | 6 +
third-party/socketpair/socketpair.c | 2 +-
third-party/yajl/src/CMakeLists.txt | 7 +
tools/chocolateyInstall.ps1 | 2 +-
tools/mkclass/CMakeLists.txt | 14 +-
tools/mkclass/class_lexer.ll | 14 +-
tools/mkclass/class_parser.yy | 219 +-
tools/mkclass/classcompiler.cpp | 1206 ++++++++---
tools/mkclass/classcompiler.hpp | 118 +-
tools/mkclass/mkclass.cpp | 6 +-
tools/mkembedconfig/CMakeLists.txt | 1 +
tools/mkembedconfig/mkembedconfig.c | 2 +-
tools/scripts/process_check_result | 97 -
tools/selinux/icinga2.fc | 21 +
tools/selinux/icinga2.if | 434 ++++
tools/selinux/icinga2.sh | 75 +
tools/selinux/icinga2.te | 195 ++
tools/syntax/vim/syntax/icinga2.vim | 35 +-
618 files changed, 27707 insertions(+), 13908 deletions(-)
diff --cc debian/changelog
index 19a7060,0ce133b..7e25cf1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,27 @@@
- icinga2 (2.3.11-1~debmon70+1) debmon-wheezy; urgency=medium
++icinga2 (2.4.0-1~debmon70+1) debmon-wheezy; urgency=medium
+
+ * Rebuild for debmon-wheezy.
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 27 Aug 2015 13:33:01 +0200
+
+ icinga2 (2.4.0-1) unstable; urgency=medium
+
+ [ Gunnar Beutner ]
+ * Add Build-Depends for libedit and add Recommends for libreadline6
+ * Revert "Run 'api setup' in post install task for icinga2-bin"
+
+ [ Michael Friedrich ]
+ * Run 'api setup' in post install task for icinga2-bin
+
+ [ Markus Frosch ]
+ * Add icinga2-studio package for Icinga 2.4
+
+ [ Alexander Wirt ]
+ * change application name for icinga studio
+ * Imported Upstream version 2.4.0
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 16 Nov 2015 11:25:14 +0100
+
icinga2 (2.3.11-1) unstable; urgency=medium
* [b9e26af] Change ido database name/user to icinga2 for new installations
--
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