From 56de94b91cfacfdc5bb53c601729d90d6d9d0870 Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Fri, 9 Jun 2017 17:14:44 +0200 Subject: [PATCH 1/2] Add ip4-or-ipv6 import to logstash ITL command --- itl/plugins-contrib.d/logmanagement.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/itl/plugins-contrib.d/logmanagement.conf b/itl/plugins-contrib.d/logmanagement.conf index af18835a1..1cd7f2a22 100644 --- a/itl/plugins-contrib.d/logmanagement.conf +++ b/itl/plugins-contrib.d/logmanagement.conf @@ -18,6 +18,7 @@ ******************************************************************************/ object CheckCommand "logstash" { + import "ipv4-or-ipv6" command = [ PluginContribDir + "/check_logstash" ] arguments = { From 15b9ffce8ef45ae1f4868cab4a51ac3acab49954 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 12 Jun 2017 08:21:36 +0200 Subject: [PATCH 2/2] Fix some formatting issues --- itl/plugins-contrib.d/logmanagement.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/itl/plugins-contrib.d/logmanagement.conf b/itl/plugins-contrib.d/logmanagement.conf index 1cd7f2a22..2fc2ed9ec 100644 --- a/itl/plugins-contrib.d/logmanagement.conf +++ b/itl/plugins-contrib.d/logmanagement.conf @@ -19,6 +19,7 @@ object CheckCommand "logstash" { import "ipv4-or-ipv6" + command = [ PluginContribDir + "/check_logstash" ] arguments = { @@ -62,8 +63,8 @@ object CheckCommand "logstash" { value = "$logstash_cpu_crit$" description = "Critical threshold for cpu usage in percent" } - } + vars.logstash_hostname = "$check_address$" vars.logstash_port = 9600 vars.logstash_filedesc_warn = 85