Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Linux agent: wrap freeipmi with lock

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 44c021fec61ae278a802e7ac97cdb178ed3437eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44c021fec61ae2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 16:48:22 2012 +0100 Linux agent: wrap freeipmi with lock --- .bugs/311 | 8 ++++++-- ChangeLog | 1 + agents/check_mk_agent.linux | 19 ++++++++++++------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.bugs/311 b/.bugs/311 index 901faf3..1ee43c0 100644 --- a/.bugs/311 +++ b/.bugs/311 @@ -1,10 +1,10 @@ Title: IPMI cache initialization race condition Component: checks +State: done +Class: nastiness Benefit: 1 -State: open Cost: 4 Date: 2011-07-18 15:42:34 -Class: nastiness Targetversion: 1.2.0 there is a very nasty issue with the IPMI agent code - if we kill the initial build of the SDR @@ -18,3 +18,7 @@ Very ugly issue, maybe xinetd can disable multiple runs of the same service (but mean staleness issues will stop the agent forever) Or we implement a caching feature similar to that of <<<ipmitool>>>. + +2012-01-02 16:47:41: changed state open -> done +I've implemented a lock with a timeout of 60 secs now. Still +need some host with freeipmi in order to test this. diff --git a/ChangeLog b/ChangeLog index 7805173..209d092 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ in the range-setting will not affect the graph anymore. * if/if64/lnx_if: pad port numbers with zeros in order to sort correctly. This can be turned off with if_inventory_pad_portnumbers = False. + * Linux agent: wrap freeipmi with lock in order to avoid cache corruption 1.1.13i2: Core, Setup, etc.: diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9d2a9ce..8c8541d 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -249,13 +249,18 @@ then else IPMI_FORMAT="" fi - for class in Temperature 'Power Unit' Fan - do - $WAITMAX ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache -g "$class" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' - # In case of a timeout immediately leave loop. - if [ $? = 255 ] ; then break ; fi - WAITMAX="waitmax 3" - done + # Aquire lock with flock in order to avoid multiple runs of ipmi-sensors + # in case of parallel or overlapping calls of the agent. + ( + flock -n 200 --wait 60 + for class in Temperature 'Power Unit' Fan + do + $WAITMAX ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache -g "$class" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' + # In case of a timeout immediately leave loop. + if [ $? = 255 ] ; then break ; fi + WAITMAX="waitmax 3" + done + ) 200 >> $"$sdrcache" fi # State of LSI MegaRAID controller via MegaCli. You can download that tool from:

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0146, #0191

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2681a944a52ecdd771be290e4834469dcbec3c0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2681a944a52ecd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 11:55:55 2012 +0100 Updated bug entries #0146, #0191 --- .bugs/146 | 9 +++++++-- .bugs/191 | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.bugs/146 b/.bugs/146 index 406ba0c..77d2f88 100644 --- a/.bugs/146 +++ b/.bugs/146 @@ -1,9 +1,14 @@ Title: logwatch_max_filesize is missing in 'config variables' doku Component: docu +State: wontfix +Class: todo Benefit: 5 -State: open Cost: 6 Date: 2011-02-11 11:20:58 -Class: todo +Targetversion: future The parameter logwatch_max_filesize is not mentioned on the config variable page. + +2012-01-02 11:34:45: changed state open -> wontfix +This is a check specific setting and described in the +check man page of logwatch. diff --git a/.bugs/191 b/.bugs/191 index 3ad01de..cbb96ff 100644 --- a/.bugs/191 +++ b/.bugs/191 @@ -1,12 +1,16 @@ Title: scan parents: documentation about output missing Component: docu +State: done +Class: todo Benefit: 3 -State: open Cost: 3 Date: 2011-07-25 16:08:41 -Class: todo +Targetversion: future There is no documentation about the meanings of the output of the scan parents feature. The single chars like o, L, G aare not mentioned in the docs. + +2012-01-02 11:55:51: changed state open -> done +Is now exaplained.

12 years, 8 months

Check_MK Git: check_mk: if/if64/lnx_if: pad port numbers with zeros in order to sort correctly.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aa0f043002d9345bd3a8190e9f64dec9954120e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa0f043002d934… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 10:59:57 2012 +0100 if/if64/lnx_if: pad port numbers with zeros in order to sort correctly. --- .bugs/131 | 7 +++++-- ChangeLog | 2 ++ checkman/if | 5 +++++ checkman/if64 | 5 +++++ checkman/lnx_if | 5 +++++ checks/if.include | 20 +++++++++++++++++--- web/plugins/wato/check_mk_configuration.py | 12 ++++++++++++ 7 files changed, 51 insertions(+), 5 deletions(-) diff --git a/.bugs/131 b/.bugs/131 index cd10ed2..b826b71 100644 --- a/.bugs/131 +++ b/.bugs/131 @@ -1,10 +1,10 @@ Title: if checks: Add 0 prefix on port numbers below 10 Component: core +State: done +Class: todo Benefit: 3 -State: open Cost: 5 Date: 2011-02-11 11:17:50 -Class: todo Targetversion: 1.2.0 When monitoring switches the services are ordered as follows: @@ -28,3 +28,6 @@ Look at brocade_fcport for details. Also we could make this configurable in order not to break existing checks. + +2012-01-02 10:59:50: changed state open -> done +Is done and switchable off with if_inventory_pad_portnumbers diff --git a/ChangeLog b/ChangeLog index e83dba2..7805173 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,8 @@ If you have changed the trend range, then your historic values will be displayed in a wrong scale. On the other hand - from now on changes in the range-setting will not affect the graph anymore. + * if/if64/lnx_if: pad port numbers with zeros in order to sort correctly. + This can be turned off with if_inventory_pad_portnumbers = False. 1.1.13i2: Core, Setup, etc.: diff --git a/checkman/if b/checkman/if index f31f46d..f65ab36 100644 --- a/checkman/if +++ b/checkman/if @@ -107,6 +107,11 @@ if_inventory_portstates (list of strings): Per default this variable is set to { only ports found in the state {up} are being added to the monitoring. If you set this to {['1', '2', '5']} then also ports in state {down} and {dormant} will be monitored. +if_inventory_pad_portnumbers (boolean): If this is set to {True} (the default), then port numbers used as + items are padded with zeroes so that all items have the same length and ports will sort correctly in + the GUI. You can set this to {False} if you want to keep the same service descriptions as in versions + prior to 1.1.13i3. + if_inventory_uses_description (boolean): Whether inventory should use the interface description as item (instead of the interface index). Default is {False}. diff --git a/checkman/if64 b/checkman/if64 index 6980812..23c3666 100644 --- a/checkman/if64 +++ b/checkman/if64 @@ -108,6 +108,11 @@ if_inventory_portstates (list of strings): Per default this variable is set to { only ports found in the state {up} are being added to the monitoring. If you set this to {['1', '2', '5']} then also ports in state {down} and {dormant} will be monitored. +if_inventory_pad_portnumbers (boolean): If this is set to {True} (the default), then port numbers used as + items are padded with zeroes so that all items have the same length and ports will sort correctly in + the GUI. You can set this to {False} if you want to keep the same service descriptions as in versions + prior to 1.1.13i3. + if_inventory_uses_description (boolean): Whether inventory should use the interface description as item (instead of the interface index). Default is {False}. diff --git a/checkman/lnx_if b/checkman/lnx_if index 272fe36..020e273 100644 --- a/checkman/lnx_if +++ b/checkman/lnx_if @@ -114,6 +114,11 @@ if_inventory_portstates (list of strings): Per default this variable is set to { only ports found in the state {up} are being added to the monitoring. If you set this to {['1', '2', '4']} then also ports in state {down} and {unknown} will be monitored. +if_inventory_pad_portnumbers (boolean): If this is set to {True} (the default), then port numbers used as + items are padded with zeroes so that all items have the same length and ports will sort correctly in + the GUI. You can set this to {False} if you want to keep the same service descriptions as in versions + prior to 1.1.13i3. + if_inventory_uses_description (boolean): Whether inventory should use the interface name as item (instead of the interface index). Default is {False}. diff --git a/checks/if.include b/checks/if.include index 85c57a0..1c96cbc 100644 --- a/checks/if.include +++ b/checks/if.include @@ -30,6 +30,7 @@ if_inventory_porttypes = [ '6', '32', '117' ] if_inventory_portstates = [ '1' ] if_inventory_uses_description = False if_inventory_uses_alias = False +if_inventory_pad_portnumbers = True if_inventory_monitor_speed = True if_inventory_monitor_state = True @@ -71,6 +72,18 @@ def if_statename(st): '7': 'lowerLayerDown' } return names.get(st, st) + +# Pads port numbers with zeroes, so that items +# nicely sort alphabetically +def if_pad_with_zeroes(info, ifIndex): + if if_inventory_pad_portnumbers: + max_index = max([int(line[0]) for line in info]) + digits = len(str(max_index)) + return ("%0"+str(digits)+"d") % int(ifIndex) + else: + return ifIndex + + def inventory_if_common(info): if len(info) == 0 or len(info[0]) != 19: return [] @@ -91,7 +104,7 @@ def inventory_if_common(info): elif if_inventory_uses_alias and ifAlias: item = ifAlias else: - item = ifIndex + item = if_pad_with_zeroes(info, ifIndex) if item in seen_items: # duplicate duplicate.add(item) @@ -147,7 +160,7 @@ def check_if_common(item, params, info): ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) - if item == ifIndex \ + if item.lstrip("0") == ifIndex \ or item == ifAlias \ or item == ifDescr \ or item == "%s %s" % (ifAlias, ifIndex) \ @@ -155,7 +168,8 @@ def check_if_common(item, params, info): # Display port number or alias in infotext if that is not part # of the service description anyway - if item == ifIndex and (item == ifAlias or ifAlias == '') \ + if item.lstrip("0") == ifIndex \ + and (item == ifAlias or ifAlias == '') \ and (item == ifDescr or ifDescr == ''): # description trivial infotext = "" elif item == "%s %s" % (ifAlias, ifIndex) and ifDescr != '': # non-unique Alias diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 468f594..78caade 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -368,6 +368,18 @@ register_configvar(group, "parameters via a rule."))) register_configvar(group, + "if_inventory_pad_portnumbers", + Checkbox(title = _("Pad port numbers with zeroes"), + label = _("pad port numbers"), + help = _("If this option is activated then Check_MK will pad port numbers of " + "network interfaces with zeroes so that all port descriptions from " + "all ports of a host or switch have the same length and thus sort " + "currectly in the GUI. In versions prior to 1.1.13i3 there was no " + "padding. You can switch back to the old behaviour by disabling this " + "option. This will retain the old service descriptions and the old " + "performance data."))) + +register_configvar(group, "if_inventory_uses_description", Checkbox(title = _("Use description as service name for network interface checks"), label = _("use description"),

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0128

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a2ac976f37a6309798707b36e10fd00389d7bf5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a2ac976f37a63… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 10:32:08 2012 +0100 Updated bug entries #0128 --- .bugs/128 | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.bugs/128 b/.bugs/128 index ff2b7b6..47dca1e 100644 --- a/.bugs/128 +++ b/.bugs/128 @@ -1,12 +1,12 @@ Title: df trends: Peak values after changing the trend_range Component: checks -State: open -Class: bug -Date: 2011-02-10 09:45:24 Benefit: 1 -Cost: 2 Fun: 0 +State: done +Cost: 2 +Date: 2011-02-10 09:45:24 Targetversion: 1.2.0 +Class: bug After changing the trend_range to a larger time the check reports a peak value which is wrong. It might be needed to detect such a change and reset @@ -44,3 +44,7 @@ range than 24h. We will do this after 1.1.11i3 is out. + +2012-01-02 10:32:06: changed state open -> done +Is done like described. Throrough testing will need some time, +though...

12 years, 8 months

Check_MK Git: check_mk: Filesystem checks: normalize trend perfdata to MB/ 24h

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd198d266f83dd2f98b6e168dcf733c22177948e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd198d266f83dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 10:31:35 2012 +0100 Filesystem checks: normalize trend perfdata to MB/24h --- ChangeLog | 5 ++++- checks/df.include | 12 ++++++++++-- pnp-templates/check_mk-df.php | 22 ++++++++++++---------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01e4823..e83dba2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,10 @@ existing RRDs of these checks. Sorry, but these have been that last checks still using counters... * ibm_imm_health: added last missing scan function - + * Filesystem checks: trend performance data is now normalized to MB/24h. + If you have changed the trend range, then your historic values will + be displayed in a wrong scale. On the other hand - from now on changes + in the range-setting will not affect the graph anymore. 1.1.13i2: Core, Setup, etc.: diff --git a/checks/df.include b/checks/df.include index 6882248..10ff062 100644 --- a/checks/df.include +++ b/checks/df.include @@ -155,6 +155,7 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): problems = [] MB = 1024 * 1024.0 + H24 = 60 * 60 * 24 if levels.get("trend_range"): try: @@ -165,7 +166,9 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): # first compute current rate in MB/s by computing delta since last check timedif, rate = get_counter("df.%s.delta" % mountpoint, this_time, used_mb, True) if levels.get("trend_perfdata"): - perfdata.append(("growth", rate * range_sec)) + # Change in 1.1.13i3: The trend perfdata always outputs + # the growth in MB/24h, not any longer in MB/trendrange + perfdata.append(("growth", rate * H24)) # average trend, initialize with zero, rate_avg is in MB/s timedif, rate_avg = get_average("df.%s.trend" % mountpoint, @@ -215,7 +218,12 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): problems[-1] += "!" if levels.get("trend_perfdata"): - perfdata.append(("trend", trend, warn_perf, crit_perf, 0, size_mb / range)) + # New in 1.1.13i3: output trend not as MB / trend_range, but as + # MB / 24 hours. The same holds for the warn and crit information. + # It is configured in MB / trend range but in the performance data + # it's sent as MB / 24h. + perfdata.append(("trend", rate_avg * H24, warn_perf / range_sec * H24, + crit_perf / range_sec * H24, 0, size_mb / range)) # compute time until filesystem is full (only for positive trend, of course) if trend > 0: diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index 6bf079c..73818f2 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -58,15 +58,18 @@ $def[1] .= "GPRINT:var1:LAST:\"current\: %6.2lf GB\" "; $def[1] .= "GPRINT:var1:MAX:\"max\: %6.2lf GB \" "; $def[1] .= "GPRINT:var1:AVERAGE:\"avg\: %6.2lf GB\" "; -# Second graph is optional and shows trend +# Second graph is optional and shows trend. The MAX field +# of the third variable contains (size of the filesystem in MB +# / range in hours). From that we can compute the configured range. if (isset($DS[2])) { $size_mb_per_hours = floatval($MAX[3]); // this is size_mb / range(hours) $size_mb = floatval($MAX[1]); $hours = 1.0 / ($size_mb_per_hours / $size_mb); $range = sprintf("%.0fh", $hours); - // Current growth / shrinking - $opt[2] = "--vertical-label '+/- MB / $range' -l -1 -u 1 -X0 --title '$hostname: Growth of $fstitle' "; + // Current growth / shrinking. This value is give as MB / 24 hours. + // Note: This has changed in 1.1.13i3. Prior it was MB / trend_range! + $opt[2] = "--vertical-label '+/- MB / 24h' -l -1 -u 1 -X0 --title '$hostname: Growth of $fstitle' "; $def[2] = "DEF:growth_max=$RRDFILE[2]:$DS[2]:MAX "; $def[2] .= "DEF:growth_min=$RRDFILE[2]:$DS[2]:MIN "; $def[2] .= "DEF:trend=$RRDFILE[3]:$DS[3]:AVERAGE "; @@ -77,25 +80,24 @@ if (isset($DS[2])) { $def[2] .= "HRULE:0#c0c0c0 "; $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" "; - $def[2] .= "GPRINT:growth:LAST:\"Current\: %+9.2lfMB / $range\" "; - $def[2] .= "GPRINT:growth:MAX:\"Max\: %+9.2lfMB / $range\\n\" "; + $def[2] .= "GPRINT:growth:LAST:\"Current\: %+9.2lfMB / 24h\" "; + $def[2] .= "GPRINT:growth:MAX:\"Max\: %+9.2lfMB / 24h\\n\" "; // Trend - $opt[3] = "--vertical-label '+/- MB / $range' -l -1 -u 1 -X0 --title '$hostname: Trend for $fstitle' "; + $opt[3] = "--vertical-label '+/- MB / 24h' -l -1 -u 1 -X0 --title '$hostname: Trend for $fstitle' "; $def[3] = "DEF:trend=$RRDFILE[3]:$DS[3]:AVERAGE "; $def[3] .= "HRULE:0#c0c0c0 "; $def[3] .= "LINE1:trend#000000:\"Trend\:\" "; - $def[3] .= "GPRINT:trend:LAST:\"%+7.2lf MB/$range\" "; + $def[3] .= "GPRINT:trend:LAST:\"%+7.2lf MB/24h\" "; if ($WARN[3]) { - $warn_mb = sprintf("%.2fMB", $WARN[3]); + $warn_mb = sprintf("%.2fMB", $WARN[3] * $hours / 24.0); $def[3] .= "LINE1:$WARN[3]#ffff00:\"Warn\: $warn_mb / $range\" "; } if ($CRIT[3]) { - $crit_mb = sprintf("%.2fMB", $CRIT[3]); + $crit_mb = sprintf("%.2fMB", $CRIT[3] * $hours / 24.0); $def[3] .= "LINE1:$CRIT[3]#ff0000:\"Crit\: $crit_mb / $range\" "; } $def[3] .= "COMMENT:\"\\n\" "; } - ?>

12 years, 8 months

Check_MK Git: check_mk: Moved code from WATO to valuespec

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 129e26e753569a3f888f0d34b1c1659d6c8f452a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=129e26e753569a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 1 14:29:37 2012 +0100 Moved code from WATO to valuespec --- web/htdocs/js/checkmk.js | 37 +++++++++++++++++++++++++++++++++++++ web/htdocs/js/wato.js | 26 -------------------------- web/htdocs/valuespec.py | 6 +++--- web/htdocs/wato.py | 6 +++--- 4 files changed, 43 insertions(+), 32 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index a8737b8..3c6382c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1346,3 +1346,40 @@ function unhide_context_buttons(oA) oDiv = null; } +// .-----------------------------------------------------------------------. +// | __ __ _ ____ | +// | \ \ / /_ _| |_ _ ___/ ___| _ __ ___ ___ | +// | \ \ / / _` | | | | |/ _ \___ \| '_ \ / _ \/ __| | +// | \ V / (_| | | |_| | __/___) | |_) | __/ (__ | +// | \_/ \__,_|_|\__,_|\___|____/| .__/ \___|\___| | +// | |_| | +// +-----------------------------------------------------------------------+ +// | Functions needed by HTML code from ValueSpec (valuespec.py) | +// '-----------------------------------------------------------------------' + +function valuespec_toggle_option(oCheckbox, divid, negate) { + var oDiv = document.getElementById(divid); + if ((oCheckbox.checked && !negate) || (!oCheckbox.checked && negate)) + oDiv.style.display = ""; + else + oDiv.style.display = "none"; + oDiv = null; +} + +function valuespec_toggle_dropdown(oDropdown, divid) { + var oDiv = document.getElementById(divid); + if (oDropdown.value == "other") oDiv.style.display = ""; + else + oDiv.style.display = "none"; + oDiv = null; +} + +function valuespec_toggle_dropdownn(oDropdown, divid) { + var oDiv = document.getElementById(divid); + if (oDropdown.value == "ignore") + oDiv.style.display = "none"; + else + oDiv.style.display = ""; + oDiv = null; +} + diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index c4dac0e..fc7b944 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -147,32 +147,6 @@ function wato_fix_visibility() { } } -function wato_toggle_option(oCheckbox, divid, negate) { - var oDiv = document.getElementById(divid); - if ((oCheckbox.checked && !negate) || (!oCheckbox.checked && negate)) - oDiv.style.display = ""; - else - oDiv.style.display = "none"; - oDiv = null; -} - -function wato_toggle_dropdown(oDropdown, divid) { - var oDiv = document.getElementById(divid); - if (oDropdown.value == "other") oDiv.style.display = ""; - else - oDiv.style.display = "none"; - oDiv = null; -} - -function wato_toggle_dropdownn(oDropdown, divid) { - var oDiv = document.getElementById(divid); - if (oDropdown.value == "ignore") - oDiv.style.display = "none"; - else - oDiv.style.display = ""; - oDiv = null; -} - // ---------------------------------------------------------------------------- diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a288aac..8c0fa99 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -499,7 +499,7 @@ class OptionalDropdownChoice(ValueSpec): defval = str(n) options.append(("other", self._otherlabel)) html.select(varprefix, options, defval, attrs={"style":"float:left;"}, - onchange="wato_toggle_dropdown(this, '%s_ex');" % varprefix ) + onchange="valuespec_toggle_dropdown(this, '%s_ex');" % varprefix ) if html.form_submitted(): div_is_open = html.var(varprefix) == "other" @@ -561,7 +561,7 @@ class Optional(ValueSpec): checked = self._negate != (value != None) html.write("<div style=\"float: none;\">") html.checkbox(varprefix + "_use" , checked, - onclick="wato_toggle_option(this, %r, %r)" % + onclick="valuespec_toggle_option(this, %r, %r)" % (div_id, self._negate and 1 or 0)) if self._label: html.write(self._label) @@ -761,7 +761,7 @@ class Dictionary(ValueSpec): if visible == None: visible = param in value html.checkbox(vp + "_USE", param in value, - onclick="wato_toggle_option(this, %r)" % div_id) + onclick="valuespec_toggle_option(this, %r)" % div_id) html.write(" %s<br>" % vs.title()) html.write('<div class=dictelement id="%s" style="display: %s">' % ( div_id, not visible and "none" or "")) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 40220ab..be43355 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8709,7 +8709,7 @@ def mode_edit_rule(phase): ("ignore", _("ignore")), ("is", _("is")), ("isnot", _("isnot"))], deflt, - onchange="wato_toggle_dropdownn(this, 'tag_sel_%s');" % id) + onchange="valuespec_toggle_dropdownn(this, 'tag_sel_%s');" % id) html.write("</td><td>") if html.form_submitted(): div_is_open = html.var("tag_" + id) != "ignore" @@ -8735,7 +8735,7 @@ def mode_edit_rule(phase): div_id = "div_all_hosts" checked = host_list != ALL_HOSTS - html.checkbox("explicit_hosts", checked, onclick="wato_toggle_option(this, %r)" % div_id) + html.checkbox("explicit_hosts", checked, onclick="valuespec_toggle_option(this, %r)" % div_id) html.write(" " + _("Specify explicit host names")) html.write('<div id="%s" style="display: %s">' % ( div_id, not checked and "none" or "")) @@ -8799,7 +8799,7 @@ def mode_edit_rule(phase): if checked == None: # read from rule itself checked = len(item_list) == 0 or item_list[0] != "" div_id = "itemlist" - html.checkbox("explicit_services", checked, onclick="wato_toggle_option(this, %r)" % div_id) + html.checkbox("explicit_services", checked, onclick="valuespec_toggle_option(this, %r)" % div_id) html.write(" " + _("Specify explicit values")) html.write('<div id="%s" style="display: %s; padding: 0px;">' % ( div_id, not checked and "none" or ""))

12 years, 8 months

Check_MK Git: check_mk: Improved ValueSpecs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3e197a28b0984a9d12d5f1b8a31fe60a974e4367 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e197a28b0984a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Dec 31 18:51:15 2011 +0100 Improved ValueSpecs --- web/htdocs/check_mk.css | 9 +++++++++ web/htdocs/forms.py | 4 ++-- web/htdocs/htmllib.py | 13 +++++++++++++ web/htdocs/pages.css | 3 +++ web/htdocs/valuespec.py | 31 +++++++++++++++++++++++-------- web/htdocs/wato.py | 13 +++++++++++++ 6 files changed, 63 insertions(+), 10 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index e8b8e48..57802d8 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -77,6 +77,15 @@ input:hover, select:hover, textarea:hover { background-color: #EDECEB; } +/* Select element with icons */ +select.icon option { + background-repeat: no-repeat; + background-position: bottom left; + background-size: 18px; + padding-left:22px; + height: 18px; +} + input.buttonlink { padding: 1px; diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index aab1955..c39dc64 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -27,7 +27,7 @@ from lib import * -def edit_dictionary(entries, value): +def edit_dictionary(entries, value, focus=None): new_value = value.copy() if html.check_transaction(): messages = [] @@ -57,7 +57,7 @@ def edit_dictionary(entries, value): else: v = vs.default_value() vs.render_input(name, v) - if first: + if (not focus and first) or (name == focus): vs.set_focus(name) first = False html.write("<tr><td class=buttons colspan=2>") diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 80d47d8..f7546b4 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -461,6 +461,19 @@ class html: if varname: self.form_vars.append(varname) + def icon_select(self, varname, options, deflt=""): + current = self.var(varname, deflt) + self.write("<select class=icon name=\"%s\" id=\"%s\" size=\"1\">\n" % + (varname, varname)) + for value, text, icon in options: + if value == None: value = "" + sel = value == current and " selected" or "" + self.write('<option style="background-image:url(images/icon_%s.png);" ' + 'value=\"%s\"%s>%s</option>\n' % (icon, value, sel, text)) + self.write("</select>\n") + if varname: + self.form_vars.append(varname) + def begin_radio_group(self, horizontal=False): if self.mobile: if horizontal: diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index f0cb41f..d682e79 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -400,6 +400,7 @@ table.form td.legend, table.form td.title { color: #274750; border: 1px solid #fff; padding-top: 10px; + padding-bottom: 10px; } /* Bottom row with action buttons, right justified */ @@ -434,6 +435,8 @@ table.form td.content { padding-right: 2ex; border: 1px solid #fff; border-left-style: none; + padding-top: 10px; + padding-bottom: 10px; } td.legend, td.content { diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 13e03c8..a288aac 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import math, os +import math, os, time from lib import * # Abstract base class of all value declaration classes. @@ -239,7 +239,7 @@ class TextAscii(ValueSpec): raise MKUserError(varprefix, _("The value must be of type str, but it has type %s") % type(value)) def validate_value(self, value, varprefix): - if not self._allow_empty and value == "": + if not self._allow_empty and value.strip() == "": raise MKUserError(varprefix, _("An empty value is not allowed here.")) class TextUnicode(TextAscii): @@ -366,6 +366,8 @@ class Checkbox(ValueSpec): # help_separator: if you set this to a character, e.g. "-", then # value_to_text will omit texts from the character up to the end of # a choices name. +# Note: The list of choices may contain 2-tuples or 3-tuples. +# The format is (value, text {, icon} ) class DropdownChoice(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) @@ -379,14 +381,18 @@ class DropdownChoice(ValueSpec): # Convert values from choices to keys defval = "0" options = [] - for n, (val, title) in enumerate(self._choices): - options.append((str(n), title)) - if val == value: + for n, entry in enumerate(self._choices): + options.append((str(n),) + entry[1:]) + if entry[0] == value: defval = str(n) - html.select(varprefix, options, defval) + if len(options[0]) == 3: + html.icon_select(varprefix, options, defval) + else: + html.select(varprefix, options, defval) def value_to_text(self, value): - for val, title in self._choices: + for entry in self._choices: + val, title = entry[:2] if value == val: if self._help_separator: return title.split(self._help_separator, 1)[0].strip() @@ -395,7 +401,8 @@ class DropdownChoice(ValueSpec): def from_html_vars(self, varprefix): sel = html.var(varprefix) - for n, (val, title) in enumerate(self._choices): + for n, entry in enumerate(self._choices): + val = entry[0] if sel == str(n): return val return self._choices[0][0] # can only happen if user garbled URL @@ -858,3 +865,11 @@ class ElementSelection(ValueSpec): if type(value) != str: raise MKUserError(varprefix, _("The datatype must be str (string), but is %s") % type(value)) + +class AutoTimestamp(FixedValue): + def __init__(self, **kwargs): + ValueSpec.__init__(self, **kwargs) + self._value = time.time() + + def value_to_text(self, value): + return time.strftime("%F %T", time.localtime(value)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bfcde17..40220ab 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6930,6 +6930,19 @@ def save_users(profiles): # Call the users_saved hook call_hook(call_hook_users_saved, users) +# Dropdown for choosing a multisite user +class UserSelection(ElementSelection): + def __init__(self, **kwargs): + ElementSelection.__init__(self, **kwargs) + + def get_elements(self): + users = load_users() + elements = dict([ (name, "%s - %s" % (name, us.get("alias", name))) for (name, us) in users.items() ]) + return elements + + def value_to_text(self, value): + return self._elements.get(value, value).split(" - ")[-1] + #. # .-Roles----------------------------------------------------------------. # | ____ _ |

12 years, 8 months

Check_MK Git: check_mk: New icon for deletion

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c1f4f8e640369ba3b8c65a5248bf3bef4afd97ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1f4f8e640369b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Dec 31 18:51:30 2011 +0100 New icon for deletion --- web/htdocs/images/icon_delete.png | Bin 0 -> 4997 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_delete.png b/web/htdocs/images/icon_delete.png new file mode 100644 index 0000000..37b1486 Binary files /dev/null and b/web/htdocs/images/icon_delete.png differ

12 years, 8 months

Check_MK Git: check_mk: Separator for Dropdown Choice

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b7f396d93525fc1932dcf58c99cd53ce5a23d85e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7f396d93525fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 30 18:58:59 2011 +0100 Separator for Dropdown Choice --- web/htdocs/forms.py | 2 +- web/htdocs/valuespec.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 7ad903e..aab1955 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -28,7 +28,7 @@ from lib import * def edit_dictionary(entries, value): - new_value = {} + new_value = value.copy() if html.check_transaction(): messages = [] for name, vs in entries: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2c5d11f..13e03c8 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -362,11 +362,15 @@ class Checkbox(ValueSpec): if type(value) != bool: raise MKUserError(varprefix, _("The value has type %s, but must be either True or False") % (type(value))) -# A type-save dropdown choice +# A type-save dropdown choice. Parameters: +# help_separator: if you set this to a character, e.g. "-", then +# value_to_text will omit texts from the character up to the end of +# a choices name. class DropdownChoice(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._choices = kwargs["choices"] + self._help_separator = kwargs.get("help_separator") def canonical_value(self): return self._choices[0][0] @@ -384,7 +388,10 @@ class DropdownChoice(ValueSpec): def value_to_text(self, value): for val, title in self._choices: if value == val: - return title + if self._help_separator: + return title.split(self._help_separator, 1)[0].strip() + else: + return title def from_html_vars(self, varprefix): sel = html.var(varprefix)

12 years, 8 months

Check_MK Git: check_mk: Move icon_button() to htmllib

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 113cde35b3ca66bf6855b0b492def77e94552b38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=113cde35b3ca66… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 29 13:16:02 2011 +0100 Move icon_button() to htmllib --- web/htdocs/htmllib.py | 13 +++++++++ web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 67 +++++++++++++++++++--------------------------- 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 31d4158..0cbbc74 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -322,6 +322,16 @@ class html: (obj_id, style, title, disabled, text, href)) # self.write("<a href=\"%s\" class=button%s%s>%s</a>" % (href, obj_id, style, text)) + def icon_button(url, help, icon): + html.write('<a href="%s">' + '<img class=iconbutton title="%s" src="images/button_%s_lo.png" ' + 'onmouseover=\"hilite_icon(this, 1)\" ' + 'onmouseout=\"hilite_icon(this, 0)\">' + '</a>\n' % (url, help, icon)) + + def empty_icon_button(): + html.write('<img class=trans src="images/trans.png">') + def jsbutton(self, varname, text, onclick, style=''): if style: style = ' style="%s"' % style @@ -662,6 +672,9 @@ class html: self.browser_reload = secs self.browser_redirect = url + def immediate_browser_redirect(self, secs, url): + self.javascript("setReload(%s, '%s');" % (secs, url)) + def header(self, title='', **args): if self.output_format == "html": if not self.header_sent: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 893a8f5..2c5d11f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -113,7 +113,7 @@ class FixedValue(ValueSpec): if self._totext != None: return self._totext else: - return self.title() + return str(value) def from_html_vars(self, varprefix): return self._value diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d035edd..bfcde17 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -999,9 +999,9 @@ def show_subfolders(folder): enter_url = make_link_to([("mode", "folder")], entry) html.write("<td class=buttons>") - icon_button(edit_url, _("Edit the properties of this folder"), "edit") + html.icon_button(edit_url, _("Edit the properties of this folder"), "edit") if config.may("wato.manage_folders"): - icon_button(delete_url, _("Delete this folder"), "delete") + html.icon_button(delete_url, _("Delete this folder"), "delete") html.write("</td>") @@ -1155,11 +1155,11 @@ def show_hosts(folder): html.write('</td>\n') html.write("<td class=buttons>") - icon_button(edit_url, _("Edit the properties of this host"), "edit") - icon_button(services_url, _("Edit the services of this host, do an inventory"), "services") + html.icon_button(edit_url, _("Edit the properties of this host"), "edit") + html.icon_button(services_url, _("Edit the services of this host, do an inventory"), "services") if config.may("wato.manage_hosts"): - icon_button(clone_url, _("Create a clone of this host"), "insert") - icon_button(delete_url, _("Delete this host"), "delete") + html.icon_button(clone_url, _("Create a clone of this host"), "insert") + html.icon_button(delete_url, _("Delete this host"), "delete") html.write("</td>\n") # Hostname with link to details page (edit host) @@ -4187,9 +4187,9 @@ def mode_snapshot(phase): html.write('<tr class="data %s0"><td>' % odd) # Buttons - icon_button(make_action_link( + html.icon_button(make_action_link( [("mode","snapshot"),("_restore_snapshot", name)]), _("Restore"), "restore") - icon_button(make_action_link( + html.icon_button(make_action_link( [("mode","snapshot"),("_delete_file", name)]), _("Delete"), "delete") html.write("<td>") @@ -4632,8 +4632,8 @@ def mode_groups(phase, what): edit_url = make_link([("mode", "edit_%s_group" % what), ("edit", name)]) delete_url = html.makeactionuri([("_delete", name)]) html.write("<td class=buttons>") - icon_button(edit_url, _("Properties"), "edit") - icon_button(delete_url, _("Delete"), "delete") + html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(delete_url, _("Delete"), "delete") html.write("</td><td>%s</td><td>%s</td>" % (name, alias)) if what == "contact": html.write("<td>%s</td>" % ", ".join( @@ -4852,8 +4852,8 @@ def mode_timeperiods(phase): delete_url = html.makeactionuri([("_delete", name)]) html.write("<td class=buttons>") - icon_button(edit_url, _("Properties"), "edit") - icon_button(delete_url, _("Delete"), "delete") + html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(delete_url, _("Delete"), "delete") html.write("</td>") html.write("<td>%s</td>" % name) @@ -5305,8 +5305,8 @@ def mode_sites(phase): edit_url = make_link([("mode", "edit_site"), ("edit", id)]) delete_url = html.makeactionuri([("_delete", id)]) html.write("<td class=buttons>") - icon_button(edit_url, _("Properties"), "edit") - icon_button(delete_url, _("Delete"), "delete") + html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(delete_url, _("Delete"), "delete") # Alias html.write("</td><td>%s</td><td>%s</td>" % (id, site.get("alias", ""))) @@ -6373,9 +6373,9 @@ def mode_users(phase): delete_url = html.makeactionuri([("_delete", id)]) clone_url = make_link([("mode", "edit_user"), ("clone", id)]) html.write("<td class=buttons>") - icon_button(edit_url, _("Properties"), "edit") - icon_button(clone_url, _("Create a copy of this user"), "clone") - icon_button(delete_url, _("Delete"), "delete") + html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(clone_url, _("Create a copy of this user"), "clone") + html.icon_button(delete_url, _("Delete"), "delete") html.write("</td>") # ID @@ -6630,7 +6630,7 @@ def mode_edit_user(phase): id="automation_secret") html.write(" ") html.write("<b style='position: relative; top: 4px;'>  ") - icon_button("javascript:wato_randomize_secret('automation_secret', 20);", + html.icon_button("javascript:wato_randomize_secret('automation_secret', 20);", _("Create random secret"), "random") html.write("</b>") html.write("</ul>") @@ -7032,8 +7032,8 @@ def mode_roles(phase): edit_url = make_link([("mode", "edit_role"), ("edit", id)]) clone_url = html.makeactionuri([("_clone", id)]) delete_url = html.makeactionuri([("_delete", id)]) - icon_button(edit_url, _("Properties"), "edit") - icon_button(clone_url, _("Clone"), "clone") + html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(clone_url, _("Clone"), "clone") if not role.get("builtin"): html.buttonlink(delete_url, _("Delete")) html.write("</td>") @@ -7353,16 +7353,16 @@ def mode_hosttags(phase): delete_url = html.makeactionuri([("_delete", tag_id)]) html.write("<td>") if nr == 0: - empty_icon_button() + empty_html.icon_button() else: - icon_button(html.makeactionuri([("_move", str(-nr))]), + html.icon_button(html.makeactionuri([("_move", str(-nr))]), _("Move this tag group one position up"), "up") if nr == len(hosttags) - 1: - empty_icon_button() + empty_html.icon_button() else: - icon_button(html.makeactionuri([("_move", str(nr))]), + html.icon_button(html.makeactionuri([("_move", str(nr))]), _("Move this tag group one position down"), "down") - icon_button(delete_url, _("Delete this tag group"), "delete") + html.icon_button(delete_url, _("Delete this tag group"), "delete") html.write("</td>") html.write("<td>%s</td>" % tag_id) html.write("<td>%s</td>" % title) @@ -8171,7 +8171,7 @@ def mode_edit_ruleset(phase): ("host", hostname), ("item", repr(item)), ("rule_folder", folder[".path"])]) - icon_button(edit_url, _("Edit this rule"), "edit") + html.icon_button(edit_url, _("Edit this rule"), "edit") rule_button("insert", _("Insert a copy of this rule into the folder '%s'") % g_folder["title"], folder, rel_rulenr) rule_button("delete", _("Delete this rule"), folder, rel_rulenr) @@ -8302,7 +8302,7 @@ def create_rule(rulespec, hostname=None, item=NO_ITEM): def rule_button(action, help=None, folder=None, rulenr=0): if action == None: - empty_icon_button() + empty_html.icon_button() else: vars = [("_folder", folder[".path"]), ("_rulenr", str(rulenr)), @@ -8310,18 +8310,7 @@ def rule_button(action, help=None, folder=None, rulenr=0): if html.var("host"): vars.append(("host", html.var("host"))) url = html.makeactionuri(vars) - icon_button(url, help, action) - -def empty_icon_button(): - html.write('<img class=trans src="images/trans.png">') - -def icon_button(url, help, icon): - html.write('<a href="%s">' - '<img class=iconbutton title="%s" src="images/button_%s_lo.png" ' - 'onmouseover=\"hilite_icon(this, 1)\" ' - 'onmouseout=\"hilite_icon(this, 0)\">' - '</a>\n' % (url, help, icon)) - + html.icon_button(url, help, action) def parse_rule(ruleset, orig_rule): rule = orig_rule

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits