Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64655 discussions

Check_MK Git: check_mk: hivemanager_devices: Added PNP template

by Mathias Kettner

Module: check_mk Branch: master Commit: 856e97b3b5a906f0ab38c0bc9345495230e88f0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=856e97b3b5a906… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 22 16:15:06 2014 +0200 hivemanager_devices: Added PNP template --- pnp-templates/check_mk-hivemanager_devices.php | 47 ++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/pnp-templates/check_mk-hivemanager_devices.php b/pnp-templates/check_mk-hivemanager_devices.php new file mode 100644 index 0000000..0b8bd74 --- /dev/null +++ b/pnp-templates/check_mk-hivemanager_devices.php @@ -0,0 +1,47 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Devices +$opt[1] = "--vertical-label 'Sessions' -l0 -X0 --title \"$servicedesc / Active Clients\" "; + +$def[1] = "DEF:clients=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "AREA:clients#0030f0:\"Active Sessions\" "; +$def[1] .= "LINE:clients#001f80 "; +$def[1] .= "GPRINT:clients:LAST:\"%7.0lf %s last\" "; +$def[1] .= "GPRINT:clients:MAX:\"%7.0lf %s max\" "; +$def[1] .= "GPRINT:clients:AVERAGE:\"%7.2lf %s avg\\n\" "; +$def[1] .= "HRULE:$WARN[1]#ffff00:\"Warning at $WARN[1]\\n\" "; +$def[1] .= "HRULE:$CRIT[1]#ff0000:\"Critical at $CRIT[1]\\n\" "; + +# Uptime +$opt[2] = "--vertical-label 'Uptime (d)' -l0 --title \"Uptime (time since last reboot)\" "; + +$def[2] = "DEF:sec=$RRDFILE[2]:$DS[2]:MAX "; +$def[2] .= "CDEF:uptime=sec,86400,/ "; +$def[2] .= "AREA:uptime#80f000:\"Uptime (days)\" "; +$def[2] .= "LINE:uptime#408000 "; +$def[2] .= "GPRINT:uptime:LAST:\"%7.2lf %s LAST\" "; +$def[2] .= "GPRINT:uptime:MAX:\"%7.2lf %s MAX\" "; +?>

10 years

Check_MK Git: check_mk: citrix_*: Fixed file permissions

by Mathias Kettner

Module: check_mk Branch: master Commit: 00d86dbf7f78f40186cd9732cb3fa9d1b9731c4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00d86dbf7f78f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 22 15:20:58 2014 +0200 citrix_*: Fixed file permissions --- 0 files changed diff --git a/checks/citrix_serverload b/checks/citrix_serverload old mode 100755 new mode 100644 diff --git a/checks/citrix_sessions b/checks/citrix_sessions old mode 100755 new mode 100644

10 years

Check_MK Git: check_mk: mkevend: missing i18n for 'pending connections'

by Andreas Boesl

Module: check_mk Branch: master Commit: d223fa65c1ea98638e5a9e5557627a456b23820e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d223fa65c1ea98… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 22 12:54:44 2014 +0200 mkevend: missing i18n for 'pending connections' --- mkeventd/web/plugins/wato/mkeventd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 14928e7..148b49f 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1812,7 +1812,7 @@ if mkeventd_enabled: minvalue = 1, default_value = 10, label = "max.", - unit = "pending connections", + unit = _("pending connections"), ), domain = "mkeventd", ) @@ -1829,7 +1829,7 @@ if mkeventd_enabled: minvalue = 1, default_value = 10, label = "max.", - unit = "pending connections", + unit = _("pending connections"), ), domain = "mkeventd", )

10 years

Check_MK Git: check_mk: fixed incorrect i18n formatting

by Andreas Boesl

Module: check_mk Branch: master Commit: 5551a2f204360a41d2ab3ddd33915359d3844b42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5551a2f204360a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 22 12:51:44 2014 +0200 fixed incorrect i18n formatting --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8276385..80af765 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12056,7 +12056,7 @@ def mode_edit_role(phase): id = html.var("edit") if phase == "title": - return _("Edit user role %s" % id) + return _("Edit user role %s") % id elif phase == "buttons": html.context_button(_("All Roles"), make_link([("mode", "roles")]), "back")

10 years

Check_MK Git: check_mk: fixed incorrect filename

by Andreas Boesl

Module: check_mk Branch: master Commit: 5d93efacfff7ba2bc3c87d5d1fa4b37a68203127 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d93efacfff7ba… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 22 10:27:32 2014 +0200 fixed incorrect filename --- checks/bluecat_command_server | 65 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/checks/bluecat_command_server b/checks/bluecat_command_server new file mode 100644 index 0000000..5853a63 --- /dev/null +++ b/checks/bluecat_command_server @@ -0,0 +1,65 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +factory_settings["bluecat_command_server"] = { + "oper_states" : { + "warning" : [ 2, 3, 4 ], + "critical" : [ 5 ], + }, +} + +def inventory_bluecat_command_server(info): + return [(None, None)] + +def check_bluecat_command_server(item, params, info): + oper_state = int(info[0][0]) + oper_states = { + 1 : "running normally", + 2 : "not running", + 3 : "currently starting", + 4 : "currently stopping", + 5 : "fault" + + } + state = 0 + if oper_state in params['oper_states']['warning']: + state = 1 + elif oper_state in params['oper_states']['critical']: + state = 2 + yield state, "Command Server is %s" % oper_states[oper_state] + +check_info["bluecat_command_server"] = { + "check_function" : check_bluecat_command_server, + "inventory_function" : inventory_bluecat_command_server, + "service_description" : "Command Server", + "default_levels_variable" : "bluecat_command_server", + "group" : "bluecat_command_server", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13315.2.1", + "snmp_info" : (".1.3.6.1.4.1.13315.3.1.7.2.1", [ + 1, # bcnCommandServerSerOperState + ]) +} +

10 years

Check_MK Git: check_mk: Updated bug entries #2183

by Mathias Kettner

Module: check_mk Branch: master Commit: 28dfb6367744b3f0f1c29d8a8babd7bb85b2a404 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28dfb6367744b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 19 11:02:38 2014 +0200 Updated bug entries #2183 --- .bugs/2183 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2183 b/.bugs/2183 new file mode 100644 index 0000000..80523ac --- /dev/null +++ b/.bugs/2183 @@ -0,0 +1,11 @@ +Title: cmk --check-inventory fails with exit code 4 on invalid configuration +Component: core +State: open +Date: 2014-09-19 11:01:41 +Targetversion: future +Class: bug + +If you have a duplicate host, for example, then the Inventory check fails with +4. This makes Nagios unhappy. + +Solution: Fail with code 3 and a useful error message

10 years

Check_MK Git: check_mk: Internal code cleanup in WATO rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 6c0ddcfc23fa32a3748a41d95063f6d8518b1fb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c0ddcfc23fa32… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 19 10:55:54 2014 +0200 Internal code cleanup in WATO rules --- web/plugins/wato/check_parameters.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c5b9e40..65058fc 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1840,7 +1840,6 @@ register_check_parameters( ], optional_keys = [ "offset" ], ), - back = transform_msx_queues, forth = transform_msx_queues, ), TextAscii(

10 years

Check_MK Git: check_mk: vms: fixed incorrect runtime.host name

by Andreas Boesl

Module: check_mk Branch: master Commit: c9a6d6c367af503ac7deb5724ce3c8df69a49aef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9a6d6c367af50… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 18 18:47:10 2014 +0200 vms: fixed incorrect runtime.host name --- agents/special/agent_vsphere | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 12b034d..97fd671 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -853,6 +853,8 @@ if not error: else: # we don't need this in the agent output del vm_data["config.hardware.device"] + if "runtime.host" in vm_data: + vm_data["runtime.host"] = hostsystems.get(vm_data["runtime.host"], vm_data["runtime.host"]) vms[vm_data.get("name")] = vm_data

10 years

Check_MK Git: check_mk: kernel: internal code cleanup

by Mathias Kettner

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', -}

10 years

Check_MK Git: check_mk: #1403 kernel.util: allow levels for the total CPU utilization

by Mathias Kettner

Module: check_mk Branch: master Commit: ca833488b6c6aca367f7a8fa9d5ba2fb769ba0e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca833488b6c6ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 18 14:39:25 2014 +0200 #1403 kernel.util: allow levels for the total CPU utilization The CPU utilization check for Linux only allowed to set levels for the disk wait percentage. The parameters have been converted to a dictionary and now allow to set levels on the total CPU utilization as well. Please note: if you have defined the variable {kernel_util_default_levels} in your {main.mk}, then you need to convert this to a dictionary - otherwise it will be ignored. Instead of F+:main.mk kernel_util_default_levels = (10, 20) F-: ... please now write...: F+:main.mk kernel_util_default_levels = { "iowait" : (10, 20) } F-: Users of WATO are not affected by this and do not need to change anything. --- .werks/1403 | 26 +++++++++++++ ChangeLog | 2 + checkman/kernel.util | 19 +++++---- checks/kernel | 70 ++++++++++++++++++++++------------ web/plugins/wato/check_parameters.py | 53 +++++++++++++++++-------- 5 files changed, 121 insertions(+), 49 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ca833488b6…

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits