Checkmk git commits August 2013

checkmk-commits@lists.checkmk.com

6 participants
167 discussions

Check_MK Git: check_mk: showing help text of rulesets only via hover

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ab2030b3ec5085d32f26ac8081aeaab7fb408f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ab2030b3ec508… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 14 10:14:07 2013 +0200 showing help text of rulesets only via hover --- web/htdocs/js/checkmk.js | 10 ---------- web/htdocs/wato.css | 10 ---------- web/htdocs/wato.py | 3 +-- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 2fcd72a..c65cabd 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1761,16 +1761,6 @@ function help_switch(how) { helpdivs[i].style.display = how ? "block" : "none"; } - // small hack for wato ruleset lists, toggle the "nofloat" class - // on those objects to make the layout possible - var rulesetdivs = document.getElementsByClassName('ruleset'); - for (var i = 0; i < rulesetdivs.length; i++) { - if (how) - add_class(rulesetdivs[i], 'nofloat'); - else - remove_class(rulesetdivs[i], 'nofloat'); - } - get_url("ajax_switch_help.py?enabled=" + (how ? "yes" : "")); } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 90d82bc..134a24a 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -781,16 +781,6 @@ div.rulesets table.nform tr.bottom td { /* color: #444; */ } -.wato .rulesets div.ruleset.nofloat { - float: none; - clear: left; -} - -.wato .rulesets div.ruleset div.help { - height: auto; - clear: left; -} - /* Page edit_ruleset */ div.varname { color: white; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5fe0ffd..d75bc24 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10304,13 +10304,12 @@ def mode_rulesets(phase): if only_host: url_vars.append(("host", only_host)) view_url = make_link(url_vars) - html.write('<div class=ruleset><div class=text>') + html.write('<div class=ruleset title="%s"><div class=text>' % html.strip_tags(rulespec["help"])) html.write('<a class="%s" href="%s">%s</a>' % (num_rules and "nonzero" or "zero", view_url, rulespec["title"])) html.write('<span class=dots>%s</span></div>' % ("." * 100)) html.write('<div class="rulecount %s" title="%s">%d</div>' % (num_rules and "nonzero" or "zero", title, num_rules)) - html.help(rulespec["help"]) html.write('</div>') if something_shown:

10 years, 10 months

Check_MK Git: check_mk: Fixed host attribute tag based dependencies in host edit dialog on initial rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: 03e397665b52b4a36457cce4d170bb8675e6962b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03e397665b52b4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 13 13:42:37 2013 +0200 Fixed host attribute tag based dependencies in host edit dialog on initial rendering --- ChangeLog | 6 ++++-- web/htdocs/js/wato.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4091581..5561dee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,10 +124,12 @@ * Allow GIT to be used for change tracking (enable via global option) * Hosts/Folders: SNMP communities can now be configured via the host and folders hierarchy. Those settings override the rule base config. - * FIX: do validation of check items in rule editor - * FIX: More consistent handling of folderpath select in rule editor * Require unique alias names in between the following elements: Host/Service/Contact Groups, Timeperiods and Roles + * FIX: do validation of check items in rule editor + * FIX: More consistent handling of folderpath select in rule editor + * FIX: Now correctly handling depends_on_tags on page rendering for + inherited values Notifications: * Flexible Notification can now filter service levels diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index b95705f..7fde70b 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -97,7 +97,7 @@ function wato_fix_visibility() { /* If the Checkbox is unchecked try to get a value from the inherited_tags */ var oCheckbox = oTdLegend.childNodes[1].childNodes[0]; if (oCheckbox.checked == false ){ - var attrname = oCheckbox.parentNode.parentNode.id; + var attrname = 'attr_' + oCheckbox.name.replace('_change_', ''); if(attrname in inherited_tags && inherited_tags[attrname] !== null){ currentTags = currentTags.concat(inherited_tags[attrname].split("|")); }

10 years, 10 months

Check_MK Git: check_mk: Improved foldertree folder filtering

by Lars Michelsen

Module: check_mk Branch: master Commit: 56517f978cb4012ef0072cf9f63d887a216130c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56517f978cb401… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 14 09:14:43 2013 +0200 Improved foldertree folder filtering --- ChangeLog | 3 +++ web/plugins/sidebar/wato.py | 22 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5561dee..c6c361c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -109,6 +109,9 @@ * Added new painters for displaying host tags (list of tags, single tag groups). All those painters are sortable. Also added new filters for tags. * Added painters, icon and filters for visualizing staleness information + * Improved filtering of the foldertree snapin by user permissions (when a user is + only permitted on one child folder, the upper folder is removed from the + hierarchy) * FIX: better error message in case of exception in SNMP handling * FIX: Inventory screen: Now shows custom checks * FIX: Fixed locking problem of multisite pages related to user loading/saving diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 8a9d23f..3cd3f66 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -156,6 +156,7 @@ def render_wato_foldertree(): '.folders': {}, } + # After the query we have a list of lists where each # row is a folder with the number of hosts on this level. # @@ -190,6 +191,25 @@ def render_wato_foldertree(): del user_folders[folder_path] # + # Now reduce the tree by e.g. removing top-level parts which the user is not + # permitted to see directly. Example: + # Locations + # -> Hamburg: Permitted to see all hosts + # -> Munich: Permitted to see no host + # In this case, where only a single child with hosts is available, remove the + # top level + def reduce_tree(folders): + for folder_path, folder in folders.items(): + if len(folder['.folders']) == 1: + child_path, child_folder = folder['.folders'].items()[0] + folders[child_path] = child_folder + del folders[folder_path] + + reduce_tree(folders) + + reduce_tree(user_folders) + + # # Render link target selection # selected_topic, selected_target = config.load_user_file("foldertree", (_('Hosts'), 'allhosts')) @@ -224,7 +244,7 @@ def render_wato_foldertree(): # Now render the whole tree if user_folders: - render_tree_folder(user_folders['']) + render_tree_folder(user_folders.values()[0]) def render_tree_folder(f): subfolders = f.get(".folders", {})

10 years, 10 months

Check_MK Git: check_mk: new check ups_test

by Götz Golla

Module: check_mk Branch: master Commit: 59636587f34e62875ce183b909e1e87d11180620 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59636587f34e62… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Aug 13 18:09:53 2013 +0200 new check ups_test --- checks/ups_test | 136 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 17 ++++- 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/checks/ups_test b/checks/ups_test new file mode 100644 index 0000000..d5d0497 --- /dev/null +++ b/checks/ups_test @@ -0,0 +1,136 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +# Description of OIDs used from RFC 1628 +# OID: 1.3.6.1.2.1.33.1.7.3 +# upsTestResultsSummary OBJECT-TYPE +# SYNTAX INTEGER { +# donePass(1), +# doneWarning(2), +# doneError(3), +# aborted(4), +# inProgress(5), +# noTestsInitiated(6) +# } +# MAX-ACCESS read-only +# STATUS current +# DESCRIPTION +# "The results of the current or last UPS diagnostics +# test performed. The values for donePass(1), +# doneWarning(2), and doneError(3) indicate that the +# test completed either successfully, with a warning, or +# with an error, respectively. The value aborted(4) is +# returned for tests which are aborted by setting the +# value of upsTestId to upsTestAbortTestInProgress. +# Tests which have not yet concluded are indicated by +# inProgress(5). The value noTestsInitiated(6) +# indicates that no previous test results are available, +# such as is the case when no tests have been run since +# the last reinitialization of the network management +# subsystem and the system has no provision for non- +# volatile storage of test results." + +# OID: 1.3.6.1.2.1.33.1.7.4 +# upsTestResultsDetail OBJECT-TYPE +# SYNTAX DisplayString (SIZE (0..255)) +# MAX-ACCESS read-only +# STATUS current +# DESCRIPTION +# "Additional information about upsTestResultsSummary. +# If no additional information available, a zero length +# string is returned." + +# OID: 1.3.6.1.2.1.33.1.7.5 +# Description: +# upsTestStartTime OBJECT-TYPE +# SYNTAX TimeStamp +# MAX-ACCESS read-only +# STATUS current +# DESCRIPTION +# "The value of sysUpTime at the time the test in +# progress was initiated, or, if no test is in progress, +# the time the previous test was initiated. If the +# value of upsTestResultsSummary is noTestsInitiated(6), +# upsTestStartTime has the value 0." + +# OID: 1.3.6.1.2.1.33.1.7.6 +# Description: +# upsTestElapsedTime OBJECT-TYPE +# SYNTAX TimeInterval +# MAX-ACCESS read-only +# STATUS current +# DESCRIPTION +# "The amount of time, in TimeTicks, since the test in +# progress was initiated, or, if no test is in progress, +# the previous test took to complete. If the value of +# TestResultsSummary is noTestsInitiated(6), +# upsTestElapsedTime has the value 0." + +ups_test_default = (None, None ) + +def inventory_ups_test(info): + if len(info) > 0: + return [ (None, "ups_test_default") ] + +def check_ups_test(item, params, info): + warn, crit = params + line = info[0] + ResultsSummary, StartTime, ElapsedTime = map(saveint, line[:-1]) + ElapsedTime = ElapsedTime/100 + etime = get_age_human_readable(ElapsedTime) + + state = 0 + state_label = "" + if ResultsSummary in [ 3, 4 ]: + state = 2 + state_label = "(!!)" + elif ResultsSummary in [ 2, 6 ]: + state = 1 + state_label = "(!)" + + time_label = "" + if crit and ElapsedTime >= crit: + state = 2 + time_label = "(!!)" + elif warn and ElapsedTime >= warn: + state = max(state, 1) + time_label = "(!)" + + ResultsDetail = "%s%s Time elapsed since test: %s%s" % (line[-1], state_label, etime, time_label) + + perf = [ ( "ElapsedTime", ElapsedTime, warn, crit) ] + return (state, ResultsDetail, perf ) + +check_info['ups_test'] = { + "inventory_function" : inventory_ups_test, + "check_function" : check_ups_test, + "service_description" : "UPS Test", + "has_perfdata" : True, + "group" : "ups_test", + "snmp_info" : ( ".1.3.6.1.2.1.33.1.7", [3,5,6,4 ] ), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.534.1"] + +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9e90ee0..212c77b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -699,6 +699,21 @@ register_check_parameters( ) register_check_parameters( + subgroup_environment, + "ups_test", + _("Time since last UPS selftest"), + Tuple( + title = _("Time since last UPS selftest"), + elements = [ + Age(title = _("Warning if above")), + Age(title = _("Critical if above")), + ] + ), + None, + "first" +) + +register_check_parameters( subgroup_storage, "fileinfo", _("Size and age of single files"), @@ -2865,7 +2880,7 @@ register_check_parameters( register_check_parameters( subgroup_os, "apc_symentra", - _("Levels for APC Symentra Check"), + _("APC Symentra Checks"), Tuple( elements = [ Integer(

10 years, 10 months

Check_MK Git: check_mk: spelling fixes

by Götz Golla

Module: check_mk Branch: master Commit: 364e2716d2a5c1ea3e2e55879a2778a2542ef9b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=364e2716d2a5c1… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Aug 13 13:32:29 2013 +0200 spelling fixes --- checkman/ups_eaton_enviroment | 8 ++++---- web/htdocs/wato.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checkman/ups_eaton_enviroment b/checkman/ups_eaton_enviroment index 06d6cd7..d63949c 100644 --- a/checkman/ups_eaton_enviroment +++ b/checkman/ups_eaton_enviroment @@ -1,17 +1,17 @@ -title: Eaton UPS Devices: Tempreature and Humidity Sensors +title: Eaton UPS Devices: Temperature and Humidity Sensors agents: snmp catalog: hw/environment license: GPL distribution: check_mk description: - Shows Sensor information for Tempreature, External Tempreature an Humidity for - Eaton UPS desvices + Shows Sensor information for Temperature, External Temperature an Humidity for + Eaton UPS devices item: None perfdata: - Tempreature + Temperature External Tempreature Humidty diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8433cf7..5fe0ffd 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11572,9 +11572,9 @@ def PredictiveLevels(**args): DropdownChoice( title = _("Base prediction on"), choices = [ - ( "wday", _("Day of the week (00:00 - 24:00 in local time)") ), - ( "day", _("Hour of the day") ), - ( "hour", _("Minute of the hour (00-59)") ), + ( "wday", _("Day of the week (1-7, 1 is Monday)") ), + ( "day", _("Day of the month (1-31)") ), + ( "hour", _("Hour of the day (0-23)") ), ] )), ( "horizon",

10 years, 10 months

Check_MK Git: check_mk: small fixes for texts

by Götz Golla

Module: check_mk Branch: master Commit: 294078e758b04bcd5f363968a659cb0659f6d1a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=294078e758b04b… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 12 18:13:48 2013 +0200 small fixes for texts --- web/plugins/wato/check_parameters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f439a8c..9e90ee0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -768,7 +768,7 @@ register_rule(group + '/' + subgroup_storage, title = _("Name of group"), ), TextAscii( - title = _("File pattern (using * and ?)"), + title = _("Pattern for mount point (using * and ?)"), help = _("You can specify one or several patterns containing " "<tt>*</tt> and <tt>?</tt>, for example <tt>/spool/tmpspace*</tt>. " "The filesystems matching the patterns will be monitored " @@ -805,7 +805,7 @@ register_rule(group + '/' + subgroup_storage, title = _("Name of group"), ), TextAscii( - title = _("Pattern for mount point (using * and ?)"), + title = _("File pattern (using * and ?)"), ), ] ), @@ -824,8 +824,8 @@ register_check_parameters( Tuple( title = _("Minimal age of oldest file"), elements = [ - Age(title = _("Warning younger than")), - Age(title = _("Critical younger than")), + Age(title = _("Warning if younger than")), + Age(title = _("Critical if younger than")), ] ) ),

10 years, 10 months

Check_MK Git: check_mk: various improvements to texts

by Götz Golla

Module: check_mk Branch: master Commit: e05232d73634d12417395ca5508e819c3e62f098 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e05232d73634d1… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 12 17:08:18 2013 +0200 various improvements to texts --- web/plugins/wato/check_parameters.py | 76 +++++++++++++++++----------------- 1 file changed, 39 insertions(+), 37 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e05232d736…

10 years, 10 months

Check_MK Git: check_mk: WATO hosts/folders: implemented snmp community config on host/folder base

by Lars Michelsen

Module: check_mk Branch: master Commit: 63ee29d3d47029d214229ffeff5c6a8386e9b36b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63ee29d3d47029… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 12 14:15:54 2013 +0200 WATO hosts/folders: implemented snmp community config on host/folder base --- ChangeLog | 2 ++ web/htdocs/wato.py | 38 +++++++++++++++++++++----------- web/plugins/wato/builtin_attributes.py | 11 +++++++++ 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82a0963..4091581 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,8 @@ requests, queue * Custom user attributes can now be managed using WATO * Allow GIT to be used for change tracking (enable via global option) + * Hosts/Folders: SNMP communities can now be configured via the host + and folders hierarchy. Those settings override the rule base config. * FIX: do validation of check items in rule editor * FIX: More consistent handling of folderpath select in rule editor * Require unique alias names in between the following elements: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 57860c5..8433cf7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -572,16 +572,17 @@ def load_hosts_file(folder): filename = root_dir + folder[".path"] + "/hosts.mk" if os.path.exists(filename): variables = { - "FOLDER_PATH" : "", - "ALL_HOSTS" : ALL_HOSTS, - "all_hosts" : [], - "clusters" : {}, - "ipaddresses" : {}, - "extra_host_conf" : { "alias" : [] }, - "extra_service_conf" : { "_WATO" : [] }, - "host_attributes" : {}, - "host_contactgroups" : [], - "_lock" : False, + "FOLDER_PATH" : "", + "ALL_HOSTS" : ALL_HOSTS, + "all_hosts" : [], + "clusters" : {}, + "ipaddresses" : {}, + "explicit_snmp_communities" : {}, + "extra_host_conf" : { "alias" : [] }, + "extra_service_conf" : { "_WATO" : [] }, + "host_attributes" : {}, + "host_contactgroups" : [], + "_lock" : False, } execfile(filename, variables, variables) nodes_of = {} @@ -610,8 +611,9 @@ def load_hosts_file(folder): alias = aliases[0] else: alias = None - host["alias"] = alias - host["ipaddress"] = ipaddress + host["alias"] = alias + host["ipaddress"] = ipaddress + host["snmp_community"] = variables["explicit_snmp_communities"].get(hostname) # Retrieve setting for each individual host tag tags = set([ tag for tag in parts[1:] if tag != 'wato' and not tag.endswith('.mk') ]) @@ -675,6 +677,7 @@ def save_hosts(folder = None): all_hosts = [] # list of [Python string for all_hosts] clusters = [] # tuple list of (Python string, nodes) ipaddresses = {} + explicit_snmp_communities = {} hostnames = hosts.keys() hostnames.sort() custom_macros = {} # collect value for attributes that are to be present in Nagios @@ -686,7 +689,8 @@ def save_hosts(folder = None): host = cleaned_hosts[hostname] effective = effective_attributes(host, folder) - ipaddress = effective.get("ipaddress") + ipaddress = effective.get("ipaddress") + snmp_community = effective.get("snmp_community") # Compute tags from settings of each individual tag. We've got # the current value for each individual tag. Also other attributes @@ -712,6 +716,8 @@ def save_hosts(folder = None): if ipaddress: ipaddresses[hostname] = ipaddress + if snmp_community: + explicit_snmp_communities[hostname] = snmp_community # Create contact group rule entries for hosts with explicitely set values # Note: since the type if this entry is a list, not a single contact group, all other list @@ -754,6 +760,12 @@ def save_hosts(folder = None): out.write("\n# Explicit IP addresses\n") out.write("ipaddresses.update(") out.write(pprint.pformat(ipaddresses)) + out.write(")\n") + + if len(ipaddresses) > 0: + out.write("\n# Explicit SNMP communities\n") + out.write("explicit_snmp_communities.update(") + out.write(pprint.pformat(explicit_snmp_communities)) out.write(")") out.write("\n") diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index cebcd2a..1d907e7 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -46,6 +46,17 @@ declare_host_attribute(TextAttribute("ipaddress", _("IP address"), show_in_table = True, show_in_folder = False) +declare_host_attribute(TextAttribute("snmp_community", _("SNMP Community"), + _("Using this option you can configure the community which should be used when " + "contacting this host via SNMP v1 or v2. It is possible to configure the SNMP community by " + "using the <a href=\"%s\">SNMP Communities</a> ruleset, but when you configure " + "some community here, this will override the community defined by the rules.") % \ + html.makeuri([('mode', 'edit_ruleset'), ('varname', 'snmp_communities')]), + allow_empty = False), + show_in_table = False, + show_in_folder = True, + depends_on_tags = ['snmp']) + # Attribute for configuring parents class ParentsAttribute(ValueSpecAttribute): def __init__(self):

10 years, 10 months

Check_MK Git: check_mk: New option explicit_snmp_communities to override rule based SNMP settings

by Lars Michelsen

Module: check_mk Branch: master Commit: d29ed9d0f808cc98c221ce3a4fd404714bdbde06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d29ed9d0f808cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 12 11:35:58 2013 +0200 New option explicit_snmp_communities to override rule based SNMP settings --- ChangeLog | 1 + modules/check_mk.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3308240..82a0963 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * Predictive monitoring: correctly handle spaces in variable names (thanks to Karl Golland) * New man page browser for console (cmk -m) + * New option explicit_snmp_communities to override rule based SNMP settings * livestatus: new service column staleness: indicator for outdated service checks * livestatus: new host column staleness: indicator for outdated host checks diff --git a/modules/check_mk.py b/modules/check_mk.py index e4142c2..2dad4a8 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -233,6 +233,7 @@ snmp_default_community = 'public' snmp_communities = [] snmp_timing = [] snmp_character_encodings = [] +explicit_snmp_communities = {} # override the rule based configuration # Inventory and inventory checks inventory_check_interval = None # Nagios intervals (4h = 240) @@ -644,6 +645,11 @@ def snmp_base_command(what, hostname): # the snmp_default_community is returned (wich is preset with # "public", but can be overridden in main.mk def snmp_credentials_of(hostname): + try: + return explicit_snmp_communities[hostname] + except KeyError: + pass + communities = host_extra_conf(hostname, snmp_communities) if len(communities) > 0: return communities[0]

10 years, 10 months

Check_MK Git: check_mk: TextAscii: Fixed editing of unicode strings

by Lars Michelsen

Module: check_mk Branch: master Commit: 365d13d71b8eb7f561793fe1e5ef709d05d997d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=365d13d71b8eb7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 12 14:00:47 2013 +0200 TextAscii: Fixed editing of unicode strings --- web/htdocs/valuespec.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 15b93aa..21c0e52 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -327,12 +327,14 @@ class TextAscii(ValueSpec): def render_input(self, varprefix, value): if value == None: value = "" + elif type(value) != unicode: + value = str(value) if self._label: html.write(self._label) html.write(" ") - html.text_input(varprefix, str(value), size = self._size, read_only = self._read_only) + html.text_input(varprefix, value, size = self._size, read_only = self._read_only) self.render_buttons() def render_buttons(self):

10 years, 10 months

← Newer
1
...
9
10
11
12
13
14
15
16
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2013