Checkmk git commits July 2012

checkmk-commits@lists.checkmk.com

1 participants
183 discussions

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3ec69f62a602b85a56e37a1dfe56fdd0686972d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ec69f62a602b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 31 10:56:43 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

12 years, 2 months

Check_MK Git: check_mk: FIX: windows agent: try to fix crash in event log handling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 53c45bfc02d2d7c232ce1bf96d8e61f6f4fa3e72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53c45bfc02d2d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 31 10:56:01 2012 +0200 FIX: windows agent: try to fix crash in event log handling --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 8 +++++--- agents/windows/check_mk_agent.exe | Bin 105472 -> 105472 bytes agents/windows/install_agent.exe | Bin 126273 -> 126266 bytes 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71a8917..a7fb697 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * cbl_airlaser.status: New Check for CBL Airlaser IP1000 laser bridge. * df, hr_fs, etc.: Filesystem checks now support grouping (pools) Please refer to the check manpage of df for details + * FIX: windows agent: try to fix crash in event log handling WATO: * Added permission to control the "clone host" feature in WATO diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 0b2a3ea..7e20554 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -907,11 +907,13 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, ch dll = NULL; WCHAR wmsgbuffer[2048]; + DWORD dwFlags = FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_SYSTEM; + if (dll) + dwFlags |= FORMAT_MESSAGE_FROM_HMODULE; + DWORD len = FormatMessageW( // DWORD len = FormatMessage( - FORMAT_MESSAGE_ARGUMENT_ARRAY | - FORMAT_MESSAGE_FROM_HMODULE | - FORMAT_MESSAGE_FROM_SYSTEM, + dwFlags, dll, event->EventID, 0, // accept any language diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 8d3f956..539941a 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 3286f34..c98e6ff 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

12 years, 2 months

Check_MK Git: check_mk: FreeBSD Agent: Added swapinfo call to mem section to make mem check work again

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4d2f96b995a9e6436337e11e659d1416683d3e3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d2f96b995a9e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 31 09:57:51 2012 +0200 FreeBSD Agent: Added swapinfo call to mem section to make mem check work again --- ChangeLog | 1 + agents/check_mk_agent.freebsd | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71a8917..09e3b6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * cbl_airlaser.status: New Check for CBL Airlaser IP1000 laser bridge. * df, hr_fs, etc.: Filesystem checks now support grouping (pools) Please refer to the check manpage of df for details + * FreeBSD Agent: Added swapinfo call to mem section to make mem check work again WATO: * Added permission to control the "clone host" feature in WATO diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index aabc993..17bcebb 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -124,6 +124,7 @@ if [ -x /usr/local/bin/muse ] echo '<<<mem>>>' # yes, i don't know sed well. muse -k 2>/dev/null | sed 's/Total/MemTotal/' | sed 's/Free/MemFree/' + swapinfo -k 1K | tail -n 1 | awk '{ print "SwapTotal: "$2" kB\nSwapFree: "$4" kB" }' fi

12 years, 2 months

Check_MK Git: check_mk: Add missing man page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2c07ecd0ed5960fc3656aa7387325a6230053855 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c07ecd0ed5960… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 30 15:41:40 2012 +0200 Add missing man page --- checkman/vms_queuejobs | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/checkman/vms_queuejobs b/checkman/vms_queuejobs new file mode 100644 index 0000000..f827fbc --- /dev/null +++ b/checkman/vms_queuejobs @@ -0,0 +1,14 @@ +title: Monitor OpenVMS Queue Jobs +agents: openvms +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors the current state of the queue jobs + on OpenVMS. Currently the check is always OK and just + prints the number of jobs in the queue and the total + CPU usage of the jobs that consumed the most CPU since. + +inventory: + One check per OpenVMS host will be created. +

12 years, 2 months

Check_MK Git: check_mk: New format for output of vms_if

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 156dc46674ec1b937a71a5e76971ede8a6cd1ec9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=156dc46674ec1b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 30 15:39:30 2012 +0200 New format for output of vms_if --- checks/vms_if | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/checks/vms_if b/checks/vms_if index abcc3b6..620c067 100644 --- a/checks/vms_if +++ b/checks/vms_if @@ -37,7 +37,10 @@ def convert_vms_if(info): ifIndex = 0 for line in info: ifDescr = line[0] - ifInOctets, ifInErrors, ifOutOctets, ifOutErrors, ifInDiscards = map(wrap_negative, line[1:6]) + ifInOctets, ifInUcastPkts, ifInMulticastPkts, ifInBroadcastPkts, \ + ifInDiscards, ifInErrors, ifOutOctets, ifOutUcastPkts, \ + ifOutMulticastPkts, ifOutBroadcastPkts, ifOutDiscards, ifOutErrors = \ + map(wrap_negative, line[1:13]) ifIndex += 1 new_info.append(( @@ -47,16 +50,16 @@ def convert_vms_if(info): '1000000000',# ifHighSpeed '1', # ifOperStatus ifInOctets, - '0', # ifHCInUcastPkts - '0', # ifHCInMulticastPkts - '0', # ifHCInBroadcastPkts + ifInUcastPkts, + ifInMulticastPkts, + ifInBroadcastPkts, ifInDiscards, ifInErrors, ifOutOctets, - '0', # ifHCOutUcastPkts - '0', # ifHCOutMulticastPkts - '0', # ifHCOutBroadcastPkts - '0', # ifOutDiscards + ifOutUcastPkts, + ifOutMulticastPkts, + ifOutBroadcastPkts, + ifOutDiscards, ifOutErrors, '0', # ifOutQLen ifDescr,

12 years, 2 months

Check_MK Git: check_mk: vms_queuejobs: new check for monitoring current VMS queue jobs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c85d392d7443a3ddeedb8c79202ed7b3b4b0ebcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c85d392d7443a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 30 12:42:05 2012 +0200 vms_queuejobs: new check for monitoring current VMS queue jobs --- ChangeLog | 1 + checks/vms_diskstat | 18 +++++++++---- checks/vms_if | 12 ++++++++- checks/vms_queuejobs | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 880289a..71a8917 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * vms_if: new check for network interfaces on OpenVMS * vms_system.ios: new check for total direct/buffered IOs on OpenVMS * vms_system.procs: new check for number of processes on OpenVMS + * vms_queuejobs: new check for monitoring current VMS queue jobs * FIX: mssql agent: Added compatibility code for MSSQL 9 * f5_bigip_temp: add performance data * added perf-o-meters for a lot of temperature checks diff --git a/checks/vms_diskstat b/checks/vms_diskstat index a202499..d9289f3 100644 --- a/checks/vms_diskstat +++ b/checks/vms_diskstat @@ -26,17 +26,23 @@ # Example output from agent: # <<<vms_diskstat>>> -# OVMS084 8380080 6430128 0.09 -# DATA 4110480 4090912 0.00 - +# $1$DGA1122: TEST_WORK 1171743836 1102431184 0.00 +# DSA1: SHAD_1 66048000 58815666 0.00 +# DSA2: SHAD_2 66048000 47101824 0.07 +# DSA3: SHAD_3 66048000 46137546 1.57 +# DSA4: SHAD_4 66048000 36087093 0.00 +# DSA5: SHAD_5 66048000 32449914 0.00 +# $1$DGA1123: TEST_WORK 2171743836 1102431184 0.00 +# $1$DGA1124: TEMP_02 3171743836 102431184 1.10 +# $1$DGA1125: DATA_01 1171743836 202431184 0.20 def inventory_vms_diskstat_fs(info): - return df_inventory([ line[0] for line in info ]) + return df_inventory([ line[1] for line in info ]) def check_vms_diskstat_fs(item, params, info): for line in info: - if line[0] == item: - label, size, used, ios = line + if line[1] == item: + device, label, size, used, ios = line size_mb = int(size) * 512 / (1024.0 * 1024.0) avail_mb = int(used) * 512 / (1024.0 * 1024.0) return df_check_filesystem(g_hostname, item, size_mb, avail_mb, params) diff --git a/checks/vms_if b/checks/vms_if index e18e236..abcc3b6 100644 --- a/checks/vms_if +++ b/checks/vms_if @@ -25,10 +25,20 @@ # Boston, MA 02110-1301 USA. def convert_vms_if(info): + # Due to signed 32-bit arithmetics we sometimes get negative values. Those + # must be converted to positive ones. + def wrap_negative(c): + if c < 0: + return c + 2**32 + else: + return c + new_info = [] ifIndex = 0 for line in info: - ifDescr, ifInOctets, ifInErrors, ifOutOctets, ifOutErrors, ifInDiscards = line[:6] + ifDescr = line[0] + ifInOctets, ifInErrors, ifOutOctets, ifOutErrors, ifInDiscards = map(wrap_negative, line[1:6]) + ifIndex += 1 new_info.append(( str(ifIndex), diff --git a/checks/vms_queuejobs b/checks/vms_queuejobs new file mode 100644 index 0000000..0d37e53 --- /dev/null +++ b/checks/vms_queuejobs @@ -0,0 +1,63 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +# Example output from agent: +# <<<vms_queuejobs>>> +# 2036F23D SRV_WATCHPROD LEF 0 05:10:00.39 945007498 7721395 +# 20201AF1 DRS_WATCHDOG_22 LEF 0 00:01:39.97 284611 2030 + +def inventory_vms_queuejobs(info): + return [(None, {})] + +def check_vms_queuejobs(_no_item, params, info): + names = [] + max_cpu_secs = 0 + max_cpu_job = None + for id, name, state, cpu_days, cpu_time, ios, pgfaults in info: + names.append(name) + hours, minutes, seconds = map(float, cpu_time.split(":")) + cpu_secs = int(cpu_days) * 86400 + hours * 3600 + minutes * 60 + seconds + if cpu_secs > max_cpu_secs: + max_cpu_secs = cpu_secs + max_cpu_job = name + + infotext = " - %d jobs" % len(info) + if max_cpu_job: + minutes, seconds = divmod(max_cpu_secs, 60) + hours, minutes = divmod(minutes, 60) + days, hours = divmod(hours, 24) + infotext += ', most CPU used by %s (%d days, %02d:%02d:%02d.%02d)' % \ + (max_cpu_job, days, hours, minutes, int(seconds), int(seconds * 100)) + + return 0, "OK" + infotext + + +check_info['vms_queuejobs'] = { + "check_function" : check_vms_queuejobs, + "inventory_function" : inventory_vms_queuejobs, + "service_description" : "Queue Jobs", + "has_perfdata" : False, +}

12 years, 2 months

Check_MK Git: check_mk: printer_supply: remote information about original author

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8215ee5ecee24c55673f64934a2910c6d6f5039f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8215ee5ecee24c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 30 11:09:35 2012 +0200 printer_supply: remote information about original author --- checks/printer_supply | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/checks/printer_supply b/checks/printer_supply index cb73800..ec0ccc6 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -24,12 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# +------------------------------------------------------------------+ -# | This file has been contributed by: | -# | | -# | Peter Lauk <lauk(a)stuttgart-airport.com> Copyright 2010 | -# +------------------------------------------------------------------+ - # In some cases the name of the part is not uniq. e.g. for c5900 # devices. In this cases add the color from the dedicated OID to # the item name. @@ -132,4 +126,4 @@ check_config_variables.append("printer_supply_some_remaining_status") snmp_scan_functions['printer_supply'] = \ lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None -checkgroup_of['printer_supply'] = "printer_supply" \ No newline at end of file +checkgroup_of['printer_supply'] = "printer_supply"

12 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0788

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a0b6314b591e6d89885430248591979451f69924 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0b6314b591e6d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jul 29 23:01:20 2012 +0200 Updated bug entries #0788 --- .bugs/788 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/788 b/.bugs/788 new file mode 100644 index 0000000..9e2b797 --- /dev/null +++ b/.bugs/788 @@ -0,0 +1,12 @@ +Title: Command and now row selected garbles things up +Component: multisite +State: open +Date: 2012-07-29 23:00:06 +Targetversion: future +Class: bug + +If you enablec checkboxes and then issue a command with now +rows selected, then an error message appears. This is nice. +But at the same time you see an empty view with now chance to +come back to normal mode other then opening the view from +fresh.

12 years, 2 months

Check_MK Git: check_mk: Skip unreachable gateways in parent scan

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2019a42e36808ea793df2a8818e4daf4ac4ed128 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2019a42e36808e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jul 29 15:30:20 2012 +0200 Skip unreachable gateways in parent scan --- ChangeLog | 3 +++ modules/automation.py | 9 +++++---- modules/check_mk.py | 39 ++++++++++++++++++++++++++++----------- web/htdocs/wato.py | 39 ++++++++++++++++++++++++++++++--------- 4 files changed, 66 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2019a42e36…

12 years, 2 months

Check_MK Git: check_mk: df, hr_fs, etc.: Filesystem checks now support grouping (pools)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2eb0230daac68348580ba504da5ef16ac4f7c1d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2eb0230daac683… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jul 28 21:21:20 2012 +0200 df, hr_fs, etc.: Filesystem checks now support grouping (pools) --- ChangeLog | 2 + checkman/df | 66 ++++++++++++++++++++++++---- checks/df | 52 +++++++++------------- checks/df.include | 79 +++++++++++++++++++++++++++++++++- checks/df_netapp.include | 28 +++++------- checks/hr_fs | 15 +++--- checks/vms_df | 2 +- checks/vms_diskstat | 2 +- web/plugins/wato/check_parameters.py | 47 ++++++++++++++++++-- 9 files changed, 219 insertions(+), 74 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2eb0230daa…

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2012