]> granicus.if.org Git - icinga2/commitdiff
Fix incorrect perfdata templates in the documentation
authorGunnar Beutner <gunnar@beutner.name>
Thu, 26 Mar 2015 06:50:46 +0000 (07:50 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Thu, 26 Mar 2015 08:44:19 +0000 (09:44 +0100)
fixes #8866

doc/13-addons-plugins.md
doc/4-advanced-topics.md

index 2770babf8c1b1d4c2b673593c090dffdcf2af319..a98d85026181b85e54706541494b24fbd7787df1 100644 (file)
@@ -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.
index b079a16b20214ad1e544ee0264932162619e3b1e..b12d495ec2a7e72cc33329b6470bfffee8d55ea5 100644 (file)
@@ -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