20 Feb
2015
20 Feb
'15
8:04 a.m.
Module: check_mk
Branch: master
Commit: 7d3f78ed27e60ab5110a89a0fec679c75ad42c7d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d3f78ed27e60a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Feb 20 14:02:39 2015 +0100
#2005 services: change service description from service_ to Service or new installations
---
.werks/2005 | 10 ++++++++++
ChangeLog | 1 +
checks/services | 2 +-
modules/check_mk.py | 1 +
web/htdocs/wato.py | 1 +
web/plugins/wato/check_mk_configuration.py | 1 +
web/plugins/wato/check_parameters.py | 3 +--
7 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/.werks/2005 b/.werks/2005
new file mode 100644
index 0000000..9931ee7
--- /dev/null
+++ b/.werks/2005
@@ -0,0 +1,10 @@
+Title: services: change service description from service_ to Service or new
installations
+Level: 1
+Component: checks
+Class: feature
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1424437340
+
+
diff --git a/ChangeLog b/ChangeLog
index 84ed61d..0daf842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -87,6 +87,7 @@
* 1998 statgrab_net: New implementation of network interface monitoring via
statgrab...
NOTE: Please refer to the migration notes!
* 1889 cmciii.phase: New check to monitor input phases for Raritan PDUs
+ * 2005 services: change service description from service_ to Service or new
installations
* 1457 FIX: logins: new check renamed from "users" check...
NOTE: Please refer to the migration notes!
* 1762 FIX: lnx_thermal: Now ignoring trip points with level 0...
diff --git a/checks/services b/checks/services
index 49d72a9..7b028d2 100644
--- a/checks/services
+++ b/checks/services
@@ -232,7 +232,7 @@ factory_settings["services_default_levels"] = {
check_info['services'] = {
"check_function" : check_windows_services,
"inventory_function" : inventory_windows_services,
- "service_description" : "service_%s",
+ "service_description" : "Service %s",
"has_perfdata" : False,
"node_info" : True,
"group" : "services",
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 60d5444..3b89116 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -230,6 +230,7 @@ old_service_descriptions = {
"ps" : "proc_%s",
"ps.perf" : "proc_%s",
"wmic_process" : "proc_%s",
+ "services" : "service_%s",
"logwatch" : "LOG %s",
"hyperv_vm" : "hyperv_vms",
}
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 34a61b6..eab4602 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -16005,6 +16005,7 @@ def create_sample_config():
"ps",
"ps.perf",
"wmic_process",
+ "services",
"logwatch",
"cmk-inventory",
"hyperv_vms",
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index 1e3f1c9..af5220a 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -1107,6 +1107,7 @@ register_configvar(group,
( "ps", _("State and Count of
Processes") ),
( "ps.perf", _("State and Count of Processes
(with additional performance data)")),
( "wmic_process", _("Resource consumption of windows
processes")),
+ ( "services", _("Windows Services")),
( "logwatch", _("Check logfiles for relevant new
messages")),
( "cmk-inventory", _("Monitor hosts for unchecked
services (Check_MK Discovery)")),
( "hyperv_vms", _("Hyper-V Server: State of
VMs")),
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 1743551..01c8b88 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -103,7 +103,7 @@ register_rule(group + '/' + subgroup_applications,
register_rule(group + '/' + subgroup_inventory,
varname = "inventory_services_rules",
- title = _("Windows Service Inventory"),
+ title = _("Windows Service Discovery"),
valuespec = Dictionary(
elements = [
('services', ListOfStrings(
@@ -5402,7 +5402,6 @@ register_check_parameters(
"The latter one is just being displayed as a further information."),
allow_empty = False),
"first",
- False,
)
register_check_parameters(