From d662ca0adadff287d6912b547b8c6f4d97a95043 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 7 Nov 2023 11:14:55 +0100 Subject: [PATCH] Docs: change "Amazon Linux 2" to "Amazon Linux" where applicable We also support Amazon Linux 2023 now. --- doc/02-installation.md | 16 ++++++++++------ doc/14-features.md | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/doc/02-installation.md b/doc/02-installation.md index c31f2ee7ae0..42d4a74302c 100644 --- a/doc/02-installation.md +++ b/doc/02-installation.md @@ -200,7 +200,7 @@ zypper ar https://download.opensuse.org/repositories/server:/monitoring/15.3/ser -### Amazon Linux 2 Repository +### Amazon Linux Repository !!! info @@ -214,12 +214,14 @@ rpm --import https://packages.icinga.com/icinga.key wget https://packages.icinga.com/subscription/amazon/ICINGA-release.repo -O /etc/yum.repos.d/ICINGA-release.repo ``` -The packages for Amazon Linux 2 depend on other packages which are distributed +The packages for **Amazon Linux 2** depend on other packages which are distributed as part of the [EPEL repository](https://fedoraproject.org/wiki/EPEL). ```bash yum install epel-release ``` + +The packages for newer versions of Amazon Linux don't require additional repositories. @@ -307,7 +309,7 @@ zypper install icinga2 -#### Amazon Linux 2 +#### Amazon Linux ```bash yum install icinga2 @@ -418,15 +420,17 @@ zypper install --recommends monitoring-plugins-all -#### Amazon Linux 2 +#### Amazon Linux -The packages for Amazon Linux 2 depend on other packages which are distributed as part of the EPEL repository. +The packages for **Amazon Linux 2** depend on other packages which are distributed as part of the EPEL repository. ```bash amazon-linux-extras install epel yum install nagios-plugins-all ``` + +Unfortunately newer versions of Amazon Linux don't provide those plugins, yet. ## Set up Icinga 2 API @@ -505,7 +509,7 @@ Use your distribution's package manager to install the `icingadb-redis` package -##### Amazon Linux 2 +##### Amazon Linux ```bash yum install icingadb-redis diff --git a/doc/14-features.md b/doc/14-features.md index 4a4ff32b7b8..19cb54b0142 100644 --- a/doc/14-features.md +++ b/doc/14-features.md @@ -843,7 +843,7 @@ yum install icinga2-ido-mysql zypper install icinga2-ido-mysql ``` -###### Amazon Linux 2 +###### Amazon Linux ```bash yum install icinga2-ido-mysql @@ -942,7 +942,7 @@ yum install icinga2-ido-pgsql zypper install icinga2-ido-pgsql ``` -###### Amazon Linux 2 +###### Amazon Linux ```bash yum install icinga2-ido-pgsql