From cc57698c3b191272fb899d3026cec5d129c1f6a3 Mon Sep 17 00:00:00 2001 From: Napsty Date: Fri, 25 Mar 2022 14:39:19 +0100 Subject: [PATCH 1/4] Add nrpe v3 parameter in ITL --- itl/command-plugins.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf index a17498f46..f72715278 100644 --- a/itl/command-plugins.conf +++ b/itl/command-plugins.conf @@ -2321,6 +2321,10 @@ object CheckCommand "nrpe" { set_if = "$nrpe_version_2$" description = "Use this if you want to connect to NRPE v2" } + "-3" = { + set_if = "$nrpe_version_3$" + description = "Use this if you want to use NRPE v3 (with increased payload size)" + } "-P" = { value = "$nrpe_payload_size$" description = "Specify non-default payload size for NSClient++" From 8c98de898c1edf386d406339ea58f65790c0486b Mon Sep 17 00:00:00 2001 From: Claudio Kuenzler Date: Mon, 28 Mar 2022 16:09:42 +0200 Subject: [PATCH 2/4] Add nrpe_version_3 in documentation --- doc/10-icinga-template-library.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md index 085d45c65..b30d63b06 100644 --- a/doc/10-icinga-template-library.md +++ b/doc/10-icinga-template-library.md @@ -882,6 +882,7 @@ nrpe_arguments | **Optional.** Arguments that should be passed to the command. M nrpe_ipv4 | **Optional.** Use IPv4 connection. Defaults to false. nrpe_ipv6 | **Optional.** Use IPv6 connection. Defaults to false. nrpe_version_2 | **Optional.** Use this if you want to connect using NRPE v2 protocol (needed for NSClient++). Defaults to false. +nrpe_version_3 | **Optional.** Use this if you want to connect using NRPE v3 packets (supports larger payload). Defaults to false. nrpe_payload_size | **Optional.** Specify non-default payload size for NSClient++. Default is 1024. nrpe_ca | **Optional.** The CA file to use for PKI. Defaults to none. nrpe_cert | **Optional.** The client cert file to use for PKI. Defaults to none. From 896590e74056dbf5c5c68002aa7883e26ce19078 Mon Sep 17 00:00:00 2001 From: Napsty Date: Wed, 30 Mar 2022 16:04:48 +0200 Subject: [PATCH 3/4] Adjust descriptions --- doc/10-icinga-template-library.md | 2 +- itl/command-plugins.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md index b30d63b06..42a4774bc 100644 --- a/doc/10-icinga-template-library.md +++ b/doc/10-icinga-template-library.md @@ -882,7 +882,7 @@ nrpe_arguments | **Optional.** Arguments that should be passed to the command. M nrpe_ipv4 | **Optional.** Use IPv4 connection. Defaults to false. nrpe_ipv6 | **Optional.** Use IPv6 connection. Defaults to false. nrpe_version_2 | **Optional.** Use this if you want to connect using NRPE v2 protocol (needed for NSClient++). Defaults to false. -nrpe_version_3 | **Optional.** Use this if you want to connect using NRPE v3 packets (supports larger payload). Defaults to false. +nrpe_version_3 | **Optional.** Use this if you want to connect using NRPE v3 protocol/packets. Defaults to false. nrpe_payload_size | **Optional.** Specify non-default payload size for NSClient++. Default is 1024. nrpe_ca | **Optional.** The CA file to use for PKI. Defaults to none. nrpe_cert | **Optional.** The client cert file to use for PKI. Defaults to none. diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf index f72715278..f77a03748 100644 --- a/itl/command-plugins.conf +++ b/itl/command-plugins.conf @@ -2323,7 +2323,7 @@ object CheckCommand "nrpe" { } "-3" = { set_if = "$nrpe_version_3$" - description = "Use this if you want to use NRPE v3 (with increased payload size)" + description = "Use this if you want to connect to NRPE v3 or send v3 packets" } "-P" = { value = "$nrpe_payload_size$" From 193aff93cf15ec294ee9e303734ebdc46e8910f2 Mon Sep 17 00:00:00 2001 From: Claudio Kuenzler Date: Mon, 4 Apr 2022 13:02:30 +0200 Subject: [PATCH 4/4] Adjust description --- doc/10-icinga-template-library.md | 2 +- itl/command-plugins.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md index 42a4774bc..faf461165 100644 --- a/doc/10-icinga-template-library.md +++ b/doc/10-icinga-template-library.md @@ -882,7 +882,7 @@ nrpe_arguments | **Optional.** Arguments that should be passed to the command. M nrpe_ipv4 | **Optional.** Use IPv4 connection. Defaults to false. nrpe_ipv6 | **Optional.** Use IPv6 connection. Defaults to false. nrpe_version_2 | **Optional.** Use this if you want to connect using NRPE v2 protocol (needed for NSClient++). Defaults to false. -nrpe_version_3 | **Optional.** Use this if you want to connect using NRPE v3 protocol/packets. Defaults to false. +nrpe_version_3 | **Optional.** Use this if you want to connect using NRPE v3 protocol. Defaults to false. nrpe_payload_size | **Optional.** Specify non-default payload size for NSClient++. Default is 1024. nrpe_ca | **Optional.** The CA file to use for PKI. Defaults to none. nrpe_cert | **Optional.** The client cert file to use for PKI. Defaults to none. diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf index f77a03748..aa79de3d8 100644 --- a/itl/command-plugins.conf +++ b/itl/command-plugins.conf @@ -2323,7 +2323,7 @@ object CheckCommand "nrpe" { } "-3" = { set_if = "$nrpe_version_3$" - description = "Use this if you want to connect to NRPE v3 or send v3 packets" + description = "Use this if you want to connect to NRPE v3" } "-P" = { value = "$nrpe_payload_size$"