Checkmk git commits December 2013

checkmk-commits@lists.checkmk.com

6 participants
316 discussions

Check_MK Git: check_mk: FIX Fixed moving of snapins while in scrolled sidebar

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ef74cbebf6964cebe2a6c47a58377ac1806faa5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ef74cbebf6964… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 14:35:55 2013 +0100 FIX Fixed moving of snapins while in scrolled sidebar Release 1.2.3i2 introduced a bug where a snapin was flipping several pixels above the current mouse position when moving a snapin while the sidebar is scrolled down. --- .werks/296 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/js/sidebar.js | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/296 b/.werks/296 new file mode 100644 index 0000000..3332c6e --- /dev/null +++ b/.werks/296 @@ -0,0 +1,10 @@ +Title: Fixed moving of snapins while in scrolled sidebar +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1385991237 +Class: fix + +Release 1.2.3i2 introduced a bug where a snapin was flipping +several pixels above the current mouse position when moving +a snapin while the sidebar is scrolled down. diff --git a/ChangeLog b/ChangeLog index 83018ec..1e84fab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 0006 FIX: Checkboxes for hosts/services were missing on modified views... * 0284 FIX: Context help toggled on/off randomly... * 0285 FIX: Fixed bookmarking of absolute URLs or PNP/NagVis URLs in sidebar snapin... + * 0296 FIX: Fixed moving of snapins while in scrolled sidebar... WATO: * 0053 New rule for configuring the display_name of a service... diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 62f57d9..270bb2a 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -160,8 +160,7 @@ function snapinDrag(event) { // Drag the snapin snapinDragging.style.position = 'absolute'; var newTop = event.clientY - snapinOffset[0] - snapinScrollTop; - /*if (weAreIEF__k) - newTop += document.getElementById('side_content').scrollTop;*/ + newTop += document.getElementById('side_content').scrollTop; snapinDragging.style.top = newTop + 'px'; snapinDragging.style.left = (event.clientX - snapinOffset[1]) + 'px'; snapinDragging.style.zIndex = 200; @@ -284,7 +283,8 @@ function getSnapinList() { } function getSnapinCoords(obj) { - var snapinTop = snapinDragging.offsetTop + document.getElementById('side_content').scrollTop; + var snapinTop = snapinDragging.offsetTop; + // + document.getElementById('side_content').scrollTop; var bottomOffset = obj.offsetTop + obj.clientHeight - snapinTop; if (bottomOffset < 0)

10 years, 10 months

Check_MK Git: check_mk: FIX Fixed problem with new created tag groups with "/" in title

by Lars Michelsen

Module: check_mk Branch: master Commit: e251be4eac6a05596da462448c7666381c08a5f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e251be4eac6a05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 14:08:17 2013 +0100 FIX Fixed problem with new created tag groups with "/" in title If you used <tt>/</tt> chars in the tag group titles before, the text before the first <tt>/</tt> was moved from the title to the topic field. This was not intended. This has been fixed now. However, there is still some issue with this: If you have existing tag groups with slashes in their title, the same problem will happen. Thist must be fixed by hand for the moment. --- .werks/295 | 15 +++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 5 +++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/295 b/.werks/295 new file mode 100644 index 0000000..cfe493d --- /dev/null +++ b/.werks/295 @@ -0,0 +1,15 @@ +Title: Fixed problem with new created tag groups with "/" in title +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1385989575 +Class: fix + +If you used <tt>/</tt> chars in the tag group titles before, the text before +the first <tt>/</tt> was moved from the title to the topic field. This was not +intended. This has been fixed now. + +However, there is still some issue with this: If you have existing tag groups with +slashes in their title, the same problem will happen. Thist must be fixed by hand +for the moment. + diff --git a/ChangeLog b/ChangeLog index 1fdb323..39f356b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * 0220 FIX: Added HTML escaping to several global settings attributes... * 0234 FIX: Improved handling of interface inventory states / types... * 0289 FIX: Renamed "Hosts & Folders" page to "Hosts" + * 0295 FIX: Fixed problem with new created tag groups with "/" in title... Notifications: * 0005 Added notification script for sending SMS via mobilant.com... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6a7f783..8de73ae 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10071,8 +10071,9 @@ def mode_edit_hosttag(phase): raise MKUserError("title", _("Please specify a title for your host tag group.")) topic = forms.get_input(vs_topic, "topic") - if topic != '': - title = '%s/%s' % (topic, title) + # always put at least "/" as prefix to the title, the title + # will then be split by the first "/' in future + title = '%s/%s' % (topic, title) new_choices = forms.get_input(vs_choices, "choices") have_none_tag = False

10 years, 10 months

Check_MK Git: check_mk: brocade_mlx: naming of checks and items better complies to standards now

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: c25d5d2b44eae3ae34e360c939dcd1ef1a002ecd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c25d5d2b44eae3… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Dec 2 12:59:40 2013 +0100 brocade_mlx: naming of checks and items better complies to standards now --- checkman/brocade_mlx.module_cpu | 4 ++-- checkman/brocade_mlx.module_mem | 4 ++-- checkman/brocade_mlx_temp | 6 +++--- checks/brocade_mlx | 17 +++++++++-------- checks/brocade_mlx_temp | 14 +++++--------- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/checkman/brocade_mlx.module_cpu b/checkman/brocade_mlx.module_cpu index ec8be8b..c23c98a 100644 --- a/checkman/brocade_mlx.module_cpu +++ b/checkman/brocade_mlx.module_cpu @@ -24,12 +24,12 @@ examples: # Check Module with ID 33 on a box called my-mlx-device with default levels checks += [ - ("my-mlx-device", "brocade_mlx.module_cpu", '33 NI-MLX-32_MR Management Module', brocade_mlx_cpu_default_levels), + ("my-mlx-device", "brocade_mlx.module_cpu", '33 NI-MLX-32_MR Management', brocade_mlx_cpu_default_levels), ] # or use individual levels for warn and crit checks += [ - ("my-mlx-device", "brocade_mlx.module_cpu", '33 NI-MLX-32_MR Management Module', { "levels": (75.0, 85.0) }), + ("my-mlx-device", "brocade_mlx.module_cpu", '33 NI-MLX-32_MR Management', { "levels": (75.0, 85.0) }), ] perfdata: diff --git a/checkman/brocade_mlx.module_mem b/checkman/brocade_mlx.module_mem index bf20e69..e2bff6e 100644 --- a/checkman/brocade_mlx.module_mem +++ b/checkman/brocade_mlx.module_mem @@ -20,12 +20,12 @@ examples: # Check Module with ID 33 on a box called my-mlx-device with default levels checks += [ - ("my-mlx-device", "brocade_mlx.module_mem", '33 NI-MLX-32_MR Management Module', brocade_mlx_mem_default_levels), + ("my-mlx-device", "brocade_mlx.module_mem", '33 NI-MLX-32_MR Management', brocade_mlx_mem_default_levels), ] # or use individual levels for warn and crit checks += [ - ("my-mlx-device", "brocade_mlx.module_mem", '33 NI-MLX-32_MR Management Module', { "levels": (75.0, 85.0) }), + ("my-mlx-device", "brocade_mlx.module_mem", '33 NI-MLX-32_MR Management', { "levels": (75.0, 85.0) }), ] perfdata: diff --git a/checkman/brocade_mlx_temp b/checkman/brocade_mlx_temp index 3f89697..4d555aa 100644 --- a/checkman/brocade_mlx_temp +++ b/checkman/brocade_mlx_temp @@ -12,7 +12,7 @@ description: {OK} is returned otherwise. item: - The description of the module as provided by SNMP. + The description of the module together with its ID as provided by SNMP. examples: # set default levels to 30°C and 40°C: @@ -21,12 +21,12 @@ examples: # Check sensors of Switch Fabric module 0 on a box called my-mlx-device with # default levels checks += [ - ("my-mlx-device", "brocade_mlx.temperature", 'Switch Fabric module 0', brocade_mlx_temperature_default_levels) + ("my-mlx-device", "brocade_mlx.temperature", 'Switch Fabric Module 35', brocade_mlx_temperature_default_levels) ] # or use individual levels for warn and crit checks += [ - ("my-mlx-device", "brocade_mlx.temperature", 'Switch Fabric module 0', (40, 50) + ("my-mlx-device", "brocade_mlx.temperature", 'Switch Fabric Module 35', (40, 50) ] perfdata: diff --git a/checks/brocade_mlx b/checks/brocade_mlx index 9b792ab..8d7ccf4 100644 --- a/checks/brocade_mlx +++ b/checks/brocade_mlx @@ -33,10 +33,11 @@ brocade_mlx_info = [ ('.1.3.6.1.4.1.1991.1.1.2.2.1.1', [ 1, 2, 12, 24, 25 ]), def brocade_mlx_scan(oid): return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1991.1.") -def combine_item(id, descr): +def combine_item_default(id, descr): if descr == "": return id else: + descr = re.sub(" *Module", "", descr) return "%s %s" % (id, descr) @@ -49,12 +50,12 @@ def inventory_brocade_mlx_module(info): for module_id, module_descr, module_state, mem_total, mem_avail in info[0]: # do not inventorize modules reported as empty if module_state != "0": - inventory.append( (combine_item(module_id, module_descr), None) ) + inventory.append( (combine_item_default(module_id, module_descr), None) ) return inventory def check_brocade_mlx_module(item, _no_params, info): for module_id, module_descr, module_state, mem_total, mem_avail in info[0]: - if combine_item(module_id, module_descr) == item: + if combine_item_default(module_id, module_descr) == item: if module_state == "0": return 1, "Module reports status 0 (empty)" elif module_state == "2": @@ -74,7 +75,7 @@ def check_brocade_mlx_module(item, _no_params, info): check_info["brocade_mlx.module_status"] = { "check_function" : check_brocade_mlx_module, "inventory_function" : inventory_brocade_mlx_module, - "service_description" : "Line module %s Status", + "service_description" : "Status Module %s", "snmp_info" : brocade_mlx_info, "snmp_scan_function" : brocade_mlx_scan, "has_perfdata" : False, @@ -92,13 +93,13 @@ def inventory_brocade_mlx_module_mem(info): # do not inventorize modules reported as empty # and: monitor memory only on NI-MLX modules if module_state != "0" and module_descr.startswith("NI-MLX"): - inventory.append( (combine_item(module_id, module_descr), "brocade_mlx_mem_default_levels") ) + inventory.append( (combine_item_default(module_id, module_descr), "brocade_mlx_mem_default_levels") ) return inventory def check_brocade_mlx_module_mem(item, params, info): warn, crit = params["levels"] for module_id, module_descr, module_state, mem_total, mem_avail in info[0]: - if combine_item(module_id, module_descr) == item: + if combine_item_default(module_id, module_descr) == item: if module_state != "10": return 3, "Module is not in state running" @@ -153,13 +154,13 @@ def inventory_brocade_mlx_module_cpu(info): # do not inventorize modules reported as empty # and: monitor cpu only on NI-MLX modules if module_state != "0" and module_descr.startswith("NI-MLX"): - inventory.append( (combine_item(module_id, module_descr), "brocade_mlx_cpu_default_levels") ) + inventory.append( (combine_item_default(module_id, module_descr), "brocade_mlx_cpu_default_levels") ) return inventory def check_brocade_mlx_module_cpu(item, params, info): warn, crit = params["levels"] for module_id, module_descr, module_state, mem_total, mem_avail in info[0]: - if combine_item(module_id, module_descr) == item: + if combine_item_default(module_id, module_descr) == item: if module_state != "10": return 3, "Module is not in state running" diff --git a/checks/brocade_mlx_temp b/checks/brocade_mlx_temp index 09aae0f..60658bd 100644 --- a/checks/brocade_mlx_temp +++ b/checks/brocade_mlx_temp @@ -30,27 +30,23 @@ brocade_mlx_temp_info = ('.1.3.6.1.4.1.1991.1.1.2.13.1.1', [ 3, OID_END, 4 ]) def brocade_mlx_scan(oid): return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1991.1.") -def combine_item(id, descr): - if descr == "": - return id - else: - return "%s %s" % (id, descr) - ############################################################################# # Temperature Sensors ############################################################################# brocade_mlx_temperature_default_levels = (50, 60) -def compose_item(name): +def compose_item(id, name): + id = re.sub("\.[0-9]+", "", id) name = re.sub(" *temperature", "", name) name = re.sub(", sensor [0-9]+", "", name) + name = re.sub("module ?[0-9]*", "Module %s" % id, name) return name def inventory_brocade_mlx_temp(info): inventory = [] for temp_descr, temp_id, temp_value in info: - temp_descr = compose_item(temp_descr) + temp_descr = compose_item(temp_id, temp_descr) if ((temp_descr, "brocade_mlx_temperature_default_levels") not in inventory): inventory.append( (temp_descr, "brocade_mlx_temperature_default_levels") ) return inventory @@ -64,7 +60,7 @@ def check_brocade_mlx_temp(item, params, info): for temp_descr, temp_id, temp_value in info: # Info from the MIB: "Each unit is 0.5 degrees Celcius." temp_value = int(temp_value) / 2 - current_item = compose_item(temp_descr) + current_item = compose_item(temp_id, temp_descr) if current_item == item: # OID_END needs to be used for sensor id because especially # Active management modules may have more temperature sensors

10 years, 10 months

Check_MK Git: check_mk: Solaris Agent: implement cached async plugins and local checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 9cb94544a822ebfb52538a71a5a50b4eab51c4bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cb94544a822eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 2 12:06:53 2013 +0100 Solaris Agent: implement cached async plugins and local checks The Solaris agent now supports the same method of asynchronously executing local checks and plugins as the Linux agent. Simply create directories below <tt>/usr/lib/check_mk_agent/local</tt> and <tt>/usr/lib/check_mk_agent/plugins</tt> whose names are a number of seconds (e.g. <tt>/usr/lib/check_mk_agent/plugins/3600</tt>). The plugins in those subdirectories will be executed at most every that number of seconds and also will be run in the background. --- .werks/13 | 14 ++++++++++++++ ChangeLog | 1 + 2 files changed, 15 insertions(+) diff --git a/.werks/13 b/.werks/13 new file mode 100644 index 0000000..248ec55 --- /dev/null +++ b/.werks/13 @@ -0,0 +1,14 @@ +Title: Solaris Agent: implement cached async plugins and local checks +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1385982276 +Class: feature + +The Solaris agent now supports the same method of asynchronously +executing local checks and plugins as the Linux agent. Simply +create directories below <tt>/usr/lib/check_mk_agent/local</tt> +and <tt>/usr/lib/check_mk_agent/plugins</tt> whose names are a +number of seconds (e.g. <tt>/usr/lib/check_mk_agent/plugins/3600</tt>). +The plugins in those subdirectories will be executed at most every +that number of seconds and also will be run in the background. diff --git a/ChangeLog b/ChangeLog index e02e2dc..ff27a1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 0084 brocade_mlx: single checks now instead of sub checks... * 0291 winperf_ts_sessions: New check to monitor Microsoft Terminal Server sessions... * 0102 modbus_value: New check and Agent to modbus devices... + * 0013 Solaris Agent: implement cached async plugins and local checks... * 0024 FIX: cisco_wlc: removed check configuration parameter ap_model... * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process inventory... * 0037 FIX: checkman browser (cmk -m) was not working properly in network subtree...

10 years, 10 months

Check_MK Git: check_mk: FIX Solaris Agent: fixed broken fileinfo section

by Mathias Kettner

Module: check_mk Branch: master Commit: d8695e13d0cfdbfa06c420f3e6ac33935d16900f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8695e13d0cfdb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 2 12:04:33 2013 +0100 FIX Solaris Agent: fixed broken fileinfo section The fileinfo section of the Solaris agent couldn't handle more than one file in a directory. This has now been fixed. --- .werks/12 | 9 +++ ChangeLog | 1 + agents/check_mk_agent.solaris | 122 ++++++++++++++++++++++++++++++----------- 3 files changed, 101 insertions(+), 31 deletions(-) diff --git a/.werks/12 b/.werks/12 new file mode 100644 index 0000000..f6c617c --- /dev/null +++ b/.werks/12 @@ -0,0 +1,9 @@ +Title: Solaris Agent: fixed broken fileinfo section +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1385982228 +Class: fix + +The fileinfo section of the Solaris agent couldn't handle +more than one file in a directory. This has now been fixed. diff --git a/ChangeLog b/ChangeLog index 53dc555..e02e2dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * 0286 FIX: esx_vsphrere_counters.ramdisk: Better handling for non existant ramdisks... * 0290 FIX: winperf_processor mem.win: Handling no/empty agent responses correctly now... * 0293 FIX: esx_vsphere_counters_ramdisk_sizes: Handles ram disk "ibmscratch" by default now + * 0012 FIX: Solaris Agent: fixed broken fileinfo section... Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris old mode 100755 new mode 100644 index 4244213..37494af --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -27,8 +27,8 @@ export LC_ALL=C unset LANG -export MK_LIBDIR="/change/me" -export MK_CONFDIR="/change/me" +export MK_LIBDIR="/usr/lib/check_mk_agent" +export MK_CONFDIR="/etc/check_mk" # All executables in PLUGINSDIR will simply be executed and their # ouput appended to the output of the agent. Plugins define their own @@ -48,8 +48,51 @@ else exec <&- 2>/dev/null fi +function file_age() { + /usr/bin/perl -e 'if (! -f $ARGV[0]){die "0000000"};$mtime=(stat($ARGV[0]))[9];print ($^T-$mtime);' "$1" +} + + + + +# Runs a command asynchronous by use of a cache file +function run_cached () { + if [ "$1" = -s ] ; then local section="echo '<<<$2>>>' ; " ; shift ; fi + local NAME=$1 + local MAXAGE=$2 + shift 2 + local CMDLINE="$section$@" + + if [ ! -d $MK_CONFDIR/cache ]; then mkdir -p $MK_CONFDIR/cache ; fi + CACHEFILE="$MK_CONFDIR/cache/$NAME.cache" + + # Check if the creation of the cache takes suspiciously long and return + # nothing if the age (access time) of $CACHEFILE.new is twice the MAXAGE + if [ -e "$CACHEFILE.new" ] ; then + AGE=$(file_age "$CACHEFILE.new") + if [ $AGE -ge $((MAXAGE * 2)) ] ; then + return + fi + fi + + # Check if cache file exists and is recent enough + if [ -s "$CACHEFILE" ] ; then + AGE=$(file_age "$CACHEFILE") + if [ $AGE -le $MAXAGE ] ; then local USE_CACHEFILE=1 ; fi + # Output the file in any case, even if it is + # outdated. The new file will not yet be available + cat "$CACHEFILE" + fi + + # Cache file outdated and new job not yet running? Start it + if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then + echo "set -o noclobber ; exec > $CACHEFILE.new || exit 1 ; $CMDLINE && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new" | nohup bash 2>/dev/null & + fi +} + + echo '<<<check_mk>>>' -echo Version: 1.2.3i6 +echo Version: 2013.12.02 echo AgentOS: solaris @@ -183,52 +226,69 @@ then fi -if cd $PLUGINSDIR 2>/dev/null -then - for skript in $(ls) - do - if [ -x "$skript" ] ; then - ./$skript - fi - done -fi - - # Fileinfo-Check: put patterns for files into $MK_CONFDIR/fileinfo.cfg if [ -f "$MK_CONFDIR/fileinfo.cfg" ] then echo '<<<fileinfo:sep(124)>>>' - echo '' - nawk 'BEGIN{print srand()}' - file=$(ls $(cat "$MK_CONFDIR/fileinfo.cfg")) - size=$(ls -nl $file | nawk '{print $5}') - date=$(truss -v lstat -t lstat ls -d $file 2>&1 | nawk '/mt = /{printf "%d\n", $9}') - echo ${file}'|'${size}'|'${date} + /usr/bin/perl -e 'print time."\n"' + ls $(cat "$MK_CONFDIR/fileinfo.cfg") | \ + /usr/bin/perl -e ' + while(my $file = <>) { + $file =~ s/\n$//; + ($device, $inode, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat($file); + print("$file|$size|$mtime\n"); + }' fi -# Local + +# MK's Remote Plugin Executor +if test -f "$MK_CONFDIR/mrpe.cfg" +then + echo '<<<mrpe>>>' + grep -v '^ *#' "$MK_CONFDIR/mrpe.cfg" | grep -v '^ *$' | \ + while read descr cmdline + do + OUTPUT=$($cmdline) + echo "$descr $? $OUTPUT" + done +fi + +# Local checks if cd $LOCALDIR 2>/dev/null then echo '<<<local>>>' for skript in $(ls) do - if [ -x "$skript" ] - then + if [ -x "$skript" ] ; then ./$skript fi done -fi + # Call some plugins only every X'th second + for skript in [1-9]*/* ; do + if [ -x "$skript" ] ; then + run_cached local_${skript//\//\#} ${skript%/*} "$skript" + fi + done + +fi -# MK's Remote Plugin Executor -if test -f "$MK_CONFDIR/mrpe.cfg" +# Plugins +if cd $PLUGINSDIR 2>/dev/null then - echo '<<<mrpe>>>' - grep -v '^ *#' "$MK_CONFDIR/mrpe.cfg" | grep -v '^ *$' | \ - while read descr cmdline + for skript in $(ls) do - OUTPUT=$($cmdline) - echo "$descr $? $OUTPUT" + if [ -x "$skript" ] ; then + ./$skript + fi + done + + # Call some plugins only every X'th second + for skript in [1-9]*/* ; do + if [ -x "$skript" ] ; then + run_cached plugins_${skript//\//\#} ${skript%/*} "$skript" + fi done fi +

10 years, 10 months

Check_MK Git: check_mk: Single-Host Problems title is now localizable

by Lars Michelsen

Module: check_mk Branch: master Commit: 5e170617e85d0def1d191b2af305240391574d23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e170617e85d0d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 11:24:01 2013 +0100 Single-Host Problems title is now localizable --- web/plugins/views/builtin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index f9e7f7c..91a6907 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2674,7 +2674,7 @@ multisite_builtin_views.update({ 'hidebutton': True, 'icon' : 'aggr', 'layout': 'table', - 'linktitle': 'Single-Host Problems', + 'linktitle': _('Single-Host Problems'), 'mustsearch': False, 'name': 'aggr_hostproblems', 'num_columns': 1, @@ -2699,7 +2699,7 @@ multisite_builtin_views.update({ 'opthostgroup', 'aggr_effective_state'], 'sorters': [('aggr_group', False), ('site_host', False)], - 'title': 'Single-Host Problems', + 'title': _('Single-Host Problems'), 'topic': _('Business Intelligence')}, # Shows a single aggregation which has to be set via aggr_name=<Name>

10 years, 10 months

Check_MK Git: check_mk: Added "services" button to host diagnose page

by Lars Michelsen

Module: check_mk Branch: master Commit: 294d85fec4320b573643509ead2e7565cd8011b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=294d85fec4320b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 11:22:03 2013 +0100 Added "services" button to host diagnose page --- .werks/294 | 8 ++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 ++ 3 files changed, 11 insertions(+) diff --git a/.werks/294 b/.werks/294 new file mode 100644 index 0000000..741f9a3 --- /dev/null +++ b/.werks/294 @@ -0,0 +1,8 @@ +Title: Added "services" button to host diagnose page +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1385979708 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 53dc555..1fdb323 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 0216 Supporting float values as SNMP timeout value now... * 0082 Improved online help for LDAP connections... * 0009 Automatically schedule inventory check after service config change... + * 0294 Added "services" button to host diagnose page * 0048 FIX: Tests on host diagnose page are executed parallel now... * 0033 FIX: Fixed problem when saving settings in WATOs host diagnostic page... * 0205 FIX: NagVis related permissions of roles can be edited again... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8a2b923..6a7f783 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2209,6 +2209,8 @@ def mode_diag_host(phase): global_buttons() html.context_button(_("Host Properties"), make_link([("mode", "edithost"), ("host", hostname)]), "back") + html.context_button(_("Services"), + make_link([("mode", "inventory"), ("host", hostname)]), "services") return vs_host = Dictionary(

10 years, 10 months

Check_MK Git: check_mk: multisite_draw_ruleicon: changed title of rule in global settings

by Lars Michelsen

Module: check_mk Branch: master Commit: fbc593648ef5df8364e4a9e728df4b7ad1761f23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbc593648ef5df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 11:04:11 2013 +0100 multisite_draw_ruleicon: changed title of rule in global settings --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 9162b01..c360ae2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -232,7 +232,7 @@ register_configvar(group, register_configvar(group, "multisite_draw_ruleicon", - Checkbox(title = _("Show icon for WATO parameter editor"), + Checkbox(title = _("Show icon linking to WATO parameter editor for services"), label = _("Show WATO icon"), help = _("When enabled a rule editor icon is displayed for each " "service in the multisite views. It is only displayed if the user "

10 years, 10 months

Check_MK Git: check_mk: fritz.conn fritz.wan_if: Improved error case handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 41793340870014df283419cb669d9b4520b0bd63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41793340870014… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 09:19:56 2013 +0100 fritz.conn fritz.wan_if: Improved error case handling --- checks/fritz | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/checks/fritz b/checks/fritz index 02ffc1d..4a43403 100644 --- a/checks/fritz +++ b/checks/fritz @@ -47,6 +47,8 @@ fritz_conn_states = { } def check_fritz_conn(_unused, _no_params, info): + if not info: + return 3, 'Connection info is missing' data = fritz_parse_info(info) state_txt = data['NewConnectionStatus'] nag_state = fritz_conn_states.get(state_txt) @@ -138,6 +140,8 @@ def inventory_fritz_wan_if(info): return inventory_if_common(fritz_wan_if_to_if64(data)) def check_fritz_wan_if(item, params, info): + if not info: + return 3, 'Interface info is missing' data = fritz_parse_info(info) if 'assumed_speed_in' not in params: params['assumed_speed_in'] = int(data['NewLayer1DownstreamMaxBitRate'])

10 years, 10 months

Check_MK Git: check_mk: FIX esx_vsphere_counters_ramdisk_sizes: Handles ram disk "ibmscratch" by default now

by Lars Michelsen

Module: check_mk Branch: master Commit: d3a5c1b620e0eef4a4071ea4c5a5f9a5676874c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3a5c1b620e0ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 09:17:11 2013 +0100 FIX esx_vsphere_counters_ramdisk_sizes: Handles ram disk "ibmscratch" by default now --- .werks/293 | 8 ++++++++ ChangeLog | 1 + checks/esx_vsphere_counters | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/293 b/.werks/293 new file mode 100644 index 0000000..5bf56ab --- /dev/null +++ b/.werks/293 @@ -0,0 +1,8 @@ +Title: esx_vsphere_counters_ramdisk_sizes: Handles ram disk "ibmscratch" by default now +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1385972211 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 39f657e..53dc555 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 0081 FIX: Fixed corruption in SNMP walks created with cmk --snmpwalk... * 0286 FIX: esx_vsphrere_counters.ramdisk: Better handling for non existant ramdisks... * 0290 FIX: winperf_processor mem.win: Handling no/empty agent responses correctly now... + * 0293 FIX: esx_vsphere_counters_ramdisk_sizes: Handles ram disk "ibmscratch" by default now Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index 293bedd..d3c822e 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -292,7 +292,7 @@ esx_vsphere_counters_ramdisk_sizes = { 'hostdstats': 319, 'snmptraps': 1, 'upgradescratch': 300, - #'ibmscratch': , + 'ibmscratch': 300, } def inventory_esx_vsphere_counters_ramdisk(info):

10 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2013