From 92448a20da0daa421666d4477850f5c10f59359f Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 14 Aug 2014 16:32:51 +0200 Subject: [PATCH] Documentation: s/service\.description/service\.name/ refs #6918 --- doc/3-monitoring-basics.md | 2 +- doc/8-migration.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/3-monitoring-basics.md b/doc/3-monitoring-basics.md index dec3087c3..656fd2728 100644 --- a/doc/3-monitoring-basics.md +++ b/doc/3-monitoring-basics.md @@ -1673,7 +1673,7 @@ the output template format for host and services backed with Icinga 2 runtime vars. host_format_template = "DATATYPE::HOSTPERFDATA\tTIMET::$icinga.timet$\tHOSTNAME::$host.name$\tHOSTPERFDATA::$host.perfdata$\tHOSTCHECKCOMMAND::$host.checkcommand$\tHOSTSTATE::$host.state$\tHOSTSTATETYPE::$host.statetype$" - service_format_template = "DATATYPE::SERVICEPERFDATA\tTIMET::$icinga.timet$\tHOSTNAME::$host.name$\tSERVICEDESC::$service.description$\tSERVICEPERFDATA::$service.perfdata$\tSERVICECHECKCOMMAND::$service.checkcommand$\tHOSTSTATE::$host.state$\tHOSTSTATETYPE::$host.statetype$\tSERVICESTATE::$service.state$\tSERVICESTATETYPE::$service.statetype$" + service_format_template = "DATATYPE::SERVICEPERFDATA\tTIMET::$icinga.timet$\tHOSTNAME::$host.name$\tSERVICEDESC::$service.name$\tSERVICEPERFDATA::$service.perfdata$\tSERVICECHECKCOMMAND::$service.checkcommand$\tHOSTSTATE::$host.state$\tHOSTSTATETYPE::$host.statetype$\tSERVICESTATE::$service.state$\tSERVICESTATETYPE::$service.statetype$" The default templates are already provided with the Icinga 2 feature configuration which can be enabled using diff --git a/doc/8-migration.md b/doc/8-migration.md index d215d1b66..fac1c6154 100644 --- a/doc/8-migration.md +++ b/doc/8-migration.md @@ -1028,7 +1028,7 @@ Changes to service runtime macros Icinga 1.x | Icinga 2 -----------------------|---------------------- - SERVICEDESC | service.description + SERVICEDESC | service.name SERVICEDISPLAYNAME | service.display_name SERVICECHECKCOMMAND | service.check_command SERVICESTATE | service.state