Removed references to Nagios from the example config.

diff --git a/docs/icinga2-config.txt b/docs/icinga2-config.txt
index 6f495a8c7cd73af074a947b97b1bdd003d1eedde..34ca295622a5726d5229fe056faac76787e46916 100644 (file)
--- a/docs/icinga2-config.txt
+++ b/docs/icinga2-config.txt
@@ -523,8 +523,8 @@ supported ("native::PluginCheck").
 Attribute: check_command
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-Optional when not using check_type == "nagios". The check command. This command
-may use macros.
+Optional when not using the "external plugin" check type. The check command.
+This command may use macros.
 
 Attribute: check_interval
 ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -731,9 +731,9 @@ local object Component "delegation" {
 
 }
 
-abstract object Service "nagios-service" {
+abstract object Service "icinga-service" {
   methods = {
-    check = "native::NagiosCheck"
+    check = "native::PluginCheck"
   },
 
   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$%",
 
   macros += {

diff --git a/icinga-app/config/icinga2.conf.dist b/icinga-app/config/icinga2.conf.dist
index 07f1022a60827e5ca4f5c1e56088f6d180be610d..4fbfa74ac5bfab200cd9eaeddf0c87f45e0411ea 100644 (file)
--- a/icinga-app/config/icinga2.conf.dist
+++ b/icinga-app/config/icinga2.conf.dist
@@ -44,7 +44,7 @@ local object Component "compat" {
  * This template defines some basic parameters for services that use
  * external plugins for their checks.
  */
-abstract object Service "nagios-service" {
+abstract object Service "icinga-service" {
   methods = {
     check = "native::PluginCheck"
   }
@@ -54,7 +54,7 @@ abstract object Service "nagios-service" {
  * The service template for ping checks. In an Icinga 1.x environment
  * 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$%",
 
   macros += {