[Pkg-nagios-changes] [pkg-icinga2] 01/06: Merge branch 'master' into ubuntu
Alexander Wirt
formorer at debian.org
Wed Aug 31 13:40:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch ubuntu
in repository pkg-icinga2.
commit 3aeaf43bd8d9e71ef4b5389e89445f3036c5643b
Merge: 5fd8e27 9f661d6
Author: Alexander Wirt <formorer at debian.org>
Date: Fri Aug 26 09:51:17 2016 +0200
Merge branch 'master' into ubuntu
.gitignore | 3 +
.mailmap | 2 +
AUTHORS | 22 +-
CMakeLists.txt | 10 +
ChangeLog | 255 +++
INSTALL.md | 1 +
RELEASE.md | 26 +-
agent/windows-setup-agent/SetupWizard.cs | 24 +-
config.h.cmake | 4 +
contrib/i2eval/i2tcl.cpp | 4 +-
contrib/i2eval/i2tcl.tcl | 3 +-
debian/TODO | 20 +-
debian/changelog | 26 +
debian/control | 1 +
debian/icinga2-common.postinst | 1 +
debian/po/sv.po | 98 +
doc/1-about.md | 815 ++-----
...te-library.md => 10-icinga-template-library.md} | 1045 ++++++---
doc/10-monitoring-remote-systems.md | 75 -
doc/{8-cli-commands.md => 11-cli-commands.md} | 104 +-
doc/11-icinga2-client.md | 813 -------
doc/{9-icinga2-api.md => 12-icinga2-api.md} | 239 ++-
doc/{14-addons-plugins.md => 13-addons.md} | 150 +-
doc/13-distributed-monitoring-ha.md | 903 --------
doc/{15-features.md => 14-features.md} | 52 +-
...16-troubleshooting.md => 15-troubleshooting.md} | 96 +-
...rading-icinga-2.md => 16-upgrading-icinga-2.md} | 8 +-
...guage-reference.md => 17-language-reference.md} | 27 +-
...ibrary-reference.md => 18-library-reference.md} | 123 +-
...20-script-debugger.md => 19-script-debugger.md} | 2 +-
doc/2-getting-started.md | 134 +-
doc/{21-development.md => 20-development.md} | 20 +-
doc/21-selinux.md | 232 ++
doc/22-migrating-from-icinga-1x.md | 55 +-
doc/23-appendix.md | 4 +-
doc/3-monitoring-basics.md | 182 +-
doc/4-configuring-icinga-2.md | 93 +-
doc/5-service-monitoring.md | 286 +++
doc/6-distributed-monitoring.md | 2241 ++++++++++++++++++++
...based-checks.md => 7-agent-based-monitoring.md} | 91 +-
doc/{5-advanced-topics.md => 8-advanced-topics.md} | 116 +-
doc/{6-object-types.md => 9-object-types.md} | 258 ++-
...ributed_automation_docker_client_icingaweb2.png | Bin 0 -> 102003 bytes
.../icinga2_distributed_bottom_up.png | Bin 0 -> 16718 bytes
.../icinga2_distributed_endpoints.png | Bin 0 -> 13374 bytes
.../icinga2_distributed_roles.png | Bin 0 -> 19711 bytes
...ga2_distributed_scenarios_ha_master_clients.png | Bin 0 -> 41392 bytes
...cinga2_distributed_scenarios_master_clients.png | Bin 0 -> 24345 bytes
...stributed_scenarios_master_satellite_client.png | Bin 0 -> 60888 bytes
...inga2_distributed_top_down_command_endpoint.png | Bin 0 -> 16443 bytes
.../icinga2_distributed_top_down_config_sync.png | Bin 0 -> 19577 bytes
..._distributed_windows_client_disk_icingaweb2.png | Bin 0 -> 128430 bytes
.../icinga2_distributed_windows_nscp.png | Bin 0 -> 21112 bytes
.../icinga2_distributed_zones.png | Bin 0 -> 15201 bytes
.../icinga2_windows_cmd_admin_net_start_stop.png | Bin 0 -> 11824 bytes
.../icinga2_windows_running_service.png | Bin 0 -> 279218 bytes
.../icinga2_windows_setup_installer_01.png | Bin 0 -> 9237 bytes
.../icinga2_windows_setup_installer_02.png | Bin 0 -> 16838 bytes
.../icinga2_windows_setup_installer_03.png | Bin
.../icinga2_windows_setup_installer_04.png | Bin 0 -> 8180 bytes
.../icinga2_windows_setup_installer_05.png | Bin 0 -> 8600 bytes
.../icinga2_windows_setup_wizard_01.png | Bin 0 -> 20526 bytes
.../icinga2_windows_setup_wizard_02.png | Bin 0 -> 28694 bytes
.../icinga2_windows_setup_wizard_03.png | Bin 0 -> 21644 bytes
.../icinga2_windows_setup_wizard_04.png | Bin 0 -> 18451 bytes
.../icinga2_windows_setup_wizard_05.png | Bin 0 -> 69068 bytes
.../icinga2_windows_setup_wizard_06.png | Bin 0 -> 7812 bytes
...icinga2_windows_setup_wizard_examine_config.png | Bin 0 -> 38218 bytes
doc/images/getting-started/id-apache-centos7.png | Bin 0 -> 21899 bytes
doc/images/getting-started/mariadb-centos7.png | Bin 0 -> 51357 bytes
doc/images/getting-started/nano-syntax.png | Bin 0 -> 48641 bytes
doc/images/getting-started/postgr-import-ido.png | Bin 0 -> 33117 bytes
doc/images/getting-started/vim-syntax.png | Bin 0 -> 38385 bytes
.../icinga2_windows_running_service.png | Bin 94889 -> 0 bytes
.../icinga2_windows_setup_installer_01.png | Bin 19483 -> 0 bytes
.../icinga2_windows_setup_installer_02.png | Bin 28449 -> 0 bytes
.../icinga2_windows_setup_installer_04.png | Bin 16644 -> 0 bytes
.../icinga2_windows_setup_installer_05.png | Bin 11081 -> 0 bytes
.../icinga2_windows_setup_wizard_01.png | Bin 29478 -> 0 bytes
.../icinga2_windows_setup_wizard_02.png | Bin 47264 -> 0 bytes
.../icinga2_windows_setup_wizard_03.png | Bin 31344 -> 0 bytes
.../icinga2_windows_setup_wizard_04.png | Bin 34177 -> 0 bytes
.../icinga2_windows_setup_wizard_05.png | Bin 98464 -> 0 bytes
.../icinga2_windows_setup_wizard_06.png | Bin 20242 -> 0 bytes
...icinga2_windows_setup_wizard_examine_config.png | Bin 22755 -> 0 bytes
doc/update-links.py | 5 +-
etc/CMakeLists.txt | 1 -
etc/icinga2/conf.d/win32/hosts.conf | 2 +-
etc/icinga2/features-available/gelf.conf | 4 +-
etc/icinga2/features-available/icingastatus.conf | 10 -
etc/icinga2/features-available/influxdb.conf | 25 +
etc/icinga2/icinga2.conf | 15 +-
etc/icinga2/win32/constants.conf | 6 +-
etc/icinga2/win32/icinga2.conf | 4 +-
etc/initsystem/icinga2.init.d.cmake | 8 +-
etc/initsystem/icinga2.service.cmake | 1 +
etc/initsystem/safe-reload | 2 +-
icinga-app/icinga.cpp | 4 +
icinga-installer/icinga-installer.cpp | 33 +-
icinga-installer/icinga2.wixpatch.cmake | 6 +
icinga2.nuspec | 2 +-
icinga2.spec | 126 +-
itl/CMakeLists.txt | 2 +-
itl/command-icinga.conf | 4 +
itl/command-nscp-local.conf | 170 ++
itl/command-plugins-manubulon.conf | 8 +
itl/command-plugins.conf | 482 ++++-
itl/itl | 1 -
itl/plugins-contrib.d/CMakeLists.txt | 2 +-
itl/plugins-contrib.d/databases.conf | 179 +-
itl/plugins-contrib.d/metrics.conf | 62 +
itl/plugins-contrib.d/network-components.conf | 68 +-
itl/plugins-contrib.d/network-services.conf | 66 +
itl/plugins-contrib.d/virtualization.conf | 5 +
itl/plugins-contrib.d/web.conf | 42 +
lib/base/CMakeLists.txt | 6 +-
lib/base/application.cpp | 10 +
lib/base/application.hpp | 2 +
lib/base/array-script.cpp | 113 +-
lib/base/array.cpp | 36 +
lib/base/array.hpp | 14 +
lib/base/boolean-script.cpp | 2 +-
lib/base/configobject-script.cpp | 4 +-
lib/base/configobject.cpp | 96 +-
lib/base/configobject.hpp | 14 +-
lib/base/configobject.ti | 9 +-
lib/base/configtype.cpp | 96 +-
lib/base/configtype.hpp | 125 +-
lib/base/configwriter.cpp | 34 +-
lib/base/configwriter.hpp | 3 +-
lib/base/convert.cpp | 29 +
lib/base/convert.hpp | 4 +
.../{number-script.cpp => datetime-script.cpp} | 15 +-
lib/base/{function.cpp => datetime.cpp} | 52 +-
.../datetime.hpp} | 42 +-
itl/timeperiod.conf => lib/base/datetime.ti | 14 +-
lib/base/dictionary-script.cpp | 14 +-
lib/base/dictionary.cpp | 20 +
lib/base/dictionary.hpp | 4 +
lib/base/function-script.cpp | 10 +-
lib/base/function.cpp | 23 +-
lib/base/function.hpp | 82 +-
lib/{db_ido/db_ido-itl.conf => base/function.ti} | 18 +-
lib/base/i2-base.hpp | 9 +
lib/base/json-script.cpp | 4 +-
lib/base/loader.cpp | 2 +-
lib/base/loader.hpp | 1 -
lib/base/math-script.cpp | 42 +-
lib/base/number-script.cpp | 5 +-
lib/base/object-script.cpp | 6 +-
lib/base/object.cpp | 79 +
lib/base/object.hpp | 38 +-
lib/base/objectlock.hpp | 11 +-
lib/base/objecttype.cpp | 2 +-
lib/base/primitivetype.hpp | 3 +
lib/base/process.cpp | 10 +-
lib/base/scriptframe.cpp | 53 +-
lib/base/scriptframe.hpp | 11 +-
lib/base/scriptglobal.cpp | 37 +-
lib/base/scriptutils.cpp | 81 +-
lib/base/scriptutils.hpp | 1 +
lib/base/serializer.cpp | 4 +-
lib/base/socketevents-poll.cpp | 5 +
lib/base/string-script.cpp | 22 +-
lib/base/tcpsocket.cpp | 11 +
lib/base/tlsstream.cpp | 25 +-
lib/base/tlsstream.hpp | 4 +
lib/base/tlsutility.cpp | 109 +-
lib/base/tlsutility.hpp | 7 +-
lib/base/type.cpp | 36 +-
lib/base/type.hpp | 5 +-
lib/base/typetype-script.cpp | 4 +-
lib/base/utility.cpp | 62 +-
lib/base/utility.hpp | 11 +-
lib/base/value-operators.cpp | 79 +-
lib/base/value.hpp | 6 +-
lib/base/visibility.hpp | 3 +-
lib/base/workqueue.cpp | 26 +-
lib/base/workqueue.hpp | 4 +
lib/checker/checkercomponent.cpp | 32 +-
lib/checker/checkercomponent.hpp | 19 +-
lib/cli/apisetuputility.cpp | 2 -
lib/cli/consolecommand.cpp | 56 +-
lib/cli/daemoncommand.cpp | 7 +
lib/cli/daemonutility.cpp | 13 +-
lib/cli/pkiutility.cpp | 21 +-
lib/cli/repositoryutility.cpp | 2 +-
lib/compat/statusdatawriter.cpp | 2 +-
lib/config/config_lexer.ll | 1 +
lib/config/config_parser.yy | 270 ++-
lib/config/configcompiler.cpp | 16 +-
lib/config/configcompiler.hpp | 8 +
lib/config/configcompilercontext.cpp | 12 +
lib/config/configcompilercontext.hpp | 1 +
lib/config/configfragment.hpp | 11 +-
lib/config/configitem.cpp | 67 +-
lib/config/configitem.hpp | 4 +-
lib/config/configitembuilder.cpp | 5 +-
lib/config/expression.cpp | 46 +-
lib/config/expression.hpp | 103 +-
lib/config/vmops.hpp | 216 +-
lib/db_ido/commanddbobject.cpp | 11 +-
lib/db_ido/commanddbobject.hpp | 3 -
lib/db_ido/db_ido-itl.conf | 22 +-
lib/db_ido/dbconnection.cpp | 224 +-
lib/db_ido/dbconnection.hpp | 21 +-
lib/db_ido/dbconnection.ti | 27 +-
lib/db_ido/dbevents.cpp | 78 +-
lib/db_ido/dbobject.cpp | 139 +-
lib/db_ido/dbobject.hpp | 14 +-
lib/db_ido/dbquery.cpp | 25 +-
lib/db_ido/dbquery.hpp | 39 +-
lib/db_ido/dbtype.cpp | 26 +-
lib/db_ido/hostdbobject.cpp | 183 +-
lib/db_ido/hostdbobject.hpp | 8 +-
lib/db_ido/hostgroupdbobject.cpp | 2 +-
lib/db_ido/idochecktask.cpp | 31 +-
lib/db_ido/servicedbobject.cpp | 156 +-
lib/db_ido/servicedbobject.hpp | 10 +-
lib/db_ido/servicegroupdbobject.cpp | 2 +-
lib/db_ido/timeperioddbobject.cpp | 2 +-
lib/db_ido/timeperioddbobject.hpp | 4 +-
lib/db_ido/userdbobject.cpp | 80 +-
lib/db_ido/userdbobject.hpp | 5 +-
lib/db_ido/usergroupdbobject.cpp | 2 +-
lib/db_ido_mysql/idomysqlconnection.cpp | 130 +-
lib/db_ido_mysql/idomysqlconnection.hpp | 8 +-
lib/db_ido_mysql/idomysqlconnection.ti | 6 +
lib/db_ido_mysql/schema/mysql.sql | 74 +-
lib/db_ido_mysql/schema/upgrade/2.5.0.sql | 101 +
lib/db_ido_pgsql/idopgsqlconnection.cpp | 106 +-
lib/db_ido_pgsql/idopgsqlconnection.hpp | 8 +-
lib/db_ido_pgsql/schema/pgsql.sql | 59 +-
lib/db_ido_pgsql/schema/upgrade/2.5.0.sql | 85 +
lib/icinga/CMakeLists.txt | 7 +-
lib/icinga/apiactions.cpp | 34 +-
lib/icinga/apiactions.hpp | 1 +
lib/icinga/apievents.cpp | 4 +-
lib/icinga/apievents.hpp | 2 +-
lib/icinga/checkable-check.cpp | 74 +-
lib/icinga/checkable-notification.cpp | 11 +-
.../checkable-script.cpp} | 15 +-
lib/icinga/checkable.cpp | 74 +-
lib/icinga/checkable.hpp | 24 +-
lib/icinga/checkable.ti | 17 +-
lib/icinga/checkresult.ti | 8 +-
lib/icinga/cib.cpp | 22 +-
lib/icinga/clusterevents.cpp | 319 ++-
lib/icinga/clusterevents.hpp | 12 +
lib/icinga/comment.cpp | 1 +
lib/icinga/comment.ti | 4 +-
lib/icinga/compatutility.cpp | 85 +-
lib/icinga/compatutility.hpp | 1 -
lib/icinga/customvarobject.cpp | 31 +
lib/icinga/customvarobject.hpp | 2 +
lib/icinga/dependency.cpp | 4 +-
lib/icinga/dependency.ti | 4 +-
lib/icinga/downtime.cpp | 29 +-
lib/icinga/downtime.hpp | 5 +-
lib/icinga/downtime.ti | 10 +-
lib/icinga/externalcommandprocessor.cpp | 6 +-
lib/icinga/host.cpp | 19 +-
lib/icinga/host.ti | 9 +-
lib/{base/convert.cpp => icinga/icinga-itl.conf} | 21 +-
lib/icinga/icingaapplication.cpp | 35 +-
lib/icinga/icingastatuswriter.cpp | 174 --
lib/icinga/icingastatuswriter.ti | 38 -
lib/icinga/legacytimeperiod.cpp | 2 +-
lib/icinga/macroprocessor.cpp | 13 +-
lib/icinga/notification.cpp | 247 +--
lib/icinga/notification.hpp | 35 +-
lib/icinga/notification.ti | 20 +-
lib/icinga/objectutils.cpp | 20 +-
lib/icinga/perfdatavalue.cpp | 2 +-
lib/icinga/service.cpp | 17 +-
lib/icinga/service.ti | 12 +-
lib/icinga/timeperiod.cpp | 78 +-
lib/icinga/timeperiod.hpp | 3 +
lib/icinga/timeperiod.ti | 9 +
lib/icinga/user.cpp | 18 +-
lib/icinga/user.ti | 11 +-
lib/livestatus/hoststable.cpp | 12 +-
lib/livestatus/hoststable.hpp | 1 -
lib/livestatus/servicestable.cpp | 12 +-
lib/livestatus/servicestable.hpp | 1 -
lib/livestatus/statustable.cpp | 4 +-
lib/methods/CMakeLists.txt | 2 +-
lib/methods/clrchecktask.cpp | 2 +-
lib/methods/clusterchecktask.cpp | 2 +-
lib/methods/clusterzonechecktask.cpp | 24 +-
.../{nullchecktask.cpp => exceptionchecktask.cpp} | 21 +-
.../exceptionchecktask.hpp} | 24 +-
lib/methods/icingachecktask.cpp | 6 +-
lib/methods/methods-itl.conf | 94 +-
lib/methods/nullchecktask.cpp | 2 +-
lib/methods/nulleventtask.cpp | 2 +-
lib/methods/pluginchecktask.cpp | 2 +-
lib/methods/plugineventtask.cpp | 2 +-
lib/methods/pluginnotificationtask.cpp | 2 +-
lib/methods/randomchecktask.cpp | 2 +-
lib/methods/timeperiodtask.cpp | 4 +-
lib/notification/notificationcomponent.cpp | 15 +-
lib/perfdata/CMakeLists.txt | 8 +-
lib/perfdata/gelfwriter.cpp | 63 +-
lib/perfdata/gelfwriter.hpp | 6 +-
lib/perfdata/gelfwriter.ti | 3 +
lib/perfdata/graphitewriter.cpp | 2 +
lib/perfdata/influxdbwriter.cpp | 439 ++++
.../influxdbwriter.hpp} | 46 +-
lib/perfdata/influxdbwriter.ti | 112 +
lib/perfdata/opentsdbwriter.cpp | 1 +
lib/remote/CMakeLists.txt | 4 +-
lib/remote/apilistener-configsync.cpp | 31 +-
lib/remote/apilistener.cpp | 196 +-
lib/remote/apilistener.hpp | 7 +
lib/remote/apilistener.ti | 8 +-
lib/remote/authority.cpp | 25 +-
lib/remote/consolehandler.cpp | 79 +-
lib/remote/createobjecthandler.cpp | 5 +-
lib/remote/endpoint.cpp | 26 +-
lib/remote/endpoint.hpp | 2 +
lib/remote/endpoint.ti | 6 +-
lib/remote/filterutility.cpp | 49 +-
lib/remote/filterutility.hpp | 3 +-
lib/remote/httprequest.cpp | 8 +-
lib/remote/httpserverconnection.cpp | 9 +-
lib/remote/infohandler.cpp | 64 +-
lib/remote/jsonrpcconnection.cpp | 8 +
lib/remote/objectqueryhandler.cpp | 2 +-
lib/remote/templatequeryhandler.cpp | 135 ++
.../templatequeryhandler.hpp} | 23 +-
lib/remote/typequeryhandler.cpp | 14 +-
lib/remote/url-characters.hpp | 5 +-
lib/remote/url.cpp | 13 +-
...pequeryhandler.cpp => variablequeryhandler.cpp} | 108 +-
.../variablequeryhandler.hpp} | 23 +-
lib/remote/zone.cpp | 34 +
lib/remote/zone.hpp | 4 +
mkdocs.yml | 34 +-
pick.py | 114 +
test/CMakeLists.txt | 9 +-
test/base-convert.cpp | 4 +-
test/{test.cpp => base-test.cpp} | 0
test/base-type.cpp | 2 +-
test/{livestatus.cpp => livestatus-test.cpp} | 127 +-
test/livestatus.cpp | 89 +-
third-party/cmake/BoostTestTargets.cmake | 10 +-
tools/chocolateyInstall.ps1 | 4 +-
tools/mkclass/class_lexer.ll | 1 +
tools/mkclass/classcompiler.cpp | 113 +-
tools/mkclass/classcompiler.hpp | 3 +-
tools/syntax/README | 1 -
tools/syntax/nano/README | 18 -
tools/syntax/nano/icinga2.nanorc | 2 +-
tools/syntax/vim/README | 15 -
tools/syntax/vim/syntax/icinga2.vim | 2 +-
356 files changed, 12175 insertions(+), 6092 deletions(-)
diff --cc debian/changelog
index 73d9b0c,4d2b633..c131055
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,26 +1,34 @@@
++<<<<<<< HEAD
+icinga2 (2.4.10-1~ppa1~wily1) wily; urgency=medium
+
+ * Rebuild for my ubuntu ppa
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 19 May 2016 14:38:41 +0200
++=======
+ icinga2 (2.5.3-1) unstable; urgency=medium
+
+ * [6cd83c4] Imported Upstream version 2.5.3
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 25 Aug 2016 13:11:20 +0200
+
+ icinga2 (2.5.1-1) unstable; urgency=medium
+
+ [ Markus Frosch ]
+ * [4dd5a4c] Update source TODO
+
+ [ Alexander Wirt ]
+ * [7225af7] Include environment file
+ * [15c6c98] Imported Upstream version 2.5.0
+ Fix FTBFS with OpenSSL 1.1.0 (Closes: #828347)
+ * [990c22b] Add swedish po templates (Closes: #822101)
+ * [d0a6d59] Explicitly set permissions on /etc/icinga2/pki (Closes: #824482)
+ * [ee12097] Add a stricter umask to service file (Closes: #827338)
+ * [0ad33c8] Add enviromentfile from /usr/lib (Closes: #831794)
+ * [063c582] Add build-dep for pkg-config to ease backporting (Closes: #831357)
+ * [792b520] Imported Upstream version 2.5.1
+
+ -- Alexander Wirt <alexander.wirt at credativ.de> Tue, 23 Aug 2016 17:17:24 +0200
++>>>>>>> master
icinga2 (2.4.10-1) unstable; urgency=medium
diff --cc debian/control
index e37230e,56ab701..3e0deb0
--- a/debian/control
+++ b/debian/control
@@@ -8,7 -8,9 +8,8 @@@ Uploaders: Markus Frosch <lazyfrosch at de
Build-Depends: bash-completion,
bison,
cmake (>= 2.8.7),
+ cmake (>= 3.2.2) | pkg-config,
debhelper (>= 9),
- dh-systemd (>= 1.5),
flex,
g++ (>= 1.96),
libboost-dev,
--
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