Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: aix_diskiod: new check for disk IO on AIX

by Mathias Kettner

Module: check_mk Branch: master Commit: 01e6308268a519208ba6858509597b8011b0165e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01e6308268a519… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 1 15:42:35 2014 +0200 aix_diskiod: new check for disk IO on AIX --- .werks/1039 | 8 ++++ ChangeLog | 1 + agents/check_mk_agent.aix | 10 +++++ checkman/aix_diskiod | 77 ++++++++++++++++++++++++++++++++ checks/aix_diskiod | 69 ++++++++++++++++++++++++++++ pnp-templates/check_mk-aix_diskiod.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 7 files changed, 167 insertions(+) diff --git a/.werks/1039 b/.werks/1039 new file mode 100644 index 0000000..e597bc9 --- /dev/null +++ b/.werks/1039 @@ -0,0 +1,8 @@ +Title: aix_diskiod: new check for disk IO on AIX +Level: 2 +Component: checks +Version: 1.2.5i5 +Date: 1404222142 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 5ac7e61..5bfe9ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * 1034 Always provide also 64 bit version of Windows agent * 0170 hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards * 0172 zfsget: Check is now usable in cluster_mode... + * 1039 aix_diskiod: new check for disk IO on AIX * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index c42abe6..401b858 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -23,6 +23,10 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Remove locale settings to eliminate localized outputs where possible +export LC_ALL=C +unset LANG + export MK_LIBDIR="/to/be/changed" export MK_CONFDIR="/to/be/changed" @@ -66,6 +70,12 @@ fi echo '<<<vmstat_aix>>>' vmstat | tail -n1 +echo '<<<aix_diskiod>>>' +iostat -d | tr -s ' ' | grep hdisk + +echo '<<<aix_memory>>>' +vmstat -v | tr -s ' ' | cut -d " " -f 2 + echo '<<<mpstat_aix>>>' mpstat -a | tail -n1 diff --git a/checkman/aix_diskiod b/checkman/aix_diskiod new file mode 100644 index 0000000..3615add --- /dev/null +++ b/checkman/aix_diskiod @@ -0,0 +1,77 @@ +title: Throughput on AIX hard disks +agents: aix +catalog: os/storage +license: GPL +distribution: check_mk +description: + + This check measures the disk IO of hard disks on AIX. The agent provides this + information via the command {diskio -d}. This check is compatible with {diskstat}, + but only supports throughput, no latency and queue lengths. Please read further + details in the man page of {diskstat}. + +item: + Either {"SUMMARY"} for a summarized check of alls LUNs or the + name of the disk device, e.g. {"hdisk15"}. + +examples: + # create one check for all disks + diskstat_inventory_mode = "summary" + + # Set default levels for diskstat + diskstat_default_levels = { + "read" : (10, 20), # level for read MB/sec + "write" : (20, 40), # level for write MB/sec + "average" : 15, # averaging in minutes + } + + # Alternative: just enable averaging over 10 minutes, + # do not apply levels: + diskstat_default_levels = { + "average" : 15 + } + + # Settings for certain hosts: + check_parameters += [ + ( {"write" : (20, 50), "average" : 10 }, [ "oracle" ], ALL_HOSTS, [ "Disk IO" ]) + ] + +perfdata: + The disk throughput for read and write in bytes per second. If averaging + is turned on, then two additional values are sent: the averaged read and + write throughput. + +inventory: + The inventory is configured via {diskstat_inventory_mode}. If this is set + to {"single"} (the default), then one check will be created for each + disk. If it is set to {"summary"} then only one service per host will be + created that has at least one hard disk. If set to {"legacy"} then a + separate check for read and write will be created (deprecated). + +[parameters] +"read": The levels to be applied to the read throughput. It this entry is + {None} or missing in the dictionary, then no levels are applied. This is + the defaut. The values are in MB per second. Setting {"read"} to {(20, 40)} + will warn if 20 MB/s is exceeded and make the check critical at 40 MB/s. + If averaging is turned on, then the levels are applied to the averaged + values! + +"write": The levels for the write throughput. + +"average": If this is not {None}, it will be interpreted as a time range + in minutes to do averaging over. Set this to {15} in order to have + the levels applied to a 15-minute average instead of the current + values (approx.). Turning the average on will also create two additional + performance values. Make sure that your graphing tool is setup to + a changing number of variables. + +[configuration] +diskstat_defaul_levels(dict): The default parameter used for inventorized + checks. This is preset to the empty dictionary. + That means that no averaging is done and no + levels are applied. + +diskstat_inventory_mode(string): Either {"single"} for one service per disk + or {"summary"} for the throughput of all disks summed up in one service. + Also possible is {"legacy"} for the old style mode (see above). Default + is {"single"}. diff --git a/checks/aix_diskiod b/checks/aix_diskiod new file mode 100644 index 0000000..7a8d3e3 --- /dev/null +++ b/checks/aix_diskiod @@ -0,0 +1,69 @@ +#!/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. + +# <<<aix_diskiod>>> +# hdisk3 0.9 237.0 9.1 1337054478 1628926522 +# hdisk5 0.9 237.1 8.8 1333731705 1633897629 +# hdisk7 0.9 256.2 10.1 1537047014 1669194644 +# hdisk6 0.9 236.6 9.1 1334163361 1626627852 +# hdisk2 0.9 237.6 9.1 1334458233 1639383130 +# hdisk9 0.8 239.4 9.3 1337740029 1658392394 +# hdisk8 0.9 238.3 8.9 1332262996 1649741796 +# hdisk4 0.9 237.4 8.8 1332426157 1638419364 +# hdisk13 0.5 238.1 8.3 394246756 2585031872 +# hdisk11 0.5 238.3 8.3 397601918 2584807275 + +# Columns means: +# 1. device +# 2. % tm_act +# 3. Kbps +# 4. tps +# 5. Kb_read -> Kilobytes read since system boot +# 6. Kb_wrtn -> Kilobytes written since system boot + +def aix_diskiod_convert(info): + converted = [] + for device, tm_act, kbps, tps, kb_read, kb_written in info: + converted.append((device, int(kb_read) * 1024, int(kb_written) * 1024)) + return converted + + +def inventory_aix_diskiod(info): + return inventory_diskstat_generic(aix_diskiod_convert(info)) + + +def check_aix_diskiod(item, params, info): + return check_diskstat_generic(item, params, time.time(), aix_diskiod_convert(info)) + +check_info["aix_diskiod"] = { + 'check_function': check_aix_diskiod, + 'inventory_function': inventory_aix_diskiod, + 'service_description': 'Disk IO %s', + 'has_perfdata': True, + 'group': 'disk_io', + 'includes': [ "diskstat.include" ], +} + diff --git a/pnp-templates/check_mk-aix_diskiod.php b/pnp-templates/check_mk-aix_diskiod.php new file mode 120000 index 0000000..8b45325 --- /dev/null +++ b/pnp-templates/check_mk-aix_diskiod.php @@ -0,0 +1 @@ +check_mk-diskstat.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 7cf2b33..74c4bf7 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -583,6 +583,7 @@ def perfometer_check_mk_diskstat(row, check_command, perf_data): perfometers["check_mk-diskstat"] = perfometer_check_mk_diskstat perfometers["check_mk-winperf_phydisk"] = perfometer_check_mk_diskstat perfometers["check_mk-hpux_lunstats"] = perfometer_check_mk_diskstat +perfometers["check_mk-aix_diskiod"] = perfometer_check_mk_diskstat perfometers["check_mk-mysql.innodb_io"] = perfometer_check_mk_diskstat perfometers["check_mk-esx_vsphere_counters.diskio"] = perfometer_check_mk_diskstat perfometers["check_mk-emcvnx_disks"] = perfometer_check_mk_diskstat

10 years, 2 months

Check_MK Git: check_mk: Fix syntax error in hitachi_hnas_volume

by Mathias Kettner

Module: check_mk Branch: master Commit: 6de1be1f5ebb9042beee866ffe392975eaadb5b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6de1be1f5ebb90… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 1 15:30:22 2014 +0200 Fix syntax error in hitachi_hnas_volume --- checks/hitachi_hnas_volume | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/hitachi_hnas_volume b/checks/hitachi_hnas_volume index 3852708..740a744 100644 --- a/checks/hitachi_hnas_volume +++ b/checks/hitachi_hnas_volume @@ -35,10 +35,10 @@ def inventory_hitachi_hnas_volume(info): def check_hitachi_hnas_volume(item, params, info): # use checks from df.include fslist = [] - for id, label, volume_status, total, free, evs in info: - if id = '': + for volid, label, volume_status, total, free, evs in info: + if volid == '': continue - if id + " " + label == item: + if volid + " " + label == item: size_mb = int(total) / 1048576.0 avail_mb = int(free) / 1048576.0 fslist.append((item, size_mb, avail_mb)) @@ -54,7 +54,7 @@ def check_hitachi_hnas_volume(item, params, info): ) error_string = ( "", " (!)", " (!!)", "" ) - volume_status=int(volume_status) + volume_status = int(volume_status) if volume_status == 0 or volume_status >= len(statusmap): message += ", Volume reports unidentified status %s" % volume_status

10 years, 2 months

Check_MK Git: check_mk: fc_port: new check for fibre channel devices supporting the FCMGMT MIB

by Goetz Golla

Module: check_mk Branch: master Commit: fc03bba4caf83b5884e0da3b8e4c8a0b1e102acd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc03bba4caf83b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Jul 1 14:55:18 2014 +0200 fc_port: new check for fibre channel devices supporting the FCMGMT MIB --- .werks/624 | 8 + ChangeLog | 1 + checkman/fc_port | 149 ++++++++++++++ checks/fc_port | 358 ++++++++++++++++++++++++++++++++++ pnp-templates/check_mk-fc_port.php | 221 +++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 1 + web/plugins/wato/check_parameters.py | 147 ++++++++++++++ 7 files changed, 885 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fc03bba4ca…

10 years, 2 months

Check_MK Git: check_mk: Massive speedup of cmk --snmptranslate

by Mathias Kettner

Module: check_mk Branch: master Commit: a82a80a9f3de7be20fa2338e973a41094d4acde9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a82a80a9f3de7b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 1 14:49:01 2014 +0200 Massive speedup of cmk --snmptranslate --- .werks/1038 | 8 ++++++++ ChangeLog | 1 + modules/check_mk.py | 19 ++++++++++--------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.werks/1038 b/.werks/1038 new file mode 100644 index 0000000..6e177a4 --- /dev/null +++ b/.werks/1038 @@ -0,0 +1,8 @@ +Title: Massive speedup of cmk --snmptranslate +Level: 1 +Component: core +Version: 1.2.5i5 +Date: 1404218927 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 431281a..d07b938 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 1012 Fix quoting of backslashes in custom checks with nagios core... NOTE: Please refer to the migration notes! + * 1038 Massive speedup of cmk --snmptranslate * 1035 FIX: Do not fail on errors in *.mk files anymore - except in interactive mode... Checks & Agents: diff --git a/modules/check_mk.py b/modules/check_mk.py index 9e943f5..22b912e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4376,9 +4376,6 @@ def do_snmptranslate(walk): for idx, line in enumerate(result): result_lines.append((line, lines[idx])) - # Add missing fields one by one - for line in lines[len(result_lines):]: - result_lines.extend(translate([line])) except Exception, e: print e @@ -4386,17 +4383,21 @@ def do_snmptranslate(walk): # Translate n-oid's per cycle - entries_per_cycle = 50 + entries_per_cycle = 500 translated_lines = [] walk_lines = file(path_walk).readlines() - sys.stderr.write("Processing %d lines (%d per dot)\n" % (len(walk_lines), entries_per_cycle)) - for i in range(0, len(walk_lines), entries_per_cycle): - sys.stderr.write(".") + sys.stderr.write("Processing %d lines.\n" % len(walk_lines)) + + i = 0 + while i < len(walk_lines): + sys.stderr.write("\r%d to go... " % (len(walk_lines) - i)) sys.stderr.flush() process_lines = walk_lines[i:i+entries_per_cycle] - translated_lines.extend(translate(process_lines)) - sys.stderr.write("\n") + translated = translate(process_lines) + i += len(translated) + translated_lines += translated + sys.stderr.write("\rfinished. \n") # Output formatted longest_translation = 40

10 years, 2 months

Check_MK Git: check_mk: FIX bintec_info: support bintec RXL12500

by Mathias Kettner

Module: check_mk Branch: master Commit: 61dbb2c4bf36908add1ec5ea990dc73c02b2b2b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61dbb2c4bf3690… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 1 14:28:46 2014 +0200 FIX bintec_info: support bintec RXL12500 --- .werks/1037 | 9 +++++++++ ChangeLog | 1 + checks/bintec_info | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1037 b/.werks/1037 new file mode 100644 index 0000000..4f8f4e6 --- /dev/null +++ b/.werks/1037 @@ -0,0 +1,9 @@ +Title: bintec_info: support bintec RXL12500 +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1404217707 + + diff --git a/ChangeLog b/ChangeLog index b136ceb..431281a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 0171 FIX: hp_blade_psu: Fixed pnp template... * 0996 FIX: apc_symmetra_test: Handle unknown date of last self test as intended... * 0173 FIX: hitachi_hnas_volume: Fixed bug when snmp outputs empty lines + * 1037 FIX: bintec_info: support bintec RXL12500 Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/bintec_info b/checks/bintec_info index 70f311f..3f93aa9 100644 --- a/checks/bintec_info +++ b/checks/bintec_info @@ -46,6 +46,7 @@ check_info["bintec_info"] = { # 1.3.6.1.4.1.272.4.1.31.0 S/N # 1.3.6.1.4.1.272.4.1.26.0 SW Version 'snmp_info': ('.1.3.6.1.4.1.272.4.1', ['26.0', '31.0']), - 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0") == \ + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.272.4.200.83.88.67.66.0.0", + ".1.3.6.1.4.1.272.4.158.82.78.66.48.0.0", ] }

10 years, 2 months

Check_MK Git: check_mk: FIX hitachi_hnas_volume: Fixed bug when snmp outputs empty lines

by Bastian Kuhn

Module: check_mk Branch: master Commit: 88d1e5d9be6546ec7709bbf87cb8dfafb4e0ca25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88d1e5d9be6546… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 1 14:25:39 2014 +0200 FIX hitachi_hnas_volume: Fixed bug when snmp outputs empty lines --- .werks/173 | 9 +++++++++ ChangeLog | 1 + checks/hitachi_hnas_volume | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/173 b/.werks/173 new file mode 100644 index 0000000..349768d --- /dev/null +++ b/.werks/173 @@ -0,0 +1,9 @@ +Title: hitachi_hnas_volume: Fixed bug when snmp outputs empty lines +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1404217488 + + diff --git a/ChangeLog b/ChangeLog index dcc47cf..b136ceb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 1032 FIX: check_traceroute: Fix option Use DNS, worked vice versa * 0171 FIX: hp_blade_psu: Fixed pnp template... * 0996 FIX: apc_symmetra_test: Handle unknown date of last self test as intended... + * 0173 FIX: hitachi_hnas_volume: Fixed bug when snmp outputs empty lines Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/hitachi_hnas_volume b/checks/hitachi_hnas_volume index cf26fc5..3852708 100644 --- a/checks/hitachi_hnas_volume +++ b/checks/hitachi_hnas_volume @@ -36,6 +36,8 @@ def check_hitachi_hnas_volume(item, params, info): # use checks from df.include fslist = [] for id, label, volume_status, total, free, evs in info: + if id = '': + continue if id + " " + label == item: size_mb = int(total) / 1048576.0 avail_mb = int(free) / 1048576.0

10 years, 2 months

Check_MK Git: check_mk: Added missing change in check_mk_agent.solaris

by Bastian Kuhn

Module: check_mk Branch: master Commit: 771e20ee7ed85935f9ece6323a05e5f04adffde2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=771e20ee7ed859… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 1 14:11:19 2014 +0200 Added missing change in check_mk_agent.solaris --- agents/check_mk_agent.solaris | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 63f9aef..8178cdb 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -124,6 +124,7 @@ done if type zfs &>/dev/null then echo '<<<zfsget>>>' + echo '[zfs]' zfs get -Hp name,quota,used,avail,mountpoint,type echo '[df]' df -l -k -F zfs 2>/dev/null | sed 1d

10 years, 2 months

Check_MK Git: check_mk: zfsget: Check is now usable in cluster_mode

by Bastian Kuhn

Module: check_mk Branch: master Commit: f45ee7f38ad6d1a6406d63f87a8f2fdb10a44633 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f45ee7f38ad6d1… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 1 14:07:44 2014 +0200 zfsget: Check is now usable in cluster_mode Until now, it was not possible to move zfs filesystems to a check_mk defined cluster host. This is now possible. It was nescessary to rewrite the hole check logic, so it's possible that we introduced new bugs, so please double-check the output of the plugin. --- .werks/172 | 9 ++++ ChangeLog | 1 + checks/zfsget | 152 ++++++++++++++++++++++++++++----------------------------- 3 files changed, 85 insertions(+), 77 deletions(-) diff --git a/.werks/172 b/.werks/172 new file mode 100644 index 0000000..63cb209 --- /dev/null +++ b/.werks/172 @@ -0,0 +1,9 @@ +Title: zfsget: Check is now usable in cluster_mode +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1404216186 +Class: feature + +Until now, it was not possible to move zfs filesystems to a check_mk defined cluster host. This is now possible. It was nescessary to rewrite +the hole check logic, so it's possible that we introduced new bugs, so please double-check the output of the plugin. diff --git a/ChangeLog b/ChangeLog index ea05c6d..dcc47cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 0169 websphere_mq_channels,ebsphere_mq_queues: New Checks to monitor IBM Websphere MQ Queues and Channels... * 1034 Always provide also 64 bit version of Windows agent * 0170 hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards + * 0172 zfsget: Check is now usable in cluster_mode... * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checks/zfsget b/checks/zfsget index c97e526..f4b0ec5 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -59,27 +59,11 @@ # tsrdb10exp 5128704 21 4982717 1% /tsrdb10exp # tsrdb10dat 30707712 19914358 10789464 65% /u01 - -def parse_zfsget(info): +def parse_zfs_entrie(info): def mb(x): return saveint(x) / (1024.0 * 1024) - - entries = [] - entry = None - lineno = 0 - last_name = None - start_of_df = None - for line in info: - lineno += 1 - if line == ['[df]']: - start_of_df = lineno - break - name, what, value = line[:3] - if last_name != name: - if entry: - entries.append(entry) - entry = {} - last_name = name + entry = {} + for name, what, value in info: if what in ["used", "available"]: entry[what] = mb(value) elif what == "quota": @@ -87,79 +71,93 @@ def parse_zfsget(info): entry[what] = mb(value) elif what in [ 'mountpoint', 'type', 'name' ]: entry[what] = value - if entry: - entries.append(entry) - - # parsed has the device name as key, because there may exist - # several device names per mount point, and we know only - # later which one to take - parsed = {} - for entry in entries: - if entry["mountpoint"].startswith("/"): - entry["is_pool"] = '/' not in entry["name"] - if entry['available'] !=0 and entry['type'] == 'filesystem': - parsed[entry["name"]] = entry - - # parsed_df and parsed_final have the mount point as key - parsed_final = {} - if start_of_df != None: - parsed_df = zfsget_parse_df_info(parsed, info[start_of_df:]) - for mountpoint, entry_df in parsed_df.items(): - found = False - # for every mount point in the df section, if the device name - # is also present in the "parsed" variable, we take those data - for name, entry in parsed.items(): - if entry_df["name"] == name: - parsed_final[mountpoint] = entry - found = True - # if a mount point in the df section is not present in the - # parsed variable, we take the data from the df section - if not found: - parsed_final[mountpoint] = entry_df - else: - # if there is no df section we take the other data, - # should there be several device names per mount point, - # (not sure if this can happen) the last one wins - for name, entry in parsed.items(): - parsed_final[entry["mountpoint"]] = entry - - return parsed_final + return entry -def zfsget_parse_df_info(entries, info): - new_entries = {} - - for entry in info: - if len(entry) == 6: - device, kbytes, used, avail, percent, mountpoint = entry - else: - device, fs_type, kbytes, used, avail, percent, mountpoint = entry - if mountpoint.startswith("/"): - entry = {} - total = int(kbytes) / 1024.0 - entry["name"] = device - entry["total"] = total - entry["used"] = int(used) / 1024.0 - entry["available"] = total - entry["used"] - entry["mountpoint"] = mountpoint - new_entries[mountpoint] = entry +def parse_zfsget(info): + run_zfs = True + run_df = False + last_name = None + zfs_agent_data = [] + zfs_converted = [] + df_parsed = {} + for line in info: + if line == ['[zfs]']: + run_zfs = True + run_df = False + continue + if line == ['[df]']: + run_df = True + run_zfs = False + continue + + if run_zfs: + name = line[0] + # New block so parse everthing and go on collecting more blocks + if last_name != name: + last_name = name + if zfs_agent_data: + zfs_converted.append(parse_zfs_entrie(zfs_agent_data)) + zfs_agent_data = [] + zfs_agent_data.append(line[:3]) + + if run_df: + if len(line) == 6: + device, kbytes, used, avail, percent, mountpoint = line + else: + device, fs_type, kbytes, used, avail, percent, mountpoint = line + if mountpoint.startswith("/"): + entry = {} + total = int(kbytes) / 1024.0 + entry["name"] = device + entry["total"] = total + entry["used"] = int(used) / 1024.0 + entry["available"] = total - entry["used"] + entry["mountpoint"] = mountpoint + df_parsed[mountpoint] = entry # Now remove duplicate entries for the root filesystem, such # as /dev/ or /lib/libc.so.1. We do this if size, used and # avail is equal. I hope that it will not happen too often # that this is per chance the case for different passed-through # filesystems - root_entry = new_entries.get("/") + root_entry = df_parsed.get("/") if root_entry: t_u_a = (root_entry["total"], root_entry["used"], root_entry["available"]) drop = [] - for mountpoint, entry in new_entries.items(): + for mountpoint, entry in df_parsed.items(): if mountpoint != "/" and \ t_u_a == (entry["total"], entry["used"], entry["available"]): drop.append(mountpoint) for mp in drop: - del new_entries[mp] - return new_entries + del df_parsed[mp] + + # parsed has the device name as key, because there may exist + # several device names per mount point, and we know only + # later which one to take + zfs_parsed = {} + for entry in zfs_converted: + if entry["mountpoint"].startswith("/"): + entry["is_pool"] = '/' not in entry["name"] + if entry['available'] !=0 and entry['type'] == 'filesystem': + zfs_parsed[entry["name"]] = entry + + # parsed_df and parsed_final have the mount point as key + parsed_final = {} + for mountpoint, entry_df in df_parsed.items(): + found = False + # for every mount point in the df section, if the device name + # is also present in the "parsed" variable, we take those data + for name, entry in zfs_parsed.items(): + if entry_df["name"] == name: + parsed_final[mountpoint] = entry + found = True + # if a mount point in the df section is not present in the + # parsed variable, we take the data from the df section + if not found: + parsed_final[mountpoint] = entry_df + + return parsed_final def inventory_zfsget(info): mplist = []

10 years, 2 months

Check_MK Git: check_mk: WATO: Hover menu of user online state shows the last seen date/time now

by Lars Michelsen

Module: check_mk Branch: master Commit: 8b30bda0e99de8cb475cd21f2f582d2d1bcc36e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b30bda0e99de8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 1 13:48:41 2014 +0200 WATO: Hover menu of user online state shows the last seen date/time now --- .werks/825 | 8 ++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/825 b/.werks/825 new file mode 100644 index 0000000..6976b2f --- /dev/null +++ b/.werks/825 @@ -0,0 +1,8 @@ +Title: WATO: Hover menu of user online state shows the last seen date/time now +Level: 1 +Component: wato +Version: 1.2.5i5 +Date: 1404215298 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 39fba89..32a3365 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 0945 FIX: Sidebar snapin "Problem hosts": Now excludes hosts and services in downtime WATO: + * 0825 WATO: Hover menu of user online state shows the last seen date/time now * 0990 FIX: Fix HTTP error handling in bulk inventory... * 1004 FIX: Fix exception when saving rules, caused by empty item * 0947 FIX: WATO snapshots: fixed missing files on restoring nagvis backup domains diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9acf07f..d8ac8ca 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11267,12 +11267,14 @@ def mode_users(phase): # Online/Offline if config.save_user_access_times: - if user.get('last_seen', 0) >= online_threshold: + last_seen = user.get('last_seen', 0) + if last_seen >= online_threshold: title = _('Online') img_txt = 'on' else: title = _('Offline') img_txt = 'off' + title += ' (%s %s)' % (fmt_date(last_seen), fmt_time(last_seen)) table.cell(_("Act."), '<img class=icon title="%s" src="images/icon_%sline.png" />' % (title, img_txt)) # Connector

10 years, 2 months

Check_MK Git: check_mk: FIX Fixed problem where user access times were not updated correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: f82e4d39e1bdac05bf1e085615910e7000038072 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f82e4d39e1bdac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 1 13:56:49 2014 +0200 FIX Fixed problem where user access times were not updated correctly --- .werks/826 | 8 ++++++++ ChangeLog | 1 + web/htdocs/sidebar.py | 2 +- web/htdocs/userdb.py | 6 +++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.werks/826 b/.werks/826 new file mode 100644 index 0000000..3745a00 --- /dev/null +++ b/.werks/826 @@ -0,0 +1,8 @@ +Title: Fixed problem where user access times were not updated correctly +Level: 1 +Component: wato +Version: 1.2.5i5 +Date: 1404215789 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 32a3365..d4e628c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 0990 FIX: Fix HTTP error handling in bulk inventory... * 1004 FIX: Fix exception when saving rules, caused by empty item * 0947 FIX: WATO snapshots: fixed missing files on restoring nagvis backup domains + * 0826 FIX: Fixed problem where user access times were not updated correctly Reporting & Availability: * 0991 FIX: Availability: optionally show time stamps as UNIX epoch time... diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 72480fc..13786b4 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -346,7 +346,7 @@ def ajax_openclose(): def ajax_snapin(): # Update online state of the user (if enabled) - userdb.update_user_access_time() + userdb.update_user_access_time(config.user_id) snapname = html.var("name") if snapname: diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 0a911cb..7fbecee 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -127,17 +127,17 @@ def user_locked(username): users = load_users() return users[username].get('locked', False) -def update_user_access_time(): +def update_user_access_time(username): if not config.save_user_access_times: return - save_custom_attr(html.user, 'last_seen', repr(time.time())) + save_custom_attr(username, 'last_seen', repr(time.time())) def on_succeeded_login(username): num_failed = load_custom_attr(username, 'num_failed', saveint) if num_failed != None and num_failed != 0: save_custom_attr(username, 'num_failed', '0') - update_user_access_time() + update_user_access_time(username) def on_failed_login(username): users = load_users(lock = True)

10 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 2014