Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: Fixed alias on contactgroups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3601ad403082fd2f5b638cd35c15a99fe0c0493f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3601ad403082fd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jun 1 18:51:58 2012 +0200 Fixed alias on contactgroups --- modules/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 7fd3af7..15b65d2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1964,7 +1964,7 @@ def create_nagios_config_contactgroups(outfile): outfile.write("\ndefine contactgroup {\n" " contactgroup_name\t\t%s\n" " alias\t\t\t\t%s\n" - "}\n" % (name, make_utf8('utf-8'))) + "}\n" % (name, make_utf8(alias))) def create_nagios_config_commands(outfile):

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0730

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 76166b9189162f3ce8194eae4cacd61e4f8c1bf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76166b9189162f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu May 31 13:58:16 2012 +0200 Updated bug entries #0730 --- .bugs/730 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/730 b/.bugs/730 new file mode 100644 index 0000000..8974aa3 --- /dev/null +++ b/.bugs/730 @@ -0,0 +1,9 @@ +Title: Expansion of macros +Component: livestatus +State: open +Date: 2012-05-31 13:25:06 +Targetversion: future +Class: feature + +Commands (Check + Notification) should also be expandet like notes_url. +This makes it easyer to use livestatus for debugging

12 years, 4 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: 501c31431fcd1b4248bb328927e185b89143b2ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=501c31431fcd1b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jun 1 16:30:53 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Added hwg_temp check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c3c245149525f757ec2f51c1c907ef3cc1f671a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3c245149525f7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jun 1 17:08:00 2012 +0200 Added hwg_temp check --- checks/hwg_temp | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/checks/hwg_temp b/checks/hwg_temp new file mode 100644 index 0000000..3447ee4 --- /dev/null +++ b/checks/hwg_temp @@ -0,0 +1,90 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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. + +hwg_temp_defaultlevels = (23, 25) + +def check_hwg_temp(item, params, info): + warn, crit = params + status_text = { + "0" : "Invalid", + "1" : "Normal", + "2" : "Out Of Range Low", + "3" : "Out Of Range High", + "4" : "Alarm Low", + "5" : "Alarm High", + } + unit_text = { + "0" : "unknown", + "1" : "°C", + "2" : "°F", + "3" : "°K", + "4" : "%", + } + for line in info: + if line[0] == item: + descr, status, current, current_m, unit = line[1:] + current_state = saveint(current_m)/10 + + state = 0 + if current_state >= crit: + state = 2 + elif current_state >= warn: + state = 1 + elif status in (4, 2): + state = 1 + elif status == 3: + state = 2 + + perfdata = [ ("temp", current, warn, crit, 0 ) ] + unit = unit_text.get(unit) + status = status_text.get(status, "UNKOWN") + return(state, nagios_state_names[state] + " - %s at %s%s (warn/crit at %s%s/%s%s), Status is %s" % \ + (descr, current, unit, warn, unit, crit, unit, status), perfdata) + + return (3, "UNKNOWN - Sensor %s not found in SNMP data %s" % (item) ) + +check_info['hwg_temp'] = { + "check_function" : check_hwg_temp, + "inventory_function" : lambda info: [ (line[0], hwg_temp_defaultlevels ) for line in info if int(line[2]) != 0] , + "service_description" : "Temperature %s", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.21796.4.1.3", [# sensors index (1-2) + "1.1", + # sensor name string + "1.2", + # unit state: 0=Invalid, 1=Normal, 2=OutOfRangeLo, 3=OutOfRangeHi, 4=AlarmLo, 5=AlarmHi + "1.3", + # current value string + "1.4", + # current value*10 integer + "1.5", + # sensor unit integer 0=unknown, 1=°C, 2=°F, 3=°K, 4=% + "1.7", + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == '"HWg-STE"', + "group" : "hw_temperature", +} +

12 years, 4 months

Check_MK Git: check_mk: Wato: Added missing table title

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e106713d53c9e5ea3d19a046d559238ebdb02a95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e106713d53c9e5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu May 31 13:58:41 2012 +0200 Wato: Added missing table title --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 17b07fc..346c414 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1243,7 +1243,7 @@ def show_hosts(folder): bulk_actions(at_least_one_imported, True, colspan, "even") # Header line - html.write("<tr><th class=left></th><th></th><th>" + html.write("<tr><th class=left></th><th>"+_("Actions")+"</th><th>" + _("Hostname") + "</th><th>" + _("Auth") + "</th>") if not config.wato_hide_hosttags:

12 years, 4 months

Check_MK Git: check_mk: WATO: visiblity fixes for hidden attributes and topics

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d1b17422be622adba14713c06689babd526e7d11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1b17422be622a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 1 14:56:15 2012 +0200 WATO: visiblity fixes for hidden attributes and topics --- web/htdocs/js/wato.js | 29 ++++++++++++++++++++--------- web/htdocs/wato.py | 10 ++++++++-- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index c02c830..5bf8df0 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -112,12 +112,20 @@ function wato_fix_visibility() { /* Now loop over all attributes that have conditions. Those are stored in the global variable wato_depends_on_tags, which is filled during the creation of the web page. */ + for (var i in wato_check_attributes) { - var attrname = wato_check_attributes[i] + var attrname = wato_check_attributes[i]; /* Now comes the tricky part: decide whether that attribute should be visible or not: */ var display = ""; - if(attrname in wato_depends_on_roles){ + + // Always invisible + if( hide_attributes.indexOf(attrname) > -1 ){ + display = "none"; + } + + // Visibility depends on roles + if( display == "" && attrname in wato_depends_on_roles){ for (var i in wato_depends_on_roles[attrname]) { var role = wato_depends_on_roles[attrname][i]; var negate = role[0] == '!'; @@ -130,6 +138,7 @@ function wato_fix_visibility() { } } + // Visibility depends on tags if( display == "" && attrname in wato_depends_on_tags){ for (var i in wato_depends_on_tags[attrname]) { var tag = wato_depends_on_tags[attrname][i]; @@ -143,6 +152,7 @@ function wato_fix_visibility() { } } + var oTr = document.getElementById("attr_" + attrname); if(oTr) { oTr.style.display = display; @@ -167,7 +177,7 @@ function wato_fix_visibility() { oAttrDisp = null; // There is at least one item in this topic -> show it - var topic = oTr.parentNode.parentNode.parentNode.id.substr(21); + var topic = oTr.parentNode.childNodes[0].textContent; if( display == "" ){ var index = hide_topics.indexOf(topic); if( index != -1 ) @@ -175,15 +185,16 @@ function wato_fix_visibility() { } } } - for (var item in volatile_topics){ - var name = volatile_topics[item]; - var oTr = document.getElementById("topic_" + name); - if(oTr) { - if(hide_topics.indexOf(name) > -1 ) + + var form_edithost = document.getElementById("form_edithost"); + for (var child in form_edithost.childNodes){ + oTr = form_edithost.childNodes[child]; + if (oTr.className == "nform"){ + if( hide_topics.indexOf(oTr.childNodes[0].childNodes[0].textContent) > -1 ) oTr.style.display = "none"; else oTr.style.display = ""; - } + } } } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 567e75c..cefdac8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4595,6 +4595,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute inherited_tags = {} volatile_topics = [] + hide_attributes = [] for topic in topics: topic_is_volatile = True # assume topic is sometimes hidden due to dependencies if len(topics) > 1: @@ -4638,6 +4639,8 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute if not depends_on_tags and not depends_on_roles: # One attribute is always shown -> topic is always visible topic_is_volatile = False + else: + hide_attributes.append(attr.name()) # "bulk": determine, if this attribute has the same setting for all hosts. values = [] @@ -4797,6 +4800,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute def dump_json(obj): return repr(obj).replace('None', 'null') + forms.end() # Provide Javascript world with the tag dependency information # of all attributes. html.javascript("var inherited_tags = %s;\n"\ @@ -4805,13 +4809,15 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute "var wato_depends_on_roles = %s;\n"\ "var volatile_topics = %s;\n"\ "var user_roles = %s;\n"\ + "var hide_attributes = %s;\n"\ "wato_fix_visibility();\n" % ( dump_json(inherited_tags), - dump_json(list(set(dependency_mapping_tags.keys()+dependency_mapping_roles.keys()))), + dump_json(list(set(dependency_mapping_tags.keys()+dependency_mapping_roles.keys()+hide_attributes))), dump_json(dependency_mapping_tags), dump_json(dependency_mapping_roles), dump_json(volatile_topics), - dump_json(config.user_role_ids))) + dump_json(config.user_role_ids), + dump_json(hide_attributes))) # Check if at least one host in a folder (or its subfolders)

12 years, 4 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: c573f5664e360265fb85d0e05451718bc9d8615b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c573f5664e3602… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 1 14:56:29 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed column label in view editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ffada7fc1f0ca2e5eff4b23cdda4a42245989dda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffada7fc1f0ca2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 1 14:50:24 2012 +0200 FIX: Fixed column label in view editor --- web/htdocs/views.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 5d7cc82..c14eac0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -639,7 +639,7 @@ def page_edit_view(): joined = allowed_for_joined_datasource(data, datasourcename) forms.header(title, isopen=False) - forms.section(_("Group columns")) + forms.section(_('Columns')) # make sure, at least 3 selection boxes are free for new columns maxnum = 1 while html.has_var("%s%d" % (var_prefix, maxnum)):

12 years, 4 months

Check_MK Git: check_mk: Fixed wrong string

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 71ffae484d79e1d3d9c79aba0d0a1f45ad57ddd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71ffae484d79e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 1 13:06:05 2012 +0200 Fixed wrong string --- web/htdocs/forms.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index fc5d1b2..60fcec9 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -110,7 +110,7 @@ def strip_bad_chars(x): ord(u"\""): None, }) else: - return s.translate(None, u"'&;<>\"") + return s.translate(None, "'&;<>\"") def header(title, isopen = True, table_id = ""): global g_header_open

12 years, 4 months

Check_MK Git: check_mk: Fixed wrong variable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4cce7da5bf8057a1b43128e9ece4ada1871e30b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cce7da5bf8057… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 1 10:34:22 2012 +0200 Fixed wrong variable --- web/htdocs/forms.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 26b3f5d..fc5d1b2 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -100,7 +100,7 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, def strip_bad_chars(x): s = "".join([c for c in x if c > ' ' and c < 'z']) - if type(s) == unicode: + if type(x) == unicode: return s.translate({ ord(u"'"): None, ord(u"&"): None,

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012