Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 62ecc1e9a6c3a8b8574a920e7553c691de976ded URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62ecc1e9a6c3a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 16:05:16 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0401, #0436

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 38fc0d2271296c9e6ccfc146213a810d9c809e82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38fc0d2271296c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 16:00:02 2011 +0100 Updated bug entries #0401, #0436 --- .bugs/401 | 7 +++++-- .bugs/436 | 10 ++++++++-- .bugs/config | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.bugs/401 b/.bugs/401 index 37ecb08..c751e75 100644 --- a/.bugs/401 +++ b/.bugs/401 @@ -1,12 +1,15 @@ Title: IE8: Hiliting of rows in checkbox mode is broken Component: multisite +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-10-27 18:51:44 Targetversion: 1.1.12 -Class: bug When in a view in Checkbox mode hovering over the rows should hilite those rows. In IE8 this does not work. The red background of the CRIT is destroyed, too. + +2011-12-15 15:12:05: changed state open -> done +Has just been fixed. diff --git a/.bugs/436 b/.bugs/436 index f3813c4..3e65aac 100644 --- a/.bugs/436 +++ b/.bugs/436 @@ -1,11 +1,11 @@ Title: sounds/ URL create Popup on Windows 7 Component: multisite +State: worksforme +Class: bug Benefit: 1 -State: open Cost: 2 Date: 2011-11-15 09:09:22 Targetversion: 1.1.12 -Class: bug In Windows 7 when you Multisite plays a sound file (e.g. due to a problem shown in the dashboard), a HTTP @@ -13,3 +13,9 @@ auth window pops up. The reason seems to be that the sounds URL is excluded from Auth via the apache config of Multisite. IE seems to think that it can log out. + +2011-12-15 15:59:59: changed state open -> worksforme +I can not reproduce this using Windows 7 + IE9. The problem may be strongly related +to the handler for the wav files. I had quicktime installed which could not play +these files. Then I uninstalled quicktime. After that the IE used the windows media +player to play the wav files and this worked with the current apache config / code. diff --git a/.bugs/config b/.bugs/config index 9f9c59d..0425a80 100644 --- a/.bugs/config +++ b/.bugs/config @@ -3,6 +3,7 @@ states = { "done" : tty_green, "closed" : tty_normal, "wontfix" : tty_magenta, + "worksforme" : tty_white, "discuss" : tty_red, }

12 years, 9 months

Check_MK Git: check_mk: gb: Added works4me solution

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d275a5768918322d6e8995aa5cbb665741bf503a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d275a576891832… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 16:05:05 2011 +0100 gb: Added works4me solution --- .bugs/436 | 2 +- .bugs/config | 2 +- gb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.bugs/436 b/.bugs/436 index 3e65aac..413c530 100644 --- a/.bugs/436 +++ b/.bugs/436 @@ -1,6 +1,6 @@ Title: sounds/ URL create Popup on Windows 7 Component: multisite -State: worksforme +State: works4me Class: bug Benefit: 1 Cost: 2 diff --git a/.bugs/config b/.bugs/config index 0425a80..9bbb6eb 100644 --- a/.bugs/config +++ b/.bugs/config @@ -3,7 +3,7 @@ states = { "done" : tty_green, "closed" : tty_normal, "wontfix" : tty_magenta, - "worksforme" : tty_white, + "works4me" : tty_white, "discuss" : tty_red, } diff --git a/gb b/gb index 2ca5703..aca9782 100755 --- a/gb +++ b/gb @@ -180,7 +180,7 @@ where COMMAND is one of: def bug_state(bug): state = bug["state"] - return "%s%-7s%s" % (tty_bold + states.get(state, ""), state, tty_normal) + return "%s%-8s%s" % (tty_bold + states.get(state, ""), state, tty_normal) def num_color(n, colors, inverse): if inverse: @@ -196,9 +196,9 @@ def list_bug(bug): bold = tty_bold + tty_cyan + "(*) " else: bold = "" - sys.stdout.write("#%04d %-6s %-9s %-10s %s%-6s%s %s%-60s%s\n" % + sys.stdout.write("#%04d %-8s %-9s %-10s %s%-6s%s %s%-60s%s\n" % (int(bug["id"]), - bug_state(bug), + bug_state(bug), bug["class"], bug["component"], tty_bold, bug["targetversion"], tty_normal, bold, bug["title"], tty_normal))

12 years, 9 months

Check_MK Git: check_mk: fix error in setup.sh

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e4a90961fb93980e0e01af67ed65a4ba9be2d88d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4a90961fb9398… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 15:13:57 2011 +0100 fix error in setup.sh --- scripts/setup.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index f021b63..62589ba 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -543,7 +543,7 @@ EOF make -j 8 2>&1 && strip src/livestatus.o && mkdir -p $DESTDIR$libdir && - install -m 755 src/livecheck src/livestatus.o $DESTDIR$libdir/livestatus.o && + install -m 755 src/livecheck src/livestatus.o $DESTDIR$libdir && mkdir -p $DESTDIR$bindir && install -m 755 src/unixcat $DESTDIR$bindir && popd

12 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eeaaa604d5bbad4535a0a9ddf3577628fc1783a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eeaaa604d5bbad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 15:13:59 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Added first version of oracle_asm_diskgroup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f7562ed165b6d3fdee6862448e2fe0f043572be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7562ed165b6d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 15:07:28 2011 +0100 Added first version of oracle_asm_diskgroup --- checks/oracle_asm_diskgroup | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup new file mode 100644 index 0000000..1c6ac46 --- /dev/null +++ b/checks/oracle_asm_diskgroup @@ -0,0 +1,50 @@ +#!/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. + +# Example output from asmcmd lsdg: +# State Type Rebal Sector Block AU Total_MB Free_MB Req_mir_free_MB Usable_file_MB Offline_disks Voting_files Name +# MOUNTED NORMAL N 512 4096 1048576 512000 92888 0 46444 0 N DATA/ +# MOUNTED NORMAL N 512 4096 1048576 3072 2146 309 918 0 Y OCR_VOTE/ +# The agent section <<<oracle_asm_diskgroup>>> does not output the header line + +check_includes['oracle_asm_diskgroup'] = [ "df.include" ] + +def inventory_oracle_asm_diskgroup(info): + return [ (line[-1].rstrip("/"), {}) for line in info ] + +def check_oracle_asm_diskgroup(item, params, info): + + for state, typ, rebal, sector, block, au, total_mb, \ + free_mb, req_mir_free_mb, usable_file_mb, offline_disks, \ + voting_files, name in info: + if name.rstrip('/') == item: + return df_check_filesystem(g_hostname, item, int(total_mb), + int(free_mb), params) + return (3, "UNKNOWN - Disk group not found") + +check_info["oracle_asm_diskgroup"] = (check_oracle_asm_diskgroup, "ASM Diskgroup %s", 1, inventory_oracle_asm_diskgroup) +checkgroup_of['oracle_asm_diskgroup'] = "fs" +check_default_levels["oracle_asm_diskgroup"] = "filesystem_default_levels"

12 years, 9 months

Check_MK Git: check_mk: FIX: fix row highlight in status GUI on IE 7

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c3a6e47df5d0a8beb0b1975088554b4d403e4fe4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3a6e47df5d0a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 14:57:54 2011 +0100 FIX: fix row highlight in status GUI on IE 7 --- ChangeLog | 2 +- web/htdocs/js/check_mk.js | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ebace5..7045d1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,7 +95,7 @@ * FIX: event/log views: reverse sorting, so that newest entries are shown first * FIX: fix dashboard dashlet background on IE - * FIX: fix row highlight in status GUI on IE 8 + * FIX: fix row highlight in status GUI on IE 7/8 * FIX: fix row highlight after status page reload Checks & Agents: diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 5e092fe..6e9aae2 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -51,6 +51,14 @@ if (!Array.prototype.indexOf) }; } +var classRegexes = {}; + +function hasClass(obj, cls) { + if(!classRegexes[cls]) + classRegexes[cls] = new RegExp('(\\s|^)'+cls+'(\\s|$)'); + return obj.className.match(classRegexes[cls]); +} + // This implements getElementsByClassName() for IE<9 if (!document.getElementsByClassName) { document.getElementsByClassName = function(className, root, tagName) { @@ -66,7 +74,7 @@ if (!document.getElementsByClassName) { // and for others... IE7-, IE8 (quirks mode), Firefox 2-, Safari 3.1-, Opera 9- var tagName = tagName || '*', _tags = root.getElementsByTagName(tagName), _nodeList = []; for (var i = 0, _tag; _tag = _tags[i++];) { - if (this.hasClass(_tag, className)) { + if (hasClass(_tag, className)) { _nodeList.push(_tag); } }

12 years, 9 months

Check_MK Git: check_mk: FIX: fix row highlight after status page reload

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 27cb5d81cb3f030dd9f9221034ad6f177b55ea78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27cb5d81cb3f03… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 14:32:44 2011 +0100 FIX: fix row highlight after status page reload --- ChangeLog | 1 + web/plugins/views/layouts.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bdc02a..8ebace5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ are shown first * FIX: fix dashboard dashlet background on IE * FIX: fix row highlight in status GUI on IE 8 + * FIX: fix row highlight after status page reload Checks & Agents: * FIX: lnx_if: assume interfaces as up if ethtool is missing or diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 25f3223..3fd6b63 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -26,7 +26,9 @@ def init_rowselect(): # Don't make rows selectable when no commands can be fired - if not 'C' in html.display_options or not config.may("act"): + # Ignore "C" display option here. Otherwise the rows will not be selectable + # after view reload. + if not config.may("act"): return selected = []

12 years, 9 months

Check_MK Git: check_mk: FIX: fix row highlight in status GUI on IE 8

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e9bda644374c7be5477f2be719dfb0a31b0d0c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e9bda644374c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 14:10:55 2011 +0100 FIX: fix row highlight in status GUI on IE 8 --- ChangeLog | 1 + web/htdocs/js/check_mk.js | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 739f6a0..f9e7e9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * FIX: event/log views: reverse sorting, so that newest entries are shown first * FIX: fix dashboard dashlet background on IE + * FIX: fix row highlight in status GUI on IE 8 Checks & Agents: * FIX: lnx_if: assume interfaces as up if ethtool is missing or diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 732208e..bc8a2fd 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -936,12 +936,13 @@ function lightenColor(color, val) { return "#" + code.toUpperCase(); } -function real_style(obj, attr) { +function real_style(obj, attr, ieAttr) { var st; - if(document.defaultView && document.defaultView.getComputedStyle) + if(document.defaultView && document.defaultView.getComputedStyle) { st = document.defaultView.getComputedStyle(obj, null).getPropertyValue(attr); - else - st = obj.currentStyle[attr]; + } else { + st = obj.currentStyle[ieAttr]; + } if(typeof(st) == 'undefined') { st = 'transparent'; @@ -953,7 +954,7 @@ function real_style(obj, attr) { if(obj.tagName == 'TD' && obj.parentNode.row_num === undefined && (st == 'transparent' || st == 'rgba(0, 0, 0, 0)')) - st = real_style(obj.parentNode, attr); + st = real_style(obj.parentNode, attr, ieAttr); return st; } @@ -1002,7 +1003,7 @@ function highlight_row(elem, on) { function highlight_elem(elem, on) { // Find all elements below "elem" with a defined background-color and change it - var bg_color = real_style(elem, 'background-color'); + var bg_color = real_style(elem, 'background-color', 'backgroundColor'); if(on) { elem['hover_orig_bg'] = bg_color; elem.style.backgroundColor = lightenColor(elem['hover_orig_bg'], -20);

12 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7c1374ff33f81c1d72c438d1ad9cb73525ed0111 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c1374ff33f81c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 14:11:50 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

← Newer
1
...
15
16
17
18
19
20
21
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011