[checkmk-commits] Remove unused argument 'hostname' from df_check_filesystem_single

Module: check_mk Branch: master Commit: 98825203905d7c3998433ee39ef219d217d71645 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98825203905d7c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 30 15:23:02 2017 +0200 Remove unused argument 'hostname' from df_check_filesystem_single Change-Id: I3d9426ffe59aff802a3ee06e2b3e546ff6e0d978 --- checks/db2_logsizes | 2 +- checks/df.include | 6 +++--- checks/esx_vsphere_datastores | 2 +- checks/netapp_api_luns | 2 +- checks/netapp_api_qtree_quota | 2 +- checks/netapp_api_volumes | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/db2_logsizes b/checks/db2_logsizes index 2bcce10..08f73b6 100644 --- a/checks/db2_logsizes +++ b/checks/db2_logsizes @@ -102,7 +102,7 @@ def check_db2_logsizes(item, params, parsed): int(db["logsecond"][data_offset])) * 4096 free = total - int(db["usedspace"][data_offset]) - return df_check_filesystem_single(host_name(), item, total / 1024**2, free / 1024**2, 0, + return df_check_filesystem_single(item, total / 1024**2, free / 1024**2, 0, None, None, params, this_time = timestamp) check_info['db2_logsizes'] = { diff --git a/checks/df.include b/checks/df.include index f62d8ae..228c0da 100644 --- a/checks/df.include +++ b/checks/df.include @@ -273,7 +273,7 @@ def df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes = None): if count == 0: return (3, "No filesystem matching the patterns") else: - status, infotext, perfdata = df_check_filesystem_single(host_name(), item, total_size_mb, total_avail_mb, total_reserved_mb, total_inodes, total_inodes_avail, params) + status, infotext, perfdata = df_check_filesystem_single(item, total_size_mb, total_avail_mb, total_reserved_mb, total_inodes, total_inodes_avail, params) infotext += " (%d filesystems)" % count return status, infotext, perfdata else: @@ -283,11 +283,11 @@ def df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes = None): inodes_total, inodes_avail = fslist_inodes[idx][1], fslist_inodes[idx][2] else: inodes_total, inodes_avail = None, None - return df_check_filesystem_single(host_name(), mp, size_mb, avail_mb, reserved_mb, inodes_total, inodes_avail, params) + return df_check_filesystem_single(mp, size_mb, avail_mb, reserved_mb, inodes_total, inodes_avail, params) return (3, "filesystem not found") -def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, reserved_mb, inodes_total, inodes_avail, params, this_time = None): +def df_check_filesystem_single(mountpoint, size_mb, avail_mb, reserved_mb, inodes_total, inodes_avail, params, this_time = None): if size_mb == 0: return (1, "Size of filesystem is 0 MB", []) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index aa5ed25..b9bb753 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -71,7 +71,7 @@ def check_esx_vsphere_datastores(item, params, info): avail_mb = store["freeSpace"] / 1024.0 / 1024.0 state, infotext, perfdata = df_check_filesystem_single( - host_name(), item, size_mb, avail_mb, 0, None, None, params) + item, size_mb, avail_mb, 0, None, None, params) if 'uncommitted' in store: uncommitted_mb = store["uncommitted"] / 1024.0 / 1024.0 diff --git a/checks/netapp_api_luns b/checks/netapp_api_luns index e79d0b2..29ff29b 100644 --- a/checks/netapp_api_luns +++ b/checks/netapp_api_luns @@ -57,7 +57,7 @@ def check_netapp_api_luns(item, params, parsed): if params.get("ignore_levels"): yield 0, "Total size: %s, Used space is ignored" % get_bytes_human_readable(size_total) else: - yield df_check_filesystem_single(host_name(), item, size_total, size_avail, 0, None, None, params) + yield df_check_filesystem_single(item, size_total, size_avail, 0, None, None, params) def netapp_api_luns_item(name): return name.rsplit("/", 1)[-1] diff --git a/checks/netapp_api_qtree_quota b/checks/netapp_api_qtree_quota index 1bc000c..5287a70 100644 --- a/checks/netapp_api_qtree_quota +++ b/checks/netapp_api_qtree_quota @@ -55,7 +55,7 @@ def check_netapp_api_qtree_quota(item, params, parsed): inodes_total = None inodes_avail = None - return df_check_filesystem_single(host_name(), item, size_total, size_avail, 0, + return df_check_filesystem_single(item, size_total, size_avail, 0, inodes_total, inodes_avail, params) check_info["netapp_api_qtree_quota"] = { diff --git a/checks/netapp_api_volumes b/checks/netapp_api_volumes index 4107f26..b414938 100644 --- a/checks/netapp_api_volumes +++ b/checks/netapp_api_volumes @@ -66,7 +66,7 @@ def check_netapp_api_volumes(item, params, parsed): size_avail = int(volume.get("size-available")) / mega inodes_total = int(volume.get("files-total")) inodes_avail = inodes_total - int(volume.get("files-used")) - state, info, perf = df_check_filesystem_single(host_name(), item, size_total, size_avail, 0, + state, info, perf = df_check_filesystem_single(item, size_total, size_avail, 0, inodes_total, inodes_avail, params) counter_wrapped = False