Module: check_mk Branch: master Commit: 701e6bfef568445c4157acfbae4f1d87c1e122a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=701e6bfef56844… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 19 08:12:57 2016 +0200 3862 FIX mknotifyd mknotifyd.connection: New service description (when enabled) The checks were using an uncommon service description for their checks: Notification Spooler [site] ... Because those processes are logically tied to the OMD sites, it makes more sense to make them match the other OMD site check naming scheme: OMD [site] Notification Spooler This has now been changed. It will automatically be applied to new sites. Existing sites will only use this new description after enabling it via Global Settings and performing a rediscovery of the services on the affected hosts. --- .werks/3862 | 21 +++++++++++++++++++++ ChangeLog | 1 + checks/mknotifyd | 4 ++-- modules/check_mk.py | 2 ++ web/htdocs/wato.py | 2 ++ web/plugins/wato/check_mk_configuration.py | 2 ++ 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/.werks/3862 b/.werks/3862 new file mode 100644 index 0000000..0b5a5b4 --- /dev/null +++ b/.werks/3862 @@ -0,0 +1,21 @@ +Title: mknotifyd mknotifyd.connection: New service description (when enabled) +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1474206536 +Class: fix + +The checks were using an uncommon service description for their checks: + +Notification Spooler [site] ... + +Because those processes are logically tied to the OMD sites, it makes more +sense to make them match the other OMD site check naming scheme: + +OMD [site] Notification Spooler + +This has now been changed. It will automatically be applied to new sites. +Existing sites will only use this new description after enabling it via +Global Settings and performing a rediscovery of the services on the affected +hosts. diff --git a/ChangeLog b/ChangeLog index 62ecc55..6f58861 100644 --- a/ChangeLog +++ b/ChangeLog @@ -394,6 +394,7 @@ * 3802 FIX: Fixed excess Check Helper PIPEs when a datasource program runs into a timeout... * 3701 FIX: FIX ps.perf graph title for Memory and CPU Usage... * 3746 FIX: tinkerforge: Keep check from crashing in case of unconfigured params + * 3862 FIX: mknotifyd mknotifyd.connection: New service description (when enabled)... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/mknotifyd b/checks/mknotifyd index 3e06950..ec19381 100644 --- a/checks/mknotifyd +++ b/checks/mknotifyd @@ -174,7 +174,7 @@ check_info["mknotifyd"] = { "parse_function" : parse_mknotifyd, "inventory_function" : inventory_mknotifyd, "check_function" : check_mknotifyd, - "service_description" : "Notification Spooler %s", + "service_description" : "OMD %s Notification Spooler", } @@ -237,6 +237,6 @@ def check_mknotifyd_connection(item, _no_params, parsed): check_info["mknotifyd.connection"] = { "inventory_function" : inventory_mknotifyd_connection, "check_function" : check_mknotifyd_connection, - "service_description" : "Notification Connection %s", + "service_description" : "OMD %s Notify Connection", } diff --git a/modules/check_mk.py b/modules/check_mk.py index ba4657c..c4423ce 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -287,6 +287,8 @@ old_service_descriptions = { "ibm_svc_systemstats.iops" : "IBM SVC IOPS %s Total", "ibm_svc_systemstats.disk_latency" : "IBM SVC Latency %s Total", "ibm_svc_systemstats.cache" : "IBM SVC Cache Total", + "mknotifyd" : "Notification Spooler %s", + "mknotifyd.connection" : "Notification Connection %s", "casa_cpu_temp" : "Temperature %s", "cmciii.temp" : get_old_cmciii_temp_description, diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e4cfb42..d91fb91 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14290,6 +14290,8 @@ def create_sample_config(): "ups_bat_temp", "innovaphone_temp", "enterasys_temp", + "mknotifyd", + "mknotifyd.connection", ], "inventory_check_interval": 120, "enable_rulebased_notifications": True, diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 9472072..ba1327b 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1066,6 +1066,8 @@ register_configvar(group, ( "enterasys_temp", _("Enterasys Switch: Temperature")), ( "raritan_emx", _("Raritan EMX Rack: Temperature")), ( "raritan_pdu_inlet", _("Raritan PDU: Input Phases")), + ( "mknotifyd", _("Notification Spooler")), + ( "mknotifyd.connection", _("Notification Spooler Connection")), ], render_orientation = "vertical", ),