Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: #1424 mknotifyd: now able to check if its still listening for telegrams

by Andreas Boesl

Module: check_mk Branch: master Commit: f85e0d90366cb5a3d27f7f860b5ed81c1c538b97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f85e0d90366cb5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 27 13:48:29 2014 +0100 #1424 mknotifyd: now able to check if its still listening for telegrams The mknotifyd server is now able to handle heartbeat telegrams.<br> Just send an empty pickled python object to the server, like "N." (a pickled None)<br> The mknotifyd will answer with an "OK".<br> You can monitor this behaviour with the active check "Check connecting to a TCP port". --- .werks/1424 | 12 ++++++++++++ ChangeLog | 1 + doc/treasures/mknotifyd | 9 +++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/1424 b/.werks/1424 new file mode 100644 index 0000000..210763e --- /dev/null +++ b/.werks/1424 @@ -0,0 +1,12 @@ +Title: mknotifyd: now able to check if its still listening for telegrams +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414413785 +Class: feature + +The mknotifyd server is now able to handle heartbeat telegrams.<br> +Just send an empty pickled python object to the server, like "N." (a pickled None)<br> +The mknotifyd will answer with an "OK".<br> +You can monitor this behaviour with the active check "Check connecting to a TCP port". diff --git a/ChangeLog b/ChangeLog index 29f7ac0..82f1df8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ * 1447 domino_transactions: new check to monitor the number of transactions per minute on Lotus Domino servers * 1190 statgrab_cpu: Check can now handle parameters * 1191 Linux agent now also sends information about tmpfs... + * 1424 mknotifyd: now able to check if its still listening for telegrams... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 0a793d8..488af11 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -260,10 +260,11 @@ class TcpServer: try: content = pickle.loads(client_data) - if not os.path.exists(g_spool_dir): - os.makedirs(g_spool_dir) - spoolfile = "%s/%s" % (g_spool_dir, uuid.uuid1()) - file(spoolfile,"w").write(pprint.pformat(content)) + if content: + if not os.path.exists(g_spool_dir): + os.makedirs(g_spool_dir) + spoolfile = "%s/%s" % (g_spool_dir, uuid.uuid1()) + file(spoolfile,"w").write(pprint.pformat(content)) verbose("client data processed - sending OK", 2) client_socket.send("OK")

9 years, 8 months

Check_MK Git: check_mk: #1192 FIX veeam_jobs: Check now recognize sync jobs

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1b5b40c26b649d833dadd1faf2d418af9535bf1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b5b40c26b649d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 27 13:41:23 2014 +0100 #1192 FIX veeam_jobs: Check now recognize sync jobs The check not longer throws an unknown state. --- .werks/1192 | 10 ++++++++++ ChangeLog | 1 + checks/veeam_jobs | 15 +++++++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.werks/1192 b/.werks/1192 new file mode 100644 index 0000000..eef96f4 --- /dev/null +++ b/.werks/1192 @@ -0,0 +1,10 @@ +Title: veeam_jobs: Check now recognize sync jobs +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414413296 +Class: fix + +The check not longer throws an unknown state. + diff --git a/ChangeLog b/ChangeLog index 611298f..29f7ac0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,7 @@ * 1131 FIX: esx_vsphere_hostsystem.maintenance: fixed misspelling in service description... NOTE: Please refer to the migration notes! * 1161 FIX: fc_port: Fixed invalid values of counters, fixed wrong values in graphs... + * 1192 FIX: veeam_jobs: Check now recognize sync jobs... Multisite: * 1066 New Dashboard Designer... diff --git a/checks/veeam_jobs b/checks/veeam_jobs index 56eea79..50ebc3b 100644 --- a/checks/veeam_jobs +++ b/checks/veeam_jobs @@ -42,14 +42,21 @@ def inventory_veeam_jobs(info): def check_veeam_jobs(item, _no_params, info): for line in info: if line[0] == item: - if line[3] == "Success": + backup_type = line[1] + backup_status = line[3] + backup_current = line[2] + + if backup_status == "Success": + state = 0 + elif backup_status == 'Idle' and backup_type == "BackupSync": + # A sync job is always idle state = 0 - elif line[2] == "Working": + elif backup_current == "Working": state = 0 line = line[:6] - elif line[3] == "Failed": + elif backup_status == "Failed": state = 2 - elif line[2] == "Stopped" and line[3] == "Warning": + elif backup_current == "Stopped" and backup_status == "Warning": state = 1 else: state = 3

9 years, 8 months

Check_MK Git: check_mk: oracle_instance: Fixed if condition

by Bastian Kuhn

Module: check_mk Branch: master Commit: 17d2f8969d82d8e634567373f7f044c4fbde8e4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17d2f8969d82d8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 27 13:02:49 2014 +0100 oracle_instance: Fixed if condition --- checks/oracle_instance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/oracle_instance b/checks/oracle_instance index 664c468..d814312 100644 --- a/checks/oracle_instance +++ b/checks/oracle_instance @@ -104,7 +104,7 @@ def check_oracle_instance(item, params, info): state, infotext = state_marker(state, infotext, 'logins', logins, 'RESTRICTED') # the new internal database _MGMTDB from 12.1.0.2 is always in NOARCHIVELOG mode - if name != '_MGMTDB' and db_unique_name != '_mgmtdb' and sid != '-MGMTDB': + if name != '_MGMTDB' and sid != '-MGMTDB': infotext += ', Log Mode %s' % (log_mode.lower()) state, infotext = state_marker(state, infotext, 'archivelog', log_mode, 'ARCHIVELOG') state, infotext = state_marker(state, infotext, 'noarchivelog',log_mode, 'NOARCHIVELOG')

9 years, 8 months

Check_MK Git: check_mk: Allow --profile in combination with --keepalive

by Mathias Kettner

Module: check_mk Branch: master Commit: 6ff29d0bed06c8894e8742440b15ee3e36238892 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ff29d0bed06c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 27 12:12:03 2014 +0100 Allow --profile in combination with --keepalive --- modules/check_mk.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index ba2c2b4..1781abc 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5560,6 +5560,10 @@ def do_check_keepalive(): (3, len(total_check_output), total_check_output)) keepalive_check_memory(num_checks, keepalive_fd) + # In case of profiling do just this one cycle and end afterwards + if g_profile: + output_profile() + sys.exit(0) # Just one lines from stdin. But: make sure that

9 years, 8 months

Check_MK Git: check_mk: corrected werk

by Bastian Kuhn

Module: check_mk Branch: master Commit: 4b1c022f9a3ca18f06cf3688c8a6485b0db67d56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b1c022f9a3ca1… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 27 11:05:59 2014 +0100 corrected werk --- .werks/1191 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/1191 b/.werks/1191 index 933642c..52e6ff0 100644 --- a/.werks/1191 +++ b/.werks/1191 @@ -8,5 +8,5 @@ Class: feature By default, the behavior of the df check is to ignore this filesystems. If you want to see the temp filsystems you have to overwrite the inventory_df_exclude_fs variable in main.mk in the -following way: inventory_df_exclude_fs = [ 'tmpfs', 'nfs', 'smbfs', 'cifs', 'iso9660' ] +following way: inventory_df_exclude_fs = [ 'nfs', 'smbfs', 'cifs', 'iso9660' ]

9 years, 8 months

Check_MK Git: check_mk: #1191 Linux agent now also sends information about tmpfs

by Bastian Kuhn

Module: check_mk Branch: master Commit: a4daaaa448f05b8f7b56c13310e24ba67599015d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4daaaa448f05b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 27 11:05:30 2014 +0100 #1191 Linux agent now also sends information about tmpfs By default, the behavior of the df check is to ignore this filesystems. If you want to see the temp filsystems you have to overwrite the inventory_df_exclude_fs variable in main.mk in the following way: inventory_df_exclude_fs = [ 'tmpfs', 'nfs', 'smbfs', 'cifs', 'iso9660' ] --- .werks/1191 | 12 ++++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- checks/df.include | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1191 b/.werks/1191 new file mode 100644 index 0000000..933642c --- /dev/null +++ b/.werks/1191 @@ -0,0 +1,12 @@ +Title: Linux agent now also sends information about tmpfs +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414403947 +Class: feature + +By default, the behavior of the df check is to ignore this filesystems. +If you want to see the temp filsystems you have to overwrite the inventory_df_exclude_fs variable in main.mk in the +following way: inventory_df_exclude_fs = [ 'tmpfs', 'nfs', 'smbfs', 'cifs', 'iso9660' ] + diff --git a/ChangeLog b/ChangeLog index 5fa1a7d..611298f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 0664 domino_users: new check to monitor the number of users on a Domino Notes server * 1447 domino_transactions: new check to monitor the number of transactions per minute on Lotus Domino servers * 1190 statgrab_cpu: Check can now handle parameters + * 1191 Linux agent now also sends information about tmpfs... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index be11b02..bc1c7df 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -128,7 +128,7 @@ fi echo '<<<df>>>' # The exclusion list is getting a bit of a problem. -l should hide any remote FS but seems # to be all but working. -excludefs="-x smbfs -x tmpfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs -x zfs" +excludefs="-x smbfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs -x zfs" df -PTlk $excludefs | sed 1d # df inodes information diff --git a/checks/df.include b/checks/df.include index fe9eebf..2094985 100644 --- a/checks/df.include +++ b/checks/df.include @@ -31,7 +31,7 @@ filesystem_levels = [] # obsolete. Just here to check config and warn if filesystem_default_levels = {} # can also be dropped some day in future # Filesystems to ignore (shouldn't be sent by agent anyway) -inventory_df_exclude_fs = [ 'nfs', 'smbfs', 'cifs', 'iso9660' ] +inventory_df_exclude_fs = [ 'tmpfs', 'nfs', 'smbfs', 'cifs', 'iso9660' ] inventory_df_exclude_mountpoints = [ '/dev' ] # Grouping of filesystems into groups that are monitored as one entity

9 years, 8 months

Check_MK Git: check_mk: veeam_client: Added new dual perfometer

by Bastian Kuhn

Module: check_mk Branch: master Commit: d56afe3874e94a4ede81b10bbb6c8b4558c5f141 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d56afe3874e94a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 27 10:08:04 2014 +0100 veeam_client: Added new dual perfometer --- web/plugins/perfometer/check_mk.py | 12 +++++++++ web/plugins/views/perfometer.py | 47 ++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 3ecdbea..efaf698 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1173,3 +1173,15 @@ def perfometer_docsis_snr(row, check_command, perf_data): return "%.1f dB" % dbmv, perfometer_logarithmic(dbmv, 50, 2, "#ad6") perfometers["check_mk-docsis_channels_upstream"] = perfometer_docsis_snr + +def perfometer_veeam_client(row, check_command, perf_data): + avgspeed_bytes = int(perf_data[4][1]) + duration_secs = int(perf_data[3][1]) + h = perfometer_logarithmic_dual_independent(avgspeed_bytes, '#54b948', 10000000, 2, duration_secs, '#2098cb', 1000, 2) + + avgspeed = bytes_human_readable(avgspeed_bytes) + duration = age_human_readable(duration_secs) + + return "%s/s   %s" % (avgspeed, duration), h + +perfometers["check_mk-veeam_client"] = perfometer_veeam_client diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index e4b874c..47f179e 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -89,6 +89,32 @@ def perfometer_logarithmic_dual(value_left, color_left, value_right, color_right return result + '</tr></table>' +def perfometer_logarithmic_dual_independent\ + (value_left, color_left, half_value_left, base_left, value_right, color_right, half_value_right, base_right): + result = '<table><tr>' + for where, value, color, half_value, base in [ + ("left", value_left, color_left, half_value_left, base_left), + ("right", value_right, color_right, half_value_right, base_left) ]: + value = float(value) + if value == 0.0: + pos = 0 + else: + half_value = float(half_value) + h = math.log(half_value, base) # value to be displayed at 50% + pos = 25 + 10.0 * (math.log(value, base) - h) + if pos < 1: + pos = 1 + if pos > 49: + pos = 49 + + if where == "right": + result += perfometer_td(pos, color) + \ + perfometer_td(50 - pos, "white") + else: + result += perfometer_td(50 - pos, "white") + \ + perfometer_td(pos, color) + + return result + '</tr></table>' def number_human_readable(n, precision=1, unit="B"): base = 1024.0 @@ -118,6 +144,27 @@ def age_human_readable(secs): days = hours / 24 return "%d days" % days +def bytes_human_readable(b, base=1024.0, bytefrac=True, unit="B"): + base = float(base) + # Handle negative bytes correctly + prefix = '' + if b < 0: + prefix = '-' + b *= -1 + + if b >= base * base * base * base: + return '%s%.2f T%s' % (prefix, b / base / base / base / base, unit) + elif b >= base * base * base: + return '%s%.2f G%s' % (prefix, b / base / base / base, unit) + elif b >= base * base: + return '%s%.2f M%s' % (prefix, b / base / base, unit) + elif b >= base: + return '%s%.2f k%s' % (prefix, b / base, unit) + elif bytefrac: + return '%s%.2f %s' % (prefix, b, unit) + else: # Omit byte fractions + return '%s%.0f %s' % (prefix, b, unit) + def paint_perfometer(row): perfstring = unicode(row["service_perf_data"].strip())

9 years, 8 months

Check_MK Git: check_mk: Fixed localization of visual type strings

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d5534d618529dfaa6b5f630f4a1e73af74cf3bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d5534d618529d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 27 09:33:56 2014 +0100 Fixed localization of visual type strings --- web/htdocs/visuals.py | 51 +++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index f81a77d..fbcc746 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -30,27 +30,6 @@ from lib import * from valuespec import * import config, table -visual_types = { - 'views': { - 'show_url' : 'view.py', - 'ident_attr' : 'view_name', - 'title' : _("view"), - 'plural_title' : _("views"), - 'module_name' : 'views', - 'multicontext_links' : False, - }, - 'dashboards': { - 'show_url' : 'dashboard.py', - 'ident_attr' : 'name', - 'title' : _("dashboard"), - 'plural_title' : _("dashboards"), - 'module_name' : 'dashboard', - 'popup_add_handler' : 'popup_list_dashboards', - 'add_visual_handler' : 'popup_add_dashlet', - 'multicontext_links' : False, - }, -} - # .--Plugins-------------------------------------------------------------. # | ____ _ _ | # | | _ \| |_ _ __ _(_)_ __ ___ | @@ -69,10 +48,32 @@ def load_plugins(): if loaded_with_language == current_language: return - global title_functions ; title_functions = [] - global infos ; infos = {} - global multisite_filters ; multisite_filters = {} - global ubiquitary_filters ; ubiquitary_filters = [] # Always show this filters + global visual_types + visual_types = { + 'views': { + 'show_url' : 'view.py', + 'ident_attr' : 'view_name', + 'title' : _("view"), + 'plural_title' : _("views"), + 'module_name' : 'views', + 'multicontext_links' : False, + }, + 'dashboards': { + 'show_url' : 'dashboard.py', + 'ident_attr' : 'name', + 'title' : _("dashboard"), + 'plural_title' : _("dashboards"), + 'module_name' : 'dashboard', + 'popup_add_handler' : 'popup_list_dashboards', + 'add_visual_handler' : 'popup_add_dashlet', + 'multicontext_links' : False, + }, + } + + global title_functions ; title_functions = [] + global infos ; infos = {} + global multisite_filters ; multisite_filters = {} + global ubiquitary_filters ; ubiquitary_filters = [] # Always show these filters load_web_plugins('visuals', globals()) loaded_with_language = current_language

9 years, 8 months

Check_MK Git: check_mk: Make visuals deal correctly with not completely imported reporting module

by Lars Michelsen

Module: check_mk Branch: master Commit: 27c5cc11bf24794a74b2124a6e1ab22dccde0c38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27c5cc11bf2479… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 27 09:40:52 2014 +0100 Make visuals deal correctly with not completely imported reporting module --- web/htdocs/visuals.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index fbcc746..4dd059f 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1151,6 +1151,9 @@ def collect_context_links_of(visual_type_name, this_visual, active_filter_vars, visual_type = visual_types[visual_type_name] module_name = visual_type["module_name"] thing_module = __import__(module_name) + load_func_name = 'load_%s'% visual_type_name + if load_func_name not in thing_module.__dict__: + return context_links # in case of exception in "reporting", the load function might be missing thing_module.__dict__['load_%s'% visual_type_name]() available = thing_module.__dict__['permitted_%s' % visual_type_name]()

9 years, 8 months

Check_MK Git: check_mk: Fixed exception when using RelativeDate valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: a09897b59ad2285d68f1b0ac7699b3d8bbc79ca7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a09897b59ad228… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 24 16:01:03 2014 +0200 Fixed exception when using RelativeDate valuespec --- web/htdocs/valuespec.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 7e42253..4acb5ab 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1694,23 +1694,28 @@ weekdays = { class RelativeDate(OptionalDropdownChoice): def __init__(self, **kwargs): - ValueSpec.__init__(self, **kwargs) - self._choices = [ - (0, _("today")), - (1, _("tomorrow"))] + choices = [ + (0, _("today")), + (1, _("tomorrow")) + ] weekday = time.localtime(today()).tm_wday for w in range(2, 7): wd = (weekday + w) % 7 - self._choices.append((w, weekdays[wd])) + choices.append((w, weekdays[wd])) for w in range(0, 7): wd = (weekday + w) % 7 if w < 2: title = _(" next week") else: title = _(" in %d days") % (w + 7) - self._choices.append((w + 7, weekdays[wd] + title)) - self._explicit = Integer() - self._otherlabel = _("in ... days") + choices.append((w + 7, weekdays[wd] + title)) + + kwargs['choices'] = choices + kwargs['explicit'] = Integer() + kwargs['otherlabel'] = _("in ... days") + + OptionalDropdownChoice.__init__(self, **kwargs) + if "default_days" in kwargs: self._default_value = kwargs["default_days"] * seconds_per_day + today() else:

9 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014