Checkmk git commits June 2014

checkmk-commits@lists.checkmk.com

6 participants
135 discussions

Check_MK Git: check_mk: FIX Fixed keepalive termination in case of exceptions during checking

by Lars Michelsen

Module: check_mk Branch: master Commit: 0afd701b3ea763ae4930c462ba0b9e1412378436 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0afd701b3ea763… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jun 15 15:39:03 2014 +0200 FIX Fixed keepalive termination in case of exceptions during checking For example regular appearing exceptions like "Cannot resolve hostname..." were terminating the keepalive instance. This restart of the keepalive process is not expected to be done in such situations. --- .werks/819 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/819 b/.werks/819 new file mode 100644 index 0000000..f85191a --- /dev/null +++ b/.werks/819 @@ -0,0 +1,10 @@ +Title: Fixed keepalive termination in case of exceptions during checking +Level: 1 +Component: checks +Version: 1.2.5i4 +Date: 1402839420 +Class: fix + +For example regular appearing exceptions like "Cannot resolve hostname..." were +terminating the keepalive instance. This restart of the keepalive process is not +expected to be done in such situations. diff --git a/ChangeLog b/ChangeLog index b4b2e93..6676490 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 0619 adva_fsp_temp: new check to monitor temperature and temperature trends on ADVA scalable optical transport solutions * 0616 FIX: brocade.fan, brocade.power, brocade.temp: will now only discover services which are not marked as absent * 0992 FIX: zfs_arc_cache: returns OK even if values of arc meta are missing... + * 0819 FIX: Fixed keepalive termination in case of exceptions during checking... Multisite: * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... diff --git a/modules/check_mk.py b/modules/check_mk.py index d7f4e3c..86dfb29 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5492,6 +5492,8 @@ def do_check_keepalive(): sys.stderr.write("WARNING: new variable appeared: %s" % ", ".join(new_vars)) except Exception, e: + signal.signal(signal.SIGALRM, signal.SIG_IGN) # Prevent ALRM from CheckHelper.cc + signal.alarm(0) if opt_debug: raise total_check_output = "UNKNOWN - %s\n" % e

10 years, 5 months

Check_MK Git: check_mk: FIX zfsget: better filesystem selection and calculation of sizes

by Goetz Golla

Module: check_mk Branch: master Commit: fbfba6eb0f6333e1f22d2908a4731c4f234ce1db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbfba6eb0f6333… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jun 13 16:00:05 2014 +0200 FIX zfsget: better filesystem selection and calculation of sizes zfsget now only inventorizes filesystems of type "filesystem". If a mountpoint is present several times in the zfsget section of the agent data (with different device name), and also in the df section, the entry in the zfsget section with the device name from the df section is taken for calculating the data. --- .werks/621 | 13 +++++++++++++ ChangeLog | 1 + checkman/zfsget | 6 +++--- checks/zfsget | 43 +++++++++++++++++++++++++++++++------------ 4 files changed, 48 insertions(+), 15 deletions(-) diff --git a/.werks/621 b/.werks/621 new file mode 100644 index 0000000..f0a8ead --- /dev/null +++ b/.werks/621 @@ -0,0 +1,13 @@ +Title: zfsget: better filesystem selection and calculation of sizes +Level: 2 +Component: checks +Version: 1.2.5i4 +Date: 1402667669 +Class: fix + +zfsget now only inventorizes filesystems of type "filesystem". + +If a mountpoint is present several times in the zfsget section of the agent +data (with different device name), and also in the df section, the entry +in the zfsget section with the device name from the df section is taken for +calculating the data. diff --git a/ChangeLog b/ChangeLog index b4b2e93..7c797c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 0619 adva_fsp_temp: new check to monitor temperature and temperature trends on ADVA scalable optical transport solutions * 0616 FIX: brocade.fan, brocade.power, brocade.temp: will now only discover services which are not marked as absent * 0992 FIX: zfs_arc_cache: returns OK even if values of arc meta are missing... + * 0621 FIX: zfsget: better filesystem selection and calculation of sizes... Multisite: * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... diff --git a/checkman/zfsget b/checkman/zfsget index df2cd05..7b21ea3 100644 --- a/checkman/zfsget +++ b/checkman/zfsget @@ -17,7 +17,7 @@ description: filesystems live together in a common "pool". Each of the filesystems has its own amount of used space. But they share a common free space. If you want to compute the {percentage} of used/free space of a filesystem, - then you run into trouble. Let's take the following example: + you may run into trouble. Let's take the following example: Lets say we have a pool P of the size 10GB where the filesystems A and B live. Lets assume that A currently uses 2GB and B uses 7GB. That makes 1GB @@ -29,6 +29,6 @@ description: as 3GB with 2GB used (which makes 66.6%). That way all filesystems will become critical if the available pool space goes to zero. - Filesystems with a {quota} are handled differntly, however! Here the quota - is reported as the total size. If A would have a quota of 5GB then we report + Filesystems with a {quota} are handled differently, however. Here the quota + is reported as the total size. If A has a quota of 5GB, we report 2GB out of 5GB used. diff --git a/checks/zfsget b/checks/zfsget index 386e08f..c97e526 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -91,18 +91,40 @@ def parse_zfsget(info): 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: - parsed[entry["mountpoint"]] = entry + 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: - zfsget_parse_df_info(parsed, info[start_of_df:]) - - return parsed - + 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 def zfsget_parse_df_info(entries, info): new_entries = {} @@ -112,11 +134,10 @@ def zfsget_parse_df_info(entries, info): device, kbytes, used, avail, percent, mountpoint = entry else: device, fs_type, kbytes, used, avail, percent, mountpoint = entry - # ignore entries already contained in zfsget and also - # entries for virtual filesystems (like swap) - if mountpoint.startswith("/") and mountpoint not in entries: + 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"] @@ -138,9 +159,7 @@ def zfsget_parse_df_info(entries, info): drop.append(mountpoint) for mp in drop: del new_entries[mp] - entries.update(new_entries) - - + return new_entries def inventory_zfsget(info): mplist = []

10 years, 5 months

Check_MK Git: check_mk: FIX agent_ibmsvc: improved error messages on using wrong credentials

by Andreas Boesl

Module: check_mk Branch: master Commit: d2aa4cfe4829f22b22a725647af8faa8e77a5bf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2aa4cfe4829f2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 13 10:04:16 2014 +0200 FIX agent_ibmsvc: improved error messages on using wrong credentials --- .werks/936 | 8 ++++++++ ChangeLog | 1 + agents/special/agent_ibmsvc | 14 +++++++++----- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.werks/936 b/.werks/936 new file mode 100644 index 0000000..e156c15 --- /dev/null +++ b/.werks/936 @@ -0,0 +1,8 @@ +Title: agent_ibmsvc: improved error messages on using wrong credentials +Level: 1 +Component: checks +Version: 1.2.5i4 +Date: 1402646582 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fd4955d..3314dc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 0993 raritan_pdu_inlet: now delivers performance data * 0616 FIX: brocade.fan, brocade.power, brocade.temp: will now only discover services which are not marked as absent * 0992 FIX: zfs_arc_cache: returns OK even if values of arc meta are missing... + * 0936 FIX: agent_ibmsvc: improved error messages on using wrong credentials Multisite: * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index 3806044..a17fd2a 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -93,7 +93,7 @@ host_address = None user = None mortypes = [ 'all' ] -command_options = { +command_options = { "lshost" : {"section_header" : "ibm_svc_host", "active" : False, "command" : "lshost -nohdr -delim :"}, "lslicense" : {"section_header" : "ibm_svc_license", "active" : False, @@ -189,13 +189,17 @@ stdout, stderr = result.communicate() exit_code = result.wait() if exit_code not in [ 0, 1 ]: - print "Error connecting via ssh" + sys.stderr.write("Error connecting via ssh") sys.exit(2) -if stdout.startswith("CMMVC7016E"): - print str(stdout) +lines = stdout.split('\n') + +if lines[0].startswith("CMMVC7016E") or (len(lines) > 1 and lines[1].startswith("CMMVC7016E")): + sys.stderr.write(stdout) sys.exit(2) -for line in stdout.split('\n'): + +# Quite strange.. Why not simply print stdout? +for line in lines: print line

10 years, 5 months

Check_MK Git: check_mk: raritan_pdu_inlet: now delivers performance data

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 2b6e8c74115a2234ce1e1e79eaaae1149fc4bf41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b6e8c74115a22… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jun 12 17:16:50 2014 +0200 raritan_pdu_inlet: now delivers performance data --- .werks/993 | 8 +++ ChangeLog | 1 + checkman/raritan_pdu_inlet | 3 + checks/raritan_pdu_inlet | 7 +- pnp-templates/check_mk-raritan_pdu_inlet.php | 90 ++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 30 +++++++++ 6 files changed, 136 insertions(+), 3 deletions(-) diff --git a/.werks/993 b/.werks/993 new file mode 100644 index 0000000..c1b7512 --- /dev/null +++ b/.werks/993 @@ -0,0 +1,8 @@ +Title: raritan_pdu_inlet: now delivers performance data +Level: 1 +Component: checks +Version: 1.2.5i4 +Date: 1402586189 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b4b2e93..fd4955d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 0617 adva_fsp_if: new check to monitor interfaces of the ADVA FSP 3000 scalable optical transport solution * 0618 adva_fsp_current: new check for the power supply units of the ADVA FSP 3000 scalable optical transport solution * 0619 adva_fsp_temp: new check to monitor temperature and temperature trends on ADVA scalable optical transport solutions + * 0993 raritan_pdu_inlet: now delivers performance data * 0616 FIX: brocade.fan, brocade.power, brocade.temp: will now only discover services which are not marked as absent * 0992 FIX: zfs_arc_cache: returns OK even if values of arc meta are missing... diff --git a/checkman/raritan_pdu_inlet b/checkman/raritan_pdu_inlet index dcd4fbe..f615df8 100644 --- a/checkman/raritan_pdu_inlet +++ b/checkman/raritan_pdu_inlet @@ -16,6 +16,9 @@ description: item: The ID Number of the inlet and the sensor type. +perfdata: + Exactly one number: The measured value together with it's unit. + inventory: During inventory all available sensors of the inlet and their type are determined. One check per sensor is created. diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet index 2d7a8d1..bca7b73 100644 --- a/checks/raritan_pdu_inlet +++ b/checks/raritan_pdu_inlet @@ -107,7 +107,8 @@ def check_raritan_pdu_inlet(item, params, info): status_txt = states[status] value = float(line[5]) / 10.0**digits message = "sensor " + name - message += "status \"%s\", value %.2f%s" % (status_txt,value,unit) + message += "status \"%s\", value %.2f %s" % (status_txt,value,unit) + perfdata = [ (cap, str(value)+unit) ] if avail != "1" or status in ( 2, 6 ): state = 2 elif status == 4: @@ -115,13 +116,13 @@ def check_raritan_pdu_inlet(item, params, info): else: state = 1 - return (state, message) + return (state, message, perfdata) check_info['raritan_pdu_inlet'] = { "inventory_function" : inventory_raritan_pdu_inlet, "check_function" : check_raritan_pdu_inlet, "service_description" : "Inlet Sensor %s", - "has_perfdata" : False, + "has_perfdata" : True, "snmp_info" : [ (".1.3.6.1.4.1.13742.6", # General properties of the inlet [ diff --git a/pnp-templates/check_mk-raritan_pdu_inlet.php b/pnp-templates/check_mk-raritan_pdu_inlet.php new file mode 100644 index 0000000..e95169c --- /dev/null +++ b/pnp-templates/check_mk-raritan_pdu_inlet.php @@ -0,0 +1,90 @@ +<?php +# +# Copyright (c) 2006-2010 Joerg Linge (http://www.pnp4nagios.org) +# Default Template used if no other template is found. +# Don`t delete this file ! +# +# Define some colors .. +# +$_WARNRULE = '#FFFF00'; +$_CRITRULE = '#FF0000'; +$_AREA = '#256aef'; +$_LINE = '#000000'; +# +# Initial Logic ... +# + +foreach ($this->DS as $KEY=>$VAL) { + + $maximum = ""; + $minimum = ""; + $critical = ""; + $crit_min = ""; + $crit_max = ""; + $warning = ""; + $warn_max = ""; + $warn_min = ""; + $vlabel = " "; + $lower = ""; + $upper = ""; + + if ($VAL['WARN'] != "" && is_numeric($VAL['WARN']) ){ + $warning = $VAL['WARN']; + } + if ($VAL['WARN_MAX'] != "" && is_numeric($VAL['WARN_MAX']) ) { + $warn_max = $VAL['WARN_MAX']; + } + if ( $VAL['WARN_MIN'] != "" && is_numeric($VAL['WARN_MIN']) ) { + $warn_min = $VAL['WARN_MIN']; + } + if ( $VAL['CRIT'] != "" && is_numeric($VAL['CRIT']) ) { + $critical = $VAL['CRIT']; + } + if ( $VAL['CRIT_MAX'] != "" && is_numeric($VAL['CRIT_MAX']) ) { + $crit_max = $VAL['CRIT_MAX']; + } + if ( $VAL['CRIT_MIN'] != "" && is_numeric($VAL['CRIT_MIN']) ) { + $crit_min = $VAL['CRIT_MIN']; + } + if ( $VAL['MIN'] != "" && is_numeric($VAL['MIN']) ) { + $lower = " --lower=" . $VAL['MIN']; + $minimum = $VAL['MIN']; + } + if ( $VAL['MAX'] != "" && is_numeric($VAL['MAX']) ) { + $maximum = $VAL['MAX']; + } + if ($VAL['UNIT'] == "%%") { + $vlabel = "%"; + $upper = " --upper=101 "; + $lower = " --lower=0 "; + } + else { + $vlabel = $VAL['UNIT']; + } + + $opt[$KEY] = '--vertical-label "' . $vlabel . '" --title "' . $this->MACRO['DISP_HOSTNAME'] . ' / ' . $this->MACRO['DISP_SERVICEDESC'] . '"' . $upper . $lower; + $ds_name[$KEY] = $VAL['LABEL']; + $def[$KEY] = rrd::def ("var1", $VAL['RRDFILE'], $VAL['DS'], "AVERAGE"); + $def[$KEY] .= rrd::gradient("var1", "3152A5", "BDC6DE", rrd::cut($VAL['NAME'],16), 20); + $def[$KEY] .= rrd::line1 ("var1", $_LINE ); + $def[$KEY] .= rrd::gprint ("var1", array("LAST","MAX","AVERAGE"), "%3.2lf %S".$VAL['UNIT']); + if ($warning != "") { + $def[$KEY] .= rrd::hrule($warning, $_WARNRULE, "Warning $warning \\n"); + } + if ($warn_min != "") { + $def[$KEY] .= rrd::hrule($warn_min, $_WARNRULE, "Warning (min) $warn_min \\n"); + } + if ($warn_max != "") { + $def[$KEY] .= rrd::hrule($warn_max, $_WARNRULE, "Warning (max) $warn_max \\n"); + } + if ($critical != "") { + $def[$KEY] .= rrd::hrule($critical, $_CRITRULE, "Critical $critical \\n"); + } + if ($crit_min != "") { + $def[$KEY] .= rrd::hrule($crit_min, $_CRITRULE, "Critical (min) $crit_min \\n"); + } + if ($crit_max != "") { + $def[$KEY] .= rrd::hrule($crit_max, $_CRITRULE, "Critical (max) $crit_max \\n"); + } +} +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 16dfe17..76681b6 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1035,3 +1035,33 @@ def perfometer_current(row, check_command, perf_data): return display_string, perfometer_linear(current_perc, display_color) perfometers["check_mk-adva_fsp_current"] = perfometer_current + +def perfometer_raritan_pdu_inlet(row, check_command, perf_data): + display_color = "#50f020" + cap = perf_data[0][0] + value = float(perf_data[0][1]) + unit = perf_data[0][2] + display_str = perf_data[0][1] + " " + unit + + if cap == "rmsCurrent": + return display_str, perfometer_logarithmic(value, 1, 2, display_color) + elif cap == "unbalancedCurrent": + return display_str, perfometer_linear(value, display_color) + elif cap == "rmsVoltage": + return display_str, perfometer_logarithmic(value, 500, 2, display_color) + elif cap == "activePower": + return display_str, perfometer_logarithmic(value, 20, 2, display_color) + elif cap == "apparentPower": + return display_str, perfometer_logarithmic(value, 20, 2, display_color) + elif cap == "powerFactor": + return display_str, perfometer_linear(value * 100, display_color) + elif cap == "activeEnergy": + return display_str, perfometer_logarithmic(value, 100000, 2, display_color) + elif cap == "apparentEnergy": + return display_str, perfometer_logarithmic(value, 100000, 2, display_color) + + return "unimplemented" , perfometer_linear(0, "#ffffff") + +perfometers["check_mk-raritan_pdu_inlet"] = perfometer_raritan_pdu_inlet + +

10 years, 5 months

Check_MK Git: check_mk: another textarea auto-resize fix..

by Andreas Boesl

Module: check_mk Branch: master Commit: fed1e4304e0e8936f3f59abe0b2f0a17f692bbe0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fed1e4304e0e89… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 12 11:35:23 2014 +0200 another textarea auto-resize fix.. --- web/htdocs/js/checkmk.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index a13b9c3..29c97da 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1663,7 +1663,8 @@ function valuespec_cascading_change(oSelect, varprefix, count) { } function valuespec_textarea_resize(oArea) { - oArea.style.height = Math.max(oArea.scrollHeight , oArea.clientHeight) + "px"; + oArea.style.height = 'auto'; + oArea.style.height = oArea.scrollHeight + "px"; }

10 years, 5 months

Check_MK Git: check_mk: Livestatus: remove debug logging

by Mathias Kettner

Module: check_mk Branch: master Commit: 19239ca26d3f3ad0592580f9beb8e10c72683213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19239ca26d3f3a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 12 10:30:52 2014 +0200 Livestatus: remove debug logging --- livestatus/src/LogCache.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 0d23a8d..9c080f9 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -62,6 +62,10 @@ int num_cached_log_messages = 0; // Debugging logging is hard if debug messages are logged themselves... void debug(const char *loginfo, ...) { + // Disable debugging, if not working in code. This can result in + // a symlink attack otherwise... + return; + if (g_debug_level >= 3) return;

10 years, 5 months

Check_MK Git: check_mk: easier implementation of autosizing a textareas height

by Andreas Boesl

Module: check_mk Branch: master Commit: f560df4efbf5c9128a9648efc9601cf829d9c1cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f560df4efbf5c9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 11 14:12:18 2014 +0200 easier implementation of autosizing a textareas height --- web/htdocs/js/checkmk.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 213d4e5..a13b9c3 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1663,10 +1663,7 @@ function valuespec_cascading_change(oSelect, varprefix, count) { } function valuespec_textarea_resize(oArea) { - oArea.style.height = (oArea.scrollHeight - - (/Chrome/i.test(navigator.userAgent) ? 6 : 0) - - (/Firefox.29.0/i.test(navigator.userAgent) ? 6 : 0) - ) + "px"; + oArea.style.height = Math.max(oArea.scrollHeight , oArea.clientHeight) + "px"; }

10 years, 5 months

Check_MK Git: check_mk: Revert " fixed autoresize function of textarea valuespec"

by Andreas Boesl

Module: check_mk Branch: master Commit: 8cbfe20bb12ac150019f260b3ec7e7b04e7e85c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cbfe20bb12ac1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 11 13:18:48 2014 +0200 Revert "fixed autoresize function of textarea valuespec" This reverts commit 6f26f98e10deb807c29f6678ba8c21eab41c4304. --- web/htdocs/js/checkmk.js | 43 ++++--------------------------------------- 1 file changed, 4 insertions(+), 39 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 8ce2e7e..213d4e5 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1662,46 +1662,11 @@ function valuespec_cascading_change(oSelect, varprefix, count) { } } -function getEffectiveStyle(e, attr) { - if(e.style[attr]) { - // Object local - return e.style[attr]; - } else if(document.defaultView && document.defaultView.getComputedStyle) { - // DOM - return document.defaultView.getComputedStyle(e, null).getPropertyValue(attr); - } else if(e.currentStyle){ - // IE - var ie_attr = attr.replace(/\-(\w)/g, function (strMatch, p1){ - return p1.toUpperCase(); - }); - var f = e.currentStyle[ie_attr]; - if(f.length > 0) { - return f; - } - } - return null; -} - function valuespec_textarea_resize(oArea) { - var padding_top_txt = getEffectiveStyle(oArea, "padding-top"); - var padding_bottom_txt = getEffectiveStyle(oArea, "padding-bottom"); - var padding_top = 0; - var padding_bottom = 0; - - if (padding_top_txt == null) { - // Fallback for Firefox and Chrome - if ((/Firefox./i.test(navigator.userAgent)) || (/Chrome/i.test(navigator.userAgent))) { - padding_top = 3; - padding_bottom = 3; - } - } else { - if (padding_top_txt.length > 2) - padding_top = padding_top_txt.substring(0, padding_top_txt.length - 2); - if (padding_bottom_txt.length > 2) - padding_bottom = padding_bottom_txt.substring(0, padding_bottom_txt.length - 2); - } - - oArea.style.height = (oArea.scrollHeight - padding_top - padding_bottom) + "px"; + oArea.style.height = (oArea.scrollHeight + - (/Chrome/i.test(navigator.userAgent) ? 6 : 0) + - (/Firefox.29.0/i.test(navigator.userAgent) ? 6 : 0) + ) + "px"; }

10 years, 5 months

Check_MK Git: check_mk: fixed autoresize function of textarea valuespec

by Andreas Boesl

Module: check_mk Branch: master Commit: 6f26f98e10deb807c29f6678ba8c21eab41c4304 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f26f98e10deb8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 11 13:15:58 2014 +0200 fixed autoresize function of textarea valuespec --- web/htdocs/js/checkmk.js | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 213d4e5..8ce2e7e 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1662,11 +1662,46 @@ function valuespec_cascading_change(oSelect, varprefix, count) { } } +function getEffectiveStyle(e, attr) { + if(e.style[attr]) { + // Object local + return e.style[attr]; + } else if(document.defaultView && document.defaultView.getComputedStyle) { + // DOM + return document.defaultView.getComputedStyle(e, null).getPropertyValue(attr); + } else if(e.currentStyle){ + // IE + var ie_attr = attr.replace(/\-(\w)/g, function (strMatch, p1){ + return p1.toUpperCase(); + }); + var f = e.currentStyle[ie_attr]; + if(f.length > 0) { + return f; + } + } + return null; +} + function valuespec_textarea_resize(oArea) { - oArea.style.height = (oArea.scrollHeight - - (/Chrome/i.test(navigator.userAgent) ? 6 : 0) - - (/Firefox.29.0/i.test(navigator.userAgent) ? 6 : 0) - ) + "px"; + var padding_top_txt = getEffectiveStyle(oArea, "padding-top"); + var padding_bottom_txt = getEffectiveStyle(oArea, "padding-bottom"); + var padding_top = 0; + var padding_bottom = 0; + + if (padding_top_txt == null) { + // Fallback for Firefox and Chrome + if ((/Firefox./i.test(navigator.userAgent)) || (/Chrome/i.test(navigator.userAgent))) { + padding_top = 3; + padding_bottom = 3; + } + } else { + if (padding_top_txt.length > 2) + padding_top = padding_top_txt.substring(0, padding_top_txt.length - 2); + if (padding_bottom_txt.length > 2) + padding_bottom = padding_bottom_txt.substring(0, padding_bottom_txt.length - 2); + } + + oArea.style.height = (oArea.scrollHeight - padding_top - padding_bottom) + "px"; }

10 years, 5 months

Check_MK Git: check_mk: apache_status: now supporting apache processes named fcgi-pm

by Lars Michelsen

Module: check_mk Branch: master Commit: 81b902ce3464b3941e0d5aa85ab6dccd982788f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81b902ce3464b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 11 10:29:01 2014 +0200 apache_status: now supporting apache processes named fcgi-pm --- agents/plugins/apache_status | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index 0b91371..22b51c3 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -47,7 +47,7 @@ def try_detect_servers(): to_replace = re.compile('^.*/') proc = to_replace.sub('', proc) - procs = [ 'apache2', 'httpd', 'httpd2-prefork', 'httpd2-worker', 'httpd.worker' ] + procs = [ 'apache2', 'httpd', 'httpd2-prefork', 'httpd2-worker', 'httpd.worker', 'fcgi-pm' ] # the pid/proc field length is limited to 19 chars. Thus in case of # long PIDs, the process names are stripped of by that length. # Workaround this problem here

10 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2014