Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: Check_MK core now supports umlauts in host-/ service- and contactgroup names

by Lars Michelsen

Module: check_mk Branch: master Commit: 4890d241c01fa0cd9c1635111c48932d2e22783a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4890d241c01fa0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 10:00:45 2013 +0200 Check_MK core now supports umlauts in host-/service- and contactgroup names --- ChangeLog | 1 + modules/check_mk.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c74d088..a920e57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ 1.2.2p1: Core: * FIX: correctly quote ! and \ in active checks for Nagios + * Check_MK core now supports umlauts in host-/service- and contactgroup names Checks & Agents: * FIX: vsphere_agent: fix problems whith ! and \ in username or password diff --git a/modules/check_mk.py b/modules/check_mk.py index 6cad5ed..432159d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1637,12 +1637,12 @@ def create_nagios_hostdefs(outfile, hostname): hostgroups_to_define.add(default_host_group) elif define_hostgroups: hostgroups_to_define.update(hgs) - outfile.write(" hostgroups\t\t\t%s\n" % hostgroups) + outfile.write(" hostgroups\t\t\t%s\n" % make_utf8(hostgroups)) # Contact groups cgrs = host_contactgroups_of([hostname]) if len(cgrs) > 0: - outfile.write(" contact_groups\t\t%s\n" % ",".join(cgrs)) + outfile.write(" contact_groups\t\t%s\n" % make_utf8(",".join(cgrs))) contactgroups_to_define.update(cgrs) # Get parents manually defined via extra_host_conf["parents"]. Only honor @@ -1710,7 +1710,7 @@ def create_nagios_hostdefs(outfile, hostname): # host gets same contactgroups as real host if len(cgrs) > 0: - outfile.write(" contact_groups\t\t+%s\n" % ",".join(cgrs)) + outfile.write(" contact_groups\t\t+%s\n" % make_utf8(",".join(cgrs))) if is_clust: outfile.write(" _NODEIPS\t\t\t%s\n" % " ".join(node_ips)) @@ -1824,7 +1824,7 @@ define service { for description in aggr_descripts: sergr = service_extra_conf(hostname, description, summary_service_groups) if len(sergr) > 0: - sg = " service_groups\t\t\t+" + ",".join(sergr) + "\n" + sg = " service_groups\t\t\t+" + make_utf8(",".join(sergr)) + "\n" if define_servicegroups: servicegroups_to_define.update(sergr) else: @@ -2058,7 +2058,7 @@ define hostgroup { hostgroup_name\t\t%s alias\t\t\t\t%s } -""" % (hg, make_utf8(alias))) +""" % (make_utf8(hg), make_utf8(alias))) # No creation of host groups but we need to define # default host group @@ -2088,7 +2088,7 @@ define servicegroup { servicegroup_name\t\t%s alias\t\t\t\t%s } -""" % (sg, make_utf8(alias))) +""" % (make_utf8(sg), make_utf8(alias))) def create_nagios_config_contactgroups(outfile): if define_contactgroups: @@ -2104,7 +2104,7 @@ def create_nagios_config_contactgroups(outfile): alias = name outfile.write("\ndefine contactgroup {\n" " contactgroup_name\t\t%s\n" - " alias\t\t\t\t%s\n" % (name, make_utf8(alias))) + " alias\t\t\t\t%s\n" % (make_utf8(name), make_utf8(alias))) members = contactgroup_members.get(name) if members: outfile.write(" members\t\t\t%s\n" % ",".join(members)) @@ -3836,7 +3836,7 @@ def dump_host(hostname): item, params, description, - ",".join(service_extra_conf(hostname, description, service_groups)), + make_utf8(",".join(service_extra_conf(hostname, description, service_groups))), if_aggr(aggregated_service_name(hostname, description)), if_aggr(",".join(service_extra_conf(hostname, aggregated_service_name(hostname, description), summary_service_groups))), ",".join(deps)

11 years, 2 months

Check_MK Git: check_mk: FIX: cisco_qos: Be compatible to newer IOS-XE versions (Thanks to Ken Smith)

by Lars Michelsen

Module: check_mk Branch: master Commit: bceeb2e9baef9538a321d5cd285bdac7d9239571 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bceeb2e9baef95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 08:35:16 2013 +0200 FIX: cisco_qos: Be compatible to newer IOS-XE versions (Thanks to Ken Smith) --- ChangeLog | 1 + checks/cisco_qos | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3d1c2dd..c74d088 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,7 @@ Checks & Agents: * FIX: vsphere_agent: fix problems whith ! and \ in username or password * FIX: check_mk_agent.aix: fix shebang: was python, must be ksh + * FIX: cisco_qos: Be compatible to newer IOS-XE versions (Thanks to Ken Smith) 1.2.2: Core: diff --git a/checks/cisco_qos b/checks/cisco_qos index 61a64e7..97bb1f2 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -192,7 +192,12 @@ def check_cisco_qos(item, params, info): # Gather information for this object policy_if_id, policy_if_id2 = cisco_qos_get_ifs_by_class_id(config, class_id)[0] - policy_id = config[policy_if_id+'.'+policy_if_id] + try: + policy_id = config[policy_if_id+'.'+policy_if_id] + except KeyError: + # Be compatible with newer IOS-XE releases where the last digit is pinned + # to "1" instead of the plicy_if_id + policy_id = config[policy_if_id+'.1'] policy_name = policies[policy_id] post_b = post_bytes[policy_if_id+'.'+policy_if_id2] drop_b = drop_bytes[policy_if_id+'.'+policy_if_id2]

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c161eee5a8a4473190e3b22cbf11937ce48799e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c161eee5a8a44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 08:37:25 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: vsphere: add counters for memory info to inline docu

by Mathias Kettner

Module: check_mk Branch: master Commit: 340c58797d9292353384db96d073234aea02b452 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=340c58797d9292… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 15 16:58:34 2013 +0200 vsphere: add counters for memory info to inline docu --- agents/special/agent_vsphere | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 2b9b8f8..7907a8c 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -237,18 +237,23 @@ def output_hostsystem_counters(): # Determine IDs of the counters: We have hard coded the IDs here in order to save # a couple of seconds... # counterids = pm.get_entity_counters(mor) + # print counterids + # print [ i for n,i in counterids.items() if n.startswith("mem.") ] # needed_ids = counterids.keys() # retrieve all ids.... needed_ids = [ \ # net.* 196616, 196621, 196617, 196625, 196619, 196623, 196609, 196614, 196620, 196624, 196615, 196622, 196618, 196612, 196613, 196626, - # uptime + # sys.uptime 262144, + # mem.* + # 65635, 65537, 65577, 65625, 65545, 65611, 65573, 65615, 65582, 65549, 65630, 65622, 65618, 65621, 65561, 65623, 65632, 65557, + # 65628, 65633, 65541, 65643, 65586, 65553, 65569, 65589, 65639, 65620, 65599, 65580, 65619, 65603, ] counters = pm.get_entity_statistic(mor, needed_ids) lines = [] for counter in counters: name = counter.group + "." + counter.counter - lines.append("%s|%s|%s|%s" % (name, counter.instance, counter.value, counter.unit)) + lines.append("%s|%s|%s|%s" % (name, counter.instance, counter.value, counter.unit)) lines.sort() for line in lines: print line

11 years, 2 months

Check_MK Git: check_mk: New check for uptime of ESX host

by Mathias Kettner

Module: check_mk Branch: master Commit: 9bade4d20bd1ac84ffc9862dd1365594f5d9dac1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bade4d20bd1ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 15 16:44:39 2013 +0200 New check for uptime of ESX host --- agents/special/agent_vsphere | 7 +++++- checkman/esx_vsphere_counters.if | 2 +- checkman/esx_vsphere_counters.uptime | 15 ++++++++++++ checks/esx_vsphere_counters | 44 ++++++++++++++++++++++++++++++++++ checks/uptime | 14 +++-------- checks/uptime.include | 37 ++++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 3 ++- 7 files changed, 108 insertions(+), 14 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index fa1de68..2b9b8f8 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -238,7 +238,12 @@ def output_hostsystem_counters(): # a couple of seconds... # counterids = pm.get_entity_counters(mor) # needed_ids = counterids.keys() # retrieve all ids.... - needed_ids = [196616, 196621, 196617, 196625, 196619, 196623, 196609, 196614, 196620, 196624, 196615, 196622, 196618, 196612, 196613, 196626] + needed_ids = [ \ + # net.* + 196616, 196621, 196617, 196625, 196619, 196623, 196609, 196614, 196620, 196624, 196615, 196622, 196618, 196612, 196613, 196626, + # uptime + 262144, + ] counters = pm.get_entity_statistic(mor, needed_ids) lines = [] for counter in counters: diff --git a/checkman/esx_vsphere_counters.if b/checkman/esx_vsphere_counters.if index 83a8b8c..abe3414 100644 --- a/checkman/esx_vsphere_counters.if +++ b/checkman/esx_vsphere_counters.if @@ -1,5 +1,5 @@ title: Physical network interfaces on VMWare ESX host -agents: esx +agents: vsphere author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/esx_vsphere_counters.uptime b/checkman/esx_vsphere_counters.uptime new file mode 100644 index 0000000..5ca8ed8 --- /dev/null +++ b/checkman/esx_vsphere_counters.uptime @@ -0,0 +1,15 @@ +title: Uptime of ESX host system +agents: vsphere +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check is always OK and simply outputs the uptime of an ESX host + system. + +perfdata: + The uptime in seconds. + +inventory: + One check per system is created if the agent has a section {<<<uptime>>>}. + diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index ba0883f..4ff8599 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -47,6 +47,18 @@ # net.droppedRx||0|number # net.droppedTx|vmnic0|0|number # net.droppedTx|vmnic1|0|number +# ... +# sys.uptime||630664|second + + +# .--Interfaces----------------------------------------------------------. +# | ___ _ __ | +# | |_ _|_ __ | |_ ___ _ __ / _| __ _ ___ ___ ___ | +# | | || '_ \| __/ _ \ '__| |_ / _` |/ __/ _ \/ __| | +# | | || | | | || __/ | | _| (_| | (_| __/\__ \ | +# | |___|_| |_|\__\___|_| |_| \__,_|\___\___||___/ | +# | | +# '----------------------------------------------------------------------' # The bad thing here: ESX does not send *counters* but *rates*. This might # seem user friendly on the first look, but is really bad at the second. The @@ -176,3 +188,35 @@ check_info['esx_vsphere_counters.if'] = { 'default_levels_variable' : 'if_default_levels', 'includes' : [ 'if.include' ], } + +#. +# .--Uptime--------------------------------------------------------------. +# | _ _ _ _ | +# | | | | |_ __ | |_(_)_ __ ___ ___ | +# | | | | | '_ \| __| | '_ ` _ \ / _ \ | +# | | |_| | |_) | |_| | | | | | | __/ | +# | \___/| .__/ \__|_|_| |_| |_|\___| | +# | |_| | +# '----------------------------------------------------------------------' + +def inventory_esx_vsphere_counters_uptime(info): + for name, instance, counter, unit in info: + if name == "sys.uptime": + return [ (None, None) ] + +def check_esx_vsphere_counters_uptime(_no_item, params, info): + for name, instance, counter, unit in info: + if name == "sys.uptime": + return check_uptime_seconds(params, int(counter)) + return 3, "No uptime information found in agent output" + + +check_info['esx_vsphere_counters.uptime'] = { + 'inventory_function' : inventory_esx_vsphere_counters_uptime, + 'check_function' : check_esx_vsphere_counters_uptime, + 'service_description': 'Uptime', + 'has_perfdata': True, + 'includes': ['uptime.include'], + 'group': 'uptime', +} + diff --git a/checks/uptime b/checks/uptime index 589c7b7..4cb63c6 100644 --- a/checks/uptime +++ b/checks/uptime @@ -28,17 +28,8 @@ def inventory_uptime(info): if len(info) >= 1 and len(info[0]) >= 1: return [ (None, None) ] -def check_uptime(_no_item, _no_params, info): - uptime = int(float(info[0][0])) - seconds = uptime % 60 - rem = uptime / 60 - minutes = rem % 60 - hours = (rem % 1440) / 60 - days = rem / 1440 - now = int(time.time()) - since = time.strftime("%c", time.localtime(now - uptime)) - return (0, "up since %s (%dd %02d:%02d:%02d)" % (since, days, hours, minutes, seconds), [ ("uptime", uptime) ]) - +def check_uptime(_no_item, params, info): + return check_uptime_seconds(params, float(info[0][0])) check_info["uptime"] = { @@ -46,5 +37,6 @@ check_info["uptime"] = { 'inventory_function': inventory_uptime, 'service_description': 'Uptime', 'has_perfdata': True, + 'includes': [ 'uptime.include' ], 'group': 'uptime', } diff --git a/checks/uptime.include b/checks/uptime.include new file mode 100644 index 0000000..91a0e59 --- /dev/null +++ b/checks/uptime.include @@ -0,0 +1,37 @@ +#!/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. + + +def check_uptime_seconds(params, uptime): + seconds = uptime % 60 + rem = uptime / 60 + minutes = rem % 60 + hours = (rem % 1440) / 60 + days = rem / 1440 + now = int(time.time()) + since = time.strftime("%c", time.localtime(now - uptime)) + return (0, "up since %s (%dd %02d:%02d:%02d)" % (since, days, hours, minutes, seconds), [ ("uptime", uptime) ]) + diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 7329f54..560e654 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -386,7 +386,7 @@ perfometers["check_mk-hpux_snmp_cs.cpu"] = perfometer_hpux_snmp_cs_cpu def perfometer_check_mk_uptime(row, check_command, perf_data): - days, rest = divmod(int(perf_data[0][1]), 60*60*24) + days, rest = divmod(int(float(perf_data[0][1])), 60*60*24) hours, rest = divmod(rest, 60*60) minutes, seconds = divmod(rest, 60) @@ -394,6 +394,7 @@ def perfometer_check_mk_uptime(row, check_command, perf_data): perfometers["check_mk-uptime"] = perfometer_check_mk_uptime perfometers["check_mk-snmp_uptime"] = perfometer_check_mk_uptime +perfometers["check_mk-esx_vsphere_counters.uptime"] = perfometer_check_mk_uptime def perfometer_check_mk_diskstat(row, check_command, perf_data):

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b819830fadcb75811a87d0519130a02bc523d04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b819830fadcb7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 15 16:19:14 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: esx_vsphere_counters.if: new check for ESX network interfaces

by Mathias Kettner

Module: check_mk Branch: master Commit: ccc315b2aee7e26e3b8aae176520922c97c9621c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccc315b2aee7e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 15 16:19:06 2013 +0200 esx_vsphere_counters.if: new check for ESX network interfaces --- agents/special/agent_vsphere | 91 +++++++++- checkman/esx_vsphere_counters.if | 33 ++++ checks/esx_vsphere_counters | 178 ++++++++++++++++++++ pnp-templates/check_mk-esx_vsphere_counters.if.php | 1 + web/plugins/perfometer/check_mk.py | 23 ++- 5 files changed, 314 insertions(+), 12 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ccc315b2ae…

11 years, 2 months

Check_MK Git: check_mk: if64: minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b93f08ec421f81747fd5e1dc8ceaf554a40070d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b93f08ec421f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 15 15:08:55 2013 +0200 if64: minor code cleanup --- checks/if64 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/if64 b/checks/if64 index 2cc9aa8..a5e6310 100644 --- a/checks/if64 +++ b/checks/if64 @@ -37,8 +37,6 @@ def check_if64(item, params, info): fix_if64_highspeed(info) return check_if_common(item, params, info) -check_includes['if64'] = [ "if.include" ] - # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 @@ -47,6 +45,7 @@ check_info["if64"] = { 'inventory_function': inventory_if64, 'service_description': 'Interface %s', 'has_perfdata': True, + 'includes': [ 'if.include' ], 'snmp_info': ( ".1.3.6.1.2.1", [ "2.2.1.1", # ifIndex 0 "2.2.1.2", # ifDescr 1

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e87b7aed382e3f9f471556ef54669f9d5321c8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e87b7aed382e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 15 14:27:36 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: setup: Added missing vars rrd_path and rrdcached_sock

by Lars Michelsen

Module: check_mk Branch: master Commit: 295df36241362e20cd77fedb8f47fd21ca2f0253 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=295df36241362e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 15 14:27:34 2013 +0200 setup: Added missing vars rrd_path and rrdcached_sock --- ChangeLog | 1 + scripts/setup.sh | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 65703eb..3d1c2dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ an alternative host check command (without manually defining one) * New variable snmp_check_interval which can be used to customize the check intervals of SNMP based checks + * setup: Added missing vars rrd_path and rrdcached_sock Multisite: * New availability view for arbitrary host/service collections diff --git a/scripts/setup.sh b/scripts/setup.sh index c57f531..487d95e 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -375,6 +375,14 @@ Those templates make the history graphs look nice. PNP4Nagios expects such templates in the directory pnp/templates in your document root for static web pages" +ask_dir rrd_path /var/lib/nagios/rrd $HOMEBASEDIR/var/nagios/rrd $OMD_ROOT/var/pnp4nagios/perfdata "RRD files" \ + "Configure the directory PNP4Nagios stores the RRD database files in" + +ask_dir rrdcached_socket /tmp/rrdcached.sock $HOMEBASEDIR/var/rrdcached.sock $OMD_ROOT/tmp/run/rrdached.sock "rrdcached socket" \ + "If you use the rrdcached to process performance data from Nagios, +you can configure the socket of the rrdcached here to make the prediction +feature use it" + # ------------------------------------------------------------------- ask_title "Check_MK Livestatus Module" # ------------------------------------------------------------------- @@ -483,6 +491,8 @@ tcp_cache_dir = '$vardir/cache' tmp_dir = '$vardir/tmp' logwatch_dir = '$vardir/logwatch' nagios_objects_file = '$nagconfdir/check_mk_objects.cfg' +rrd_path = '$rrd_path' +rrddcached_socket = '$rrdcached_socket' nagios_command_pipe_path = '$nagpipe' check_result_path = '$check_result_path' nagios_status_file = '$nagios_status_file'

11 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013