Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

Fixed using short titles in views after recent refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: c58e6ae95c3acde99bbad886598d94c502ef51f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c58e6ae95c3acd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 15:29:24 2016 +0200 Fixed using short titles in views after recent refactoring --- web/plugins/views/layouts.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 12f369d..fd9bf16 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -82,7 +82,7 @@ def render_single_dataset(rows, view, group_cells, cells, num_columns, _ignore_s odd = odd == "odd" and "even" or "odd" html.write('<tr class="data %s0">' % odd) if view.get("column_headers") != "off": - html.write("<td class=left>%s</td>" % cell.title()) + html.write("<td class=left>%s</td>" % cell.title(use_short=False)) for row in thispart: cell.paint(row) @@ -682,7 +682,7 @@ def render_matrix(rows, view, group_cells, cells, num_columns, _ignore_show_chec for cell_nr, cell in enumerate(group_cells): odd = odd == "odd" and "even" or "odd" html.write('<tr class="data %s0">' % odd) - html.write('<td class=matrixhead>%s</td>' % cell.title()) + html.write('<td class=matrixhead>%s</td>' % cell.title(use_short=False)) for group, group_row in groups: tdclass, content = cell.render(group_row) if cell_nr > 0: @@ -750,7 +750,7 @@ def csv_export_matrix(rows, view, group_cells, cells): table.begin(output_format="csv") for cell_nr, cell in enumerate(group_cells): table.row() - table.cell("", cell.title()) + table.cell("", cell.title(use_short=False)) for group, group_row in groups: tdclass, content = cell.render(group_row) table.cell("", content)

8 years

Moved print debug code detection from git hook to tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 1658cb10cd06ef043f9d79b73fe5c4419f381867 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1658cb10cd06ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 14:25:06 2016 +0200 Moved print debug code detection from git hook to tests --- tests/general/test_find_debug_print.py | 44 ++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tests/general/test_find_debug_print.py b/tests/general/test_find_debug_print.py new file mode 100644 index 0000000..771cfe8 --- /dev/null +++ b/tests/general/test_find_debug_print.py @@ -0,0 +1,44 @@ +#!/usr/bin/python +# encoding: utf-8 + +import os +import glob +from testlib import cmk_path, cmc_path + +check_paths = [ + "bin", + "modules", + "lib", + "checks", + "inventory", + "notifications", + "doc/treasures/active_checks", + # CMC specific + "agents/bakery", + # TODO: Update all agent plugins to use sys.stdout.write instead of print + #"agents/plugins", +] + +def test_find_debug_code(): + scanned = 0 + for base_path in [ cmk_path(), cmc_path() ]: + for dir_path in check_paths: + path = "%s/%s" % (base_path, dir_path) + if not os.path.exists(path): + continue + + for dirpath, dirnames, filenames in os.walk(path): + scanned += 1 + for filename in filenames: + file_path = "%s/%s" % (dirpath, filename) + + for nr, line in enumerate(open(file_path)): + l = line.lstrip() + assert not l.startswith("print("), \ + "Found \"print(...)\" call in %s:%d" % \ + (file_path, nr) + assert not l.startswith("print "), \ + "Found \"print ...\" call in %s:%d" % \ + (file_path, nr) + + assert scanned > 0

8 years

Replaced print statements with sys.stdout.write calls

by Lars Michelsen

Module: check_mk Branch: master Commit: dc18498e2e4cea193b670a712cd2ada84c657ca3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc18498e2e4cea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 14:25:32 2016 +0200 Replaced print statements with sys.stdout.write calls --- doc/treasures/active_checks/check_cpu_peaks | 15 ++-- doc/treasures/active_checks/check_traceroute | 4 +- doc/treasures/active_checks/check_uniserv | 14 ++-- modules/check_mk.py | 107 ++++++++++++++------------- modules/check_mk_base.py | 14 ++-- notifications/asciimail | 2 +- notifications/pushover | 8 +- 7 files changed, 82 insertions(+), 82 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dc18498e2e…

8 years

Also checking agent plugins for print statements

by Lars Michelsen

Module: check_mk Branch: master Commit: b2c979c13906d63ea15bd2f003c156c753d47f10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2c979c13906d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 15:11:35 2016 +0200 Also checking agent plugins for print statements --- tests/general/test_find_debug_print.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/general/test_find_debug_print.py b/tests/general/test_find_debug_print.py index 771cfe8..9725bd4 100644 --- a/tests/general/test_find_debug_print.py +++ b/tests/general/test_find_debug_print.py @@ -16,7 +16,7 @@ check_paths = [ # CMC specific "agents/bakery", # TODO: Update all agent plugins to use sys.stdout.write instead of print - #"agents/plugins", + "agents/plugins", ] def test_find_debug_code(): @@ -33,12 +33,15 @@ def test_find_debug_code(): file_path = "%s/%s" % (dirpath, filename) for nr, line in enumerate(open(file_path)): + if nr == 0 and ("bash" in line or "php" in line): + break # skip non python files + l = line.lstrip() assert not l.startswith("print("), \ "Found \"print(...)\" call in %s:%d" % \ - (file_path, nr) + (file_path, nr+1) assert not l.startswith("print "), \ "Found \"print ...\" call in %s:%d" % \ - (file_path, nr) + (file_path, nr+1) assert scanned > 0

8 years

Replaced print statements with sys.stdout.write calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e2927acf6b19a35a085b9922c380ab61f81fede URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e2927acf6b19a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 15:18:05 2016 +0200 Replaced print statements with sys.stdout.write calls --- agents/plugins/apache_status | 4 +- agents/plugins/mailman_lists | 6 +-- agents/plugins/mk_inotify | 10 ++--- agents/plugins/mk_jolokia | 4 +- agents/plugins/mk_logwatch | 12 +++--- agents/plugins/mk_mongodb | 82 ++++++++++++++++++------------------ agents/plugins/mk_sap | 12 +++--- agents/plugins/mk_tinkerforge | 13 +++--- agents/plugins/mtr | 37 ++++++++-------- agents/plugins/nginx_status | 4 +- agents/plugins/plesk_backups | 2 +- agents/plugins/plesk_domains | 4 +- agents/plugins/unitrends_replication | 5 ++- 13 files changed, 100 insertions(+), 95 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3e2927acf6…

8 years

Moved file permission check from git hook to test

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ee71ecaa0766c2051728736e5158aab07c67c25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ee71ecaa0766c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 13:17:16 2016 +0200 Moved file permission check from git hook to test --- tests/general/test_permissions.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/general/test_permissions.py b/tests/general/test_permissions.py new file mode 100644 index 0000000..4fea257 --- /dev/null +++ b/tests/general/test_permissions.py @@ -0,0 +1,34 @@ +#!/usr/bin/python +# encoding: utf-8 + +import os +import glob +from testlib import cmk_path + +def is_executable(path): + return os.path.isfile(path) and os.access(path, os.X_OK) + +def is_not_executable(path): + return os.path.isfile(path) and not os.access(path, os.X_OK) + +permissions = [ + # globbing pattern check function, excludes + ('doc/treasures/active_checks/*', is_executable, ['Makefile', 'check_mkevents.cc']), + ('agents/special/*', is_executable, []), + ('agents/check_mk_agent.*', is_executable, ['check_mk_agent.spec']), + ('agents/plugins/*', is_executable, ['README']), + ('checks/*', is_not_executable, []), + ('checkman/*', is_not_executable, []), + ('inventory/*', is_not_executable, []), + ('pnp-templates/*', is_not_executable, []), + ('notifications/*', is_executable, ['README', 'debug']), + ('bin/*', is_executable, ['Makefile', 'mkevent.cc', 'mkeventd_open514.cc']), +] + +def test_permissions(): + for pattern, check_func, excludes in permissions: + for f in glob.glob("%s/%s" % (cmk_path(), pattern)): + if f.split('/')[-1] in excludes: + continue + assert check_func(f), "%s has wrong permissions (%r)" % \ + (f, check_func)

8 years

3836 FIX Fixed perfometer in kentix multisensor rack

by Marcel Arentz

Module: check_mk Branch: master Commit: 96e16cef9223a8b3be6ae1f6e9c261e8f504f684 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96e16cef9223a8… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Sep 6 13:13:01 2016 +0200 3836 FIX Fixed perfometer in kentix multisensor rack Perfometer of kentix multisensor rack formatted in degree and not percent. --- .werks/3836 | 9 +++++++++ ChangeLog | 1 + checks/kentix_humidity | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3836 b/.werks/3836 new file mode 100644 index 0000000..2145156 --- /dev/null +++ b/.werks/3836 @@ -0,0 +1,9 @@ +Title: Fixed perfometer in kentix multisensor rack +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1473160272 +Class: fix + +Perfometer of kentix multisensor rack formatted in degree and not percent. diff --git a/ChangeLog b/ChangeLog index d5058fa..c8733ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -373,6 +373,7 @@ * 3781 FIX: ipmi: made check more robust against incomplete datasets * 3700 FIX: FIX lparstat_aix.cpu_util usage of checkgroup parameters... * 3798 FIX: Clusters: Fixed invalid timestamp of last cached agent data... + * 3836 FIX: Fixed perfometer in kentix multisensor rack... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/kentix_humidity b/checks/kentix_humidity index 30e81d3..178ecf3 100644 --- a/checks/kentix_humidity +++ b/checks/kentix_humidity @@ -31,7 +31,7 @@ def inventory_kentix_humidity(info): def check_kentix_humidity(_no_item, _no_params, info): value, lower_warn, upper_warn, alarm, text = info[0] temp = float(value)/10 - perfdata = [ ("temp", temp, lower_warn+":"+upper_warn ) ] + perfdata = [ ("humidity", temp, lower_warn+":"+upper_warn ) ] upper_warn = float(upper_warn) lower_warn = float(lower_warn) infotext = "%.1f%% (min/max at %.1f%%/%.1f%%)" % (temp, lower_warn, upper_warn)

8 years

3798 FIX Clusters: Fixed invalid timestamp of last cached agent data

by Andreas Boesl

Module: check_mk Branch: master Commit: de4dedfc6c55e4f8d4ea05f3280cbc4d4e2ab7e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de4dedfc6c55e4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 6 11:10:52 2016 +0200 3798 FIX Clusters: Fixed invalid timestamp of last cached agent data Due to this bug the last checked information was around the year 1923. --- .werks/3798 | 9 +++++++++ ChangeLog | 1 + modules/check_mk_base.py | 10 +++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/3798 b/.werks/3798 new file mode 100644 index 0000000..30bb269 --- /dev/null +++ b/.werks/3798 @@ -0,0 +1,9 @@ +Title: Clusters: Fixed invalid timestamp of last cached agent data +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1473152942 +Class: fix + +Due to this bug the last checked information was around the year 1923. diff --git a/ChangeLog b/ChangeLog index 4212f10..d5058fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -372,6 +372,7 @@ * 3770 FIX: win_dhcp_pools: Fixed crash in case of empty DHCP pools * 3781 FIX: ipmi: made check more robust against incomplete datasets * 3700 FIX: FIX lparstat_aix.cpu_util usage of checkgroup parameters... + * 3798 FIX: Clusters: Fixed invalid timestamp of last cached agent data... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index e0a29f3..39c295d 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1494,10 +1494,18 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_ag # use the oldest of the timestamps, of course. oldest_cached_at = None largest_interval = None + + def minn(a, b): + if a == None: + return b + elif b == None: + return a + return min(a,b) + for section_entries in g_agent_cache_info.values(): if infotype in section_entries: cached_at, cache_interval = section_entries[infotype] - oldest_cached_at = -max(oldest_cached_at, -cached_at) + oldest_cached_at = minn(oldest_cached_at, cached_at) largest_interval = max(largest_interval, cache_interval) submit_check_result(hostname, description, result, aggrname,

8 years

LDAP profile sync: Fixed exception during logging

by Lars Michelsen

Module: check_mk Branch: master Commit: b0af1c5b2f22ae7b2ab87e81990783447f630301 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0af1c5b2f22ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 10:14:07 2016 +0200 LDAP profile sync: Fixed exception during logging --- web/plugins/userdb/ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 1ea0557..6d027ab 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1824,7 +1824,7 @@ def synchronize_profile_to_sites(connection, user_id, profile): if not config.site_is_local(site_id) ] connection.log('Credentials changed: %s. Trying to sync to %d sites' % - (user_id, len(sites))) + (user_id, len(remote_sites))) num_disabled = 0 num_succeeded = 0

8 years

fixed displaying wrong check details in f5_bigip_conns

by Simon Betz

Module: check_mk Branch: master Commit: 9449770d78cddae32cb8544753cfceb042af9d98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9449770d78cdda… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 6 07:57:28 2016 +0200 fixed displaying wrong check details in f5_bigip_conns --- checks/f5_bigip_conns | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/f5_bigip_conns b/checks/f5_bigip_conns index e37f2f7..bec1da4 100644 --- a/checks/f5_bigip_conns +++ b/checks/f5_bigip_conns @@ -55,7 +55,7 @@ def check_f5_bigip_conns(item, params, info): else: state, extrainfo, perfdata = check_levels(int(val), what, params.get(what)) - infotext += " %s%s" % (what, extrainfo) + infotext += " %s%s" % (val, extrainfo) yield state, infotext, perfdata

8 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016