Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

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

Check_MK Git: check_mk: Fix headrify (it deleted files)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a2e52b056415ce2130cbcfa85bd35cbf0c18aa4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2e52b056415ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 13:38:12 2011 +0100 Fix headrify (it deleted files) --- doc/helpers/headrify | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index 62996a5..350d44f 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -78,7 +78,7 @@ headrify () if [ "${firstline:0:20}" = "${shouldbe:0:20}" \ -o "${secondline:0:20}" = "${shouldbe:0:20}" \ -o "${thirdline:0:20}" = "${shouldbe:0:20}" ] ; then - sed '0,/^'"${endline//\*/\*}"'$/d' $file | sed 1d >> $TMP + sed '0,/^'"$endline"'$/d' $file | sed 1d >> $TMP else cat $file >> $TMP fi

12 years, 9 months

Check_MK Git: check_mk: Updated file headers

by git＠mathias-kettner.de

12 years, 9 months

Check_MK Git: check_mk: Fixed ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60dceec600e66c24ebcbbe17e72a1c94acd11f40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60dceec600e66c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 11:59:38 2011 +0100 Fixed ChangeLog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 999c096..3643936 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,7 +100,7 @@ * FIX: lnx_if: assume interfaces as up if ethtool is missing or not working but interface has been used since last reboot. This fixes the problem where interface are not found by inventory. - * FIX: snmp_uptime: handels alternative timeformat * FIX: snmp_uptime: handels alternative timeformat + * FIX: snmp_uptime: handels alternative timeformat 1.1.12p4: Multisite:

12 years, 9 months

Check_MK Git: check_mk: FIX: snmp_uptime: fixed alternative time output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7deaf9ead161443dee68292eb9a82140da665217 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7deaf9ead16144… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 15 11:54:27 2011 +0100 FIX: snmp_uptime: fixed alternative time output --- ChangeLog | 1 + checks/snmp_uptime | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 739f6a0..999c096 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ * FIX: lnx_if: assume interfaces as up if ethtool is missing or not working but interface has been used since last reboot. This fixes the problem where interface are not found by inventory. + * FIX: snmp_uptime: handels alternative timeformat * FIX: snmp_uptime: handels alternative timeformat 1.1.12p4: Multisite: diff --git a/checks/snmp_uptime b/checks/snmp_uptime index dbcf882..7b20d07 100644 --- a/checks/snmp_uptime +++ b/checks/snmp_uptime @@ -33,7 +33,12 @@ def inventory_snmp_uptime(info): def check_snmp_uptime(checktype, _no_params, info): if len(info[0]) >= 1: ticks = info[0][0] - uptime = saveint(ticks[:-2]) + try: + uptime = int(ticks[:-2]) + except: + days, h, m, s = ticks.split(":") + uptime = (int(days) * 86400 ) + (int(h) * 3600) + (int(m) * 60) + int(float(s)) + days, rest = divmod(uptime, 60*60*24) hours, rest = divmod(rest, 60*60) minutes, seconds = divmod(rest, 60)

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits