Checkmk git commits May 2011

checkmk-commits@lists.checkmk.com

2 participants
134 discussions

Check_MK Git: check_mk: New config variable filter_columns (default is 2)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5833c83cd4bb7fa0c18ef5bb8822d7374c8ae430 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5833c83cd4bb7f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 10 15:21:28 2011 +0200 New config variable filter_columns (default is 2) --- ChangeLog | 1 + web/htdocs/config.py | 3 +++ web/htdocs/views.py | 7 ++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 194d0db..abecf8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * Added snmp_uptime, uptime and printer_supply perfometers * Allow for displaying service data in host tables * View editor foldable states are now permament per user + * New config variable filter_columns (default is 2) BI: * Added new component BI to Multisite. diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 1fdce0c..226b642 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -438,6 +438,9 @@ start_url = "main.py" # Timeout for rescheduling of host- and servicechecks reschedule_timeout = 10.0 +# Number of columsn in "Filter" form +filter_columns = 2 + # __ ___ _____ ___ # \ \ / / \|_ _/ _ \ # \ \ /\ / / _ \ | || | | | diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 45dc34b..11bb7f8 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -101,6 +101,7 @@ def show_filter_form(is_open, filters): html.write("<div class=whiteborder>\n") html.write("<table class=\"form\">\n") + # sort filters according to title s = [(f.sort_index, f.title, f) for f in filters] s.sort() @@ -112,12 +113,12 @@ def show_filter_form(is_open, filters): html.write("<td class=content>") f.display() html.write("</td>") - if col == 1: + if col == config.filter_columns - 1: html.write("</tr>\n") - col = (col + 1) % 2 + col = (col + 1) % config.filter_columns if col == 1: html.write("<td class=legend></td>\n<td class=content></td></tr>\n") - html.write('<tr><td class="legend button" colspan=4>') + html.write('<tr><td class="legend button" colspan=%d>' % (config.filter_columns * 2)) html.button("search", "Search", "submit") html.write("</td></tr>\n") html.write("</table>\n")

13 years, 4 months

Check_MK Git: check_mk: Execute SNMP scan in sorted order (cosmetic)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0b3ab4c2d22633e5752885c39b3f6994108e3900 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b3ab4c2d22633… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 10 14:46:20 2011 +0200 Execute SNMP scan in sorted order (cosmetic) --- modules/check_mk.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 79ad2d2..493db25 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -685,7 +685,9 @@ def snmp_scan(hostname, ipaddress): return [] found = [] - for checktype, detect_function in snmp_scan_functions.items(): + items = snmp_scan_functions.items() + items.sort() + for checktype, detect_function in items: if checktype in ignored_checktypes: continue try: @@ -698,7 +700,9 @@ def snmp_scan(hostname, ipaddress): pass # Now try all checks not having a scan function - for checktype in check_info.keys(): + items = check_info.keys() + items.sort() + for checktype in items: if checktype in ignored_checktypes: continue @@ -1652,6 +1656,7 @@ def do_snmp_scan(hostnamelist, check_only=False, include_state=False): return result + def make_inventory(checkname, hostnamelist, check_only=False, include_state=False): try: inventory_function = check_info[checkname][3]

13 years, 4 months

Check_MK Git: check_mk: FIX: Avoid duplicate SNMP scan of checktypes containing a period

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b482d0c0899655d720cf0efd98ebd77fd0b54be6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b482d0c0899655… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 10 14:45:53 2011 +0200 FIX: Avoid duplicate SNMP scan of checktypes containing a period --- ChangeLog | 1 + modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e57bf8b..194d0db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: Avoid duplicate SNMP scan of checktypes containing a period * FIX: honor ignored_checktypes also on SNMP scan * FIX: cmk -II also refreshes cluster checks, if all nodes are specified * FIX: avoid floating points with 'e' in performance data diff --git a/modules/check_mk.py b/modules/check_mk.py index 2bba92c..79ad2d2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1615,7 +1615,7 @@ def inventorable_checktypes(what): # tcp, all checknames = [ k for k in check_info.keys() if check_info[k][3] != no_inventory_possible # and (k not in ignored_checktypes) - and (what == "all" or k not in snmp_info) + and (what == "all" or k.split('.')[0] not in snmp_info) ] checknames.sort() return checknames

13 years, 4 months

Check_MK Git: check_mk: FIX: honor ignored_checktypes also on SNMP scan

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7bf44150060bd5aadf2ae8afed09e50ed5cde37f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bf44150060bd5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 10 14:26:21 2011 +0200 FIX: honor ignored_checktypes also on SNMP scan --- ChangeLog | 1 + modules/check_mk.py | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d8a241..e57bf8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: honor ignored_checktypes also on SNMP scan * FIX: cmk -II also refreshes cluster checks, if all nodes are specified * FIX: avoid floating points with 'e' in performance data * FIX: cmk -D: drop obsolete (and always empty) Notification: diff --git a/modules/check_mk.py b/modules/check_mk.py index 0857469..2bba92c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -686,6 +686,8 @@ def snmp_scan(hostname, ipaddress): found = [] for checktype, detect_function in snmp_scan_functions.items(): + if checktype in ignored_checktypes: + continue try: if detect_function(lambda oid: get_single_oid(hostname, ipaddress, oid)): found.append(checktype) @@ -697,6 +699,9 @@ def snmp_scan(hostname, ipaddress): # Now try all checks not having a scan function for checktype in check_info.keys(): + if checktype in ignored_checktypes: + continue + datatype = checktype.split('.')[0] if not check_uses_snmp(datatype): continue # no snmp check

13 years, 4 months

Check_MK Git: check_mk: FIX: Multisite: avoid duplicate import of plugins

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 798c3e1e262759fe051559fbc62307f8ace57ab9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=798c3e1e262759… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 10 09:07:22 2011 +0200 FIX: Multisite: avoid duplicate import of plugins This happend in a local OMD setup. Also the plugins are now read in alphabetical order. --- ChangeLog | 1 + web/htdocs/views.py | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a56adc..8d8a241 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * FIX: custom_style_sheet now also honored by sidebar * FIX: ignore case when sorting groups in ...groups snapin * FIX: Fixed handling of embedded graphs to support the changes made to + * FIX: avoid duplicate import of plugins in OMD local installation the PNP webservice * Added snmp_uptime, uptime and printer_supply perfometers * Allow for displaying service data in host tables diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 9f1b26e..45dc34b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -195,16 +195,21 @@ class Filter: # Load all view plugins plugins_path = defaults.web_dir + "/plugins/views" -for fn in os.listdir(plugins_path): +fns = os.listdir(plugins_path) +fns.sort() +for fn in fns: if fn.endswith(".py"): execfile(plugins_path + "/" + fn) if defaults.omd_root: local_plugins_path = defaults.omd_root + "/local/share/check_mk/web/plugins/views" - if os.path.exists(local_plugins_path): - for fn in os.listdir(local_plugins_path): - if fn.endswith(".py"): - execfile(local_plugins_path + "/" + fn) + if local_plugins_path != plugins_path: # honor ./setup.sh in site + if os.path.exists(local_plugins_path): + fns = os.listdir(local_plugins_path) + fns.sort() + for fn in fns: + if fn.endswith(".py"): + execfile(local_plugins_path + "/" + fn) # Declare permissions for builtin views config.declare_permission_section("view", "Builtin views")

13 years, 4 months

Check_MK Git: check_mk: Ouput cache information only in debug mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d4de8352addfad5f9715892d09edca943be832b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4de8352addfad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 9 17:48:34 2011 +0200 Ouput cache information only in debug mode --- modules/check_mk_base.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 9c1e601..e8d14d9 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -375,10 +375,10 @@ def read_cache_file(relpath, max_cache_age): result = f.read(10000000) f.close() if len(result) > 0: - if opt_verbose: + if opt_debug: sys.stderr.write("Using data from cachefile %s.\n" % cachefile) return result - elif opt_verbose: + elif opt_debug: sys.stderr.write("Skipping cache file %s: Too old\n" % cachefile) if simulation_mode and not opt_no_cache:

13 years, 4 months

Check_MK Git: check_mk: Multisite: fix editing of views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 56cbfe28cad712b50e6c115b4e53bfb347511a94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56cbfe28cad712… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 9 16:44:49 2011 +0200 Multisite: fix editing of views --- 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 da50f88..9f1b26e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1613,7 +1613,7 @@ def allowed_for_datasource(collection, datasourcename): def allowed_for_joined_datasource(collection, datasourcename): if 'join' not in multisite_datasources[datasourcename]: - return [] + return {} return allowed_for_datasource(collection, multisite_datasources[datasourcename]['join'][0]) def is_joined_value(collection, varname):

13 years, 4 months

Check_MK Git: check_mk: df: fix problems with check parameters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7d9771d9add9324b4309ab3631584b552dacafef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d9771d9add932… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 6 16:27:43 2011 +0200 df: fix problems with check parameters The check crashed, if old style (tuple) parameters where used. --- checks/df.include | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/checks/df.include b/checks/df.include index 6f8d3dd..930ce0b 100644 --- a/checks/df.include +++ b/checks/df.include @@ -59,13 +59,20 @@ factory_settings["filesystem_default_levels"] = { # compute warning and critical levels. Takes into account the size of # the filesystem and the magic number. Since the size is only known at # check time this function's result cannot be precompiled. +# Note: this function is in our days only needed in order to support +# old style params a'la (80, 90). As soon as we drop support for that +# (can happen any decade now), we can get rid of this function. def get_filesystem_levels(host, mountpoint, size_gb, params): - # convert default levels to dictionary + # Start with factory settings + levels = factory_settings["filesystem_default_levels"].copy() + # convert default levels to dictionary. This is in order support + # old style levels like (80, 90) if type(filesystem_default_levels) == dict: - levels = filesystem_default_levels.copy() + levels.update(filesystem_default_levels) else: - levels = { "levels": filesystem_default_levels[:2] } + levels = factory_settings["filesystem_default_levels"].copy() + levels["levels"] = filesystem_default_levels[:2] if len(filesystem_default_levels) == 2: levels["magic"] = None else:

13 years, 4 months

Check_MK Git: check_mk: Make sanity check for OIDs requested by checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c85a674928a574c78eac29ca389d7bd1d1f3e1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c85a674928a57… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 5 18:22:59 2011 +0200 Make sanity check for OIDs requested by checks --- modules/snmp.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index b76a132..e0fe30d 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -178,6 +178,9 @@ def get_snmp_table(hostname, ip, oid_info): else: oid, suboids, targetcolumns = oid_info + if not oid.startswith("."): + raise MKGeneralException("OID definition '%s' does not begin with ." % oid) + all_values = [] index_column = -1 index_format = None

13 years, 4 months

Check_MK Git: check_mk: Fixed minor inline doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ac35172e3a422333e18de41ef18b85364a37436f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac35172e3a4223… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 5 17:23:10 2011 +0200 Fixed minor inline doku --- 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 a97231f..0857469 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -210,7 +210,7 @@ NEGATE = '@negate' # negation in boolean lists agent_port = 6556 tcp_connect_timeout = 5.0 do_rrd_update = False -check_submission = "pipe" # alternative: "files" +check_submission = "pipe" # alternative: "file" aggr_summary_hostname = "%s-s" agent_min_version = 0 # warn, if plugin has not at least version check_max_cachefile_age = 0 # per default do not use cache files when checking

13 years, 4 months

← Newer
1
...
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2011