Checkmk git commits March 2012

checkmk-commits@lists.checkmk.com

3 participants
160 discussions

Check_MK Git: check_mk: New function for getting a users alias

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4fea9b61af0cf6f24d85dd39d0db454284c135a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fea9b61af0cf6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 25 12:18:58 2012 +0200 New function for getting a users alias --- web/htdocs/config.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 5701af6..9e88fdf 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -335,6 +335,13 @@ def roles_of_user(user): else: return [] +def alias_of_user(user): + if user in multisite_users: + return multisite_users[user].get("alias", user) + else: + return user + + def base_roles_of(some_roles): base_roles = set([]) for r in some_roles:

12 years, 8 months

Check_MK Git: check_mk: FIX: snmp_uptime handles empty snmp information without exception

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 55ecd56f0991e3ba18e35c77b03b85479d3238d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55ecd56f0991e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 23 14:00:35 2012 +0100 FIX: snmp_uptime handles empty snmp information without exception --- checks/snmp_uptime | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/snmp_uptime b/checks/snmp_uptime index 4589397..5553543 100644 --- a/checks/snmp_uptime +++ b/checks/snmp_uptime @@ -27,11 +27,11 @@ # Author: Lars Michelsen <lm(a)mathias-kettner.de> def inventory_snmp_uptime(info): - if len(info[0]) >= 1: + if len(info) > 0 and len(info[0]) >= 1: return [ (None, None) ] def check_snmp_uptime(checktype, _no_params, info): - if len(info[0]) >= 1: + if len(info) > 0 and len(info[0]) >= 1: ticks = info[0][0] try: uptime = int(ticks[:-2])

12 years, 8 months

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6ed15481fba4c0ce430640a2099887a20a1177e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6ed15481fba4c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 23 14:01:35 2012 +0100 Updated changelog --- ChangeLog | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28ac828..af05e44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ Multisite * FIX: Fixed encoding problem in "custom notification" message + Checks & Agents: + * FIX: snmp_uptime handles empty snmp information without exception + * FIX: Oracle checks try to handle ORA-* errors reported by the agent + All oracle checks will return UNKNOWN when finding an ORA-* message + 1.2.0b1: Core, Setup, etc.: * new tool 'livedump' for dumping configuration and status

12 years, 8 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e5b0779f63ce347f0618ddf799c5c3f80499c0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e5b0779f63ce3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 23 14:03:09 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 8 months

Check_MK Git: check_mk: FIX: Oracle checks try to handle ORA-* errors reported by the agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1335f615e07b1af8356071ee2c19810895b9867c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1335f615e07b1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 23 14:01:03 2012 +0100 FIX: Oracle checks try to handle ORA-* errors reported by the agent All oracle checks will return UNKNOWN when finding an ORA-* message --- checks/oracle.include | 44 ++++++++++++++++++++++++++++++++ checks/oracle_logswitches | 7 +++++ checks/oracle_sessions | 7 +++++ checks/oracle_tablespaces | 62 ++++++++++++++++++++++++++------------------- 4 files changed, 94 insertions(+), 26 deletions(-) diff --git a/checks/oracle.include b/checks/oracle.include new file mode 100644 index 0000000..794667c --- /dev/null +++ b/checks/oracle.include @@ -0,0 +1,44 @@ +#!/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. + + +# This function must be executed for each agent line which has been +# found for the current item. It must deal with the ORA-* error +# messages. It has to skip over the lines which show the SQL statement +# and the SQL error message which comes before the ORA-* message. +# +# The check must completely skip the lines before the ORA-* messages +# and return UNKNOWN on the first found ORA-* message. +# line[0] is the item (db instance) +# +# This function returns a tuple when an ORA-* message has been found. +# It returns False if this line should be skipped by the check. +def oracle_handle_ora_errors(line): + if line[1] in [ 'select', '*', 'ERROR' ]: + return False + if line[1].startswith('ORA-'): + return (3, 'UNKNOWN - Found error in agent output "%s"' % ' '.join(line[1:])) + diff --git a/checks/oracle_logswitches b/checks/oracle_logswitches index 558ad25..e912d23 100644 --- a/checks/oracle_logswitches +++ b/checks/oracle_logswitches @@ -36,6 +36,12 @@ def inventory_oracle_logswitches(info): def check_oracle_logswitches(item, params, info): for line in info: if line[0] == item: + err = oracle_handle_ora_errors(line) + if err == False: + continue + elif isinstance(err, tuple): + return err + locrit, lowarn, warn, crit = params logswitches = int(line[1]) infotext = " - %d log switches in the last 60 minutes (levels at %d/%d .. %d/%d)" \ @@ -51,3 +57,4 @@ def check_oracle_logswitches(item, params, info): check_info['oracle_logswitches'] = (check_oracle_logswitches, "ORA %s Logswitches", 1, inventory_oracle_logswitches ) checkgroup_of['oracle_logswitches'] = "oracle_logswitches" +check_includes['oracle_logswitches'] = [ "oracle.include" ] diff --git a/checks/oracle_sessions b/checks/oracle_sessions index af55546..2f5f143 100644 --- a/checks/oracle_sessions +++ b/checks/oracle_sessions @@ -36,6 +36,12 @@ def inventory_oracle_sessions(info): def check_oracle_sessions(item, params, info): for line in info: if line[0] == item: + err = oracle_handle_ora_errors(line) + if err == False: + continue + elif isinstance(err, tuple): + return err + warn, crit = params sessions = int(line[1]) infotext = " - %d active sessions (levels at %d/%d)" % (sessions, warn, crit) @@ -49,3 +55,4 @@ def check_oracle_sessions(item, params, info): return (2, "UNKNOWN - Database not existing or not running") check_info['oracle_sessions'] = (check_oracle_sessions, "ORA %s Sessions", 1, inventory_oracle_sessions ) +check_includes['oracle_sessions'] = [ "oracle.include" ] diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index a98f95a..76ac671 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -61,6 +61,8 @@ def inventory_oracle_tablespaces(info): tablespaces = set([]) autoextensible = set([]) for line in info: + if len(line) != 13: + continue ts = (line[0], line[2]) if line[11] in [ "ONLINE", "READONLY" ]: tablespaces.add(ts) @@ -93,32 +95,39 @@ def check_oracle_tablespaces(item, params, info): uses_default_increment = False for line in info: - if line[0] == sid and line[2] == tbsname: - ts_status = line[11] - blocksize = int(line[10]) - num_files += 1 - if line[3] in [ "AVAILABLE", "ONLINE", "READONLY" ]: - num_avail += 1 - current_size += blocksize * int(line[5]) - used += blocksize * (int(line[5]) - int(line[12])) - # Autoextensible? Honor max size - if line[4] == "YES": - num_extensible += 1 - my_max_size = blocksize * int(line[6]) - max_size += my_max_size - free_bl = int(line[6]) - int(line[5]) # number of free extension blocks - incsize = int(line[8]) # size of next increment in blocks - if incsize == 1: - uses_default_increment = True - incs = free_bl / incsize - num_increments += incs - increment_size += blocksize * incsize * incs - free_space += blocksize * (incsize * incs + (int(line[12]))) - # not autoextensible: take current size as maximum - else: - my_max_size = blocksize * int(line[5]) - max_size += my_max_size - free_space += blocksize * int(line[12]) + if line[0] == sid: + err = oracle_handle_ora_errors(line) + if err == False: + continue + elif isinstance(err, tuple): + return err + + if line[2] == tbsname and len(line) == 13: + ts_status = line[11] + blocksize = int(line[10]) + num_files += 1 + if line[3] in [ "AVAILABLE", "ONLINE", "READONLY" ]: + num_avail += 1 + current_size += blocksize * int(line[5]) + used += blocksize * (int(line[5]) - int(line[12])) + # Autoextensible? Honor max size + if line[4] == "YES": + num_extensible += 1 + my_max_size = blocksize * int(line[6]) + max_size += my_max_size + free_bl = int(line[6]) - int(line[5]) # number of free extension blocks + incsize = int(line[8]) # size of next increment in blocks + if incsize == 1: + uses_default_increment = True + incs = free_bl / incsize + num_increments += incs + increment_size += blocksize * incsize * incs + free_space += blocksize * (incsize * incs + (int(line[12]))) + # not autoextensible: take current size as maximum + else: + my_max_size = blocksize * int(line[5]) + max_size += my_max_size + free_space += blocksize * int(line[12]) if ts_status == None: @@ -189,3 +198,4 @@ def check_oracle_tablespaces(item, params, info): check_info['oracle_tablespaces'] = (check_oracle_tablespaces, "ORA %s Tablespace", 1, inventory_oracle_tablespaces ) check_config_variables.append("oracle_tablespaces_check_default_increment") +check_includes['oracle_tablespaces'] = [ "oracle.include" ]

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0689

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1781d33ca2159456c8a828d33f9ec85795aa4c2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1781d33ca21594… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 21 11:26:03 2012 +0100 Updated bug entries #0689 --- .bugs/689 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/689 b/.bugs/689 new file mode 100644 index 0000000..abe4ba1 --- /dev/null +++ b/.bugs/689 @@ -0,0 +1,10 @@ +Title: BI nodes must not use the label of the aggregation for the node id +Component: bi +State: open +Date: 2012-03-21 11:24:20 +Targetversion: 1.2.0 +Class: bug + +At the moment the aggregation label is used for the html node id without any escaping or similar. +Labels like this "Host <a href=\"view.py?view_name=hoststatus&site=&host=$HOST$\">$HOST$</a>" will +destroy the bi page but should really be possible.

12 years, 8 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 87ff1292a10d0a4d6b1f70bfd41a9f5863a9f72e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87ff1292a10d0a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 22 13:48:51 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 8 months

Check_MK Git: check_mk: ValueSpec Checkbox: labels for on/off

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 02470e61e58db0d07eb2efc9b6f4c9c180fb22f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02470e61e58db0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 23 13:32:52 2012 +0100 ValueSpec Checkbox: labels for on/off --- web/htdocs/valuespec.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 951fa10..e43bc0d 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -687,6 +687,8 @@ class Checkbox(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._label = kwargs.get("label") + self._true_label = kwargs.get("true_label", _("on")) + self._false_label = kwargs.get("false_label", _("off")) def canonical_value(self): return False @@ -695,7 +697,7 @@ class Checkbox(ValueSpec): html.checkbox(varprefix, value, label = self._label) def value_to_text(self, value): - return value and _("on") or _("off") + return value and self._true_label or self._false_label def from_html_vars(self, varprefix): if html.var(varprefix):

12 years, 8 months

Check_MK Git: check_mk: Really fix visibility of Optional ValueSpec

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3b34919e808a494a6f09b8797a80cdd52715ae5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b34919e808a49… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 22 17:41:04 2012 +0100 Really fix visibility of Optional ValueSpec --- web/htdocs/valuespec.py | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 9ffd5ed..951fa10 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1210,7 +1210,10 @@ class Optional(ValueSpec): div_id = "option_" + varprefix checked = html.get_checkbox(varprefix + "_use") if checked == None: - checked = (value != None) + if self._negate: + checked = value == None + else: + checked = value != None html.write("") @@ -1233,8 +1236,12 @@ class Optional(ValueSpec): else: html.write(" ") html.write("") - html.write('' % ( - div_id, checked == self._negate and "none" or "")) + if checked == self._negate: + display = "none" + else: + display = "" + + html.write('' % (div_id, display)) if value == None: value = self._valuespec.default_value() if self._valuespec.title():

12 years, 8 months

Check_MK Git: check_mk: Fix visibility in ValueSpec Optional

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 65a51c34557eb10104756b0448b1e9453266a648 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65a51c34557eb1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 22 17:30:21 2012 +0100 Fix visibility in ValueSpec Optional --- web/htdocs/valuespec.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 09b610f..9ffd5ed 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1208,10 +1208,10 @@ class Optional(ValueSpec): def render_input(self, varprefix, value): div_id = "option_" + varprefix - if html.has_var(varprefix + "_use"): - checked = html.get_checkbox(varprefix + "_use") - else: - checked = self._negate != (value != None) + checked = html.get_checkbox(varprefix + "_use") + if checked == None: + checked = (value != None) + html.write("") if self._label:

12 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2012