Module: check_mk
Branch: master
Commit: 49e4ca689ea70f15f6e75db9602e0ca985faa6cf
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49e4ca689ea70f…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Mar 10 12:41:00 2017 +0100
4491 FIX logwatch.groups: Fixed inconsistency of service description which now begins with
'Log' instead of 'LOG'
Change-Id: Ibb53f07024cc5fe5c0d00223aba6feff249ffc4a
---
.werks/4491 | 13 +++++++++++++
checks/logwatch | 2 +-
modules/check_mk.py | 1 +
web/htdocs/wato.py | 1 +
web/plugins/wato/check_mk_configuration.py | 1 +
5 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/.werks/4491 b/.werks/4491
new file mode 100644
index 0000000..6686424
--- /dev/null
+++ b/.werks/4491
@@ -0,0 +1,13 @@
+Title: logwatch.groups: Fixed inconsistency of service description which now begins with
'Log' instead of 'LOG'
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.4.0b4
+Date: 1489145596
+
+In order to use the new service desciption please enable configuration option
+below {{Global Settings > Execution of checks > Use new service descriptions}}
+for logfile groups.
diff --git a/checks/logwatch b/checks/logwatch
index 3dbfeb7..473a712 100644
--- a/checks/logwatch
+++ b/checks/logwatch
@@ -413,7 +413,7 @@ def check_logwatch_groups(item, params, info):
check_info['logwatch.groups'] = {
'check_function' : check_logwatch_groups,
'inventory_function' : inventory_logwatch_groups,
- 'service_description' : "LOG %s",
+ 'service_description' : "Log %s",
'node_info' : True,
'group' : 'logwatch',
}
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 5b41a29..53b40a0 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -204,6 +204,7 @@ old_service_descriptions = {
"wmic_process" : "proc_%s",
"services" : "service_%s",
"logwatch" : "LOG %s",
+ "logwatch.groups" : "LOG %s",
"hyperv_vm" : "hyperv_vms",
"ibm_svc_mdiskgrp" : "MDiskGrp %s",
"ibm_svc_system" : "IBM SVC Info",
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index b6825d1..83bd489 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -14548,6 +14548,7 @@ def create_sample_config():
"wmic_process",
"services",
"logwatch",
+ "logwatch.groups",
"cmk-inventory",
"hyperv_vms",
"ibm_svc_mdiskgrp",
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index 3091258..efe6774 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -1197,6 +1197,7 @@ register_configvar(group,
( "wmic_process", _("Resource consumption
of windows processes")),
( "services", _("Windows
Services")),
( "logwatch", _("Check logfiles for
relevant new messages")),
+ ( "logwatch.groups", _("Check logfile
groups")),
( "cmk-inventory", _("Monitor hosts for
unchecked services (Check_MK Discovery)")),
( "hyperv_vms", _("Hyper-V Server: State
of VMs")),
( "ibm_svc_mdiskgrp", _("IBM SVC / Storwize
V3700 / V7000: Status and Usage of MDisksGrps")),