[Pkg-nagios-changes] [pkg-icinga2] branch ubuntu updated (dfcbd1e -> 5c38fed)
Alexander Wirt
formorer at debian.org
Thu Aug 7 15:30:37 UTC 2014
This is an automated email from the git hooks/post-receive script.
formorer pushed a change to branch ubuntu
in repository pkg-icinga2.
from dfcbd1e Fix version
adds 5b33ec5 Adapt url_cgi_path in cgi.cfg, so that icinga2-classic doesn't trigger csrf protection
adds 3639615 Add dbcconfig-common to ido-pg depends
adds 5aaa17c Fix some lintian warnings
adds dba1572 Imported Upstream version 2.0.1
adds a7eda24 Revert "Imported Upstream version 2.0.1"
adds 22e4446 Merge branch 'upstream' of git.debian.org:/git/pkg-nagios/pkg-icinga2 into upstream
adds 2f7dcb6 Imported Upstream version 2.0.1
adds 315175a Merge tag 'upstream/2.0.1'
adds 0842ae8 let the ido packages epend on ucf
adds 7ae88bd Finalize changelog
adds 93ca878 Fix dependency on apache2-utils and take care cgi is loaded
adds 63fb799 Adding Vcs-headers
adds 769efdb Finalize changelog
adds f66aa0e Fix dep on icinga-cgi-bin
adds e6fec86 Adding me to the Uploaders
adds a90f93f Merge branch 'master' of git.debian.org:/git/pkg-nagios/pkg-icinga2
adds aef20e1 Imported Upstream version 2.0.2
adds f82d5c0 Merge tag 'upstream/2.0.2'
new 2b1d87f README is now README.md
new ac7b2ba Reenable Make snippet for installing upgrade files
new 9efd61c Finalize changelog
new 5c38fed Merge branch 'master' into ubuntu
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
AUTHORS | 5 +
CMakeLists.txt | 8 +-
ChangeLog | 103 ++++++++++-
INSTALL | 22 ++-
README => README.md | 0
{third-party/cmake => cmake}/InstallConfig.cmake | 17 ++
components/compat/CMakeLists.txt | 2 +-
components/compat/externalcommandlistener.cpp | 83 +++++----
components/compat/externalcommandlistener.hpp | 1 +
components/compat/externalcommandlistener.ti | 2 +-
components/db_ido_mysql/CMakeLists.txt | 4 +-
components/db_ido_mysql/idomysqlconnection.cpp | 25 ++-
components/db_ido_mysql/schema/mysql.sql | 6 +-
components/db_ido_mysql/schema/upgrade/.gitignore | 0
components/db_ido_mysql/schema/upgrade/2.0.2.sql | 20 ++
components/db_ido_pgsql/idopgsqlconnection.cpp | 39 ++--
components/db_ido_pgsql/schema/pgsql.sql | 2 +-
components/db_ido_pgsql/schema/upgrade/.gitignore | 0
components/db_ido_pgsql/schema/upgrade/2.0.2.sql | 17 ++
components/livestatus/attributefilter.cpp | 8 +-
components/livestatus/avgaggregator.cpp | 6 +-
components/livestatus/commandstable.cpp | 5 +
components/livestatus/commandstable.hpp | 1 +
components/livestatus/commentstable.cpp | 5 +
components/livestatus/commentstable.hpp | 1 +
components/livestatus/contactgroupstable.cpp | 5 +
components/livestatus/contactgroupstable.hpp | 1 +
components/livestatus/contactstable.cpp | 5 +
components/livestatus/contactstable.hpp | 1 +
components/livestatus/downtimestable.cpp | 5 +
components/livestatus/downtimestable.hpp | 1 +
components/livestatus/endpointstable.cpp | 5 +
components/livestatus/endpointstable.hpp | 1 +
components/livestatus/hostgroupstable.cpp | 5 +
components/livestatus/hostgroupstable.hpp | 1 +
components/livestatus/hoststable.cpp | 5 +
components/livestatus/hoststable.hpp | 1 +
components/livestatus/invavgaggregator.cpp | 6 +-
components/livestatus/invsumaggregator.cpp | 6 +-
components/livestatus/livestatuslistener.ti | 2 +-
components/livestatus/livestatusquery.cpp | 47 ++++-
components/livestatus/livestatusquery.hpp | 6 +-
components/livestatus/logtable.cpp | 5 +
components/livestatus/logtable.hpp | 1 +
components/livestatus/maxaggregator.cpp | 6 +-
components/livestatus/minaggregator.cpp | 6 +-
components/livestatus/servicegroupstable.cpp | 5 +
components/livestatus/servicegroupstable.hpp | 1 +
components/livestatus/servicestable.cpp | 5 +
components/livestatus/servicestable.hpp | 1 +
components/livestatus/statehisttable.cpp | 5 +
components/livestatus/statehisttable.hpp | 1 +
components/livestatus/statustable.cpp | 5 +
components/livestatus/statustable.hpp | 1 +
components/livestatus/stdaggregator.cpp | 6 +-
components/livestatus/sumaggregator.cpp | 6 +-
components/livestatus/table.cpp | 11 +-
components/livestatus/table.hpp | 1 +
components/livestatus/timeperiodstable.cpp | 5 +
components/livestatus/timeperiodstable.hpp | 1 +
components/notification/notificationcomponent.cpp | 4 +
components/perfdata/graphitewriter.cpp | 23 ++-
config.h.cmake | 1 +
contrib/icinga2-setup-agent.cmake | 4 +-
debian/changelog | 42 ++++-
debian/classicui/cgi.cfg | 1 +
debian/control | 11 +-
debian/copyright | 1 -
debian/docs | 2 +-
debian/icinga2-classicui.postinst | 2 +
debian/icinga2-ido-mysql.postrm | 2 +
debian/icinga2-ido-pgsql.postrm | 2 +
debian/rules | 7 +-
doc/1-about.md | 65 ++++++-
doc/2-getting-started.md | 177 ++++++++++++++----
doc/3-monitoring-basics.md | 98 ++++++----
doc/4-monitoring-remote-systems.md | 130 ++++++++++---
doc/5-addons-plugins.md | 3 +-
doc/6-configuring-icinga-2.md | 138 +++++++++++---
doc/7-troubleshooting.md | 51 +++++-
doc/8-migration.md | 10 +
etc/CMakeLists.txt | 3 +-
etc/icinga2/conf.d/commands.conf | 44 ++---
etc/icinga2/conf.d/hosts/localhost/disk.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/http.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/icinga.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/load.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/procs.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/ssh.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/swap.conf | 5 +
etc/icinga2/conf.d/hosts/localhost/users.conf | 5 +
etc/icinga2/conf.d/services.conf | 6 +-
etc/icinga2/conf.d/templates.conf | 4 +
etc/icinga2/conf.d/timeperiods.conf | 4 +-
.../{constants.conf => constants.conf.cmake} | 2 +-
etc/icinga2/features-available/debuglog.conf | 2 +-
etc/icinga2/features-available/graphite.conf | 2 +-
etc/icinga2/features-available/ido-mysql.conf | 6 +-
etc/icinga2/features-available/ido-pgsql.conf | 6 +-
etc/icinga2/features-available/mainlog.conf | 2 +-
etc/initsystem/CMakeLists.txt | 15 +-
etc/initsystem/icinga2-prepare-dirs | 6 +-
etc/initsystem/icinga2.service.cmake | 6 +-
etc/initsystem/icinga2.sysconfig.cmake | 3 +-
icinga-app/CMakeLists.txt | 2 +-
icinga-app/icinga.cpp | 48 +++--
icinga2.spec | 204 ++++++++++-----------
itl/command-plugins.conf | 151 +++++++++++----
lib/base/application.cpp | 137 +++++++++-----
lib/base/application.hpp | 8 +-
lib/base/dynamicobject.cpp | 2 +-
lib/base/logger.hpp | 2 +
lib/base/process.cpp | 9 +-
lib/base/socket.cpp | 16 +-
lib/base/socket.hpp | 2 +-
lib/base/stacktrace.cpp | 5 +-
lib/base/streamlogger.cpp | 8 +-
lib/base/streamlogger.hpp | 1 +
lib/base/sysloglogger.cpp | 5 +
lib/base/sysloglogger.hpp | 1 +
lib/base/tcpsocket.cpp | 4 +-
lib/base/threadpool.cpp | 3 +-
lib/base/tlsstream.cpp | 38 ++--
lib/base/tlsstream.hpp | 4 +-
lib/base/tlsutility.cpp | 59 +++++-
lib/base/tlsutility.hpp | 3 +-
lib/base/utility.cpp | 83 +--------
lib/base/utility.hpp | 2 -
lib/db_ido/dbconnection.cpp | 2 -
lib/icinga/apievents.cpp | 54 ++++--
lib/icinga/checkable-check.cpp | 12 +-
lib/icinga/command.cpp | 12 ++
lib/icinga/command.hpp | 2 +
lib/icinga/dependency.cpp | 57 +++---
lib/icinga/dependency.hpp | 3 +
lib/icinga/icinga-type.conf | 11 +-
lib/icinga/notification.cpp | 2 +-
lib/icinga/perfdatavalue.cpp | 1 +
lib/icinga/pluginutility.cpp | 14 +-
lib/icinga/user.cpp | 19 +-
lib/icinga/user.hpp | 5 +
lib/icinga/user.ti | 6 +-
lib/methods/plugineventtask.cpp | 13 +-
lib/methods/plugineventtask.hpp | 3 +
lib/remote/apiclient.cpp | 19 +-
lib/remote/apiclient.hpp | 5 +
lib/remote/apilistener.cpp | 72 +++++---
lib/remote/apilistener.hpp | 4 +-
lib/remote/authority.cpp | 3 +
lib/remote/endpoint.ti | 1 +
pki/icinga2-build-ca.cmake | 2 +-
pki/icinga2-sign-key.cmake | 5 +-
test/config/5927.conf | 46 +++++
test/config/5980.conf | 8 +
test/config/6105.conf | 2 +
test/config/6479.conf | 46 +++++
test/config/6608.conf | 16 ++
test/config/templates.conf | 67 +++++++
third-party/cmake/FindMYSQL.cmake | 47 -----
third-party/cmake/FindMySQL.cmake | 118 ++++++++++++
third-party/cmake/FindPostgreSQL.cmake | 31 +++-
tools/syntax/nano/icinga2.nanorc | 2 +-
tools/syntax/vim/syntax/icinga2.vim | 2 +-
163 files changed, 2187 insertions(+), 804 deletions(-)
rename README => README.md (100%)
rename {third-party/cmake => cmake}/InstallConfig.cmake (64%)
delete mode 100644 components/db_ido_mysql/schema/upgrade/.gitignore
create mode 100644 components/db_ido_mysql/schema/upgrade/2.0.2.sql
delete mode 100644 components/db_ido_pgsql/schema/upgrade/.gitignore
create mode 100644 components/db_ido_pgsql/schema/upgrade/2.0.2.sql
rename etc/icinga2/{constants.conf => constants.conf.cmake} (90%)
create mode 100644 test/config/5927.conf
create mode 100644 test/config/6479.conf
create mode 100644 test/config/6608.conf
delete mode 100644 third-party/cmake/FindMYSQL.cmake
create mode 100644 third-party/cmake/FindMySQL.cmake
--
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