From c41f71a4cecb82c561dc747667348e73d3b14da4 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 26 Mar 2015 07:50:46 +0100 Subject: [PATCH] Fix incorrect perfdata templates in the documentation fixes #8866 --- doc/13-addons-plugins.md | 4 ++-- doc/4-advanced-topics.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/13-addons-plugins.md b/doc/13-addons-plugins.md index 2770babf8..a98d85026 100644 --- a/doc/13-addons-plugins.md +++ b/doc/13-addons-plugins.md @@ -233,7 +233,7 @@ Example for services: # vim /etc/icinga2/features-enabled/perfdata.conf - service_format_template = "DATATYPE::SERVICEPERFDATA\tTIMET::$icinga.timet$\tHOSTNAME::$host.name$\tSERVICEDESC::$service.name$\tSERVICEPERFDATA::$service.perfdata$\tSERVICECHECKCOMMAND::$service.checkcommand$$pnp_check_arg1$\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.check_command$$pnp_check_arg1$\tHOSTSTATE::$host.state$\tHOSTSTATETYPE::$host.state_type$\tSERVICESTATE::$service.state$\tSERVICESTATETYPE::$service.state_type$" # vim /etc/icinga2/conf.d/services.conf @@ -253,4 +253,4 @@ Example for services: If there are warnings about unresolved macros make sure to specify a default value for `vars.pnp_check_arg1` inside the In PNP, the custom template for nrpe is then defined in `/etc/pnp4nagios/custom/nrpe.cfg` -and the additional command arg string will be seen in the xml too for other templates. \ No newline at end of file +and the additional command arg string will be seen in the xml too for other templates. diff --git a/doc/4-advanced-topics.md b/doc/4-advanced-topics.md index b079a16b2..b12d495ec 100644 --- a/doc/4-advanced-topics.md +++ b/doc/4-advanced-topics.md @@ -424,8 +424,8 @@ Therefore the Icinga 2 `PerfdataWriter` object allows you to define 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.name$\tSERVICEPERFDATA::$service.perfdata$\tSERVICECHECKCOMMAND::$service.checkcommand$\tHOSTSTATE::$host.state$\tHOSTSTATETYPE::$host.statetype$\tSERVICESTATE::$service.state$\tSERVICESTATETYPE::$service.statetype$" + host_format_template = "DATATYPE::HOSTPERFDATA\tTIMET::$icinga.timet$\tHOSTNAME::$host.name$\tHOSTPERFDATA::$host.perfdata$\tHOSTCHECKCOMMAND::$host.check_command$\tHOSTSTATE::$host.state$\tHOSTSTATETYPE::$host.state_type$" + service_format_template = "DATATYPE::SERVICEPERFDATA\tTIMET::$icinga.timet$\tHOSTNAME::$host.name$\tSERVICEDESC::$service.name$\tSERVICEPERFDATA::$service.perfdata$\tSERVICECHECKCOMMAND::$service.check_command$\tHOSTSTATE::$host.state$\tHOSTSTATETYPE::$host.state_type$\tSERVICESTATE::$service.state$\tSERVICESTATETYPE::$service.state_type$" The default templates are already provided with the Icinga 2 feature configuration which can be enabled using -- 2.40.0