tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 06:34:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed references to Nagios from the example config.

Browse Source
This commit is contained in:
Gunnar Beutner 2012-09-25 15:26:06 +02:00
parent 980913d980
commit 0d77919057
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/icinga2-config.txt
View File

@ -523,8 +523,8 @@ supported ("native::PluginCheck").
Attribute: check_command Attribute: check_command
^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^
Optional when not using check_type == "nagios". The check command. This command Optional when not using the "external plugin" check type. The check command.
may use macros. This command may use macros.
Attribute: check_interval Attribute: check_interval
^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^
@ -731,9 +731,9 @@ local object Component "delegation" {
} }
abstract object Service "nagios-service" { abstract object Service "icinga-service" {
methods = { methods = {
check = "native::NagiosCheck" check = "native::PluginCheck"
}, },
macros = { macros = {
@ -741,7 +741,7 @@ abstract object Service "nagios-service" {
} }
} }
abstract object Service "ping" inherits "nagios-service" { abstract object Service "ping" inherits "icinga-service" {
check_command = "$plugindir$/check_ping -H $address$ -w $wrta$,$wpl$% -c $crta$,$cpl$%", check_command = "$plugindir$/check_ping -H $address$ -w $wrta$,$wpl$% -c $crta$,$cpl$%",
macros += { macros += {

4
icinga-app/config/icinga2.conf.dist
View File

@ -44,7 +44,7 @@ local object Component "compat" {
* This template defines some basic parameters for services that use * This template defines some basic parameters for services that use
* external plugins for their checks. * external plugins for their checks.
*/ */
abstract object Service "nagios-service" { abstract object Service "icinga-service" {
methods = { methods = {
check = "native::PluginCheck" check = "native::PluginCheck"
} }
@ -54,7 +54,7 @@ abstract object Service "nagios-service" {
* The service template for ping checks. In an Icinga 1.x environment * The service template for ping checks. In an Icinga 1.x environment
* this would be defined as a check command. * this would be defined as a check command.
*/ */
abstract object Service "ping" inherits "nagios-service" { abstract object Service "ping" inherits "icinga-service" {
check_command = "$plugindir$/check_ping -H $address$ -w $wrta$,$wpl$% -c $crta$,$cpl$%", check_command = "$plugindir$/check_ping -H $address$ -w $wrta$,$wpl$% -c $crta$,$cpl$%",
macros += { macros += {