Module: check_mk
Branch: master
Commit: 056125926e7ee7793c6fcc54461f48345a439d4c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=056125926e7ee7…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Aug 30 15:33:05 2017 +0200
Remove superfluous wrapper function
Change-Id: I1b0bae1d983e25af91b8bf9a7e928cc4934db7b5
---
checks/df.include | 3 ---
checks/hp_msa_volume | 2 +-
checks/oracle_asm_diskgroup | 4 ++--
checks/ucd_disk | 2 +-
checks/vms_diskstat | 2 +-
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/checks/df.include b/checks/df.include
index 228c0da..7e2e2d1 100644
--- a/checks/df.include
+++ b/checks/df.include
@@ -243,9 +243,6 @@ def get_filesystem_levels(mountpoint, size_gb, params):
return levels
-# Legacy function for checks that do not support groups yet
-def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, reserved_mb, params):
- return df_check_filesystem_list(mountpoint, params, [(mountpoint, size_mb, avail_mb,
reserved_mb)])
# New function for checks that support groups.
def df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes = None):
diff --git a/checks/hp_msa_volume b/checks/hp_msa_volume
index 54a8e8b..cfed4d3 100644
--- a/checks/hp_msa_volume
+++ b/checks/hp_msa_volume
@@ -195,7 +195,7 @@ def check_hp_msa_volume_df(item, params, parsed):
alloc_mb = (int(parsed[item]["allocated-size-numeric"]) * 512) / 1024
** 2
avail_mb = size_mb - alloc_mb
- yield df_check_filesystem(host_name(), item, size_mb, avail_mb, 0, params)
+ yield df_check_filesystem_single(item, size_mb, avail_mb, 0, None, None, params)
check_info['hp_msa_volume.df'] = {
diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup
index 168bc90..796cea2 100644
--- a/checks/oracle_asm_diskgroup
+++ b/checks/oracle_asm_diskgroup
@@ -149,8 +149,8 @@ def check_oracle_asm_diskgroup(item, params, parsed):
# EXTERNAL Redundancy
free_space_mb = int(free_mb)
- status, infotext, perfdata = df_check_filesystem(host_name(), item,
int(total_mb),
- free_space_mb, 0, params)
+ status, infotext, perfdata = df_check_filesystem_single(item, int(total_mb),
+ free_space_mb, 0, None, None,
params)
if disktype is not None:
infotext += ', %s redundancy' % disktype.lower()
infotext += add_text
diff --git a/checks/ucd_disk b/checks/ucd_disk
index 707d1f2..0173e50 100644
--- a/checks/ucd_disk
+++ b/checks/ucd_disk
@@ -38,7 +38,7 @@ def check_ucd_disk(item, params, info):
if disk_path == item:
disk_total_mb = float(disk_total_str) / 1024
disk_avail_mb = float(disk_avail_str) / 1024
- return df_check_filesystem(host_name(), item, disk_total_mb, disk_avail_mb,
0, params)
+ return df_check_filesystem_single(item, disk_total_mb, disk_avail_mb, 0,
None, None, params)
check_info['ucd_disk'] = {
diff --git a/checks/vms_diskstat b/checks/vms_diskstat
index cc4e59b..6701241 100644
--- a/checks/vms_diskstat
+++ b/checks/vms_diskstat
@@ -45,7 +45,7 @@ def check_vms_diskstat_fs(item, params, info):
device, label, size, used, ios = line
size_mb = int(size) * 512 / (1024.0 * 1024.0)
avail_mb = int(used) * 512 / (1024.0 * 1024.0)
- return df_check_filesystem(host_name(), item, size_mb, avail_mb, 0, params)
+ return df_check_filesystem_single(item, size_mb, avail_mb, 0, None, None,
params)
return (3, "no such disk")