diff --git a/doc/02-installation.md b/doc/02-installation.md index 8efb4a5b9..15127abf8 100644 --- a/doc/02-installation.md +++ b/doc/02-installation.md @@ -496,7 +496,7 @@ visualizing monitoring data in the Icinga ecosystem, consisting of: [Icinga DB Web](https://icinga.com/docs/icinga-db-web) module enabled, which connects to both Redis and the database to display and work with the most up-to-date data -![Icinga DB Architecture](images/installation/icingadb-architecture.png) +![Icinga DB Architecture](images/icingadb/icingadb-architecture.png) !!! info @@ -512,7 +512,7 @@ A Redis server from version 6.2 is required. which ships a current Redis Server version and is preconfigured for the Icinga DB components. Using own Redis server setups is supported as long as the version requirements are met. -![Icinga DB Redis](images/installation/icingadb-redis.png) +![Icinga DB Redis](images/icingadb/icingadb-redis.png) !!! tip @@ -617,7 +617,7 @@ Icinga 2 publishes all of its monitoring data to the Redis server. This includes its runtime updates via the Icinga 2 API, check results, state changes, downtimes, acknowledgments, notifications and other events such as flapping. -![Icinga DB Icinga 2](images/installation/icingadb-icinga2.png) +![Icinga DB Icinga 2](images/icingadb/icingadb-icinga2.png) Icinga 2 installs the feature configuration file to `/etc/icinga2/features-available/icingadb.conf`, pre-configured for a local setup. diff --git a/doc/14-features.md b/doc/14-features.md index efd0927fb..943621757 100644 --- a/doc/14-features.md +++ b/doc/14-features.md @@ -47,28 +47,23 @@ The REST API is documented [here](12-icinga2-api.md#icinga2-api) as a core featu ### Icinga DB -Icinga DB provides a new core backend and aims to replace the IDO backend -output. It consists of different components: +Icinga DB is a set of components for publishing, synchronizing and +visualizing monitoring data in the Icinga ecosystem, consisting of: -* Icinga 2 provides the `icingadb` feature which stores monitoring data in a memory database -* The [IcingaDB service](https://github.com/icinga/icingadb) collects and synchronizes monitoring data into its backend -* Icinga Web reads monitoring data from the new IcingaDB backend +* Icinga 2 with its `icingadb` feature enabled, + responsible for publishing monitoring data to a Redis server, i.e. configuration and its runtime updates, + check results, state changes, downtimes, acknowledgements, notifications, and other events such as flapping +* The [Icinga DB daemon](https://icinga.com/docs/icinga-db), + which synchronizes the data between the Redis server and a database +* And Icinga Web with the + [Icinga DB Web](https://icinga.com/docs/icinga-db-web) module enabled, + which connects to both Redis and the database to display and work with the most up-to-date data -Requirements: +![Icinga DB Architecture](images/icingadb/icingadb-architecture.png) -* Local Redis instance -* MySQL/MariaDB server with `icingadb` database, user and schema imports -* Icinga 2's `icingadb` feature enabled -* IcingaDB service requires Redis and MySQL/MariaDB server -* Icinga Web module - -Consult the [Icinga DB installation documentation](https://icinga.com/docs/icinga-db/latest/doc/02-Installation/) for setup instructions. - -We will deprecate the IDO and shift towards the Icinga DB as main backend, -but we will not drop the IDO for now. -We know that it takes time until the Icinga DB is adopted -(maybe even up to one to two years) -and we won’t drop the IDO until it is comfortable to do so. +To set up a Redis server and the Icinga DB feature, please follow the steps from the +Icinga 2 [Installation](02-installation.md) guide. For the feature configuration options, +see its [Icinga DB object type](09-object-types.md#icingadb) documentation. ## Metrics diff --git a/doc/images/installation/icingadb-architecture.png b/doc/images/icingadb/icingadb-architecture.png similarity index 100% rename from doc/images/installation/icingadb-architecture.png rename to doc/images/icingadb/icingadb-architecture.png diff --git a/doc/images/installation/icingadb-icinga2.png b/doc/images/icingadb/icingadb-icinga2.png similarity index 100% rename from doc/images/installation/icingadb-icinga2.png rename to doc/images/icingadb/icingadb-icinga2.png diff --git a/doc/images/installation/icingadb-redis.png b/doc/images/icingadb/icingadb-redis.png similarity index 100% rename from doc/images/installation/icingadb-redis.png rename to doc/images/icingadb/icingadb-redis.png