Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64206 discussions

Check_MK Git: check_mk: hpux_snmp_cs.cpu: new SNMP check for CPU utilization on HP-UX

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 668495503329c05b79e11fab62747967f54951af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=668495503329c0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 17:34:54 2012 +0100 hpux_snmp_cs.cpu: new SNMP check for CPU utilization on HP-UX --- ChangeLog | 2 + checkman/hpux_snmp_cs.cpu | 15 ++++ checks/hpux_snmp_cs | 103 +++++++++++++++++++++++++++ pnp-templates/check_mk-hpux_snmp_cs.cpu.php | 48 ++++++++++++ web/plugins/perfometer/check_mk.py | 13 ++++ 5 files changed, 181 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28f7512..f2b327f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ * added new checks for Fujitsu ETERNUS DX80 S2 (thanks to Philipp Höfflin) * Fix Perf-O-Meter of fileage + * hpux_snmp_cs.cpu: new SNMP check for CPU utilization + on HP-UX. Multisite: * Added several missing localization stringsw diff --git a/checkman/hpux_snmp_cs.cpu b/checkman/hpux_snmp_cs.cpu new file mode 100644 index 0000000..e9be8f2 --- /dev/null +++ b/checkman/hpux_snmp_cs.cpu @@ -0,0 +1,15 @@ +title: Check CPU usage (utilisation) via SNMP on HP-UX +agents: snmp +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check measures the CPU utilization during the last check + cycle using SNMP and the HP-UX SNMP agent. It outputs values + for user, system, nice and idle. + +perfdata: + Four variables: The percentage of time spent in {user}, {system}, {nice} and {idle}. + +inventory: + One check per host is created if the agent supports this check. diff --git a/checks/hpux_snmp_cs b/checks/hpux_snmp_cs new file mode 100644 index 0000000..c32cfbe --- /dev/null +++ b/checks/hpux_snmp_cs @@ -0,0 +1,103 @@ +#!/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. + + +# Some relevant OIDs are +# sysUpTime: 1.3.6.1.4.1.11.2.3.1.1.1 +# sysUsers: 1.3.6.1.4.1.11.2.3.1.1.2 +# sysAvgJobs1: 1.3.6.1.4.1.11.2.3.1.1.3 +# sysAvgJobs5: 1.3.6.1.4.1.11.2.3.1.1.4 +# sysAvgJobs15: 1.3.6.1.4.1.11.2.3.1.1.5 +# sysMaxProcess: 1.3.6.1.4.1.11.2.3.1.1.6 +# sysFreeMemory: 1.3.6.1.4.1.11.2.3.1.1.7 +# sysPhysMemory: 1.3.6.1.4.1.11.2.3.1.1.8 +# sysMaxUserMemory: 1.3.6.1.4.1.11.2.3.1.1.9 +# sysSwapConfig: 1.3.6.1.4.1.11.2.3.1.1.10 +# sysEnabledSwap: 1.3.6.1.4.1.11.2.3.1.1.11 +# sysFreeSwap: 1.3.6.1.4.1.11.2.3.1.1.12 +# sysUserCPU: 1.3.6.1.4.1.11.2.3.1.1.13 +# sysSysCPU: 1.3.6.1.4.1.11.2.3.1.1.14 +# sysIdleCPU: 1.3.6.1.4.1.11.2.3.1.1.15 +# sysNiceCPU: 1.3.6.1.4.1.11.2.3.1.1.16 + +# Example walk: +# .1.3.6.1.4.1.11.2.3.1.1.1.0 215207600 +# .1.3.6.1.4.1.11.2.3.1.1.10.0 33357824 +# .1.3.6.1.4.1.11.2.3.1.1.11.0 33357824 +# .1.3.6.1.4.1.11.2.3.1.1.12.0 29350932 +# .1.3.6.1.4.1.11.2.3.1.1.13.0 52129100 +# .1.3.6.1.4.1.11.2.3.1.1.14.0 23331438 +# .1.3.6.1.4.1.11.2.3.1.1.15.0 123137168 +# .1.3.6.1.4.1.11.2.3.1.1.16.0 10 + + + +def inventory_hpux_snmp_cpu(info): + if len(info) > 0: + return [(None, None)] + +def check_hpux_snmp_cpu(item, _no_params, info): + parts = dict(info) + some_counter_wrapped = False + this_time = time.time() + total_rate = 0 + rates = [] + for what, oid in [ + ( "user", "13.0" ), + ( "system", "14.0" ), + ( "idle", "15.0" ), + ( "nice", "16.0" )]: + value = int(parts[oid]) + try: + timedif, rate = get_counter("snmp_cpu_util.%s" % what, this_time, value) + total_rate += rate + rates.append(rate) + except MKCounterWrapped: + some_counter_wrapped = True + + if some_counter_wrapped: + raise MKCounterWrapped("", "Some counter wrapped, no data this time") + + if total_rate == 0: + raise MKCounterWrapped("", "No counter counted. Time has ceased to flow.") + + perfdata = [] + infos = [] + for what, rate in zip(["user", "system", "idle", "nice"], rates): + part = rate / total_rate + perc = part * 100 + perfdata.append((what, perc, None, None, 0, 100)) + infos.append("%s: %.0f%%" % (what, perc)) + + return (0, "OK - " + ", ".join(infos), perfdata) + + +check_info['hpux_snmp_cs.cpu'] = (check_hpux_snmp_cpu, "CPU utilization", 1, inventory_hpux_snmp_cpu) + +snmp_info['hpux_snmp_cs'] = ( ".1.3.6.1.4.1.11.2.3.1", [ OID_END, 1 ]) + +snmp_scan_functions['hpux_snmp_cs.cpu'] = \ + lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith("HP-UX") diff --git a/pnp-templates/check_mk-hpux_snmp_cs.cpu.php b/pnp-templates/check_mk-hpux_snmp_cs.cpu.php new file mode 100644 index 0000000..7f5c962 --- /dev/null +++ b/pnp-templates/check_mk-hpux_snmp_cs.cpu.php @@ -0,0 +1,48 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +$opt[1] = "--vertical-label 'CPU utilization %' -l0 -u 100 --title \"CPU Utilization for $hostname\" "; +# +$def[1] = "DEF:user=$RRDFILE[1]:$DS[1]:AVERAGE " ; +$def[1] .= "DEF:system=$RRDFILE[2]:$DS[2]:AVERAGE " ; +$def[1] .= "DEF:idle=$RRDFILE[3]:$DS[3]:AVERAGE " ; +$def[1] .= "DEF:nice=$RRDFILE[4]:$DS[4]:AVERAGE " ; +$def[1] .= "CDEF:sum=user,system,+,nice,+ "; + +$def[1] .= "AREA:user#60f020:\"User\" " ; +$def[1] .= "GPRINT:user:LAST:\"%2.1lf%%\" " ; + +$def[1] .= "AREA:system#ff6000:\"System\":STACK " ; +$def[1] .= "GPRINT:system:LAST:\"%2.1lf%%\" " ; + +$def[1] .= "AREA:nice#00d080:\"Nice\":STACK " ; +$def[1] .= "GPRINT:nice:LAST:\"%2.1lf%%\" " ; + +$def[1] .= "LINE:idle#ffffff:\"Idle\":STACK " ; +$def[1] .= "GPRINT:idle:LAST:\"%2.1lf%%\" " ; + +$def[1] .= "LINE:sum#004080:\"Utilization\" " ; + +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 4fd17e5..06c1872 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -300,6 +300,19 @@ def perfometer_cpu_utilization(row, check_command, perf_data): perfometers["check_mk-h3c_lanswitch_cpu"] = perfometer_cpu_utilization perfometers["check_mk-winperf_processor.util"] = perfometer_cpu_utilization +def perfometer_hpux_snmp_cs_cpu(row, check_command, perf_data): + h = '<table><tr>' + h += perfometer_td(float(perf_data[0][1]), "#60f020") + h += perfometer_td(float(perf_data[1][1]), "#ff6000") + h += perfometer_td(float(perf_data[2][1]), "#00d080") + h += perfometer_td(float(perf_data[3][1]), "#ffffff") + h += '</tr></table>' + sum = float(perf_data[0][1]) + float(perf_data[1][1]) + float(perf_data[2][1]) + return "%.0f%%" % sum, h + +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) hours, rest = divmod(rest, 60*60)

12 years, 7 months

Check_MK Git: check_mk: Fix Perf-O-Meter of fileage

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea10df8b9ef5935e0c077d11199d564662bf86fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea10df8b9ef593… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 16:08:04 2012 +0100 Fix Perf-O-Meter of fileage --- ChangeLog | 1 + web/htdocs/status.css | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec45c06..28f7512 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * diskstat: make inventory mode configurable via WATO * added new checks for Fujitsu ETERNUS DX80 S2 (thanks to Philipp Höfflin) + * Fix Perf-O-Meter of fileage Multisite: * Added several missing localization stringsw diff --git a/web/htdocs/status.css b/web/htdocs/status.css index f6dcd18..67fb770 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -193,15 +193,19 @@ table.data td.perfometer td.inner { height: 22px; padding: 0px 0px 0px 1px; } + table.data td.perfometer div.stacked table:first-child { border-bottom-style: none; } +table.data td.perfometer div.stacked table { + height: 12px; +} + table.data td.perfometer div.stacked td.inner { height: 10px; } - td.perfometer a { color: #000; text-decoration: none;

12 years, 7 months

Check_MK Git: check_mk: Fixed file headers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9f0a4c80bbbe3faac82bc6de08901517c4fd9d73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f0a4c80bbbe3f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 16:04:30 2012 +0100 Fixed file headers --- checks/cisco_temp_sensor | 2 +- checks/dmraid | 1 - checks/fjdarye.include | 41 +++++++++++++++++++++++++---------------- checks/fjdarye100_cadaps | 40 +++++++++++++++++++++++++--------------- checks/fjdarye100_cmods | 40 +++++++++++++++++++++++++--------------- checks/fjdarye100_cmods_mem | 40 +++++++++++++++++++++++++--------------- checks/fjdarye100_conencs | 40 +++++++++++++++++++++++++--------------- checks/fjdarye100_cpsus | 40 +++++++++++++++++++++++++--------------- checks/fjdarye100_devencs | 40 +++++++++++++++++++++++++--------------- checks/fjdarye100_disks | 40 +++++++++++++++++++++++++--------------- checks/fjdarye100_rluns | 40 +++++++++++++++++++++++++--------------- checks/fjdarye100_sum | 40 +++++++++++++++++++++++++--------------- checks/fjdarye100_syscaps | 40 +++++++++++++++++++++++++--------------- doc/jasperreports/Makefile | 24 ++++++++++++++++++++++++ doc/opt/benchmark/cmkbench.sh | 23 +++++++++++++++++++++++ 15 files changed, 323 insertions(+), 168 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9f0a4c80bb…

12 years, 7 months

Check_MK Git: check_mk: added new checks for Fujitsu ETERNUS DX80 S2

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 874dde866cf24b9a326e52b1aa074baa9fe44bf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=874dde866cf24b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 15:58:54 2012 +0100 added new checks for Fujitsu ETERNUS DX80 S2 --- ChangeLog | 2 + checkman/fjdarye100_cadaps | 20 +++++++ checkman/fjdarye100_cmods | 20 +++++++ checkman/fjdarye100_cmods_mem | 20 +++++++ checkman/fjdarye100_conencs | 20 +++++++ checkman/fjdarye100_cpsus | 20 +++++++ checkman/fjdarye100_devencs | 20 +++++++ checkman/fjdarye100_disks | 26 +++++++++ checkman/fjdarye100_disks.summary | 34 ++++++++++++ checkman/fjdarye100_rluns | 27 +++++++++ checkman/fjdarye100_sum | 15 +++++ checkman/fjdarye100_syscaps | 20 +++++++ checks/fjdarye.include | 109 +++++++++++++++++++++++++++++++++++++ checks/fjdarye100_cadaps | 37 +++++++++++++ checks/fjdarye100_cmods | 35 ++++++++++++ checks/fjdarye100_cmods_mem | 37 +++++++++++++ checks/fjdarye100_conencs | 33 +++++++++++ checks/fjdarye100_cpsus | 35 ++++++++++++ checks/fjdarye100_devencs | 35 ++++++++++++ checks/fjdarye100_disks | 72 ++++++++++++++++++++++++ checks/fjdarye100_rluns | 77 ++++++++++++++++++++++++++ checks/fjdarye100_sum | 52 ++++++++++++++++++ checks/fjdarye100_syscaps | 35 ++++++++++++ checks/fjdarye60_cadaps | 26 +-------- checks/fjdarye60_cmods | 27 +--------- checks/fjdarye60_cmods_flash | 26 +-------- checks/fjdarye60_cmods_mem | 27 +--------- checks/fjdarye60_conencs | 26 +-------- checks/fjdarye60_devencs | 27 +--------- checks/fjdarye60_disks | 61 ++------------------- checks/fjdarye60_expanders | 26 +-------- checks/fjdarye60_inletthmls | 27 +--------- checks/fjdarye60_psus | 27 +--------- checks/fjdarye60_syscaps | 27 +--------- checks/fjdarye60_thmls | 27 +--------- 35 files changed, 827 insertions(+), 328 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=874dde866c…

12 years, 7 months

Check_MK Git: check_mk: WATO: Better output in case of inventory error

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fea02d5aa329057e7d0a4c89e3424d57dc91bd92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fea02d5aa32905… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 15:34:10 2012 +0100 WATO: Better output in case of inventory error --- ChangeLog | 1 + modules/automation.py | 132 ++++++++++++++++++++++++++++++++++--------------- 2 files changed, 93 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index b79f236..140ba57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ WATO: * Distributed WATO: Made all url calls using curl now * FIX: fix bug in inventory in validate_datatype() + * Better output in case of inventory error Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/modules/automation.py b/modules/automation.py index 1e19a80..0b72d5e 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -173,25 +173,51 @@ def automation_try_inventory_node(hostname): except: raise MKAutomationError("Cannot lookup IP address of host %s" % hostname) - f = [] + found_services = [] + + dual_host = is_snmp_host(hostname) and is_tcp_host(hostname) # if we are using cache files, then we restrict us to existing # check types. SNMP scan is only done without the --cache option + snmp_error = None if is_snmp_host(hostname): - if opt_use_cachefile: - existing_checks = set([ cn for (cn, item) in get_check_table(hostname) ]) - for cn in inventorable_checktypes("snmp"): - if cn in existing_checks: - f += make_inventory(cn, [hostname], True, True) - else: - f = do_snmp_scan([hostname], True, True) + try: + if opt_use_cachefile: + existing_checks = set([ cn for (cn, item) in get_check_table(hostname) ]) + for cn in inventorable_checktypes("snmp"): + if cn in existing_checks: + found_services += make_inventory(cn, [hostname], True, True) + else: + sys_descr = get_single_oid(hostname, ipaddress, ".1.3.6.1.2.1.1.1.0") + if sys_descr != None: + found_services = do_snmp_scan([hostname], True, True) + else: + raise MKSNMPError("Cannot get system description via SNMP. " + "SNMP agent is not responding. Probably wrong " + "community or wrong SNMP version.") + + except Exception, e: + if not dual_host: + raise + snmp_error = str(e) + tcp_error = None if is_tcp_host(hostname): - for cn in inventorable_checktypes("tcp"): - f += make_inventory(cn, [hostname], True, True) + try: + for cn in inventorable_checktypes("tcp"): + found_services += make_inventory(cn, [hostname], True, True) + except Exception, e: + if not dual_host: + raise + tcp_error = str(e) + + # raise MKAutomationError("%s/%s/%s" % (dual_host, snmp_error, tcp_error)) + if dual_host and snmp_error and tcp_error: + raise MKAutomationError("Error using TCP (%s)\nand SNMP (%s)" % + (tcp_error, snmp_error)) found = {} - for hn, ct, item, paramstring, state_type in f: + for hn, ct, item, paramstring, state_type in found_services: found[(ct, item)] = ( state_type, paramstring ) # Check if already in autochecks (but not found anymore) @@ -210,6 +236,7 @@ def automation_try_inventory_node(hostname): for cmd, descr, perf in legchecks: found[('legacy', descr)] = ( 'legacy', 'None' ) + # Collect current status information about all existing checks table = [] for (ct, item), (state_type, paramstring) in found.items(): if state_type != 'legacy': @@ -220,48 +247,73 @@ def automation_try_inventory_node(hostname): opt_dont_submit = True try: + exitcode = None + perfdata = [] info = get_host_info(hostname, ipaddress, infotype) # Handle cases where agent does not output data except MKAgentError, e: - if str(e) == "": - continue - else: - raise - except MKSNMPError, e: - if str(e) == "": - continue - else: - raise + exitcode = 3 + output = "Error getting data from agent" + if str(e): + output += ": %s" % e + tcp_error = output - check_function = check_info[ct][0] - # apply check_parameters - try: - if type(paramstring) == str: - params = eval(paramstring) - else: - params = paramstring - except: - raise MKAutomationError("Invalid check parameter string '%s'" % paramstring) - if state_type != 'manual': - params = compute_check_parameters(hostname, ct, item, params) + except MKSNMPError, e: + exitcode = 3 + output = "Error getting data from agent for %s via SNMP" % infotype + if str(e): + output += ": %s" % e + snmp_error = output - try: - result = check_function(item, params, info) - except MKCounterWrapped, e: - result = (None, "WAITING - Counter based check, cannot be done offline") except Exception, e: - result = (3, "UNKNOWN - invalid output from agent or error in check implementation") - if len(result) == 2: - result = (result[0], result[1], []) - exitcode, output, perfdata = result + exitcode = 3 + output = "Error getting data for %s: %s" % (infotype, e) + if check_uses_snmp(ct): + snmp_error = output + else: + tcp_error = output + + if exitcode == None: + check_function = check_info[ct][0] + # apply check_parameters + try: + if type(paramstring) == str: + params = eval(paramstring) + else: + params = paramstring + except: + raise MKAutomationError("Invalid check parameter string '%s'" % paramstring) + if state_type != 'manual': + params = compute_check_parameters(hostname, ct, item, params) + + try: + result = check_function(item, params, info) + except MKCounterWrapped, e: + result = (None, "WAITING - Counter based check, cannot be done offline") + except Exception, e: + result = (3, "UNKNOWN - invalid output from agent or error in check implementation") + if len(result) == 2: + result = (result[0], result[1], []) + exitcode, output, perfdata = result else: descr = item exitcode = None output = "WAITING - Legacy check, cannot be done offline" perfdata = [] + checkgroup = checkgroup_of.get(ct) table.append((state_type, ct, checkgroup, item, paramstring, params, descr, exitcode, output, perfdata)) + if not table and (tcp_error or snmp_error): + error = "" + if snmp_error: + error = "Error getting data via SNMP: %s" % snmp_error + if tcp_error: + if error: + error += ", " + error += "Error getting data from Check_MK agent: %s" % tcp_error + raise MKAutomationError(error) + return table # Set the new list of autochecks. This list is specified by a

12 years, 7 months

Check_MK Git: check_mk: FIX: fix bug in inventory in validate_datatype()

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73a8d3bb25bc790f94ea9410af8cb56e2c217741 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73a8d3bb25bc79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 14:40:53 2012 +0100 FIX: fix bug in inventory in validate_datatype() --- ChangeLog | 1 + web/htdocs/valuespec.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fbcb19..b79f236 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ WATO: * Distributed WATO: Made all url calls using curl now + * FIX: fix bug in inventory in validate_datatype() Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e25ffa5..83c370c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -862,7 +862,7 @@ class OptionalDropdownChoice(ValueSpec): for val, title in self._choices: if val == value: return - self._explicit.validate_datatype(self, value, varprefix + "_ex") + self._explicit.validate_datatype(value, varprefix + "_ex") # Input of date with optimization for nearby dates

12 years, 7 months

Check_MK Git: check_mk: CascadingDropdown: fix initially displayed valued

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e5d1f16edba0d8976e90cd567036baf8c15d1396 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5d1f16edba0d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 12:28:11 2012 +0100 CascadingDropdown: fix initially displayed valued --- web/htdocs/valuespec.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 516463c..e25ffa5 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -637,7 +637,7 @@ class CascadingDropdown(ValueSpec): options.append((str(nr), title)) if value == val or ( type(value) == tuple and value[0] == val): - def_val = nr + def_val = str(nr) vp = varprefix + "_sel" onchange="valuespec_cascading_change(this, '%s', %d);" % (varprefix, len(self._choices))

12 years, 7 months

Check_MK Git: check_mk: config.py: make user_alias availabe

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 259af1bb334e159aa9c08f72dcbab5b4a5cc8213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=259af1bb334e15… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 12:03:41 2012 +0100 config.py: make user_alias availabe --- web/htdocs/config.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index c3f96ce..13c04e2 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -274,11 +274,13 @@ def login(u): user_baserole_id = "guest" # Prepare user object - global user + global user, user_alias if u in multisite_users: user = multisite_users[u] + user_alias = user.get("alias", user_id) else: user = { "roles" : user_role_ids } + user_alias = user_id # Prepare cache of already computed permissions global user_permissions

12 years, 7 months

Check_MK Git: check_mk: ValueSpec Float: decimal_separator

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1f34bb842dc89e355cf1cf1cbe2d9f47e346a894 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f34bb842dc89e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 11:53:02 2012 +0100 ValueSpec Float: decimal_separator --- web/htdocs/valuespec.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index d6267e0..516463c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -479,10 +479,15 @@ class ListOfStrings(ValueSpec): class Float(Integer): def __init__(self, **kwargs): Integer.__init__(self, **kwargs) + self._decimal_separator = kwargs.get("decimal_separator", ".") + self._display_format = kwargs.get("display_format", "%.2f") def canonical_value(self): return float(Integer.canonical_value(self)) + def value_to_text(self, value): + return Integer.value_to_text(self, value).replace(".", self._decimal_separator) + def from_html_vars(self, varprefix): try: return float(html.var(varprefix))

12 years, 7 months

Check_MK Git: check_mk: New tool: livedump

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 61c149252f86485ec21d4c934be694f6bd0e6e0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61c149252f8648… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 09:32:53 2012 +0100 New tool: livedump --- ChangeLog | 11 +- doc/treasures/README.livedump | 65 +++++++++ doc/treasures/livedump | 310 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 382 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=61c149252f…

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits