Module: check_mk
Branch: master
Commit: 4af2507cc770964e54cd97625d8cd918bfb1b721
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4af2507cc77096…
Author: Moritz Kiemer <mo(a)mathias-kettner.de>
Date: Wed Jan 9 15:01:49 2019 +0100
lparstat_aix: minor reorganization
Change-Id: I190ba557220584e91b2b8c509a61f464c740b82e
---
checks/lparstat_aix | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/checks/lparstat_aix b/checks/lparstat_aix
index 3ef6031..972f004 100644
--- a/checks/lparstat_aix
+++ b/checks/lparstat_aix
@@ -30,22 +30,6 @@
# | Joerg Linge 2009 <joerg.linge(a)pnp4nagios.org> Copyright 2010 |
# +------------------------------------------------------------------+
-# %user %sys %wait %idle physc %entc lbusy app vcsw phint
-# ----- ---- ----- ----- ----- ----- ------ --- ---- -----
-# 2.5 6.0 0.1 91.5 0.03 11.4 1.8 3.27 1976647217 490545630
-
-# %user %sys %wait %idle physc %entc lbusy vcsw phint %nsp %utcyc
-# ----- ----- ------ ------ ----- ----- ------ ----- ----- ----- ------
-# 0.2 0.4 0.0 99.3 0.02 1.7 0.0 215 3 101 0.64
-
-# %user %sys %wait %idle physc %entc lbusy app vcsw phint %nsp %utcyc
-# ----- ----- ------ ------ ----- ----- ------ --- ----- ----- ----- ------
-# 0.1 0.4 0.0 99.5 0.02 1.6 0.0 3.97 297 0 101 0.64
-
-# %user %sys %wait %idle physc %entc lbusy vcsw phint %nsp
-# ----- ----- ------ ------ ----- ----- ------ ----- ----- -----
-# 0.1 0.2 0.0 99.6 0.04 1.8 2.3 371 0 58
-
def parse_lparstat_aix(info):
if not info:
@@ -111,15 +95,15 @@ def check_lparstat_aix_cpu(_no_item, params, parsed):
if None in (user, system, wait):
return
- perfdata = [("user", user), ("system", system),
("wait", wait)]
-
util = user + system + wait
-
- infotext = "user: %2.1f%%, system: %2.1f%%, wait: %2.1f%%" % (user, system,
wait)
-
# ancient legacy rule
# and legacy None defaults before 1.6
params = transform_cpu_iowait(params)
+
+ perfdata = [("user", user), ("system", system),
("wait", wait)]
+
+ infotext = "user: %2.1f%%, system: %2.1f%%, wait: %2.1f%%" % (user, system,
wait)
+
result = 0
if isinstance(params.get('util'), tuple):