Module: check_mk Branch: master Commit: f563bbbc6a1e9396f283daccb0c0d858af943f3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f563bbbc6a1e93… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 17 14:05:54 2018 +0200 Fix service description (%s) or discovery item. Change-Id: I9b086c2245787c3f549372d13a3b657a74e9d7b4 --- checks/hpux_serviceguard | 2 +- checks/netapp_api_snapshots | 2 +- checks/oracle_crs_version | 4 ++-- checks/oracle_crs_voting | 4 ++-- checks/veeam_client | 2 +- checks/wmi_webservices | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/hpux_serviceguard b/checks/hpux_serviceguard index a4d2579..4b942d6 100644 --- a/checks/hpux_serviceguard +++ b/checks/hpux_serviceguard @@ -70,5 +70,5 @@ def check_hpux_serviceguard(item, _no_params, info): check_info["hpux_serviceguard"] = { 'check_function': check_hpux_serviceguard, 'inventory_function': inventory_hpux_serviceguard, - 'service_description': 'Serviceguard', + 'service_description': 'Serviceguard %s', } diff --git a/checks/netapp_api_snapshots b/checks/netapp_api_snapshots index 8265b4b..2990fb0 100644 --- a/checks/netapp_api_snapshots +++ b/checks/netapp_api_snapshots @@ -83,7 +83,7 @@ check_info["netapp_api_snapshots"] = { 'check_function' : check_netapp_api_snapshots, 'inventory_function' : inventory_netapp_api_snapshots, "default_levels_variable" : "netapp_api_snapshots_default_levels", - 'service_description' : 'Snapshots Volume', + 'service_description' : 'Snapshots Volume %s', 'group' : "netapp_snapshots", 'has_perfdata' : True, 'includes' : ["netapp_api.include"] diff --git a/checks/oracle_crs_version b/checks/oracle_crs_version index d0e6d25..dd0c806 100644 --- a/checks/oracle_crs_version +++ b/checks/oracle_crs_version @@ -26,9 +26,9 @@ def inventory_oracle_crs_version(info): - return [ ('', None) for line in info ] + return [(None, {}) for line in info] -def check_oracle_crs_version(item, params, info): +def check_oracle_crs_version(_no_item, params, info): for line in info: return (0, line[0]) diff --git a/checks/oracle_crs_voting b/checks/oracle_crs_voting index ca41c4a..fd07909 100644 --- a/checks/oracle_crs_voting +++ b/checks/oracle_crs_voting @@ -31,9 +31,9 @@ def inventory_oracle_crs_voting(info): inventory = [] - return [ ('', None) for line in info ] + return [(None, {}) for line in info] -def check_oracle_crs_voting(item, params, info): +def check_oracle_crs_voting(_no_item, params, info): # state = -1 => no data for Service state = -1 infotext = '' diff --git a/checks/veeam_client b/checks/veeam_client index cfbd51d..2189ab1 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -159,7 +159,7 @@ check_info["veeam_client"] = { 'parse_function': parse_veeam_client, 'check_function': check_veeam_client, 'inventory_function': inventory_veeam_client, - 'service_description': 'VEEAM Client', + 'service_description': 'VEEAM Client %s', 'group': 'veeam_backup', 'default_levels_variable' : 'veeam_client', 'has_perfdata': True, diff --git a/checks/wmi_webservices b/checks/wmi_webservices index 38d0610..d697aa0 100644 --- a/checks/wmi_webservices +++ b/checks/wmi_webservices @@ -36,6 +36,6 @@ check_info['wmi_webservices'] = { 'check_function' : check_wmi_webservices, 'parse_function' : parse_wmi_table, 'has_perfdata' : True, - 'service_description' : "Web Service", + 'service_description' : "Web Service %s", 'includes' : ["wmi.include"] }