Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: FIX: Detecting duplicate tag ids between regular tags and auxtags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5e77fe9c5842b583628ce1ec6da8216c0cda016d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e77fe9c5842b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 09:41:23 2012 +0200 FIX: Detecting duplicate tag ids between regular tags and auxtags --- ChangeLog | 1 + web/htdocs/wato.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd1ad12..6b8c213 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.0b5: WATO: * FIX: fix folding problems with dependent host tags + * FIX: Detecting duplicate tag ids between regular tags and auxtags Multisite: * FIX: remove refresh button from dashboard. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 05f0192..3fa36ab 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8620,6 +8620,7 @@ def mode_edit_hosttag(phase): tgid = entry[0] tit = entry[1] ch = entry[2] + # Do not compare the taggroup with itselfs if tgid != tag_id: for e in ch: # Check primary and secondary tags @@ -8629,7 +8630,12 @@ def mode_edit_hosttag(phase): "'%s' in the tag group '%s'.") % ( id, e[1], tit )) - + # Also check all defined aux tags even if they are not used anywhere + for tag, descr in auxtags: + if id == tag: + raise MKUserError("choices_id_%d" % (nr+1), + _("The tag ID '%s' is already being used as auxiliary tag.") % id) + if len(new_choices) == 0: raise MKUserError("id_0", _("Please specify at least on tag.")) if len(new_choices) == 1 and new_choices[0][0] == None:

12 years, 3 months

Check_MK Git: check_mk: Wato: Added pager as contact field

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d487b1a10b3d7d56cc72fb9143b6bd506804893f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d487b1a10b3d7d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 23 21:33:13 2012 +0200 Wato: Added pager as contact field --- modules/check_mk.py | 2 ++ web/htdocs/wato.py | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 618177c..d1e9288 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2037,6 +2037,8 @@ def create_nagios_config_contacts(outfile): outfile.write(" alias\t\t\t\t%s\n" % contact["alias"].encode("utf-8")) if "email" in contact: outfile.write(" email\t\t\t\t%s\n" % contact["email"]) + if "pager" in contact: + outfile.write(" pager\t\t\t\t%s\n" % contact["pager"]) not_enabled = contact.get("notifications_enabled", True) for what in [ "host", "service" ]: no = contact.get(what + "_notification_options", "") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a0a2eb0..05f0192 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7447,6 +7447,10 @@ def mode_edit_user(phase): if email and not re.match(regex_email, email): raise MKUserError("email", _("'%s' is not a valid email address." % email)) new_user["email"] = email + + # Pager + pager = html.var("pager").strip() + new_user["pager"] = pager # Roles new_user["roles"] = filter(lambda role: html.get_checkbox("role_" + role), @@ -7541,6 +7545,9 @@ def mode_edit_user(phase): "if the user is a monitoring contact and receives notifications " "via Email.")) + forms.section(_("Pager address")) + html.text_input("pager", user.get("pager", ""), size = 50) + html.help(_("The pager address is optional ")) forms.header(_("Security")) forms.section(_("Authentication")) is_automation = user.get("automation_secret", None) != None

12 years, 3 months

Check_MK Git: check_mk: AIX: new check for CPU utilization (

by git＠mathias-kettner.de

using section lparstat_aix) User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 7f88d4b3c9edc06b65dc8a2043b5ea8509ef27c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f88d4b3c9edc0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 23 16:49:22 2012 +0200 AIX: new check for CPU utilization (using section lparstat_aix) --- ChangeLog | 1 + checks/kernel | 13 ++++-- checks/lparstat_aix | 47 +++++++++++++++++++++- pnp-templates/check_mk-lparstat_aix.cpu_util.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 5 files changed, 56 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7d908a..fd1ad12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ Checks & Agents: * AIX: convert NIC check to lnx_if (now being compatible with if/if64) + * AIX: new check for CPU utilization (using section lparstat_aix) 1.2.0b4: Core: diff --git a/checks/kernel b/checks/kernel index 2102d27..2996bb2 100644 --- a/checks/kernel +++ b/checks/kernel @@ -135,21 +135,24 @@ def check_cpu_utilization(item, params, info): ( "system", "%.3f" % system_perc ), ( "wait", "%.3f" % wait_perc ) ] + infotext = " - user: %2.1f%%, system: %2.1f%%, wait: %2.1f%%" % (user_perc, system_perc, wait_perc) + # You may set a warning/critical level on the io wait # percentage. This can be done by setting params to # a pair of (warn, crit) - result = (0, "OK") + result = 0 try: warn, crit = params if wait_perc >= crit: - result = (2, "CRIT (wait too large)") + result = 2 + infotext += "(!!)" elif wait_perc >= warn: - result = (1, "WARNING (wait too large)") + result = 1 + infotext += "(!)" except: pass - return (result[0], result[1] + " - user: %2.1f%%, system: %2.1f%%, wait: %2.1f%%" % - (user_perc, system_perc, wait_perc), perfdata) + return (result, nagios_state_names[result] + infotext, perfdata) check_info['kernel.util'] = (check_cpu_utilization, "CPU utilization", 1, inventory_cpu_utilization) checkgroup_of['kernel.util'] = "cpu_iowait" diff --git a/checks/lparstat_aix b/checks/lparstat_aix index 85799e4..514cd1f 100644 --- a/checks/lparstat_aix +++ b/checks/lparstat_aix @@ -52,7 +52,7 @@ def check_lparstat(item, params, info): lbusy = info[0][6] app = info[0][7] except: - return (3, "Unknown - invalid or incomplete output from plugin") + return (3, "UNKNOWN - invalid or incomplete output from plugin") perfdata = [ ('user', str(user) + '%'), @@ -65,6 +65,49 @@ def check_lparstat(item, params, info): ('app', str(app) + ''), ] - return (0, "OK: AIX lparstat, user=%s%% sys=%s%% wait=%s%% idle=%s%% physc=%s app=%s" % (user,sys,wait,idle,physc,app),perfdata ) + return (0, "OK - AIX lparstat, user=%s%% sys=%s%% wait=%s%% idle=%s%% physc=%s app=%s" % (user,sys,wait,idle,physc,app),perfdata ) check_info['lparstat_aix'] = (check_lparstat, "lparstat", 1, inventory_lparstat ) + +# Utilization and IO/Wait +kernel_util_default_levels = None + +def inventory_lparstat_aix_cpu(info): + if len(info) == 1 and len(info[0]) >= 4: + return [(None, "kernel_util_default_levels")] + +def check_lparstat_aix_cpu(_no_item, params, info): + user, system, wait, idle = map(float, info[0][:4]) + perfdata = [ + ( "user", "%.3f" % user ), + ( "system", "%.3f" % system ), + ( "wait", "%.3f" % wait ) ] + + infotext = " - user: %2.1f%%, system: %2.1f%%, wait: %2.1f%%" % (user, system, wait) + + # You may set a warning/critical level on the io wait + # percentage. This can be done by setting params to + # a pair of (warn, crit) + result = 0 + try: + warn, crit = params + if wait >= crit: + result = 2 + infotext += "(!!)" + elif wait >= warn: + result = 1 + infotext += "(!)" + except: + pass + + return (result, nagios_state_names[result] + infotext, perfdata) + + + +check_info['lparstat_aix.cpu_util'] = { + "check_function" : check_lparstat_aix_cpu, + "inventory_function" : inventory_lparstat_aix_cpu, + "service_description" : "CPU utilization", + "has_perfdata" : True, + "group" : "cpu_iowait", +} diff --git a/pnp-templates/check_mk-lparstat_aix.cpu_util.php b/pnp-templates/check_mk-lparstat_aix.cpu_util.php new file mode 120000 index 0000000..16648b1 --- /dev/null +++ b/pnp-templates/check_mk-lparstat_aix.cpu_util.php @@ -0,0 +1 @@ +check_mk-kernel.util.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 9004877..b6bda11 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -83,6 +83,7 @@ def perfometer_check_mk_kernel_util(row, check_command, perf_data): perfometers["check_mk-kernel.util"] = perfometer_check_mk_kernel_util perfometers["check_mk-vms_sys.util"] = perfometer_check_mk_kernel_util perfometers["check_mk-ucd_cpu_util"] = perfometer_check_mk_kernel_util +perfometers["check_mk-lparstat_aix.cpu_util"] = perfometer_check_mk_kernel_util def perfometer_check_mk_mem_used(row, check_command, perf_data): h = '<table><tr>'

12 years, 3 months

Check_MK Git: check_mk: AIX: convert NIC check to lnx_if

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7963df8d85b81758767e1df838e49601e73dced URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7963df8d85b81… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 23 16:20:28 2012 +0200 AIX: convert NIC check to lnx_if --- ChangeLog | 3 +++ agents/check_mk_agent.aix | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91b11f1..a7d908a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,9 @@ * New aggregation function count_ok, that counts the number of nodes in state OK. + Checks & Agents: + * AIX: convert NIC check to lnx_if (now being compatible with if/if64) + 1.2.0b4: Core: * New configuration variable snmp_timing, allowing to diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 238b23d..c0133e3 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -69,8 +69,7 @@ echo $load 1/$ps $$ $procs # The following section has been contributed by Joerg Linge -echo "<<<netctr>>>" -date +%s +echo "<<<lnx_if:sep(58)>>>" for ent in $(ifconfig -a | grep '^en' | cut -d ":" -f 1) do bytes=$(entstat $ent | grep ^Bytes: | awk '{printf "%s %s", $2, $4}') @@ -81,7 +80,7 @@ do packets_tx=$(echo $packets | awk '{print $1'}) errors_tx=$(entstat $ent | grep 'Transmit Errors:' | awk '{print $3'}) errors_rx=$(entstat $ent | grep 'Receive Errors:' | awk '{print $6'}) - echo "$ent $bytes_rx $packets_rx $errors_rx 0 0 0 0 0 $bytes_tx $packets_tx $errors_tx 0 0 0 0 0" + echo "$ent: $bytes_rx $packets_rx $errors_rx 0 0 0 0 0 $bytes_tx $packets_tx $errors_tx 0 0 0 0 0" done

12 years, 3 months

Check_MK Git: check_mk: mem: modularized check, use mem.include

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2822258ddb18095c93e85a7dcd7f134505be38bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2822258ddb1809… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 23 16:11:57 2012 +0200 mem: modularized check, use mem.include --- checks/mem | 77 ++-------------------------------------- checks/mem.include | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 73 deletions(-) diff --git a/checks/mem b/checks/mem index 8282a4b..c733125 100644 --- a/checks/mem +++ b/checks/mem @@ -37,9 +37,6 @@ # | used for unixoide operating systems. | # +----------------------------------------------------------------------+ -memused_default_levels = (150.0, 200.0) -mem_extended_perfdata = False - def parse_proc_meminfo(info): return dict([ (i[0][:-1], int(i[1])) for i in info ]) @@ -49,76 +46,9 @@ def inventory_mem_used(info): "PageTotal" not in meminfo: # This case is handled by mem.win return [(None, "memused_default_levels")] -def check_mem_used(item, params, info): - try: - meminfo = parse_proc_meminfo(info) - swapused = meminfo['SwapTotal'] - meminfo['SwapFree'] - memused = meminfo['MemTotal'] - meminfo['MemFree'] - # Buffers and Cached are optional (not supported on Windows yet) - caches = meminfo.get('Buffers', 0) + meminfo.get('Cached', 0) - except: - return (3, "UNKNOWN - invalid output from plugin") - - # Add extended memory performance data, if this is - # enabled and the agent provides that information. - extended_perf = [] - extrainfo = "" - if mem_extended_perfdata: - mapped = meminfo.get('Mapped') - if mapped: - mapped_mb = int(mapped) / 1024 - committed_as = meminfo.get('Committed_AS') - if committed_as: - committed_as_mb = int(committed_as) / 1024 - else: - committed_as = 0 - extended_perf = [ - ('mapped', str(mapped_mb) + 'MB', '', '', 0, ''), - ('committed_as', str(committed_as_mb) + 'MB', '', '', 0, ''), - ] - extrainfo = ", %.1f GB mapped, %.1f GB committed" % \ - (mapped_mb / 1024.0, committed_as_mb / 1024.0) - - totalused_kb = (swapused + memused - caches) - totalused_mb = totalused_kb / 1024 - totalmem_kb = meminfo['MemTotal'] - totalmem_mb = totalmem_kb / 1024 - totalused_perc = 100 * (float(totalused_kb) / float(totalmem_kb)) - totalvirt_mb = (meminfo['SwapTotal'] + meminfo['MemTotal']) / 1024 - warn, crit = params - - perfdata = [ - ('ramused', str( (memused - caches) / 1024) + 'MB', '', '', 0, totalmem_mb), - ('swapused', str(swapused / 1024) + 'MB', '', '', 0, meminfo['SwapTotal']/1024) ] - - # levels may be given either in int -> MB or in float -> percentages - - infotext = ("%.2f GB used (%.2f GB RAM + %.2f GB SWAP, this is %.1f%% of %.2f GB RAM)" % \ - (totalused_mb / 1024.0, (memused-caches) / 1024.0 / 1024, swapused / 1024.0 / 1024, - totalused_perc, totalmem_mb / 1024.0)) \ - + extrainfo - - if type(warn) == float: - perfdata.append(('memused', str(totalused_mb)+'MB', int(warn/100.0 * totalmem_mb), - int(crit/100.0 * totalmem_mb), 0, totalvirt_mb)) - perfdata += extended_perf - if totalused_perc >= crit: - return (2, 'CRIT - %s, critical at %.1f%%' % (infotext, crit), perfdata) - elif totalused_perc >= warn: - return (1, 'WARN - %s, warning at %.1f%%' % (infotext, warn), perfdata) - else: - return (0, 'OK - %s' % infotext, perfdata) - - else: - perfdata.append(('memused', str(totalused_mb)+'MB', warn, crit, 0, totalvirt_mb)) - perfdata += extended_perf - if totalused_mb >= crit: - return (2, 'CRIT - %s, critical at %.2f GB' % (infotext, crit / 1024.0), perfdata) - elif totalused_mb >= warn: - return (1, 'WARN - %s, warning at %.2f GB' % (infotext, warn / 1024.0), perfdata) - else: - return (0, 'OK - %s' % infotext, perfdata) - +def check_mem_used(_no_item, params, info): + meminfo = parse_proc_meminfo(info) + return check_memory(params, meminfo) check_info['mem.used'] = { "check_function" : check_mem_used, @@ -127,6 +57,7 @@ check_info['mem.used'] = { "has_perfdata" : True, "group" : "memory", "check_config_variables" : [ "mem_extended_perfdata" ], + "includes" : [ "mem.include" ], } diff --git a/checks/mem.include b/checks/mem.include new file mode 100644 index 0000000..f87456a --- /dev/null +++ b/checks/mem.include @@ -0,0 +1,98 @@ +#!/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. + +memused_default_levels = (150.0, 200.0) +mem_extended_perfdata = False + +def check_memory(params, meminfo): + try: + swapused = meminfo['SwapTotal'] - meminfo['SwapFree'] + memused = meminfo['MemTotal'] - meminfo['MemFree'] + # Buffers and Cached are optional (not supported on Windows yet) + caches = meminfo.get('Buffers', 0) + meminfo.get('Cached', 0) + except: + return (3, "UNKNOWN - invalid output from plugin") + + # Add extended memory performance data, if this is + # enabled and the agent provides that information. + extended_perf = [] + extrainfo = "" + if mem_extended_perfdata: + mapped = meminfo.get('Mapped') + if mapped: + mapped_mb = int(mapped) / 1024 + committed_as = meminfo.get('Committed_AS') + if committed_as: + committed_as_mb = int(committed_as) / 1024 + else: + committed_as = 0 + extended_perf = [ + ('mapped', str(mapped_mb) + 'MB', '', '', 0, ''), + ('committed_as', str(committed_as_mb) + 'MB', '', '', 0, ''), + ] + extrainfo = ", %.1f GB mapped, %.1f GB committed" % \ + (mapped_mb / 1024.0, committed_as_mb / 1024.0) + + totalused_kb = (swapused + memused - caches) + totalused_mb = totalused_kb / 1024 + totalmem_kb = meminfo['MemTotal'] + totalmem_mb = totalmem_kb / 1024 + totalused_perc = 100 * (float(totalused_kb) / float(totalmem_kb)) + totalvirt_mb = (meminfo['SwapTotal'] + meminfo['MemTotal']) / 1024 + warn, crit = params + + perfdata = [ + ('ramused', str( (memused - caches) / 1024) + 'MB', '', '', 0, totalmem_mb), + ('swapused', str(swapused / 1024) + 'MB', '', '', 0, meminfo['SwapTotal']/1024) ] + + # levels may be given either in int -> MB or in float -> percentages + + infotext = ("%.2f GB used (%.2f GB RAM + %.2f GB SWAP, this is %.1f%% of %.2f GB RAM)" % \ + (totalused_mb / 1024.0, (memused-caches) / 1024.0 / 1024, swapused / 1024.0 / 1024, + totalused_perc, totalmem_mb / 1024.0)) \ + + extrainfo + + if type(warn) == float: + perfdata.append(('memused', str(totalused_mb)+'MB', int(warn/100.0 * totalmem_mb), + int(crit/100.0 * totalmem_mb), 0, totalvirt_mb)) + perfdata += extended_perf + if totalused_perc >= crit: + return (2, 'CRIT - %s, critical at %.1f%%' % (infotext, crit), perfdata) + elif totalused_perc >= warn: + return (1, 'WARN - %s, warning at %.1f%%' % (infotext, warn), perfdata) + else: + return (0, 'OK - %s' % infotext, perfdata) + + else: + perfdata.append(('memused', str(totalused_mb)+'MB', warn, crit, 0, totalvirt_mb)) + perfdata += extended_perf + if totalused_mb >= crit: + return (2, 'CRIT - %s, critical at %.2f GB' % (infotext, crit / 1024.0), perfdata) + elif totalused_mb >= warn: + return (1, 'WARN - %s, warning at %.2f GB' % (infotext, warn / 1024.0), perfdata) + else: + return (0, 'OK - %s' % infotext, perfdata) +

12 years, 3 months

Check_MK Git: check_mk: FIX: AIX agent now support more than 100 CPUs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e7aef435d94919082e08d5c6c98e5691347ff2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e7aef435d9491… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 23 15:33:16 2012 +0200 FIX: AIX agent now support more than 100 CPUs --- agents/check_mk_agent.aix | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index fb11ac6..238b23d 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -64,7 +64,7 @@ mpstat -a | tail -n1 echo '<<<cpu>>>' load=`uptime|sed -e 's;.*average: $[[:digit:]]\{1,\}\.[[:digit:]]\{1,\}$, $[[:digit:]]\{1,\}\.[[:digit:]]\{1,\}$, $[[:digit:]]\{1,\}\.[[:digit:]]\{1,\}$;\1 \2 \3;'` ps=`ps -eo thcount | awk '{SUM+=$1} END {print SUM}'` -procs=`vmstat|grep lcpu|sed -e 's;.* lcpu=$[[:digit:]]\{1,2\}$ .*;\1;'` +procs=`vmstat|grep lcpu|sed -e 's;.* lcpu=$[[:digit:]]\{1,4\}$ .*;\1;'` echo $load 1/$ps $$ $procs

12 years, 3 months

Check_MK Git: check_mk: added missing images

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f870cb2491a90b73a382ec467067ff019929ae8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f870cb2491a90b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 23 13:00:07 2012 +0200 added missing images --- web/htdocs/images/button_filters_set_down_lo.png | Bin 1253 -> 1233 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/button_filters_set_down_lo.png b/web/htdocs/images/button_filters_set_down_lo.png index aab7f97..1932c36 100644 Binary files a/web/htdocs/images/button_filters_set_down_lo.png and b/web/htdocs/images/button_filters_set_down_lo.png differ

12 years, 3 months

Check_MK Git: check_mk: Added hover-help for display option buttons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ec0752fbdfaf1a58299ad90e0bc543f0d67078f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec0752fbdfaf1a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 23 12:57:54 2012 +0200 Added hover-help for display option buttons --- web/htdocs/views.css | 4 ++++ web/htdocs/views.py | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 1a3ed40..35b13f3 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -126,6 +126,10 @@ div.togglebutton.down { top: -1px; left: -3px; } +div.togglebutton.checkbox.down { + top: 0px; + left: -2px; +} div.togglebutton.filters { background-image: url("images/button_filters_lo.png"); } div.togglebutton.filters:hover { background-image: url("images/button_filters_hi.png"); } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1857bf8..95c0c0c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1526,26 +1526,26 @@ def view_linktitle(view): else: return t -def view_optiondial(view, option, choices): +def view_optiondial(view, option, choices, help): vo = view_options(view["name"]) value = vo.get(option, view.get(option, choices[0][0])) title = dict(choices).get(value, value) html.begin_context_buttons() # just to be sure - html.write('<div id="optiondial_%s" class="optiondial %s val_%s"' + html.write('<div title="%s" id="optiondial_%s" class="optiondial %s val_%s"' 'onclick="view_dial_option(this, \'%s\', \'%s\', %r);"><div>%s</div></div>' % ( - option, option, value, view["name"], option, choices, title)) + help, option, option, value, view["name"], option, choices, title)) def view_optiondial_off(option): html.write('<div class="optiondial off %s"></div>' % option) -def view_option_toggler(view, option, icon): +def view_option_toggler(view, option, icon, help): vo = view_options(view["name"]) value = vo.get(option, view.get(option, False)) html.begin_context_buttons() # just to be sure - html.write('<div class="togglebutton %s %s"' + html.write('<div title="%s" class="togglebutton %s %s"' 'onclick="view_switch_option(this, \'%s\', \'%s\');"></div>' % ( - icon, value and "down" or "up", view["name"], option)) + help, icon, value and "down" or "up", view["name"], option)) @@ -1607,7 +1607,7 @@ def show_context_links(thisview, active_filters, show_filters, display_options, if 'C' in display_options: if command_form: togglebutton("commands", False, "commands", _("Execute commands on hosts, services and other objects")) - view_option_toggler(thisview, "show_checkboxes", "checkbox") + view_option_toggler(thisview, "show_checkboxes", "checkbox", _("Enable/Disable checkboxes for selecting rows for commands")) else: togglebutton_off("commands") togglebutton_off("checkboxes") @@ -1615,13 +1615,13 @@ def show_context_links(thisview, active_filters, show_filters, display_options, if 'O' in display_options: if config.may("view_option_columns"): choices = [ [x, "%s" % x] for x in config.view_option_columns ] - view_optiondial(thisview, "num_columns", choices) + view_optiondial(thisview, "num_columns", choices, _("Change the number of display columns")) else: view_optiondial_off("num_columns") if 'R' in display_options and config.may("view_option_refresh"): choices = [ [x, {0:_("off")}.get(x,str(x) + "s") + (x and "" or "")] for x in config.view_option_refreshes ] - view_optiondial(thisview, "refresh", choices) + view_optiondial(thisview, "refresh", choices, _("Change the refresh rate")) else: view_optiondial_off("refresh")

12 years, 3 months

Check_MK Git: check_mk: Update of view button images

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d991cd521aca1a6835450d003826500b645b957 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d991cd521aca1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 23 12:52:29 2012 +0200 Update of view button images --- web/htdocs/images/button_commands_down_hi.png | Bin 1205 -> 1267 bytes web/htdocs/images/button_commands_down_lo.png | Bin 1192 -> 1179 bytes web/htdocs/images/button_filters_down_hi.png | Bin 1209 -> 1266 bytes web/htdocs/images/button_filters_down_lo.png | Bin 1205 -> 1195 bytes web/htdocs/images/button_filters_set_down_hi.png | Bin 1265 -> 1315 bytes .../images/button_painteroptions_down_hi.png | Bin 1366 -> 1418 bytes .../images/button_painteroptions_down_lo.png | Bin 1352 -> 1339 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/button_commands_down_hi.png b/web/htdocs/images/button_commands_down_hi.png index 974dcc6..39c5737 100644 Binary files a/web/htdocs/images/button_commands_down_hi.png and b/web/htdocs/images/button_commands_down_hi.png differ diff --git a/web/htdocs/images/button_commands_down_lo.png b/web/htdocs/images/button_commands_down_lo.png index f1dbc02..6cfc1bc 100644 Binary files a/web/htdocs/images/button_commands_down_lo.png and b/web/htdocs/images/button_commands_down_lo.png differ diff --git a/web/htdocs/images/button_filters_down_hi.png b/web/htdocs/images/button_filters_down_hi.png index 89371ec..ca06b5b 100644 Binary files a/web/htdocs/images/button_filters_down_hi.png and b/web/htdocs/images/button_filters_down_hi.png differ diff --git a/web/htdocs/images/button_filters_down_lo.png b/web/htdocs/images/button_filters_down_lo.png index 7a5e384..d1aa4aa 100644 Binary files a/web/htdocs/images/button_filters_down_lo.png and b/web/htdocs/images/button_filters_down_lo.png differ diff --git a/web/htdocs/images/button_filters_set_down_hi.png b/web/htdocs/images/button_filters_set_down_hi.png index cae669e..55fa306 100644 Binary files a/web/htdocs/images/button_filters_set_down_hi.png and b/web/htdocs/images/button_filters_set_down_hi.png differ diff --git a/web/htdocs/images/button_painteroptions_down_hi.png b/web/htdocs/images/button_painteroptions_down_hi.png index 6095097..8e2c3c2 100644 Binary files a/web/htdocs/images/button_painteroptions_down_hi.png and b/web/htdocs/images/button_painteroptions_down_hi.png differ diff --git a/web/htdocs/images/button_painteroptions_down_lo.png b/web/htdocs/images/button_painteroptions_down_lo.png index 13c3159..c8829cd 100644 Binary files a/web/htdocs/images/button_painteroptions_down_lo.png and b/web/htdocs/images/button_painteroptions_down_lo.png differ

12 years, 3 months

Check_MK Git: check_mk: added missing images

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 644da7a252f929d93e587586185d6a412c55b7d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=644da7a252f929… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 23 12:50:44 2012 +0200 added missing images --- web/htdocs/images/button_checkbox_down_hi.png | Bin 0 -> 992 bytes web/htdocs/images/button_checkbox_down_lo.png | Bin 0 -> 994 bytes web/htdocs/images/button_checkbox_hi.png | Bin 0 -> 795 bytes web/htdocs/images/button_checkbox_lo.png | Bin 0 -> 782 bytes web/htdocs/images/button_checkbox_off.png | Bin 0 -> 979 bytes web/htdocs/images/button_commands_down_hi.png | Bin 0 -> 1205 bytes web/htdocs/images/button_commands_down_lo.png | Bin 0 -> 1192 bytes web/htdocs/images/button_commands_hi.png | Bin 0 -> 1278 bytes web/htdocs/images/button_commands_lo.png | Bin 0 -> 1260 bytes web/htdocs/images/button_commands_off.png | Bin 0 -> 1228 bytes web/htdocs/images/button_filters_down_hi.png | Bin 0 -> 1209 bytes web/htdocs/images/button_filters_down_lo.png | Bin 0 -> 1205 bytes web/htdocs/images/button_filters_hi.png | Bin 0 -> 1289 bytes web/htdocs/images/button_filters_lo.png | Bin 0 -> 1287 bytes web/htdocs/images/button_filters_off.png | Bin 0 -> 1229 bytes web/htdocs/images/button_filters_set_down_hi.png | Bin 0 -> 1265 bytes web/htdocs/images/button_filters_set_down_lo.png | Bin 0 -> 1253 bytes web/htdocs/images/button_filters_set_hi.png | Bin 0 -> 1322 bytes web/htdocs/images/button_filters_set_lo.png | Bin 0 -> 1316 bytes web/htdocs/images/button_filters_set_off.png | Bin 0 -> 1224 bytes .../images/button_painteroptions_down_hi.png | Bin 0 -> 1366 bytes .../images/button_painteroptions_down_lo.png | Bin 0 -> 1352 bytes web/htdocs/images/button_painteroptions_hi.png | Bin 0 -> 1430 bytes web/htdocs/images/button_painteroptions_lo.png | Bin 0 -> 1428 bytes web/htdocs/images/button_painteroptions_off.png | Bin 0 -> 1365 bytes web/htdocs/images/contextlink_down.png | Bin 0 -> 677 bytes web/htdocs/images/contextlink_lo.png | Bin 0 -> 703 bytes web/htdocs/images/dial_num_columns.png | Bin 0 -> 301 bytes web/htdocs/images/dial_num_columns_hi.png | Bin 0 -> 320 bytes web/htdocs/images/dial_num_columns_off.png | Bin 0 -> 329 bytes web/htdocs/images/dial_refresh.png | Bin 0 -> 330 bytes web/htdocs/images/dial_refresh_hi.png | Bin 0 -> 291 bytes web/htdocs/images/dial_refresh_off.png | Bin 0 -> 330 bytes web/htdocs/images/snapinfooter_addsnapin_down.png | Bin 0 -> 1033 bytes .../images/snapinfooter_einstellungen_down.png | Bin 0 -> 1332 bytes web/htdocs/images/snapinfooter_logout_down.png | Bin 0 -> 1483 bytes 36 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/button_checkbox_down_hi.png b/web/htdocs/images/button_checkbox_down_hi.png new file mode 100644 index 0000000..cee3821 Binary files /dev/null and b/web/htdocs/images/button_checkbox_down_hi.png differ diff --git a/web/htdocs/images/button_checkbox_down_lo.png b/web/htdocs/images/button_checkbox_down_lo.png new file mode 100644 index 0000000..0b1a4b3 Binary files /dev/null and b/web/htdocs/images/button_checkbox_down_lo.png differ diff --git a/web/htdocs/images/button_checkbox_hi.png b/web/htdocs/images/button_checkbox_hi.png new file mode 100644 index 0000000..fd6d3f9 Binary files /dev/null and b/web/htdocs/images/button_checkbox_hi.png differ diff --git a/web/htdocs/images/button_checkbox_lo.png b/web/htdocs/images/button_checkbox_lo.png new file mode 100644 index 0000000..be26502 Binary files /dev/null and b/web/htdocs/images/button_checkbox_lo.png differ diff --git a/web/htdocs/images/button_checkbox_off.png b/web/htdocs/images/button_checkbox_off.png new file mode 100644 index 0000000..9632100 Binary files /dev/null and b/web/htdocs/images/button_checkbox_off.png differ diff --git a/web/htdocs/images/button_commands_down_hi.png b/web/htdocs/images/button_commands_down_hi.png new file mode 100644 index 0000000..974dcc6 Binary files /dev/null and b/web/htdocs/images/button_commands_down_hi.png differ diff --git a/web/htdocs/images/button_commands_down_lo.png b/web/htdocs/images/button_commands_down_lo.png new file mode 100644 index 0000000..f1dbc02 Binary files /dev/null and b/web/htdocs/images/button_commands_down_lo.png differ diff --git a/web/htdocs/images/button_commands_hi.png b/web/htdocs/images/button_commands_hi.png new file mode 100644 index 0000000..39b437b Binary files /dev/null and b/web/htdocs/images/button_commands_hi.png differ diff --git a/web/htdocs/images/button_commands_lo.png b/web/htdocs/images/button_commands_lo.png new file mode 100644 index 0000000..bd235a5 Binary files /dev/null and b/web/htdocs/images/button_commands_lo.png differ diff --git a/web/htdocs/images/button_commands_off.png b/web/htdocs/images/button_commands_off.png new file mode 100644 index 0000000..e649a0f Binary files /dev/null and b/web/htdocs/images/button_commands_off.png differ diff --git a/web/htdocs/images/button_filters_down_hi.png b/web/htdocs/images/button_filters_down_hi.png new file mode 100644 index 0000000..89371ec Binary files /dev/null and b/web/htdocs/images/button_filters_down_hi.png differ diff --git a/web/htdocs/images/button_filters_down_lo.png b/web/htdocs/images/button_filters_down_lo.png new file mode 100644 index 0000000..7a5e384 Binary files /dev/null and b/web/htdocs/images/button_filters_down_lo.png differ diff --git a/web/htdocs/images/button_filters_hi.png b/web/htdocs/images/button_filters_hi.png new file mode 100644 index 0000000..00ffa08 Binary files /dev/null and b/web/htdocs/images/button_filters_hi.png differ diff --git a/web/htdocs/images/button_filters_lo.png b/web/htdocs/images/button_filters_lo.png new file mode 100644 index 0000000..52b15c9 Binary files /dev/null and b/web/htdocs/images/button_filters_lo.png differ diff --git a/web/htdocs/images/button_filters_off.png b/web/htdocs/images/button_filters_off.png new file mode 100644 index 0000000..a66f491 Binary files /dev/null and b/web/htdocs/images/button_filters_off.png differ diff --git a/web/htdocs/images/button_filters_set_down_hi.png b/web/htdocs/images/button_filters_set_down_hi.png new file mode 100644 index 0000000..cae669e Binary files /dev/null and b/web/htdocs/images/button_filters_set_down_hi.png differ diff --git a/web/htdocs/images/button_filters_set_down_lo.png b/web/htdocs/images/button_filters_set_down_lo.png new file mode 100644 index 0000000..aab7f97 Binary files /dev/null and b/web/htdocs/images/button_filters_set_down_lo.png differ diff --git a/web/htdocs/images/button_filters_set_hi.png b/web/htdocs/images/button_filters_set_hi.png new file mode 100644 index 0000000..aac1f14 Binary files /dev/null and b/web/htdocs/images/button_filters_set_hi.png differ diff --git a/web/htdocs/images/button_filters_set_lo.png b/web/htdocs/images/button_filters_set_lo.png new file mode 100644 index 0000000..4874c68 Binary files /dev/null and b/web/htdocs/images/button_filters_set_lo.png differ diff --git a/web/htdocs/images/button_filters_set_off.png b/web/htdocs/images/button_filters_set_off.png new file mode 100644 index 0000000..a2370e8 Binary files /dev/null and b/web/htdocs/images/button_filters_set_off.png differ diff --git a/web/htdocs/images/button_painteroptions_down_hi.png b/web/htdocs/images/button_painteroptions_down_hi.png new file mode 100644 index 0000000..6095097 Binary files /dev/null and b/web/htdocs/images/button_painteroptions_down_hi.png differ diff --git a/web/htdocs/images/button_painteroptions_down_lo.png b/web/htdocs/images/button_painteroptions_down_lo.png new file mode 100644 index 0000000..13c3159 Binary files /dev/null and b/web/htdocs/images/button_painteroptions_down_lo.png differ diff --git a/web/htdocs/images/button_painteroptions_hi.png b/web/htdocs/images/button_painteroptions_hi.png new file mode 100644 index 0000000..51d9c8f Binary files /dev/null and b/web/htdocs/images/button_painteroptions_hi.png differ diff --git a/web/htdocs/images/button_painteroptions_lo.png b/web/htdocs/images/button_painteroptions_lo.png new file mode 100644 index 0000000..31b6435 Binary files /dev/null and b/web/htdocs/images/button_painteroptions_lo.png differ diff --git a/web/htdocs/images/button_painteroptions_off.png b/web/htdocs/images/button_painteroptions_off.png new file mode 100644 index 0000000..e704d76 Binary files /dev/null and b/web/htdocs/images/button_painteroptions_off.png differ diff --git a/web/htdocs/images/contextlink_down.png b/web/htdocs/images/contextlink_down.png new file mode 100644 index 0000000..0729650 Binary files /dev/null and b/web/htdocs/images/contextlink_down.png differ diff --git a/web/htdocs/images/contextlink_lo.png b/web/htdocs/images/contextlink_lo.png new file mode 100644 index 0000000..f9bd1c0 Binary files /dev/null and b/web/htdocs/images/contextlink_lo.png differ diff --git a/web/htdocs/images/dial_num_columns.png b/web/htdocs/images/dial_num_columns.png new file mode 100644 index 0000000..ecd0f1e Binary files /dev/null and b/web/htdocs/images/dial_num_columns.png differ diff --git a/web/htdocs/images/dial_num_columns_hi.png b/web/htdocs/images/dial_num_columns_hi.png new file mode 100644 index 0000000..d2b7e6b Binary files /dev/null and b/web/htdocs/images/dial_num_columns_hi.png differ diff --git a/web/htdocs/images/dial_num_columns_off.png b/web/htdocs/images/dial_num_columns_off.png new file mode 100644 index 0000000..57abb72 Binary files /dev/null and b/web/htdocs/images/dial_num_columns_off.png differ diff --git a/web/htdocs/images/dial_refresh.png b/web/htdocs/images/dial_refresh.png new file mode 100644 index 0000000..ca8a265 Binary files /dev/null and b/web/htdocs/images/dial_refresh.png differ diff --git a/web/htdocs/images/dial_refresh_hi.png b/web/htdocs/images/dial_refresh_hi.png new file mode 100644 index 0000000..40ad175 Binary files /dev/null and b/web/htdocs/images/dial_refresh_hi.png differ diff --git a/web/htdocs/images/dial_refresh_off.png b/web/htdocs/images/dial_refresh_off.png new file mode 100644 index 0000000..fb5047a Binary files /dev/null and b/web/htdocs/images/dial_refresh_off.png differ diff --git a/web/htdocs/images/snapinfooter_addsnapin_down.png b/web/htdocs/images/snapinfooter_addsnapin_down.png new file mode 100644 index 0000000..5a9d865 Binary files /dev/null and b/web/htdocs/images/snapinfooter_addsnapin_down.png differ diff --git a/web/htdocs/images/snapinfooter_einstellungen_down.png b/web/htdocs/images/snapinfooter_einstellungen_down.png new file mode 100644 index 0000000..705cfa4 Binary files /dev/null and b/web/htdocs/images/snapinfooter_einstellungen_down.png differ diff --git a/web/htdocs/images/snapinfooter_logout_down.png b/web/htdocs/images/snapinfooter_logout_down.png new file mode 100644 index 0000000..649a383 Binary files /dev/null and b/web/htdocs/images/snapinfooter_logout_down.png differ

12 years, 3 months

← Newer
1
...
17
18
19
20
21
22
23
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012