Module: check_mk
Branch: master
Commit: c786d94a287633ab18be78e827666165b365100b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c786d94a287633…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Sep 8 11:36:04 2017 +0200
5201 FIX check_mkevents: Removed deprecated "less verbose output" option
This parameter was not working anymore for a long time. It is not implemented in the
current check and has been removed from the GUI now.
Change-Id: I94c4673e6dcd2a6a5c367ebe3de5cfd2998be206
---
.werks/5201 | 11 +++++++++++
checks/.f12 | 2 +-
checks/check_mkevents | 3 ---
web/plugins/wato/mkeventd.py | 17 ++---------------
4 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/.werks/5201 b/.werks/5201
new file mode 100644
index 0000000..03cfbcb
--- /dev/null
+++ b/.werks/5201
@@ -0,0 +1,11 @@
+Title: check_mkevents: Removed deprecated "less verbose output" option
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.5.0i1
+Date: 1504863316
+Class: fix
+
+This parameter was not working anymore for a long time. It is not implemented in the
+current check and has been removed from the GUI now.
diff --git a/checks/.f12 b/checks/.f12
index 7d65f22..6e3cc8c 100644
--- a/checks/.f12
+++ b/checks/.f12
@@ -2,5 +2,5 @@
SITE=${SITE:-$(cat ../.site 2>/dev/null || true)}
SITE=${SITE:-$(omd sites --bare | head -n 1)}
echo "TARGET: /omd/sites/$SITE/share/check_mk/checks"
-sudo rsync --exclude=check_mkevents -ar --delete-after ./
/omd/sites/$SITE/share/check_mk/checks/
+sudo rsync -ar --delete-after ./ /omd/sites/$SITE/share/check_mk/checks/
diff --git a/checks/check_mkevents b/checks/check_mkevents
index 9b298f2..c4ef0a3 100644
--- a/checks/check_mkevents
+++ b/checks/check_mkevents
@@ -13,9 +13,6 @@ def check_mkevents_arguments(params):
if params.get("ignore_acknowledged"):
args += "-a "
- if params.get("less_verbose"):
- args += "-l "
-
hostspec = params.get("hostspec", "$HOSTADDRESS$")
if type(hostspec) == list:
hostspec = "/".join(hostspec)
diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py
index 36c92ba..d8b2529 100644
--- a/web/plugins/wato/mkeventd.py
+++ b/web/plugins/wato/mkeventd.py
@@ -2970,20 +2970,6 @@ register_rule(
totext = _("acknowledged events will not be honored"),
)
),
- ( "less_verbose",
- FixedValue(
- True,
- title = _("Less verbose output"),
- help = _("If enabled the check reports less information in its
output. "
- "You will see no information regarding the worst state or
unacknowledged events. "
- " For example a default output without this option is
"
- "<tt>WARN - 1 events (1 unacknowledged), worst
state is WARN (Last line: Incomplete Content)</tt>."
- "Output with less verbosity: "
- "<tt>WARN - 1 events (Worst line: Incomplete
Content)</tt><br>"
- ),
- totext = _("produce a more terse output"),
- )
- ),
( "remote",
Alternative(
title = _("Access to the Event Console"),
@@ -3026,7 +3012,8 @@ register_rule(
)
),
],
- optional_keys = [ "application", "remote",
"ignore_acknowledged", "less_verbose", "item" ],
+ optional_keys = [ "application", "remote",
"ignore_acknowledged", "item" ],
+ ignored_keys = [ "less_verbose" ], # is deprecated
),
match = 'all',
)