[checkmk-commits] Check_MK Git: check_mk: kernel: internal code cleanup

Module: check_mk Branch: master Commit: 18201772d77a0d16c87720f42484b1c9b1266cd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18201772d77a0d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 18 12:00:15 2014 +0200 kernel: internal code cleanup --- checks/kernel | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/checks/kernel b/checks/kernel index caa301c..cd7cb7e 100644 --- a/checks/kernel +++ b/checks/kernel @@ -24,6 +24,17 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# .--kernel--Counters----------------------------------------------------. +# | ____ _ | +# | / ___|___ _ _ _ __ | |_ ___ _ __ ___ | +# | | | / _ \| | | | '_ \| __/ _ \ '__/ __| | +# | | |__| (_) | |_| | | | | || __/ | \__ \ | +# | \____\___/ \__,_|_| |_|\__\___|_| |___/ | +# | | +# +----------------------------------------------------------------------+ +# | Check page faults, context switches and process creations | +# '----------------------------------------------------------------------' + # Inventory creates three checks per default: inventory_kernel_counters = [ "pgmajfault", "ctxt", "processes" ] kernel_default_levels = None @@ -72,6 +83,26 @@ def check_kernel(item, params, info): infotext += ", " + text return state, infotext, perfdata +check_info["kernel"] = { + 'check_function': check_kernel, + 'inventory_function': inventory_kernel, + 'service_description': 'Kernel %s', + 'has_perfdata': True, + 'group': 'vm_counter', +} + +#. +# .--kernel.util--CPU Utilization----------------------------------------. +# | _ _ _ _ _ _ _ _ | +# | | | | | |_(_) (_)______ _| |_(_) ___ _ __ | +# | | | | | __| | | |_ / _` | __| |/ _ \| '_ \ | +# | | |_| | |_| | | |/ / (_| | |_| | (_) | | | | | +# | \___/ \__|_|_|_/___\__,_|\__|_|\___/|_| |_| | +# | | +# +----------------------------------------------------------------------+ +# | Check system/user/io-wait | +# '----------------------------------------------------------------------' + kernel_util_default_levels = None def inventory_cpu_utilization(info): @@ -156,10 +187,3 @@ check_info["kernel.util"] = { 'group': 'cpu_iowait', } -check_info["kernel"] = { - 'check_function': check_kernel, - 'inventory_function': inventory_kernel, - 'service_description': 'Kernel %s', - 'has_perfdata': True, - 'group': 'vm_counter', -}