diff --git a/doc/2.3-setting-up-check-plugins.md b/doc/2.3-setting-up-check-plugins.md index 6822acb46..4e453ed73 100644 --- a/doc/2.3-setting-up-check-plugins.md +++ b/doc/2.3-setting-up-check-plugins.md @@ -1,13 +1,20 @@ ## Setting up Check Plugins On its own Icinga 2 does not know how to check external services. The -[Nagios Plugins Project](https://www.nagios-plugins.org/) provides an extensive -set of plugins which can be used by Icinga 2 to check whether services are -working properly. +[Monitoring Plugins Project](https://www.monitoring-plugins.org/) (former +Nagios Plugins) provides an extensive set of plugins which can be used by +Icinga 2 to check whether services are working properly. The recommended way of installing these standard plugins is to use your -distribution's package manager. For your convenience here is a list of package -names for some of the more popular operating systems/distributions: +distribution's package manager. + +> **Note** +> +> The `Nagios Plugins` project was renamed to `Monitoring Plugins` project +> in Jan 2014. Therefore package names may still reflect the old name. + +For your convenience here is a list of package names for some of the more +popular operating systems/distributions: OS/Distribution | Package Name | Installation Path -----------------------|--------------------|--------------------------- @@ -28,7 +35,7 @@ All existing Nagios or Icinga 1.x plugins found on public community websites will work with Icinga 2 as well. * [MonitoringExchange](https://www.monitoringexchange.org) -* [Icinga Wiki]() +* [Icinga Wiki](https://wiki.icinga.org) Once you have downloaded the plugin copy them into the directory defined by the global `IcingaMacro` `$plugindir$` and make sure that the user the Icinga daemon is running as diff --git a/doc/6-advanced-topics.md b/doc/6-advanced-topics.md index 1f7ac0475..52c686456 100644 --- a/doc/6-advanced-topics.md +++ b/doc/6-advanced-topics.md @@ -325,12 +325,14 @@ Modified Attributes can be reset using external commands. ## Plugin API -Currently the native plugin api inherited from the `Nagios Plugins` project is available. +Currently the native plugin api inherited from the `Monitoring Plugins` (former +`Nagios Plugins`) project is available. Future specifications will be documented here. -### Nagios Plugin API +### Monitoring Plugin API -The `Nagios Plugin API` is defined the [Nagios Plugins Development Guidelines](https://www.nagios-plugins.org/doc/guidelines.html). +The `Monitoring Plugin API` (former `Nagios Plugin API`) is defined in the +[Monitoring Plugins Development Guidelines](https://www.monitoring-plugins.org/doc/guidelines.html). diff --git a/doc/9-vagrant-demo-vm.md b/doc/9-vagrant-demo-vm.md index 4997c148f..757c6f6d0 100644 --- a/doc/9-vagrant-demo-vm.md +++ b/doc/9-vagrant-demo-vm.md @@ -21,7 +21,7 @@ The Vagrant VM is based on CentOS 6.4 and uses the official Icinga 2 RPM packages from `packages.icinga.org`. In addition to installing Icinga 2 the Vagrant script also installs the Icinga -1.x Classic UI and the check plugins that are available from the Nagios Plugins +1.x Classic UI and the check plugins that are available from the Monitoring Plugins project. The Classic UI is available at [http://localhost:8080/icinga](http://localhost:8080/icinga).