Module: check_mk
Branch: master
Commit: 8b21231b8386bcaf9e0e1a39347e7f8f05fc2dd7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b21231b8386bc…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jun 8 18:35:18 2012 +0200
Renamed stgpool to stagingpool
---
ChangeLog | 3 ++-
agents/plugins/mk_tsm | 4 ++--
checks/{tsm_stgpools => tsm_stagingpools} | 22 +++++++++++-----------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6eeb7f7..5de00c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,8 @@
* FIX: diskstat: handle output 'No Devices Found' - avoiding exception
* 3ware_units: Following states now lead to WARNING state instead of
CRITICAL: "VERIFY-PAUSED", "VERIFYING", "REBUILDING"
- * New checks tsm_stgpools and tsm_drives for Linux/UNIX
+ * New checks tsm_stagingpools, tsm_drive and tsm_storagepools
+ Linux/UNIX
Multisite:
* FIX: fix severe exception in all views on older Python versions
diff --git a/agents/plugins/mk_tsm b/agents/plugins/mk_tsm
index 5e3dc4f..141e9a5 100755
--- a/agents/plugins/mk_tsm
+++ b/agents/plugins/mk_tsm
@@ -26,7 +26,7 @@ do_tsm_checks ()
dsmcmd="dsmadmc -id=$TSM_USER -pass=$TSM_PASSWORD -tab"
# Staging Pools
- echo '<<<tsm_stgpools>>>'
+ echo '<<<tsm_stagingpools>>>'
$dsmcmd <<EOF | sed -n "/^FOO/s//$INST/p"
select 'FOO',stgpool_name,pct_utilized from volumes where
access='READWRITE' and devclass_name<>'DISK'
EOF
@@ -38,7 +38,7 @@ SELECT 'FOO', library_name, drive_name, drive_state, online,
drive_serial FROM d
EOF
# Occupancy
- echo '<<<tsm_occupancy>>>'
+ echo '<<<tsm_storagepools>>>'
$dsmcmd <<EOF | sed -n "/^FOO/s//$INST/p"
SELECT 'FOO', type, stgpool_name, sum(logical_mb) from occupancy group by type,
stgpool_name
EOF
diff --git a/checks/tsm_stgpools b/checks/tsm_stagingpools
similarity index 85%
rename from checks/tsm_stgpools
rename to checks/tsm_stagingpools
index e313ab1..5fbd464 100644
--- a/checks/tsm_stgpools
+++ b/checks/tsm_stagingpools
@@ -24,7 +24,7 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-# <<<tsm_stgpools>>>
+# <<<tsm_stagingpools>>>
# tsmfarm2 SL8500_STGPOOL_05 99.9
# tsmfarm2 SL8500_STGPOOL_05 97.9
# tsmfarm2 SL8500_LTO4_STGPOOL_01 48.6
@@ -38,20 +38,20 @@
# "levels" : (5, 2), # warn/crit if less then that many free tapes
# }
-factory_settings["tsm_stgpools_default_levels"] = {
+factory_settings["tsm_stagingpools_default_levels"] = {
"free_below" : 70,
}
-def inventory_tsm_stgpools(info):
+def inventory_tsm_stagingpools(info):
items = set([])
for inst, pool, util in info:
if inst == "default":
items.add(pool)
else:
items.add(inst + " / " + pool)
- return [ (item, "tsm_stgpools_default_levels") for item in items ]
+ return [ (item, "tsm_stagingpools_default_levels") for item in items ]
-def check_tsm_stgpools(item, params, info):
+def check_tsm_stagingpools(item, params, info):
num_tapes = 0
num_free_tapes = 0
utilization = 0.0 # in relation to one tape size
@@ -90,12 +90,12 @@ def check_tsm_stgpools(item, params, info):
return (state, nagios_state_names[state] + " - " + infotext, perfdata)
-check_info['tsm_stgpools'] = {
- "check_function" : check_tsm_stgpools,
- "inventory_function" : inventory_tsm_stgpools,
- "service_description" : "TSM Storagepool %s",
+check_info['tsm_stagingpools'] = {
+ "check_function" : check_tsm_stagingpools,
+ "inventory_function" : inventory_tsm_stagingpools,
+ "service_description" : "TSM Stagingpool %s",
"has_perfdata" : True,
- "group" : "tsm_stgpools",
- "default_levels_variable" : "tsm_stgpools_default_levels",
+ "group" : "tsm_stagingpools",
+ "default_levels_variable" : "tsm_stagingpools_default_levels",
}