Unterschiede

Hier werden die Unterschiede zwischen zwei Versionen angezeigt.

--- centos:web_c7:icinga:web2 [16.03.2015 13:15. ] – [Konfiguration über die Web-GUI] django
+++ centos:web_c7:icinga:web2 [30.05.2020 16:42. ] (aktuell) – [Links] aktualisiert django
@@ Zeile 1: / Zeile 1: @@
-<WRAP center round important 60%>
-Artikel ist g'rad' in der Bearbeitung!
-</WRAP>
 ====== Icinga Web 2 - Installation und Konfiguration unter CentOS 7.x ======
 {{:centos:web_c7:icinga:icingaweb2-pic.png?nolink&200 |Bild: Icinga Web 2}} \\
@@ Zeile 16: / Zeile 12: @@
 ==== MariaDB ====
 Wir nutzen für **Icinga Web 2** nicht unsere zentrale, bereits bestehende MariaDB, sondern installieren uns eine eigene MariaDB auf unserem Monitoring Host, wie **[[centos:mariadb|hier]]** ausführlich beschrieben. So kann der Monitoring-Server immer noch seinen Dienst verrichten, wenn z.B. der zentrale Datenbank-Server ausfallen sollte.
 ==== Apache 2.4 ====
@@ Zeile 27: / Zeile 20: @@
    # yum install php php-cli php-xmlrpc php-xsl php-pdo php-ldap php-soap php-gd php-mysql -y
+/*
+   # yum install php70u php70u-cli php70u-xmlrpc libxslt php70u-xml php70u-pdo php70u-ldap php70u-soap php70u-gd php70u-mysqlnd
+ */
 === PHP Timezone ===
 Zur korrekten Anzeige von Datum und Uhrzeit setzen wir den Parameter **date.timezone** in der PHP-Konfigurationsdatei //**/etc/php.ini**//.
@@ Zeile 54: / Zeile 50: @@
 <code>Name        : icinga2-ido-mysql
-Version     : 2.3.2
+Version     : 2.6.2
 Release     : 1.el7.centos
 Architecture: x86_64
-Install Date: Fri 13 Mar 2015 08:44:32 AM CET
+Install Date: Mon 20 Feb 2017 09:30:11 PM CET
 Group       : Applications/System
-Size        : 528988
+Size        : 588917
 License     : GPL-2.0+
-Signature   : DSA/SHA1, Thu 12 Mar 2015 04:17:20 PM CET, Key ID c6e319c334410682
+Signature   : DSA/SHA1, Mon 13 Feb 2017 01:42:28 PM CET, Key ID c6e319c334410682
-Source RPM  : icinga2-2.3.2-1.el7.centos.src.rpm
+Source RPM  : icinga2-2.6.2-1.el7.centos.src.rpm
-Build Date  : Thu 12 Mar 2015 04:17:05 PM CET
+Build Date  : Mon 13 Feb 2017 01:42:07 PM CET
-Build Host  : jenkins-build-5c74b3d4-776
+Build Host  : 90c74ef910b1
 Relocations : (not relocatable)
-URL         : https://www.icinga.org/
+URL         : https://www.icinga.com/
 Summary     : IDO MySQL database backend for Icinga 2
 Description :
@@ Zeile 73: / Zeile 69: @@
 /etc/icinga2/features-available/ido-mysql.conf
 /usr/lib64/icinga2/libdb_ido_mysql.so
-/usr/share/doc/icinga2-ido-mysql-2.3.2
+/usr/lib64/icinga2/libdb_ido_mysql.so.2.6.2
-/usr/share/doc/icinga2-ido-mysql-2.3.2/AUTHORS
+/usr/share/doc/icinga2-ido-mysql-2.6.2
-/usr/share/doc/icinga2-ido-mysql-2.3.2/COPYING
+/usr/share/doc/icinga2-ido-mysql-2.6.2/AUTHORS
-/usr/share/doc/icinga2-ido-mysql-2.3.2/COPYING.Exceptions
+/usr/share/doc/icinga2-ido-mysql-2.6.2/COPYING
-/usr/share/doc/icinga2-ido-mysql-2.3.2/ChangeLog
+/usr/share/doc/icinga2-ido-mysql-2.6.2/COPYING.Exceptions
-/usr/share/doc/icinga2-ido-mysql-2.3.2/NEWS
+/usr/share/doc/icinga2-ido-mysql-2.6.2/ChangeLog
-/usr/share/doc/icinga2-ido-mysql-2.3.2/README.md
+/usr/share/doc/icinga2-ido-mysql-2.6.2/NEWS
+/usr/share/doc/icinga2-ido-mysql-2.6.2/README.md
 /usr/share/icinga2-ido-mysql
 /usr/share/icinga2-ido-mysql/schema
@@ Zeile 88: / Zeile 85: @@
 /usr/share/icinga2-ido-mysql/schema/upgrade/2.2.0.sql
 /usr/share/icinga2-ido-mysql/schema/upgrade/2.3.0.sql
-</code>
+/usr/share/icinga2-ido-mysql/schema/upgrade/2.4.0.sql
+/usr/share/icinga2-ido-mysql/schema/upgrade/2.5.0.sql
+/usr/share/icinga2-ido-mysql/schema/upgrade/2.6.0.sql</code>
 ==== Dokumentation ====
@@ Zeile 94: / Zeile 93: @@
    # less /usr/share/doc/icinga2-ido-mysql-*/README.md
-<file markdown /usr/share/doc/icinga2-ido-mysql-2.3.2/README.md># Icinga 2
+<file markdown /usr/share/doc/icinga2-ido-mysql-2.3.2/README.md>[![Build Status](https://travis-ci.org/Icinga/icinga2.svg?branch=master)](https://travis-ci.org/Icinga/icinga2)
+# Icinga 2
+![Icinga Logo](https://www.icinga.com/wp-content/uploads/2014/06/icinga_logo.png)
+#### Table of Contents
+. [About][About]
+. [License][License]
+. [Installation][Installation]
+. [Documentation][Documentation]
+. [Support][Support]
+. [Development and Contributions][Development]
 ## About
@@ Zeile 104: / Zeile 116: @@
 multiple locations.
-Check doc/1-about.md for a detailed introduction.
+Icinga 2 as monitoring core works best with [Icinga Web 2](https://www.icinga.com/products/icinga-web-2/)
+as web interface.
+More information can be found at [www.icinga.com](https://www.icinga.com/products/icinga-2/)
+and inside the [documentation](doc/1-about.md).
+## License
+Icinga 2 and the Icinga 2 documentation are licensed under the terms of the GNU
+General Public License Version 2, you will find a copy of this license in the
+COPYING file included in the source package.
 ## Installation
-Read the INSTALL file for more information about how to install it.
+Read the [INSTALL.md](INSTALL.md) file for more information about how to install it.
 ## Documentation
-The documentation is located in the doc/ directory. The latest documentation
+The documentation is located in the [doc/](doc/) directory. The latest documentation
-is also available on https://docs.icinga.org
+is also available on https://docs.icinga.com
 ## Support
-Check the project website at https://www.icinga.org for status updates and
+Check the project website at https://www.icinga.com for status updates. Join the
-https://support.icinga.org if you want to contact us.
+[community channels](https://www.icinga.com/community/get-involved/) for questions
-</file>
+or ask an Icinga partner for [professional support](https://www.icinga.com/services/support/).
+## Development
+The Git repository is located on [GitHub](https://github.com/Icinga/icinga2).
+Icinga 2 is written in C++ and can be built on Linux/Unix and Windows.
+Read more about development builds in the [INSTALL.md](INSTALL.md) file.
+### Contributing
+There are many ways to contribute to Icinga -- whether it be sending patches,
+testing, reporting bugs, or reviewing and updating the documentation. Every
+contribution is appreciated!
+Please read the [contributing section](https://www.icinga.com/community/get-involved/)
+first. Then you should have a look at the [roadmap](https://github.com/Icinga/icinga2/milestones)
+and remaining [open issues](https://github.com/Icinga/icinga2/issues).
+Pick issues you want to help resolve, fork the [repository on GitHub](https://github.com/Icinga/icinga2)
+and send a pull request with your changes. Thanks for your contribution!
+### Testing
+Basic unit test coverage is provided by running `make test` during package builds.
+Read the [INSTALL.md](INSTALL.md) file for more information about development builds.
+Snapshot packages from the laster development branch are available inside the
+[package repository](http://packages.icinga.com).
+You can help test-drive the latest Icinga 2 snapshot packages inside the
+[Icinga 2 Vagrant boxes](https://github.com/icinga/icinga-vagrant).
+[About]: #about
+[License]: #license
+[Installation]: #installation
+[Documentation]: #documentation
+[Support]: #support
+[Development]: #development</file>
 Sehr detaillierte Informationen zur Konfiguration von **Icinga Web 2** findet man direkt in der **[[http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc#!/icinga2/latest/doc/module/icinga2/chapter/getting-started#setting-up-the-user-interface|aktuellesten Dokumentation]]** bei **[[http://icinga.org|Icinga]]**.
@@ Zeile 206: / Zeile 267: @@
 Bsp.:
    # rpm -qil icingaweb2
 <code>Name        : icingaweb2
-Version     : 2.0.0
+Version     : 2.4.1
-Release     : 3.beta3.el7.centos
+Release     : 1.el7.centos
 Architecture: noarch
-Install Date: Fri 13 Mar 2015 07:29:49 PM CET
+Install Date: Mon 20 Feb 2017 10:00:08 PM CET
 Group       : Applications/System
-Size        : 4148350
+Size        : 5972640
 License     : GPLv2+ and MIT and BSD
-Signature   : DSA/SHA1, Fri 13 Mar 2015 05:40:48 PM CET, Key ID c6e319c334410682
+Signature   : DSA/SHA1, Fri 20 Jan 2017 02:12:11 PM CET, Key ID c6e319c334410682
-Source RPM  : icingaweb2-2.0.0-3.beta3.el7.centos.src.rpm
+Source RPM  : icingaweb2-2.4.1-1.el7.centos.src.rpm
-Build Date  : Fri 13 Mar 2015 05:40:46 PM CET
+Build Date  : Fri 20 Jan 2017 02:12:08 PM CET
-Build Host  : jenkins-build-e5f722ea-272
+Build Host  : 2a1f1a0ffca5
 Relocations : (not relocatable)
-Packager    : Icinga Team <info@icinga.org>
+Packager    : Icinga Team <info@icinga.com>
-URL         : https://icinga.org
+URL         : https://icinga.com
 Summary     : Icinga Web 2
 Description :
@@ Zeile 227: / Zeile 288: @@
 /etc/icingaweb2/modules/setup
 /etc/icingaweb2/modules/setup/config.ini
+/etc/icingaweb2/modules/translation
+/etc/icingaweb2/modules/translation/config.ini
 /usr/share/doc/icingaweb2
 /usr/share/doc/icingaweb2/schema
+/usr/share/doc/icingaweb2/schema/mysql-upgrades
+/usr/share/doc/icingaweb2/schema/mysql-upgrades/2.0.0beta3-2.0.0rc1.sql
 /usr/share/doc/icingaweb2/schema/mysql.schema.sql
+/usr/share/doc/icingaweb2/schema/pgsql-upgrades
+/usr/share/doc/icingaweb2/schema/pgsql-upgrades/2.0.0beta3-2.0.0rc1.sql
 /usr/share/doc/icingaweb2/schema/pgsql.schema.sql
+/usr/share/icingaweb2/application/VERSION
 /usr/share/icingaweb2/application/controllers
+/usr/share/icingaweb2/application/controllers/AboutController.php
+/usr/share/icingaweb2/application/controllers/AccountController.php
+/usr/share/icingaweb2/application/controllers/AnnouncementsController.php
+/usr/share/icingaweb2/application/controllers/ApplicationStateController.php
 /usr/share/icingaweb2/application/controllers/AuthenticationController.php
 /usr/share/icingaweb2/application/controllers/ConfigController.php
 /usr/share/icingaweb2/application/controllers/DashboardController.php
 /usr/share/icingaweb2/application/controllers/ErrorController.php
-/usr/share/icingaweb2/application/controllers/FilterController.php
+/usr/share/icingaweb2/application/controllers/GroupController.php
+/usr/share/icingaweb2/application/controllers/IframeController.php
 /usr/share/icingaweb2/application/controllers/IndexController.php
 /usr/share/icingaweb2/application/controllers/LayoutController.php
 /usr/share/icingaweb2/application/controllers/ListController.php
-/usr/share/icingaweb2/application/controllers/PreferenceController.php
+/usr/share/icingaweb2/application/controllers/NavigationController.php
-/usr/share/icingaweb2/application/controllers/RolesController.php
+/usr/share/icingaweb2/application/controllers/RoleController.php
 /usr/share/icingaweb2/application/controllers/SearchController.php
 /usr/share/icingaweb2/application/controllers/StaticController.php
+/usr/share/icingaweb2/application/controllers/UserController.php
+/usr/share/icingaweb2/application/controllers/UsergroupbackendController.php
 /usr/share/icingaweb2/application/fonts
 /usr/share/icingaweb2/application/fonts/fontello-ifont
@@ Zeile 259: / Zeile 334: @@
 /usr/share/icingaweb2/application/fonts/icingaweb.md
 /usr/share/icingaweb2/application/forms
+/usr/share/icingaweb2/application/forms/Account
+/usr/share/icingaweb2/application/forms/Account/ChangePasswordForm.php
+/usr/share/icingaweb2/application/forms/Announcement
+/usr/share/icingaweb2/application/forms/Announcement/AcknowledgeAnnouncementForm.php
+/usr/share/icingaweb2/application/forms/Announcement/AnnouncementForm.php
 /usr/share/icingaweb2/application/forms/Authentication
 /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php
 /usr/share/icingaweb2/application/forms/AutoRefreshForm.php
 /usr/share/icingaweb2/application/forms/Config
-/usr/share/icingaweb2/application/forms/Config/Authentication
-/usr/share/icingaweb2/application/forms/Config/Authentication/DbBackendForm.php
-/usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php
-/usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php
-/usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php
-/usr/share/icingaweb2/application/forms/Config/AuthenticationBackendReorderForm.php
 /usr/share/icingaweb2/application/forms/Config/General
 /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php
 /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php
+/usr/share/icingaweb2/application/forms/Config/General/ThemingConfigForm.php
 /usr/share/icingaweb2/application/forms/Config/GeneralConfigForm.php
 /usr/share/icingaweb2/application/forms/Config/Resource
@@ Zeile 278: / Zeile 353: @@
 /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php
 /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php
+/usr/share/icingaweb2/application/forms/Config/Resource/SshResourceForm.php
 /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php
+/usr/share/icingaweb2/application/forms/Config/User
+/usr/share/icingaweb2/application/forms/Config/User/CreateMembershipForm.php
+/usr/share/icingaweb2/application/forms/Config/User/UserForm.php
+/usr/share/icingaweb2/application/forms/Config/UserBackend
+/usr/share/icingaweb2/application/forms/Config/UserBackend/DbBackendForm.php
+/usr/share/icingaweb2/application/forms/Config/UserBackend/ExternalBackendForm.php
+/usr/share/icingaweb2/application/forms/Config/UserBackend/LdapBackendForm.php
+/usr/share/icingaweb2/application/forms/Config/UserBackendConfigForm.php
+/usr/share/icingaweb2/application/forms/Config/UserBackendReorderForm.php
+/usr/share/icingaweb2/application/forms/Config/UserGroup
+/usr/share/icingaweb2/application/forms/Config/UserGroup/AddMemberForm.php
+/usr/share/icingaweb2/application/forms/Config/UserGroup/DbUserGroupBackendForm.php
+/usr/share/icingaweb2/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
+/usr/share/icingaweb2/application/forms/Config/UserGroup/UserGroupBackendForm.php
+/usr/share/icingaweb2/application/forms/Config/UserGroup/UserGroupForm.php
 /usr/share/icingaweb2/application/forms/ConfigForm.php
 /usr/share/icingaweb2/application/forms/ConfirmRemovalForm.php
+/usr/share/icingaweb2/application/forms/Control
+/usr/share/icingaweb2/application/forms/Control/LimiterControlForm.php
 /usr/share/icingaweb2/application/forms/Dashboard
 /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php
 /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php
+/usr/share/icingaweb2/application/forms/Navigation
+/usr/share/icingaweb2/application/forms/Navigation/DashletForm.php
+/usr/share/icingaweb2/application/forms/Navigation/MenuItemForm.php
+/usr/share/icingaweb2/application/forms/Navigation/NavigationConfigForm.php
+/usr/share/icingaweb2/application/forms/Navigation/NavigationItemForm.php
 /usr/share/icingaweb2/application/forms/PreferenceForm.php
+/usr/share/icingaweb2/application/forms/RepositoryForm.php
 /usr/share/icingaweb2/application/forms/Security
 /usr/share/icingaweb2/application/forms/Security/RoleForm.php
@@ Zeile 290: / Zeile 389: @@
 /usr/share/icingaweb2/application/layouts/scripts
 /usr/share/icingaweb2/application/layouts/scripts/body.phtml
+/usr/share/icingaweb2/application/layouts/scripts/guest-error.phtml
 /usr/share/icingaweb2/application/layouts/scripts/inline.phtml
 /usr/share/icingaweb2/application/layouts/scripts/layout.phtml
@@ Zeile 295: / Zeile 395: @@
 /usr/share/icingaweb2/application/layouts/scripts/parts/navigation.phtml
 /usr/share/icingaweb2/application/layouts/scripts/pdf.phtml
+/usr/share/icingaweb2/application/layouts/scripts/wrapped.phtml
 /usr/share/icingaweb2/application/views
 /usr/share/icingaweb2/application/views/helpers
-/usr/share/icingaweb2/application/views/helpers/DateFormat.php
+/usr/share/icingaweb2/application/views/helpers/CreateTicketLinks.php
 /usr/share/icingaweb2/application/views/helpers/FormDateTime.php
 /usr/share/icingaweb2/application/views/helpers/FormNumber.php
@@ Zeile 304: / Zeile 405: @@
 /usr/share/icingaweb2/application/views/helpers/Util.php
 /usr/share/icingaweb2/application/views/scripts
+/usr/share/icingaweb2/application/views/scripts/about
+/usr/share/icingaweb2/application/views/scripts/about/index.phtml
+/usr/share/icingaweb2/application/views/scripts/account
+/usr/share/icingaweb2/application/views/scripts/account/index.phtml
+/usr/share/icingaweb2/application/views/scripts/announcements
+/usr/share/icingaweb2/application/views/scripts/announcements/index.phtml
+/usr/share/icingaweb2/application/views/scripts/application-state
+/usr/share/icingaweb2/application/views/scripts/application-state/index.phtml
 /usr/share/icingaweb2/application/views/scripts/authentication
 /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml
 /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml
 /usr/share/icingaweb2/application/views/scripts/config
-/usr/share/icingaweb2/application/views/scripts/config/application.phtml
-/usr/share/icingaweb2/application/views/scripts/config/authentication
-/usr/share/icingaweb2/application/views/scripts/config/authentication/create.phtml
-/usr/share/icingaweb2/application/views/scripts/config/authentication/modify.phtml
-/usr/share/icingaweb2/application/views/scripts/config/authentication/remove.phtml
-/usr/share/icingaweb2/application/views/scripts/config/authentication/reorder.phtml
 /usr/share/icingaweb2/application/views/scripts/config/devtools.phtml
+/usr/share/icingaweb2/application/views/scripts/config/general.phtml
 /usr/share/icingaweb2/application/views/scripts/config/module-configuration-error.phtml
 /usr/share/icingaweb2/application/views/scripts/config/module.phtml
@@ Zeile 323: / Zeile 427: @@
 /usr/share/icingaweb2/application/views/scripts/config/resource/modify.phtml
 /usr/share/icingaweb2/application/views/scripts/config/resource/remove.phtml
+/usr/share/icingaweb2/application/views/scripts/config/userbackend
+/usr/share/icingaweb2/application/views/scripts/config/userbackend/reorder.phtml
 /usr/share/icingaweb2/application/views/scripts/dashboard
 /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml
@@ Zeile 337: / Zeile 443: @@
 /usr/share/icingaweb2/application/views/scripts/form
 /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml
+/usr/share/icingaweb2/application/views/scripts/group
+/usr/share/icingaweb2/application/views/scripts/group/form.phtml
+/usr/share/icingaweb2/application/views/scripts/group/list.phtml
+/usr/share/icingaweb2/application/views/scripts/group/show.phtml
+/usr/share/icingaweb2/application/views/scripts/iframe
+/usr/share/icingaweb2/application/views/scripts/iframe/index.phtml
 /usr/share/icingaweb2/application/views/scripts/index
 /usr/share/icingaweb2/application/views/scripts/index/welcome.phtml
@@ Zeile 342: / Zeile 454: @@
 /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml
 /usr/share/icingaweb2/application/views/scripts/layout
+/usr/share/icingaweb2/application/views/scripts/layout/announcements.phtml
 /usr/share/icingaweb2/application/views/scripts/layout/menu.phtml
 /usr/share/icingaweb2/application/views/scripts/list
 /usr/share/icingaweb2/application/views/scripts/list/applicationlog.phtml
 /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml
+/usr/share/icingaweb2/application/views/scripts/navigation
+/usr/share/icingaweb2/application/views/scripts/navigation/index.phtml
+/usr/share/icingaweb2/application/views/scripts/navigation/shared.phtml
 /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml
-/usr/share/icingaweb2/application/views/scripts/preference
+/usr/share/icingaweb2/application/views/scripts/role
-/usr/share/icingaweb2/application/views/scripts/preference/index.phtml
+/usr/share/icingaweb2/application/views/scripts/role/list.phtml
-/usr/share/icingaweb2/application/views/scripts/roles
-/usr/share/icingaweb2/application/views/scripts/roles/index.phtml
-/usr/share/icingaweb2/application/views/scripts/roles/new.phtml
-/usr/share/icingaweb2/application/views/scripts/roles/remove.phtml
-/usr/share/icingaweb2/application/views/scripts/roles/update.phtml
 /usr/share/icingaweb2/application/views/scripts/search
 /usr/share/icingaweb2/application/views/scripts/search/hint.phtml
 /usr/share/icingaweb2/application/views/scripts/search/index.phtml
 /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml
+/usr/share/icingaweb2/application/views/scripts/simple-form.phtml
+/usr/share/icingaweb2/application/views/scripts/user
+/usr/share/icingaweb2/application/views/scripts/user/form.phtml
+/usr/share/icingaweb2/application/views/scripts/user/list.phtml
+/usr/share/icingaweb2/application/views/scripts/user/show.phtml
 /usr/share/icingaweb2/doc
+/usr/share/icingaweb2/doc/01-About.md
+/usr/share/icingaweb2/doc/02-Installation.md
+/usr/share/icingaweb2/doc/03-Configuration.md
+/usr/share/icingaweb2/doc/04-Resources.md
+/usr/share/icingaweb2/doc/05-Authentication.md
+/usr/share/icingaweb2/doc/06-Security.md
+/usr/share/icingaweb2/doc/07-Preferences.md
+/usr/share/icingaweb2/doc/90-SELinux.md
+/usr/share/icingaweb2/doc/99-Vagrant.md
 /usr/share/icingaweb2/doc/accessibility
 /usr/share/icingaweb2/doc/accessibility/ifont-mute.html
@@ Zeile 367: / Zeile 492: @@
 /usr/share/icingaweb2/doc/accessibility/svg.html
 /usr/share/icingaweb2/doc/accessibility/text-cue-for-required-form-control-labels.html
-/usr/share/icingaweb2/doc/authentication.md
-/usr/share/icingaweb2/doc/external_authentication.md
-/usr/share/icingaweb2/doc/installation.md
 /usr/share/icingaweb2/doc/phpdoc.xml
-/usr/share/icingaweb2/doc/preferences.md
 /usr/share/icingaweb2/doc/res
 /usr/share/icingaweb2/doc/res/GraphExample#1.png
@@ Zeile 383: / Zeile 504: @@
 /usr/share/icingaweb2/doc/res/GraphExample#8.png
 /usr/share/icingaweb2/doc/res/GraphExample#9.png
-/usr/share/icingaweb2/doc/resources.md
-/usr/share/icingaweb2/doc/vagrant.md
 /usr/share/icingaweb2/modules
 /usr/share/icingaweb2/modules/doc
@@ Zeile 411: / Zeile 530: @@
 /usr/share/icingaweb2/modules/doc/doc
 /usr/share/icingaweb2/modules/doc/doc/1-module-documentation.md
+/usr/share/icingaweb2/modules/doc/doc/img
+/usr/share/icingaweb2/modules/doc/doc/img/markdown.png
 /usr/share/icingaweb2/modules/doc/library
 /usr/share/icingaweb2/modules/doc/library/Doc
 /usr/share/icingaweb2/modules/doc/library/Doc/DocController.php
-/usr/share/icingaweb2/modules/doc/library/Doc/DocIterator.php
 /usr/share/icingaweb2/modules/doc/library/Doc/DocParser.php
 /usr/share/icingaweb2/modules/doc/library/Doc/DocSection.php
@@ Zeile 420: / Zeile 540: @@
 /usr/share/icingaweb2/modules/doc/library/Doc/Exception
 /usr/share/icingaweb2/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
-/usr/share/icingaweb2/modules/doc/library/Doc/Exception/DocEmptyException.php
 /usr/share/icingaweb2/modules/doc/library/Doc/Exception/DocException.php
 /usr/share/icingaweb2/modules/doc/library/Doc/Renderer
@@ Zeile 435: / Zeile 554: @@
 /usr/share/icingaweb2/modules/doc/public/css
 /usr/share/icingaweb2/modules/doc/public/css/module.less
-/usr/share/icingaweb2/modules/doc/public/img
+/usr/share/icingaweb2/modules/doc/public/js
-/usr/share/icingaweb2/modules/doc/public/img/doc
+/usr/share/icingaweb2/modules/doc/public/js/module.js
-/usr/share/icingaweb2/modules/doc/public/img/doc/markdown.png
 /usr/share/icingaweb2/modules/doc/run.php
 /usr/share/icingaweb2/modules/monitoring
@@ Zeile 446: / Zeile 564: @@
 /usr/share/icingaweb2/modules/monitoring/application/clicommands/NrpeCommand.php
 /usr/share/icingaweb2/modules/monitoring/application/controllers
+/usr/share/icingaweb2/modules/monitoring/application/controllers/ActionsController.php
 /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php
-/usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php
+/usr/share/icingaweb2/modules/monitoring/application/controllers/CommentController.php
+/usr/share/icingaweb2/modules/monitoring/application/controllers/CommentsController.php
 /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php
+/usr/share/icingaweb2/modules/monitoring/application/controllers/DowntimeController.php
+/usr/share/icingaweb2/modules/monitoring/application/controllers/DowntimesController.php
+/usr/share/icingaweb2/modules/monitoring/application/controllers/HealthController.php
 /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php
 /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php
 /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php
-/usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php
 /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php
 /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php
@@ Zeile 469: / Zeile 591: @@
 /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+/usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+/usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
@@ Zeile 481: / Zeile 605: @@
 /usr/share/icingaweb2/modules/monitoring/application/forms/Config
 /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php
-/usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance
-/usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
-/usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
-/usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php
+/usr/share/icingaweb2/modules/monitoring/application/forms/Config/Transport
+/usr/share/icingaweb2/modules/monitoring/application/forms/Config/Transport/ApiTransportForm.php
+/usr/share/icingaweb2/modules/monitoring/application/forms/Config/Transport/LocalTransportForm.php
+/usr/share/icingaweb2/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php
+/usr/share/icingaweb2/modules/monitoring/application/forms/Config/TransportConfigForm.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php
+/usr/share/icingaweb2/modules/monitoring/application/forms/Navigation
+/usr/share/icingaweb2/modules/monitoring/application/forms/Navigation/ActionForm.php
+/usr/share/icingaweb2/modules/monitoring/application/forms/Navigation/HostActionForm.php
+/usr/share/icingaweb2/modules/monitoring/application/forms/Navigation/ServiceActionForm.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/Setup
 /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php
-/usr/share/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php
+/usr/share/icingaweb2/modules/monitoring/application/forms/Setup/TransportPage.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php
 /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php
 /usr/share/icingaweb2/modules/monitoring/application/locale
+/usr/share/icingaweb2/modules/monitoring/application/locale/ar_SA
+/usr/share/icingaweb2/modules/monitoring/application/locale/ar_SA/LC_MESSAGES
+/usr/share/icingaweb2/modules/monitoring/application/locale/ar_SA/LC_MESSAGES/monitoring.mo
+/usr/share/icingaweb2/modules/monitoring/application/locale/ar_SA/LC_MESSAGES/monitoring.po
 /usr/share/icingaweb2/modules/monitoring/application/locale/de_DE
 /usr/share/icingaweb2/modules/monitoring/application/locale/de_DE/LC_MESSAGES
@@ Zeile 508: / Zeile 641: @@
 /usr/share/icingaweb2/modules/monitoring/application/locale/pt_BR/LC_MESSAGES/monitoring.mo
 /usr/share/icingaweb2/modules/monitoring/application/locale/pt_BR/LC_MESSAGES/monitoring.po
+/usr/share/icingaweb2/modules/monitoring/application/locale/ru_RU
+/usr/share/icingaweb2/modules/monitoring/application/locale/ru_RU/LC_MESSAGES
+/usr/share/icingaweb2/modules/monitoring/application/locale/ru_RU/LC_MESSAGES/monitoring.po
 /usr/share/icingaweb2/modules/monitoring/application/views
 /usr/share/icingaweb2/modules/monitoring/application/views/helpers
@@ Zeile 513: / Zeile 649: @@
 /usr/share/icingaweb2/modules/monitoring/application/views/helpers/ContactFlags.php
 /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Customvar.php
+/usr/share/icingaweb2/modules/monitoring/application/views/helpers/EscapeComment.php
+/usr/share/icingaweb2/modules/monitoring/application/views/helpers/HostFlags.php
+/usr/share/icingaweb2/modules/monitoring/application/views/helpers/IconImage.php
 /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Link.php
 /usr/share/icingaweb2/modules/monitoring/application/views/helpers/MonitoringFlags.php
 /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php
 /usr/share/icingaweb2/modules/monitoring/application/views/helpers/PluginOutput.php
-/usr/share/icingaweb2/modules/monitoring/application/views/helpers/ResolveMacros.php
 /usr/share/icingaweb2/modules/monitoring/application/views/helpers/RuntimeVariables.php
-/usr/share/icingaweb2/modules/monitoring/application/views/helpers/SelectionToolbar.php
+/usr/share/icingaweb2/modules/monitoring/application/views/helpers/ServiceFlags.php
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/defectimage.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/chart
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/comment
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/chart/hostgroup.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/comment/remove.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/chart/servicegroup.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/comment/show.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/chart/test.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/comments
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/comments/delete-all.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/comments/show.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/createbackend.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/form.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/createinstance.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/editbackend.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/editinstance.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/removebackend.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/removeinstance.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/security.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/downtime
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/downtime/remove.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/downtime/show.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/downtimes
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/downtimes/delete-all.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/downtimes/show.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/health
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/health/disable-notifications.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/health/info.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/health/not-running.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/health/stats.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/host
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/host/services.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/host/show.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts
@@ Zeile 558: / Zeile 705: @@
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/object
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/object/detail-history.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/command
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/comment
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/downtime
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/event-history.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/object
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/object/detail-content.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/object/host-header.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/object/service-header.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/show-more.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/process
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/disable-notifications.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/not-running.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/performance.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/service
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/service/show.phtml
@@ Zeile 586: / Zeile 740: @@
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checktimeperiod.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ Zeile 595: / Zeile 750: @@
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/grapher.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
+/usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notes.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/output.phtml
@@ Zeile 601: / Zeile 757: @@
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/status.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml
-/usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/services.phtml
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical
 /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components
@@ Zeile 616: / Zeile 770: @@
 /usr/share/icingaweb2/modules/monitoring/configuration.php
 /usr/share/icingaweb2/modules/monitoring/doc
-/usr/share/icingaweb2/modules/monitoring/doc/instances.md
+/usr/share/icingaweb2/modules/monitoring/doc/commandtransports.md
+/usr/share/icingaweb2/modules/monitoring/doc/configuration.md
+/usr/share/icingaweb2/modules/monitoring/doc/restrict-custom-variables.md
+/usr/share/icingaweb2/modules/monitoring/doc/security.md
 /usr/share/icingaweb2/modules/monitoring/library
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring
@@ Zeile 635: / Zeile 792: @@
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
-/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventhistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/FlappingendhistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/FlappingstarthistoryQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentdeletionhistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeendhistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostflappingendhistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostflappingstarthistoryQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostserviceproblemsummaryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/InstanceQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
@@ Zeile 646: / Zeile 819: @@
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentdeletionhistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeendhistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServiceflappingendhistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServiceflappingstarthistoryQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
-/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php
-/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Livestatus
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
@@ Zeile 663: / Zeile 848: @@
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Cli/CliUtils.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command
-/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Exception
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/IcingaApiCommand.php
-/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Instance
@@ Zeile 686: / Zeile 870: @@
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Renderer
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Renderer/IcingaApiCommandRenderer.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Transport
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Transport/ApiCommandTransport.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
@@ Zeile 694: / Zeile 880: @@
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Controller.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Data
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Data/ColumnFilterIterator.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Command.php
@@ Zeile 702: / Zeile 890: @@
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/DataView.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Downtime.php
-/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/EventHistory.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
-/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
-/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Hostcomment.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Instance.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Notification.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Programstatus.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
-/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Servicecomment.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
-/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Servicestatussummary.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/Statussummary.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Environment.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Exception
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Exception/CommandTransportException.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
-/usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Hook
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Hook/DataviewExtensionHook.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Hook/HostActionsHook.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Hook/IdoQueryExtensionHook.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Hook/ObjectActionsHook.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Hook/ServiceActionsHook.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Hook/TimelineProviderHook.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Acknowledgement.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/HostList.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Macro.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ Zeile 735: / Zeile 940: @@
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/TransportStep.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller
@@ Zeile 740: / Zeile 946: @@
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Hook
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Hook/ServiceActionsHook.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Navigation
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Navigation/Action.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Navigation/HostAction.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Navigation/HostNote.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Navigation/Renderer
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Navigation/Renderer/BackendAvailabilityNavigationItemRenderer.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Navigation/Renderer/MonitoringBadgeNavigationItemRenderer.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Navigation/ServiceAction.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Navigation/ServiceNote.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Rest
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Rest/RestRequest.php
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Widget
 /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
+/usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Widget/StateBadges.php
 /usr/share/icingaweb2/modules/monitoring/module.info
 /usr/share/icingaweb2/modules/monitoring/public
 /usr/share/icingaweb2/modules/monitoring/public/css
 /usr/share/icingaweb2/modules/monitoring/public/css/module.less
+/usr/share/icingaweb2/modules/monitoring/public/css/service-grid.less
+/usr/share/icingaweb2/modules/monitoring/public/css/tables.less
 /usr/share/icingaweb2/modules/monitoring/public/js
 /usr/share/icingaweb2/modules/monitoring/public/js/module.js
@@ Zeile 755: / Zeile 976: @@
 /usr/share/icingaweb2/modules/monitoring/test/php/application/views/helpers
 /usr/share/icingaweb2/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
-/usr/share/icingaweb2/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
 /usr/share/icingaweb2/modules/monitoring/test/php/library
 /usr/share/icingaweb2/modules/monitoring/test/php/library/Monitoring
+/usr/share/icingaweb2/modules/monitoring/test/php/library/Monitoring/Object
+/usr/share/icingaweb2/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
 /usr/share/icingaweb2/modules/monitoring/test/php/library/Monitoring/Plugin
 /usr/share/icingaweb2/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
 /usr/share/icingaweb2/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
 /usr/share/icingaweb2/modules/monitoring/test/php/regression
+/usr/share/icingaweb2/modules/monitoring/test/php/regression/Bug11728Test.php
+/usr/share/icingaweb2/modules/monitoring/test/php/regression/Bug11796Test.php
 /usr/share/icingaweb2/modules/monitoring/test/php/regression/Bug6088Test.php
 /usr/share/icingaweb2/modules/monitoring/test/php/regression/Bug7043Test.php
@@ Zeile 782: / Zeile 1006: @@
 /usr/share/icingaweb2/modules/setup/application/forms/LdapResourcePage.php
 /usr/share/icingaweb2/modules/setup/application/forms/ModulePage.php
-/usr/share/icingaweb2/modules/setup/application/forms/PreferencesPage.php
 /usr/share/icingaweb2/modules/setup/application/forms/RequirementsPage.php
 /usr/share/icingaweb2/modules/setup/application/forms/SummaryPage.php
+/usr/share/icingaweb2/modules/setup/application/forms/UserGroupBackendPage.php
 /usr/share/icingaweb2/modules/setup/application/forms/WelcomePage.php
+/usr/share/icingaweb2/modules/setup/application/locale
+/usr/share/icingaweb2/modules/setup/application/locale/de_DE
+/usr/share/icingaweb2/modules/setup/application/locale/de_DE/LC_MESSAGES
+/usr/share/icingaweb2/modules/setup/application/locale/de_DE/LC_MESSAGES/setup.mo
+/usr/share/icingaweb2/modules/setup/application/locale/de_DE/LC_MESSAGES/setup.po
+/usr/share/icingaweb2/modules/setup/application/locale/it_IT
+/usr/share/icingaweb2/modules/setup/application/locale/it_IT/LC_MESSAGES
+/usr/share/icingaweb2/modules/setup/application/locale/it_IT/LC_MESSAGES/setup.mo
+/usr/share/icingaweb2/modules/setup/application/locale/it_IT/LC_MESSAGES/setup.po
 /usr/share/icingaweb2/modules/setup/application/views
 /usr/share/icingaweb2/modules/setup/application/views/scripts
 /usr/share/icingaweb2/modules/setup/application/views/scripts/form
-/usr/share/icingaweb2/modules/setup/application/views/scripts/form/setup-admin-account.phtml
 /usr/share/icingaweb2/modules/setup/application/views/scripts/form/setup-modules.phtml
 /usr/share/icingaweb2/modules/setup/application/views/scripts/form/setup-requirements.phtml
@@ Zeile 821: / Zeile 1053: @@
 /usr/share/icingaweb2/modules/setup/library/Setup/Steps/GeneralConfigStep.php
 /usr/share/icingaweb2/modules/setup/library/Setup/Steps/ResourceStep.php
+/usr/share/icingaweb2/modules/setup/library/Setup/Steps/UserGroupStep.php
 /usr/share/icingaweb2/modules/setup/library/Setup/Utils
 /usr/share/icingaweb2/modules/setup/library/Setup/Utils/DbTool.php
 /usr/share/icingaweb2/modules/setup/library/Setup/Utils/EnableModuleStep.php
-/usr/share/icingaweb2/modules/setup/library/Setup/Utils/MakeDirStep.php
 /usr/share/icingaweb2/modules/setup/library/Setup/Web
 /usr/share/icingaweb2/modules/setup/library/Setup/Web/Form
@@ Zeile 834: / Zeile 1066: @@
 /usr/share/icingaweb2/modules/setup/library/Setup/Webserver/Apache.php
 /usr/share/icingaweb2/modules/setup/library/Setup/Webserver/Nginx.php
+/usr/share/icingaweb2/modules/setup/module.info
 /usr/share/icingaweb2/modules/setup/test
 /usr/share/icingaweb2/modules/setup/test/php
@@ Zeile 845: / Zeile 1078: @@
 /usr/share/icingaweb2/modules/translation/application/clicommands/RefreshCommand.php
 /usr/share/icingaweb2/modules/translation/doc
+/usr/share/icingaweb2/modules/translation/doc/img
+/usr/share/icingaweb2/modules/translation/doc/img/poedit_001.png
+/usr/share/icingaweb2/modules/translation/doc/img/poedit_002.png
+/usr/share/icingaweb2/modules/translation/doc/img/poedit_003.png
+/usr/share/icingaweb2/modules/translation/doc/img/poedit_004.png
+/usr/share/icingaweb2/modules/translation/doc/img/poedit_005.png
 /usr/share/icingaweb2/modules/translation/doc/translation.md
 /usr/share/icingaweb2/modules/translation/library
@@ Zeile 853: / Zeile 1092: @@
 /usr/share/icingaweb2/modules/translation/library/Translation/Util/GettextTranslationHelper.php
 /usr/share/icingaweb2/modules/translation/module.info
-/usr/share/icingaweb2/modules/translation/public
-/usr/share/icingaweb2/modules/translation/public/img
-/usr/share/icingaweb2/modules/translation/public/img/doc
-/usr/share/icingaweb2/modules/translation/public/img/doc/poedit_001.png
-/usr/share/icingaweb2/modules/translation/public/img/doc/poedit_002.png
-/usr/share/icingaweb2/modules/translation/public/img/doc/poedit_003.png
-/usr/share/icingaweb2/modules/translation/public/img/doc/poedit_004.png
-/usr/share/icingaweb2/modules/translation/public/img/doc/poedit_005.png
 /usr/share/icingaweb2/public
 /usr/share/icingaweb2/public/css
 /usr/share/icingaweb2/public/css/icinga
+/usr/share/icingaweb2/public/css/icinga/about.less
 /usr/share/icingaweb2/public/css/icinga/animation.less
-/usr/share/icingaweb2/public/css/icinga/defaults.less
+/usr/share/icingaweb2/public/css/icinga/badges.less
+/usr/share/icingaweb2/public/css/icinga/base.less
+/usr/share/icingaweb2/public/css/icinga/compat.less
+/usr/share/icingaweb2/public/css/icinga/controls.less
+/usr/share/icingaweb2/public/css/icinga/dev.less
 /usr/share/icingaweb2/public/css/icinga/forms.less
-/usr/share/icingaweb2/public/css/icinga/header-elements.less
+/usr/share/icingaweb2/public/css/icinga/grid.less
-/usr/share/icingaweb2/public/css/icinga/layout-colors.less
 /usr/share/icingaweb2/public/css/icinga/layout-structure.less
+/usr/share/icingaweb2/public/css/icinga/layout.less
 /usr/share/icingaweb2/public/css/icinga/login.less
-/usr/share/icingaweb2/public/css/icinga/main-content.less
+/usr/share/icingaweb2/public/css/icinga/main.less
 /usr/share/icingaweb2/public/css/icinga/menu.less
-/usr/share/icingaweb2/public/css/icinga/monitoring-colors.less
+/usr/share/icingaweb2/public/css/icinga/mixins.less
-/usr/share/icingaweb2/public/css/icinga/pagination.less
+/usr/share/icingaweb2/public/css/icinga/nav.less
-/usr/share/icingaweb2/public/css/icinga/selection-toolbar.less
+/usr/share/icingaweb2/public/css/icinga/print.less
+/usr/share/icingaweb2/public/css/icinga/responsive.less
 /usr/share/icingaweb2/public/css/icinga/setup.less
+/usr/share/icingaweb2/public/css/icinga/spinner.less
 /usr/share/icingaweb2/public/css/icinga/tabs.less
 /usr/share/icingaweb2/public/css/icinga/widgets.less
 /usr/share/icingaweb2/public/css/pdf
 /usr/share/icingaweb2/public/css/pdf/pdfprint.less
+/usr/share/icingaweb2/public/css/themes
+/usr/share/icingaweb2/public/css/themes/Winter.less
+/usr/share/icingaweb2/public/css/themes/high-contrast.less
 /usr/share/icingaweb2/public/css/vendor
+/usr/share/icingaweb2/public/css/vendor/normalize.css
 /usr/share/icingaweb2/public/css/vendor/tipsy.css
 /usr/share/icingaweb2/public/error_norewrite.html
+/usr/share/icingaweb2/public/font
+/usr/share/icingaweb2/public/font/ifont.eot
+/usr/share/icingaweb2/public/font/ifont.svg
+/usr/share/icingaweb2/public/font/ifont.ttf
+/usr/share/icingaweb2/public/font/ifont.woff
+/usr/share/icingaweb2/public/font/ifont.woff2
 /usr/share/icingaweb2/public/img
 /usr/share/icingaweb2/public/img/favicon.png
-/usr/share/icingaweb2/public/img/icinga-icon-inv.png
+/usr/share/icingaweb2/public/img/icinga-logo-big-dark.png
-/usr/share/icingaweb2/public/img/icinga-icon.png
+/usr/share/icingaweb2/public/img/icinga-logo-big.png
+/usr/share/icingaweb2/public/img/icinga-logo-big.svg
+/usr/share/icingaweb2/public/img/icinga-logo.png
+/usr/share/icingaweb2/public/img/icinga-logo.svg
 /usr/share/icingaweb2/public/img/icons
 /usr/share/icingaweb2/public/img/icons/acknowledgement.png
@@ Zeile 953: / Zeile 1204: @@
 /usr/share/icingaweb2/public/img/icons/save_petrol.png
 /usr/share/icingaweb2/public/img/icons/search.png
+/usr/share/icingaweb2/public/img/icons/search_icinga_blue.png
 /usr/share/icingaweb2/public/img/icons/search_petrol.png
 /usr/share/icingaweb2/public/img/icons/service.png
@@ Zeile 972: / Zeile 1224: @@
 /usr/share/icingaweb2/public/img/icons/user_petrol.png
 /usr/share/icingaweb2/public/img/icons/win.png
-/usr/share/icingaweb2/public/img/logo_icinga-inv.png
+/usr/share/icingaweb2/public/img/touch-icon.png
-/usr/share/icingaweb2/public/img/logo_icinga.png
-/usr/share/icingaweb2/public/img/logo_icinga_big.png
-/usr/share/icingaweb2/public/img/logo_icinga_big_dark.png
 /usr/share/icingaweb2/public/img/tree
 /usr/share/icingaweb2/public/img/tree/tree-minus.gif
 /usr/share/icingaweb2/public/img/tree/tree-plus.gif
+/usr/share/icingaweb2/public/img/winter
+/usr/share/icingaweb2/public/img/winter/logo_icinga_big_winter.png
+/usr/share/icingaweb2/public/img/winter/snow1.png
+/usr/share/icingaweb2/public/img/winter/snow2.png
+/usr/share/icingaweb2/public/img/winter/snow3.png
 /usr/share/icingaweb2/public/index.php
 /usr/share/icingaweb2/public/js
@@ Zeile 985: / Zeile 1239: @@
 /usr/share/icingaweb2/public/js/icinga.js
 /usr/share/icingaweb2/public/js/icinga/behavior
+/usr/share/icingaweb2/public/js/icinga/behavior/actiontable.js
+/usr/share/icingaweb2/public/js/icinga/behavior/application-state.js
+/usr/share/icingaweb2/public/js/icinga/behavior/autofocus.js
+/usr/share/icingaweb2/public/js/icinga/behavior/dropdown.js
 /usr/share/icingaweb2/public/js/icinga/behavior/form.js
 /usr/share/icingaweb2/public/js/icinga/behavior/navigation.js
+/usr/share/icingaweb2/public/js/icinga/behavior/selectable.js
 /usr/share/icingaweb2/public/js/icinga/behavior/sparkline.js
 /usr/share/icingaweb2/public/js/icinga/behavior/tooltip.js
@@ Zeile 1012: / Zeile 1271: @@
 /usr/share/icingaweb2/public/js/vendor/jquery.tipsy.js
 /usr/share/icingaweb2/public/js/vendor/jquery.tipsy.min.js
-/var/log/icingaweb2
+/var/log/icingaweb2</code>
-</code>
 Neben den Icinga-Paketen benötigen wir noch weitere RPM-Pakete, die wir nun noch installieren werden. So brauchen wir zum Beispiel für die Authentifizierungsabfragen gegen unseren **[[centos:ldap:start|LDAP-Server]]** das Paket **php-ldap**.
@@ Zeile 1115: / Zeile 1373: @@
 ==== externe Authentifikation (htdigest) ====
-Im ersten Konfigurationsbeispiel gehen wir auf die Authentifizierungsart ein, bei der Usernamen und Passwörter in einer lokal gespeicherten Datei ein. Unter Zuhilfenahme des Programms **htdigest** legen wir erst einmal einen User an und speichern das zugehörige Passwort ab.
+Im ersten Konfigurationsbeispiel gehen wir auf die Authentifizierungsart ein, bei der Usernamen und Passwörter in einer lokal gespeicherten Datei vorgehalten werden. Unter Zuhilfenahme des Programms **htdigest** legen wir erst einmal einen User an und speichern das zugehörige Passwort ab.
    # htdigest -c /etc/icingaweb2/.icingawebdigest "Icinga Web 2" django
@@ Zeile 1194: / Zeile 1452: @@
 backend = external
 </file>
 <WRAP center round tip 90%>
@@ Zeile 1265: / Zeile 1522: @@
 Entscheidend ist hier, dass der Parameter **resource** dem Wert entspricht, der in der Ressourcen-Konfigurationsdatei **// /etc/icingaweb2/resources.ini//** verwendet wurde
 </WRAP>
 Bei unserem Apache-Webserver bedarf es dazu keiner weiteren Anpassung, so dass wir die [[centos:web_c7:icinga:web2#apache_konfiguration|Default-Datei]] aus dem RPM einfach weiterverwenden kann!
@@ Zeile 1272: / Zeile 1528: @@
 Meist haben wir nicht nur eine Web-Anwendung an der sich User zum Arbeiten anmelden müssen, sondern mehrere bis mit unter sehr vielen. In diesem Umfeld bietet es sich förmlich an, die Authentifizierungsdaten zentral an einem **LDAP**-Server((**L**ightweight **D**irectory **A**ccess **P**rotocol)) zu verwalten.
-Wie im vorhergehenden Beispiel bei der [[centos:web_c7:icinga:web2?&#authentifikation_gegen_eine_sql-tabelle_mariadb|Authentifikation gegen eine SQL-Tabelle (MariaDB)]] müssen wir unserer Installation beibringen, welches Autehtifizierungs-Backend bzw. -Methode zu verwenden ist und wie dies erreicht werden kann. Nur so können die eingegebenen Daten beim Anmelde-Fenster von **Icinga Web 2** geprüft werden.
+Wie im vorhergehenden Beispiel bei der [[centos:web_c7:icinga:web2?&#authentifikation_gegen_eine_sql-tabelle_mariadb|Authentifikation gegen eine SQL-Tabelle (MariaDB)]] müssen wir unserer Installation beibringen, welches Authtifizierungs-Backend bzw. -Methode zu verwenden ist und wie dies erreicht werden kann. Nur so können die eingegebenen Daten beim Anmelde-Fenster von **Icinga Web 2** geprüft werden.
 Als erstes definieren wir die Ressource, also das „WIE erreiche ich den LDAP-Server“. Dazu legen wir im Verzeichnis //**/etc/icingaweb2**// die Datei **resources.ini** an.
@@ Zeile 1287: / Zeile 1543: @@
 bind_pw             = "Kl4u5-157-d3r-gr035573!"
 </file>
+Für LDAPs sieht die Beispielskonfigurationen entsprechend nachfolgend aus.
+<file php /etc/icingaweb2/resources.ini>; Django : 2015-03-15
+; Authetifizierungs-Backend "LDAP" verwenden.
+[ldap_auth]
+type                = "ldap"
+hostname            = "ldap.dmz.nausch.org"
+port                = "636"
+root_dn             = "ou=people,dc=nausch,dc=org"
+bind_dn             = "cn=Technischeruser,dc=nausch,dc=org"
+bind_pw             = "Kl4u5-157-d3r-gr035573!"
+encryption          = "ldaps"
+reqcert             = "1"
+</file>
 Mit dieser Definition weiß nun **Icinga Web 2** wie es den LDAP-Server anzusprechen hat. Was nun noch fehlt, ist die Antwort auf die Frage: "Welches Authentifizierungs-Backend soll verwendet werden?". Hierzu legen wir die Datei //**/etc/icingaweb2/authentication.ini**// an.
@@ Zeile 1347: / Zeile 1619: @@
    $ firefox http://icinga.nausch.org/icingaweb2/
-{{ :centos:web_c7:icinga:icinga_1000.png?direct&650 |Bild: Icinga Web 2 Anmeldefenster}}
+{{ :centos:web_c7:icinga:icinga_1000.png?direct&700 |Bild: Icinga Web 2 Anmeldefenster}}
 Hier geben wir nun die Daten unseres Incinga Admins ein und klicken auf die Schaltfläche **[ Login  ]**.
-{{ :centos:web_c7:icinga:icinga_1001.png?direct&650 |Bild: Icinga Web 2 Übersicht}}
+{{ :centos:web_c7:icinga:icinga_1001.png?direct&800 |Bild: Icinga Web 2 Übersicht}}
 Auf der linken Seite finden wir den Menüpunkt **System**; diese wählen wir nun an.
-{{ :centos:web_c7:icinga:icinga_1002.png?direct&650 |Bild: Icinga Web 2 Systemmenü}}
+{{ :centos:web_c7:icinga:icinga_1002.png?direct&800 |Bild: Icinga Web 2 Systemmenü}}
 Hier klicken wir nun den Menüpunkt **Configuration*** an; die Konfiguration des Systems allgemein findet auf dem ersten Reiter **Application** statt.
@@ Zeile 1361: / Zeile 1633: @@
 Auf dem Reiter **Resources** ... finden wir dann auch die zuvor definierten **Ressourcen** wieder. Das nächste Bild zeigt exemplarisch die definierte Ressource **icinga_ido**, der Anbindung an die **Icinga 2  IDO Datenbank**.
-{{ :centos:web_c7:icinga:icinga_1003.png?direct&650 |Bild: Icinga Web 2 Configuration Menue Resources}}
+{{ :centos:web_c7:icinga:icinga_1003.png?direct&800 |Bild: Icinga Web 2 Configuration Menue Resources}}
 Die definierten Authentication-Backends sind auf dem Reiter **Authentication** zu finden. Das nächste Bild zeigt exemplarisch das definierte Backend **ldap_auth**.
-{{ :centos:web_c7:icinga:icinga_1004.png?direct&650 |Bild: Icinga Web 2 Configuration Menue Authentication Backends}}
+{{ :centos:web_c7:icinga:icinga_1004.png?direct&800 |Bild: Icinga Web 2 Configuration Menue Authentication Backends}}
 ==== Icinga CLI ====
@@ Zeile 1387: / Zeile 1653: @@
 Das nachfolgende Beispiel zeigt die Konfiguration von **Icinga Web 2** bei Benutzung einer **MariaDB SQL-Tabelle**.
    $ firefox https://icinga.nausch.org/icingaweb2/setup
-{{ :centos:web_c7:icinga:icinga_1101.png?direct&650 |Bild: Icinga Web 2 Setup Wizard}}
+{{ :centos:web_c7:icinga:icinga_1101.png?direct&800 |Bild: Icinga Web 2 Setup Wizard}}
 In dem Feld **Setup Token** tragen wir den zuvor auf der Konsole generierten Token ein und klicken auf die Schaltfläche **[ Next ]**.
-{{ :centos:web_c7:icinga:icinga_1102.png?direct&650 |Bild: Icinga Web 2 Modul Auswahl}}
+{{ :centos:web_c7:icinga:icinga_1102.png?direct&800 |Bild: Icinga Web 2 Modul Auswahl}}
 In dem Fenster wählen wir zusätzlich noch das Modul **Doc** aus, dass uns später direkt die sehr gute Programmdokumentation von **Icinga 2** als Menüpunkt zur Verfügung stellt. Dieses Fenster verlassen wir auch wieder mit einem Klick die Schaltfläche **[ Next ]**.
@@ Zeile 1397: / Zeile 1663: @@
 Auf dem nächsten Fenster werden uns nochmal alle Optionen und Module angezeigt. Sollte einer der angemahnten Module noch fehlen, wäre jetzt die beste Gelegenheit den Fehler abzustellen bzw. das noch fehlende Modul zu installieren.
-{{ :centos:web_c7:icinga:icinga_1103.png?direct&650 |Bild: Icinga Web 2 Requirements}}
+{{ :centos:web_c7:icinga:icinga_1103.png?direct&800 |Bild: Icinga Web 2 Requirements}}
 Auch dieses Fenster verlassen wir mit einem Klick auf die Schaltfläche **[ Next ]**.
-{{ :centos:web_c7:icinga:icinga_1104.png?direct&650 |Bild: Icinga Web 2 Authentication}}
+{{ :centos:web_c7:icinga:icinga_1104.png?direct&800 |Bild: Icinga Web 2 Authentication}}
 In diesem Fenster erfolgt die Auswahl der Authentifizierung. In unserem Beispiel haben wir **Database** gewählt. Die anderen Optionen wären **LDAP** und **external**. Wie immer geht es weiter mit einem Klick auf die Schaltfläche **[ Next ]**.
-{{ :centos:web_c7:icinga:icinga_1105.png?direct&650 |Bild: Icinga Web 2 Preferences}}
+{{ :centos:web_c7:icinga:icinga_1105.png?direct&800 |Bild: Icinga Web 2 Preferences}}
 In diesem Konfigurationsfenster wird abgefragt, wohin die benutzerspezifischen Einstellungen gespeichert werden sollen. Wir wählen hier ebenfalls **Database** aus und klicken auf die Schaltfläche **[ Next ]**.
 Die Konfiguration in Sachen **LDAP** unterscheidet sich lediglich bei der Definition des **Resource //ldap_auth//** und dem **Authentication Backend //ldap_auth//**.
-{{ :centos:web_c7:icinga:icinga_1106.png?direct&651 |Bild: Icinga Web 2 Datenbank Ressource}}
+{{ :centos:web_c7:icinga:icinga_1106.png?direct&800 |Bild: Icinga Web 2 Datenbank Ressource}}
 In diesem Fenster werden nun die Ressourcedefinitionen für die Benutzerauthentifizierung und den benutzerspezifischen Einstellungen eingetragen. haben wir alle Werte eingetragen, geht es weiter mit einem Klick auf die Schaltfläche **[ Next ]**
-{{ :centos:web_c7:icinga:icinga_1108.png?direct&650 |Bild: Icinga Web 2 Administration}}
+{{ :centos:web_c7:icinga:icinga_1108.png?direct&800 |Bild: Icinga Web 2 Administration}}
 In diesem Fenster erfolgt dann das Anlegen des ersten Icinga 2 Admin Accounts. Die Daten bestätigen wir mit einem Klick auf die Schaltfläche **[ Next ]** und gelangen so zum nächsten Fenster.
-{{ :centos:web_c7:icinga:icinga_1109.png?direct&650 |Bild: Icinga Web 2 Konfiguration der Applikation}}
+{{ :centos:web_c7:icinga:icinga_1109.png?direct&800 |Bild: Icinga Web 2 Konfiguration der Applikation}}
 In diesem Fenster wird das Logging und wie umfangreich dieses erfolgen soll, definiert. Passt alles, klicken wir auf die Schaltfläche **[ Next ]**.
-{{ :centos:web_c7:icinga:icinga_1110.png?direct&650 |Bild: Icinga Web 2 Zusammenfassung der bisherigen Konfiguration}}
+{{ :centos:web_c7:icinga:icinga_1110.png?direct&800 |Bild: Icinga Web 2 Zusammenfassung der bisherigen Konfiguration}}
 In diesem Fenster werden uns noch einmal zusammengefasst die bisherigen Definitionen angezeigt. Zum Verlassen dieses Fensters klicken wir auf die Schaltfläche **[ Next ]**.
-{{ :centos:web_c7:icinga:icinga_1111.png?direct&650 |Bild: Icinga Web 2 Monitoring Modul}}
+{{ :centos:web_c7:icinga:icinga_1111.png?direct&800 |Bild: Icinga Web 2 Monitoring Modul}}
 Ab hier erfolgt nun die Konfiguration des Icinga Web 2 Monitoring Modul. Weiter geht es mit einem Klick auf die Schaltfläche **[ Next ]**.
-{{ :centos:web_c7:icinga:icinga_1112.png?direct&650 |Bild: Icinga Web 2 Monitoring Backend}}
+{{ :centos:web_c7:icinga:icinga_1112.png?direct&800 |Bild: Icinga Web 2 Monitoring Backend}}
 Als Monitoring Backend verwenden wir **IDO** und können so einfach die Vorgaben mit einem Klick auf die Schaltfläche **[ Next ]** übernehmen.
-{{ :centos:web_c7:icinga:icinga_1113.png?direct&650 |Bild: Icinga Web 2 IDO Datenbank}}
+{{ :centos:web_c7:icinga:icinga_1113.png?direct&800 |Bild: Icinga Web 2 IDO Datenbank}}
 In diesem Fenster wird nun die Datenbankanbindung (Ressource)) an die **[[centos:web_c7:icinga:web2#sql-datenbank|Icinga 2 IDO Datenbank]]** definiert. Passen alle Werte klicken wir auf die Schaltfläche **[ Next ]**.
-{{ :centos:web_c7:icinga:icinga_1114.png?direct&650 |Bild: Icinga Web 2 Monitoring Instanz}}
+{{ :centos:web_c7:icinga:icinga_1114.png?direct&800 |Bild: Icinga Web 2 Monitoring Instanz}}
 Die Definition der **Monitoring Instanz** erfolgt in diesem Fenster. Wir akzeptieren die Werte und gehen weiter mit einem Klick auf die Schaltfläche **[ Next ]**.
-{{ :centos:web_c7:icinga:icinga_1115.png?direct&650 |Bild: Icinga Web 2 Variablendefinition}}
+{{ :centos:web_c7:icinga:icinga_1115.png?direct&800 |Bild: Icinga Web 2 Variablendefinition}}
 Die besonders zu schützenden Variablen werden in diesem Fenster angezeigt. Wir akzeptieren dies und gehen weiter mit einem Klick auf die Schaltfläche **[ Next ]** zum nächsten Fenster.
-{{ :centos:web_c7:icinga:icinga_1116.png?direct&650 |Bild: Icinga Web 2 Konfiguration der Datenbankanbindung}}
+{{ :centos:web_c7:icinga:icinga_1116.png?direct&800 |Bild: Icinga Web 2 Konfiguration der Datenbankanbindung}}
 Auf diesem Fenster werden nochmal alle gewählten Optionen angezeigt. Letztmalig klicken wir auf die Schaltfläche **[ Next ]** und gelangen auf die letzte Seite der Konfigurationsarbeit von **Icinga Web 2**.
-{{ :centos:web_c7:icinga:icinga_1117.png?direct&650 |Bild: Icinga Web 2 }}
+{{ :centos:web_c7:icinga:icinga_1117.png?direct&800 |Bild: Icinga Web 2 }}
 Dieses Fenster verlassen wir nun über die Schaltfläche **[ Congratulations! Icinga Web 2 has been successfully set up. ]**
+====== Links ======
+  * **⇐ [[centos:web_c7:icinga:info|Zurück zum Kapitel "IT Infrastruktur und System Monitoring mit Icinga 2 unter CentOS 7.x"]]**
+  * **⇒ [[centos:web_c7:icinga:config_1|Weiter zum Kapitel "Icinga 2 - Überwachung von Clients/Hosts bzw. Services auf Hosts"]]**
+  * **[[centos:web_c7:icinga:start|Zurück zum Kapitel(übersicht) >>IT Infrastruktur und System Monitoring mit Icinga 2<<]]**
+  * **[[centos:web_c7:start|Zurück zum Kapitel >>Webserverinstallation unter CentOS 7.x<<]]**
+  * **[[wiki:start|Zurück zu >>Projekte und Themenkapitel<<]]**
+  * **[[http://dokuwiki.nausch.org/doku.php/|Zurück zur Startseite]]**