[Pkg-nagios-changes] [pkg-icinga2] branch master updated (4c69aaa -> 6e577e4)
Alexander Wirt
formorer at debian.org
Mon Jun 16 08:51:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
formorer pushed a change to branch master
in repository pkg-icinga2.
from 4c69aaa Let those ido modules conflict for now
new a6ccd18 Imported Upstream version 2.0.0
new 9e435cb Merge tag 'upstream/2.0.0'
new 558c5f6 Remove HTML documentation
new 6e577e4 Disable automatic sql upgrade file installation until there are updates
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:
.gitignore | 3 +-
.../files/etc/icinga2/conf.d/passive.conf | 26 ---
.../etc/icinga2/features-available/ido-mysql.conf | 13 --
.vagrant-puppet/files/etc/motd | 8 -
.vagrant-puppet/files/etc/nsca-ng.cfg | 128 -----------
.../files/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 | 29 ---
.../files/etc/pki/rpm-gpg/RPM-GPG-KEY-ICINGA | 30 ---
.vagrant-puppet/files/etc/send_nsca.cfg | 15 --
.vagrant-puppet/files/home/vagrant/passive_result | 3 -
.vagrant-puppet/files/var/www/html/icinga_wall.png | Bin 12118 -> 0 bytes
.vagrant-puppet/files/var/www/html/index.html | 104 ---------
.vagrant-puppet/manifests/default.pp | 44 ----
.vagrant-puppet/manifests/finalize.sh | 2 -
.vagrant-puppet/modules/apache/manifests/init.pp | 38 ----
.vagrant-puppet/modules/cpan/manifests/init.pp | 49 ----
.../modules/cpan/templates/MyConfig.pm.erb | 68 ------
.vagrant-puppet/modules/epel/manifests/init.pp | 37 ---
.vagrant-puppet/modules/epel/manifests/key.pp | 13 --
.../modules/icinga-rpm-snapshot/manifests/init.pp | 39 ----
.../modules/icinga-rpm-snapshot/manifests/key.pp | 13 --
.../modules/icinga-web/manifests/init.pp | 40 ----
.../modules/icinga2-classicui/manifests/init.pp | 40 ----
.../modules/icinga2-icinga-web/manifests/init.pp | 17 --
.vagrant-puppet/modules/icinga2/manifests/init.pp | 124 -----------
.vagrant-puppet/modules/mysql/manifests/init.pp | 37 ---
.vagrant-puppet/modules/mysql/templates/my.cnf.erb | 133 -----------
.../modules/nagios-plugins/manifests/init.pp | 9 -
.vagrant-puppet/modules/nsca-ng/manifests/init.pp | 93 --------
.vagrant-puppet/modules/pgsql/manifests/init.pp | 43 ----
.../modules/pgsql/templates/pg_hba.conf.erb | 84 -------
.vagrant-puppet/modules/php/manifests/extension.pp | 34 ---
.vagrant-puppet/modules/php/manifests/init.pp | 38 ----
.../modules/php/templates/error_reporting.ini.erb | 4 -
.../modules/php/templates/xdebug_settings.ini.erb | 5 -
.vagrant-puppet/modules/wget/manifests/init.pp | 19 --
AUTHORS | 3 +
CMakeLists.txt | 3 +-
ChangeLog | 176 +--------------
INSTALL | 64 ++++--
README | 24 +-
Vagrantfile | 115 ----------
components/compat/externalcommandlistener.cpp | 8 +-
components/db_ido_mysql/schema/upgrade/.gitignore | 0
components/db_ido_mysql/schema/upgrade/0.0.10.sql | 8 -
components/db_ido_mysql/schema/upgrade/0.0.11.sql | 13 --
components/db_ido_mysql/schema/upgrade/0.0.8.sql | 80 -------
components/db_ido_mysql/schema/upgrade/0.0.9.sql | 2 -
components/db_ido_pgsql/schema/upgrade/.gitignore | 0
components/db_ido_pgsql/schema/upgrade/0.0.10.sql | 8 -
components/db_ido_pgsql/schema/upgrade/0.0.11.sql | 14 --
components/db_ido_pgsql/schema/upgrade/0.0.8.sql | 76 -------
components/db_ido_pgsql/schema/upgrade/0.0.9.sql | 2 -
components/livestatus/hoststable.cpp | 1 +
components/livestatus/livestatusquery.cpp | 7 +-
components/livestatus/servicestable.cpp | 1 +
{tools => contrib}/CMakeLists.txt | 18 +-
{tools => contrib}/icinga2-discover-agent.cmake | 0
{tools => contrib}/icinga2-forget-agent.cmake | 0
{tools => contrib}/icinga2-list-agents.cmake | 0
{pki => contrib}/icinga2-setup-agent.cmake | 0
{tools => contrib}/icinga2-setup-agent/.gitignore | 0
.../icinga2-setup-agent/AgentWizard.Designer.cs | 0
.../icinga2-setup-agent/AgentWizard.cs | 0
.../icinga2-setup-agent/AgentWizard.resx | 0
{tools => contrib}/icinga2-setup-agent/App.config | 0
.../icinga2-setup-agent/Icinga2SetupAgent.csproj | 0
{tools => contrib}/icinga2-setup-agent/Program.cs | 0
.../icinga2-setup-agent/Properties/AssemblyInfo.cs | 0
.../Properties/Resources.Designer.cs | 0
.../icinga2-setup-agent/Properties/Resources.resx | 0
.../Properties/Settings.Designer.cs | 0
.../Properties/Settings.settings | 0
.../icinga2-setup-agent/app.manifest | 0
.../icinga2-setup-agent/icinga-banner.png | Bin
{tools => contrib}/icinga2-setup-agent/icinga.ico | Bin
.../icinga2-setup-agent/tar-cs/COPYING | 0
.../icinga2-setup-agent/tar-cs/ITarHeader.cs | 0
.../icinga2-setup-agent/tar-cs/TarException.cs | 0
.../icinga2-setup-agent/tar-cs/TarHeader.cs | 0
.../icinga2-setup-agent/tar-cs/TarReader.cs | 0
.../icinga2-setup-agent/tar-cs/UsTarHeader.cs | 0
debian/control | 3 -
debian/icinga2-doc.doc-base | 10 -
debian/icinga2-doc.install | 2 +-
debian/rules | 16 +-
doc/1-about.md | 49 ++--
doc/2-getting-started.md | 123 ++++------
doc/3-monitoring-basics.md | 167 ++++++++------
doc/4-monitoring-remote-systems.md | 55 +++--
doc/5-addons-plugins.md | 13 +-
doc/6-configuring-icinga-2.md | 117 +++++++---
doc/7-troubleshooting.md | 6 +-
doc/8-migration.md | 115 +++++++---
doc/CMakeLists.txt | 26 +--
doc/conf.py | 247 ---------------------
doc/icinga2-build-ca.8 | 25 +++
doc/icinga2-build-key.8 | 25 +++
doc/icinga2-disable-feature.8 | 32 +++
doc/icinga2-enable-feature.8 | 32 +++
doc/icinga2-prepare-dirs.8 | 28 +++
doc/icinga2-sign-key.8 | 25 +++
doc/icinga2.8 | 8 +-
doc/mkdoc.sh | 53 -----
etc/CMakeLists.txt | 9 +-
etc/icinga2/zones.conf | 13 ++
etc/initsystem/CMakeLists.txt | 58 +++++
etc/initsystem/icinga2-prepare-dirs | 33 +++
.../icinga2.init.d.cmake} | 63 +++---
etc/initsystem/icinga2.service.cmake | 14 ++
etc/initsystem/icinga2.sysconfig.cmake | 11 +
etc/logrotate.d/icinga2.cmake | 2 +
icinga2.spec | 118 +++++++---
itl/command-plugins.conf | 69 ++++++
lib/base/utility.cpp | 31 +++
lib/base/utility.hpp | 2 +
lib/remote/apilistener-sync.cpp | 54 +++--
lib/remote/apilistener.hpp | 4 +-
lib/remote/endpoint.cpp | 3 +
lib/remote/remote-type.conf | 4 +-
lib/remote/zone.cpp | 27 ++-
lib/remote/zone.hpp | 1 +
lib/remote/zone.ti | 1 +
pki/CMakeLists.txt | 7 -
test/jenkins/bootstrap-vm.sh | 5 +-
test/livestatus/queries/host/host_nagvis | 6 +
.../cmake}/BoostTestTargets.cmake | 0
.../cmake}/BoostTestTargetsDynamic.h | 0
.../cmake}/BoostTestTargetsIncluded.h | 0
.../cmake}/BoostTestTargetsStatic.h | 0
.../cmake}/CopyResourcesToBuildTree.cmake | 0
{cmake => third-party/cmake}/FindBISON.cmake | 0
{cmake => third-party/cmake}/FindFLEX.cmake | 0
{cmake => third-party/cmake}/FindGit.cmake | 0
{cmake => third-party/cmake}/FindMYSQL.cmake | 0
{cmake => third-party/cmake}/FindPostgreSQL.cmake | 0
{cmake => third-party/cmake}/GNUInstallDirs.cmake | 0
.../cmake}/GetForceIncludeDefinitions.cmake | 0
.../cmake}/GetGitRevisionDescription.cmake | 0
.../cmake}/GetGitRevisionDescription.cmake.in | 0
{cmake => third-party/cmake}/InstallConfig.cmake | 0
tools/CMakeLists.txt | 19 +-
{dev => tools/docker}/.gitignore | 0
{dev => tools/docker}/README | 0
{dev => tools/docker}/clean | 0
{dev => tools/docker}/docker/build | 0
{dev => tools/docker}/run | 2 +-
tools/icinga2-enable-feature.cmake | 4 +-
tools/migration/README | 12 -
148 files changed, 1106 insertions(+), 2648 deletions(-)
delete mode 100644 .vagrant-puppet/files/etc/icinga2/conf.d/passive.conf
delete mode 100644 .vagrant-puppet/files/etc/icinga2/features-available/ido-mysql.conf
delete mode 100644 .vagrant-puppet/files/etc/motd
delete mode 100644 .vagrant-puppet/files/etc/nsca-ng.cfg
delete mode 100644 .vagrant-puppet/files/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
delete mode 100644 .vagrant-puppet/files/etc/pki/rpm-gpg/RPM-GPG-KEY-ICINGA
delete mode 100644 .vagrant-puppet/files/etc/send_nsca.cfg
delete mode 100644 .vagrant-puppet/files/home/vagrant/passive_result
delete mode 100644 .vagrant-puppet/files/var/www/html/icinga_wall.png
delete mode 100644 .vagrant-puppet/files/var/www/html/index.html
delete mode 100644 .vagrant-puppet/manifests/default.pp
delete mode 100644 .vagrant-puppet/manifests/finalize.sh
delete mode 100644 .vagrant-puppet/modules/apache/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/cpan/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/cpan/templates/MyConfig.pm.erb
delete mode 100644 .vagrant-puppet/modules/epel/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/epel/manifests/key.pp
delete mode 100644 .vagrant-puppet/modules/icinga-rpm-snapshot/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/icinga-rpm-snapshot/manifests/key.pp
delete mode 100644 .vagrant-puppet/modules/icinga-web/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/icinga2-classicui/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/icinga2-icinga-web/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/icinga2/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/mysql/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/mysql/templates/my.cnf.erb
delete mode 100644 .vagrant-puppet/modules/nagios-plugins/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/nsca-ng/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/pgsql/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/pgsql/templates/pg_hba.conf.erb
delete mode 100644 .vagrant-puppet/modules/php/manifests/extension.pp
delete mode 100644 .vagrant-puppet/modules/php/manifests/init.pp
delete mode 100644 .vagrant-puppet/modules/php/templates/error_reporting.ini.erb
delete mode 100644 .vagrant-puppet/modules/php/templates/xdebug_settings.ini.erb
delete mode 100644 .vagrant-puppet/modules/wget/manifests/init.pp
delete mode 100644 Vagrantfile
create mode 100644 components/db_ido_mysql/schema/upgrade/.gitignore
delete mode 100644 components/db_ido_mysql/schema/upgrade/0.0.10.sql
delete mode 100644 components/db_ido_mysql/schema/upgrade/0.0.11.sql
delete mode 100644 components/db_ido_mysql/schema/upgrade/0.0.8.sql
delete mode 100644 components/db_ido_mysql/schema/upgrade/0.0.9.sql
create mode 100644 components/db_ido_pgsql/schema/upgrade/.gitignore
delete mode 100644 components/db_ido_pgsql/schema/upgrade/0.0.10.sql
delete mode 100644 components/db_ido_pgsql/schema/upgrade/0.0.11.sql
delete mode 100644 components/db_ido_pgsql/schema/upgrade/0.0.8.sql
delete mode 100644 components/db_ido_pgsql/schema/upgrade/0.0.9.sql
copy {tools => contrib}/CMakeLists.txt (59%)
rename {tools => contrib}/icinga2-discover-agent.cmake (100%)
rename {tools => contrib}/icinga2-forget-agent.cmake (100%)
rename {tools => contrib}/icinga2-list-agents.cmake (100%)
rename {pki => contrib}/icinga2-setup-agent.cmake (100%)
rename {tools => contrib}/icinga2-setup-agent/.gitignore (100%)
rename {tools => contrib}/icinga2-setup-agent/AgentWizard.Designer.cs (100%)
rename {tools => contrib}/icinga2-setup-agent/AgentWizard.cs (100%)
rename {tools => contrib}/icinga2-setup-agent/AgentWizard.resx (100%)
rename {tools => contrib}/icinga2-setup-agent/App.config (100%)
rename {tools => contrib}/icinga2-setup-agent/Icinga2SetupAgent.csproj (100%)
rename {tools => contrib}/icinga2-setup-agent/Program.cs (100%)
rename {tools => contrib}/icinga2-setup-agent/Properties/AssemblyInfo.cs (100%)
rename {tools => contrib}/icinga2-setup-agent/Properties/Resources.Designer.cs (100%)
rename {tools => contrib}/icinga2-setup-agent/Properties/Resources.resx (100%)
rename {tools => contrib}/icinga2-setup-agent/Properties/Settings.Designer.cs (100%)
rename {tools => contrib}/icinga2-setup-agent/Properties/Settings.settings (100%)
rename {tools => contrib}/icinga2-setup-agent/app.manifest (100%)
rename {tools => contrib}/icinga2-setup-agent/icinga-banner.png (100%)
rename {tools => contrib}/icinga2-setup-agent/icinga.ico (100%)
rename {tools => contrib}/icinga2-setup-agent/tar-cs/COPYING (100%)
rename {tools => contrib}/icinga2-setup-agent/tar-cs/ITarHeader.cs (100%)
rename {tools => contrib}/icinga2-setup-agent/tar-cs/TarException.cs (100%)
rename {tools => contrib}/icinga2-setup-agent/tar-cs/TarHeader.cs (100%)
rename {tools => contrib}/icinga2-setup-agent/tar-cs/TarReader.cs (100%)
rename {tools => contrib}/icinga2-setup-agent/tar-cs/UsTarHeader.cs (100%)
delete mode 100644 debian/icinga2-doc.doc-base
delete mode 100644 doc/conf.py
create mode 100644 doc/icinga2-build-ca.8
create mode 100644 doc/icinga2-build-key.8
create mode 100644 doc/icinga2-disable-feature.8
create mode 100644 doc/icinga2-enable-feature.8
create mode 100644 doc/icinga2-prepare-dirs.8
create mode 100644 doc/icinga2-sign-key.8
delete mode 100755 doc/mkdoc.sh
create mode 100644 etc/initsystem/CMakeLists.txt
create mode 100644 etc/initsystem/icinga2-prepare-dirs
rename etc/{init.d/icinga2.cmake => initsystem/icinga2.init.d.cmake} (63%)
create mode 100644 etc/initsystem/icinga2.service.cmake
create mode 100644 etc/initsystem/icinga2.sysconfig.cmake
create mode 100644 test/livestatus/queries/host/host_nagvis
rename {cmake => third-party/cmake}/BoostTestTargets.cmake (100%)
rename {cmake => third-party/cmake}/BoostTestTargetsDynamic.h (100%)
rename {cmake => third-party/cmake}/BoostTestTargetsIncluded.h (100%)
rename {cmake => third-party/cmake}/BoostTestTargetsStatic.h (100%)
rename {cmake => third-party/cmake}/CopyResourcesToBuildTree.cmake (100%)
rename {cmake => third-party/cmake}/FindBISON.cmake (100%)
rename {cmake => third-party/cmake}/FindFLEX.cmake (100%)
rename {cmake => third-party/cmake}/FindGit.cmake (100%)
rename {cmake => third-party/cmake}/FindMYSQL.cmake (100%)
rename {cmake => third-party/cmake}/FindPostgreSQL.cmake (100%)
rename {cmake => third-party/cmake}/GNUInstallDirs.cmake (100%)
rename {cmake => third-party/cmake}/GetForceIncludeDefinitions.cmake (100%)
rename {cmake => third-party/cmake}/GetGitRevisionDescription.cmake (100%)
rename {cmake => third-party/cmake}/GetGitRevisionDescription.cmake.in (100%)
rename {cmake => third-party/cmake}/InstallConfig.cmake (100%)
rename {dev => tools/docker}/.gitignore (100%)
rename {dev => tools/docker}/README (100%)
rename {dev => tools/docker}/clean (100%)
rename {dev => tools/docker}/docker/build (100%)
rename {dev => tools/docker}/run (94%)
delete mode 100644 tools/migration/README
--
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