Module: check_mk
Branch: master
Commit: f50070696ce4b2073b3a520765d56bfafc343a1e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f50070696ce4b2…
Author: Ronny Bruska <rb(a)mathias-kettner.de>
Date: Thu Mar 14 09:49:32 2019 +0100
7200 FIX check_mail_loop: Fixed 'option --subject not recognized'
When used in WATO, the 'subject' parameter was not called correctly in the check
command.
This has been fixed.
Change-Id: Ie76c7ee3942832b5f0c50ae0310d8aaa9f0e3ec4
---
.werks/7200 | 11 +++++++++++
active_checks/check_mail_loop | 1 +
checks/check_mail_loop | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/7200 b/.werks/7200
new file mode 100644
index 0000000..82d44b8
--- /dev/null
+++ b/.werks/7200
@@ -0,0 +1,11 @@
+Title: check_mail_loop: Fixed 'option --subject not recognized'
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.6.0i1
+Date: 1552553063
+Class: fix
+
+When used in WATO, the 'subject' parameter was not called correctly in the check
command.
+This has been fixed.
diff --git a/active_checks/check_mail_loop b/active_checks/check_mail_loop
index cbf7731..0477bcd 100755
--- a/active_checks/check_mail_loop
+++ b/active_checks/check_mail_loop
@@ -133,6 +133,7 @@ long_options = [
'help',
'status-dir=',
'status-suffix=',
+ 'subject=',
"debug",
]
diff --git a/checks/check_mail_loop b/checks/check_mail_loop
index 0d9a4cc..6ff678f 100644
--- a/checks/check_mail_loop
+++ b/checks/check_mail_loop
@@ -79,7 +79,7 @@ def check_mail_loop_arguments(params):
args += ['--critical=%d' % params['duration'][1]]
if 'subject' in params:
- args += ' --subject=%s' % quote_shell_string(params['subject'])
+ args += ['--subject=%s' % params['subject']]
return args