Checkmk git commits May 2013

checkmk-commits@lists.checkmk.com

3 participants
111 discussions

Check_MK Git: check_mk: FIX: jolokia_info: ignore ERROR instances

by Mathias Kettner

Module: check_mk Branch: master Commit: e1e567fa7602ccd46645569b346abe4bdc8bb329 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1e567fa7602cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 6 14:03:40 2013 +0200 FIX: jolokia_info: ignore ERROR instances Conflicts: ChangeLog --- ChangeLog | 6 ++++++ checks/jolokia_info | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2de199d..462695c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,12 @@ * Inventory: Display link symbol for ps ruleset * FIX: Rulesets: correct display of rules within subfolders + +1.2.2p2: + Checks & Agents: + * FIX: jolokia_info: ignore ERROR instances + + 1.2.2p1: Core: * FIX: correctly quote ! and \ in active checks for Nagios diff --git a/checks/jolokia_info b/checks/jolokia_info index 30c7e01..9bde781 100644 --- a/checks/jolokia_info +++ b/checks/jolokia_info @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. def inventory_jolokia_info(info): - return [ (line[0], None) for line in info ] + return [ (line[0], None) for line in info if line[1] != 'ERROR' ] def check_jolokia_info(item, _no_params, info): for line in info:

11 years, 1 month

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

by Mathias Kettner

Module: check_mk Branch: master Commit: ea8c788af88c142a9644f1813debd4e0afc81364 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea8c788af88c14… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 6 13:06:02 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 1 month

Check_MK Git: check_mk: esx_vsphere_hostsystem.multipath: added man page

by Mathias Kettner

Module: check_mk Branch: master Commit: 92e84de21b27fb4a938f4fb025726af1f45c7171 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92e84de21b27fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 6 13:06:00 2013 +0200 esx_vsphere_hostsystem.multipath: added man page --- checkman/esx_vsphere_hostsystem.multipath | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/checkman/esx_vsphere_hostsystem.multipath b/checkman/esx_vsphere_hostsystem.multipath new file mode 100644 index 0000000..3d9fcb2 --- /dev/null +++ b/checkman/esx_vsphere_hostsystem.multipath @@ -0,0 +1,18 @@ +title: Multipath state on VMWare ESX host systems +agents: vsphere +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors the state of all Multipath devices + on an ESX host system. It gets critical if at least one + path is dead or in {unknown} state. + It gets warning if at least one path is disabled or in standby mode. + +inventory: + One service per multipath device will be created. Paths + to local disk are ignored. + +item: + The path type and the unique id of the path joined with a slash. +

11 years, 1 month

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 3356c96cff9c88ae58e9bd44b62b399e777c2394 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3356c96cff9c88… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 6 11:55:19 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 1 month

Check_MK Git: check_mk: vsphere ramdisk monitoring: Added new ramdisk " snmptraps"

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f421dddbfea7f343aad09a2c4b72002e28e6b58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f421dddbfea7f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 6 11:55:13 2013 +0200 vsphere ramdisk monitoring: Added new ramdisk "snmptraps" --- checks/esx_vsphere_counters | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index 6ef4406..a7b9dcd 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -287,6 +287,7 @@ esx_vsphere_counters_ramdisk_sizes = { 'etc': 28, 'tmp': 192, 'hostdstats': 319, + 'snmptraps': 1, } def inventory_esx_vsphere_counters_ramdisk(info): @@ -304,7 +305,10 @@ def check_esx_vsphere_counters_ramdisk(item, params, info): if name == 'sys.resourceMemConsumed' \ and instance.startswith('host/system/kernel/kmanaged/visorfs/'): name = instance.split('/')[-1] - size_mb = esx_vsphere_counters_ramdisk_sizes[name] + try: + size_mb = esx_vsphere_counters_ramdisk_sizes[name] + except KeyError: + return 3, 'Unhandled ramdisk found (%s)' % name used_mb = float(counter) / 1000 avail_mb = size_mb - used_mb ramdisks.append((name, size_mb, avail_mb))

11 years, 1 month

Check_MK Git: check_mk: zfsget: ignore moint points not beginning with /

by Mathias Kettner

Module: check_mk Branch: master Commit: 5a56be417cdc4cbd34ef974a4187a3e7d1b6c0ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a56be417cdc4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 6 11:49:32 2013 +0200 zfsget: ignore moint points not beginning with / --- checks/zfsget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/zfsget b/checks/zfsget index 5a5cdab..cb51094 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -93,7 +93,7 @@ def parse_zfsget(info): parsed = {} for entry in entries: - if entry["mountpoint"] not in [ '-', 'none' ]: + if entry["mountpoint"].startswith("/"): entry["is_pool"] = '/' not in name parsed[entry["mountpoint"]] = entry

11 years, 1 month

Check_MK Git: check_mk: zfsget: ignore moint points with "none"

by Mathias Kettner

Module: check_mk Branch: master Commit: 91f184dbdc4efdeac0e1b7647dc4e36d694410c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91f184dbdc4efd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 6 11:47:09 2013 +0200 zfsget: ignore moint points with "none" --- checks/zfsget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/zfsget b/checks/zfsget index aacbb12..5a5cdab 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -93,7 +93,7 @@ def parse_zfsget(info): parsed = {} for entry in entries: - if entry["mountpoint"] != '-': + if entry["mountpoint"] not in [ '-', 'none' ]: entry["is_pool"] = '/' not in name parsed[entry["mountpoint"]] = entry

11 years, 1 month

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 1d7e8248beffd2df0464b68b3d57e82a1b7aeefd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d7e8248beffd2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 6 11:47:11 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 1 month

Check_MK Git: check_mk: vsphere agent: Added counter dump mode for easier debugging

by Lars Michelsen

Module: check_mk Branch: master Commit: 3c69ef2f839d43cac2edc83c81a5384d3f9b9e48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c69ef2f839d43… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 6 11:14:45 2013 +0200 vsphere agent: Added counter dump mode for easier debugging --- agents/special/agent_vsphere | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 8a696aa..24f4e29 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -74,6 +74,8 @@ OPTIONS: hostsystem, virtualmachine and storage. Default is to query all modules. + -c, --dump-counters Simply dumping out all available counters and their values. + This mode is meant for debugging and diagnostic purposes. """)

11 years, 1 month

Check_MK Git: check_mk: vsphere agent: Added counter dump mode for easier debugging

by Lars Michelsen

Module: check_mk Branch: master Commit: 244754b67dd49210b40d27577880fdea41868fc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=244754b67dd492… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 6 11:12:42 2013 +0200 vsphere agent: Added counter dump mode for easier debugging --- agents/special/agent_vsphere | 126 +++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 56 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index eeb6250..8a696aa 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -77,9 +77,10 @@ OPTIONS: """) -short_options = 'hi:u:s:Dat:H:' +short_options = 'hi:u:s:Dat:H:c' long_options = [ 'help', 'user=', 'secret=', 'direct', 'agent', 'debug', 'modules=', 'timeout=', 'hostname=', + 'dump-counters', ] try: @@ -88,11 +89,13 @@ except getopt.GetoptError, err: sys.stderr.write("%s\n" % err) sys.exit(1) -opt_debug = False -opt_direct = False -opt_agent = False -opt_timeout = 60 -opt_hostname = None +opt_debug = False +opt_direct = False +opt_agent = False +opt_dump_counters = False +opt_timeout = 60 +opt_hostname = None + host_address = None user = None secret = None @@ -115,6 +118,8 @@ for o,a in opts: opt_timeout = int(a) elif o in [ '-H', '--hostname' ]: opt_hostname = a + elif o in [ '-c', '--dump-counters' ]: + opt_dump_counters = True elif o in [ '-h', '--help' ]: usage() sys.exit(0) @@ -426,7 +431,10 @@ def dump_list(l, indent): # 'sys.resourceMemZero': 262157, # 'sys.uptime': 262144} -def output_hostsystem_counters(): +def dump_hostsystem_counters(): + output_hostsystem_counters(all_counters = True) + +def output_hostsystem_counters(all_counters = False): pm = host.get_performance_manager() for mor, name in all_hosts.items(): if not opt_direct: @@ -437,57 +445,58 @@ def output_hostsystem_counters(): # a couple of seconds. To check out which counters are available just comment out # the hardcoded needed_ids and uncomment the following three lines of code. This will # give you a) A dict of name to id mappings and b) Current values of all counters. - #counterids = pm.get_entity_counters(mor) - #needed_ids = counterids.keys() # retrieve all ids.... - #print counterids - - needed_ids = [ - # net.* - 196616, 196621, 196617, 196625, 196619, 196623, 196609, 196614, - 196620, 196624, 196615, 196622, 196618, 196612, 196613, 196626, - # 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, - # 'disk.deviceLatency': 131091, - # 'disk.deviceReadLatency': 131083, - # 'disk.deviceWriteLatency': 131087, - # 'disk.kernelLatency': 131092, - # 'disk.kernelReadLatency': 131084, - # 'disk.kernelWriteLatency': 131088, - # 'disk.maxQueueDepth': 131096, - # 'disk.maxTotalLatency': 131095, - # 'disk.numberRead': 131076, - # 'disk.numberReadAveraged': 131097, - # 'disk.numberWrite': 131077, - # 'disk.numberWriteAveraged': 131098, - # 'disk.queueLatency': 131094, - # 'disk.queueReadLatency': 131086, - # 'disk.queueWriteLatency': 131090, - # 'disk.read': 131078, - # 'disk.totalLatency': 131093, - # 'disk.totalReadLatency': 131085, - # 'disk.totalWriteLatency': 131089, - # 'disk.usage': 131073, - - # disk.read/write/deviceLatency/numberRead/numberWrite - 131078, 131079, 131091, 131076, 131077, - ] - - # Seems as this is not available in ESX 5.0 but we saw it on 5.1 - if esx_version_num > 5.0: - # sys.resourceMemConsumed - needed_ids += [ - 262171, + if all_counters: + counterids = pm.get_entity_counters(mor) + needed_ids = counterids.keys() # retrieve all ids.... + else: + needed_ids = [ + # net.* + 196616, 196621, 196617, 196625, 196619, 196623, 196609, 196614, + 196620, 196624, 196615, 196622, 196618, 196612, 196613, 196626, + # 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, + # 'disk.deviceLatency': 131091, + # 'disk.deviceReadLatency': 131083, + # 'disk.deviceWriteLatency': 131087, + # 'disk.kernelLatency': 131092, + # 'disk.kernelReadLatency': 131084, + # 'disk.kernelWriteLatency': 131088, + # 'disk.maxQueueDepth': 131096, + # 'disk.maxTotalLatency': 131095, + # 'disk.numberRead': 131076, + # 'disk.numberReadAveraged': 131097, + # 'disk.numberWrite': 131077, + # 'disk.numberWriteAveraged': 131098, + # 'disk.queueLatency': 131094, + # 'disk.queueReadLatency': 131086, + # 'disk.queueWriteLatency': 131090, + # 'disk.read': 131078, + # 'disk.totalLatency': 131093, + # 'disk.totalReadLatency': 131085, + # 'disk.totalWriteLatency': 131089, + # 'disk.usage': 131073, + + # disk.read/write/deviceLatency/numberRead/numberWrite + 131078, 131079, 131091, 131076, 131077, ] - #needed_ids = [ - # # sys.resourceMem* - # 262151, 262155, 262169, 262152, 262154, 262153, 262157, 262156, 262168, - #] + # Seems as this is not available in ESX 5.0 but we saw it on 5.1 + if esx_version_num > 5.0: + # sys.resourceMemConsumed + needed_ids += [ + 262171, + ] + + #needed_ids = [ + # # sys.resourceMem* + # 262151, 262155, 262169, 262152, 262154, 262153, 262157, 262156, 262168, + #] + counters = pm.get_entity_statistic(mor, needed_ids) lines = [] for counter in counters: @@ -609,6 +618,11 @@ def conv_numeric_sensor_info(value): def conv_host(value): return all_hosts.get(value) +# This is only for testing/debugging. Simply printing all counters. +if opt_dump_counters: + dump_hostsystem_counters() + sys.exit(0) + if "datastore" in mortypes: output_datastores()

11 years, 1 month

← Newer
1
...
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2013