Merge pull request #9864 from Icinga/al2023

Docs: change "Amazon Linux 2" to "Amazon Linux" where applicable
This commit is contained in:
Julian Brost 2023-11-21 11:09:40 +01:00 committed by GitHub
commit cbb2caf030
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions

View File

@ -200,7 +200,7 @@ zypper ar https://download.opensuse.org/repositories/server:/monitoring/15.3/ser
<!-- {% endif %} --> <!-- {% endif %} -->
<!-- {% if amazon_linux %} --> <!-- {% if amazon_linux %} -->
### Amazon Linux 2 Repository <a id="amazon-linux-2-repository"></a> ### Amazon Linux Repository <a id="amazon-linux-2-repository"></a>
!!! info !!! 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 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). as part of the [EPEL repository](https://fedoraproject.org/wiki/EPEL).
```bash ```bash
yum install epel-release yum install epel-release
``` ```
The packages for newer versions of Amazon Linux don't require additional repositories.
<!-- {% endif %} --> <!-- {% endif %} -->
<!-- {% if windows %} --> <!-- {% if windows %} -->
@ -307,7 +309,7 @@ zypper install icinga2
<!-- {% if amazon_linux %} --> <!-- {% if amazon_linux %} -->
<!-- {% if not icingaDocs %} --> <!-- {% if not icingaDocs %} -->
#### Amazon Linux 2 #### Amazon Linux
<!-- {% endif %} --> <!-- {% endif %} -->
```bash ```bash
yum install icinga2 yum install icinga2
@ -418,15 +420,17 @@ zypper install --recommends monitoring-plugins-all
<!-- {% if amazon_linux %} --> <!-- {% if amazon_linux %} -->
<!-- {% if not icingaDocs %} --> <!-- {% if not icingaDocs %} -->
#### Amazon Linux 2 #### Amazon Linux
<!-- {% endif %} --> <!-- {% endif %} -->
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 ```bash
amazon-linux-extras install epel amazon-linux-extras install epel
yum install nagios-plugins-all yum install nagios-plugins-all
``` ```
Unfortunately newer versions of Amazon Linux don't provide those plugins, yet.
<!-- {% endif %} --> <!-- {% endif %} -->
## Set up Icinga 2 API <a id="set-up-icinga2-api"></a> ## Set up Icinga 2 API <a id="set-up-icinga2-api"></a>
@ -505,7 +509,7 @@ Use your distribution's package manager to install the `icingadb-redis` package
<!-- {% if amazon_linux %} --> <!-- {% if amazon_linux %} -->
<!-- {% if not icingaDocs %} --> <!-- {% if not icingaDocs %} -->
##### Amazon Linux 2 ##### Amazon Linux
<!-- {% endif %} --> <!-- {% endif %} -->
```bash ```bash
yum install icingadb-redis yum install icingadb-redis

View File

@ -843,7 +843,7 @@ yum install icinga2-ido-mysql
zypper install icinga2-ido-mysql zypper install icinga2-ido-mysql
``` ```
###### Amazon Linux 2 ###### Amazon Linux
```bash ```bash
yum install icinga2-ido-mysql yum install icinga2-ido-mysql
@ -942,7 +942,7 @@ yum install icinga2-ido-pgsql
zypper install icinga2-ido-pgsql zypper install icinga2-ido-pgsql
``` ```
###### Amazon Linux 2 ###### Amazon Linux
```bash ```bash
yum install icinga2-ido-pgsql yum install icinga2-ido-pgsql