Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

updated mknotifyd-check to work with new mknotifyd output

by Sebastian Herbord

Module: check_mk Branch: master Commit: 6cd6c1521974048ed3aed75d43ca6a8040e11cfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cd6c152197404… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jun 20 13:31:21 2016 +0200 updated mknotifyd-check to work with new mknotifyd output --- checks/mknotifyd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/checks/mknotifyd b/checks/mknotifyd index 305c67e..3e06950 100644 --- a/checks/mknotifyd +++ b/checks/mknotifyd @@ -63,12 +63,14 @@ def parse_mknotifyd(info): site_entry = { "spools" : {}, "connections" : {}, + "queues" : {} } sub_entry = site_entry parsed[site] = site_entry else: varname, value = line[0].split(":", 1) value = value.strip() + if varname == "Spool": sub_entry = {} site_entry["spools"][value] = sub_entry @@ -77,6 +79,10 @@ def parse_mknotifyd(info): sub_entry = {} site_entry["connections"][value] = sub_entry + elif varname == "Queue": + sub_entry = {} + site_entry["queues"][value] = sub_entry + else: if value == "None": value = None

8 years

bugfix in 3144 didn't work in all cases

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9c1fbc4d035c0be6387a78ba8d2dc4555f0994ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c1fbc4d035c0b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jun 20 13:26:32 2016 +0200 bugfix in 3144 didn't work in all cases --- modules/check_mk_base.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index b0cbad7..180767d 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1918,8 +1918,13 @@ def submit_check_result(host, servicedesc, result, sa, cached_at=None, cache_int infotext = core_state_names[state] + " - " + infotext # make sure that plugin output does not contain a vertical bar. If that is the - # case then replace it with a Uniocode "Light vertical bar" - infotext = infotext.replace("|", u"\u2758".encode("utf8")) + # case then replace it with a Uniocode "Light vertical bar + if isinstance(infotext, unicode): + # regular check results are unicode... + infotext = infotext.replace(u"|", u"\u2758") + else: + # ...crash dumps, and hard-coded outputs are regular strings + infotext = infotext.replace("|", u"\u2758".encode("utf8")) # Aggregated service -> store for later if sa != "":

8 years

3640 new filter option for status details: can now be negated

by Simon Betz

Module: check_mk Branch: master Commit: e113b33718b4115fd16c0739d7f828586a7112bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e113b33718b411… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 20 11:31:05 2016 +0200 3640 new filter option for status details: can now be negated --- .werks/3640 | 9 +++++++++ ChangeLog | 1 + web/plugins/visuals/filters.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3640 b/.werks/3640 new file mode 100644 index 0000000..c9aa8d2 --- /dev/null +++ b/.werks/3640 @@ -0,0 +1,9 @@ +Title: new filter option for status details: can now be negated +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i1 +Date: 1466415026 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 8b66860..7d18f3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -295,6 +295,7 @@ * 3575 User logins can now be limited to single session at a time... * 3592 Views: Added sorter for host names (without site) * 3141 added user interfaces and permissions to view and acknowledge failed notifications + * 3640 new filter option for status details: can now be negated * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 86bd7fd..386dec8 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -119,7 +119,7 @@ declare_filter(201, FilterUnicode("service", _("Service (exact match)"), declare_filter(202, FilterUnicode("service_display_name", _("Service alternative display name"), "service", "service_display_name", "service_display_name", "~~"), _("Alternative display name of the service, regex match")) -declare_filter(202, FilterUnicode("output", _("Status detail"), "service", "service_plugin_output", "service_output", "~~")) +declare_filter(202, FilterUnicode("output", _("Status detail"), "service", "service_plugin_output", "service_output", "~~", True)) declare_filter(102, FilterHostnameOrAlias("hostnameoralias", _("Hostname or Alias"), "host", ["host_alias", "host_name"], "hostnameoralias", "~~", False), _("Search field allowing regular expressions and partial matches"))

8 years

Remove buildtime need to compile Windows agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 7a17978ac055cf40351a3a21149e28324758014f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a17978ac055cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 20 10:17:10 2016 +0200 Remove buildtime need to compile Windows agent This should reenable the daily builds --- agents/windows/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 0af2ed0..8e86cd8 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -123,10 +123,10 @@ check_mk_agent-64.unstripped.exe: $(OBJS64) $(CXX_64) $(COPTIONS) -o $@ $^ check_mk_agent-64.res -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi -limagehlp -check_mk_agent.unversioned.exe: check_mk_agent.unstripped.exe +check_mk_agent.unversioned.exe: strip -o $@ $^ -check_mk_agent-64.unversioned.exe: check_mk_agent-64.unstripped.exe +check_mk_agent-64.unversioned.exe: strip -o $@ $^

8 years

lib: new function for rendering filesizes

by Mathias Kettner

Module: check_mk Branch: master Commit: 197237031160ada59557a974437efa82b04b5081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=197237031160ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 19 16:14:08 2016 +0200 lib: new function for rendering filesizes --- lib/render.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/render.py b/lib/render.py index 125aa2e..0ad5c70 100644 --- a/lib/render.py +++ b/lib/render.py @@ -52,3 +52,18 @@ def date_and_time(timestamp): def time_of_day(timestamp): return time.strftime("%H:%M:%S", time.localtime(timestamp)) + + +# Precise size of a file - separated decimal separator +# 1234 -> "1234" +# 12345 => "12,345" +def filesize(size): + dec_sep = "," + if size < 10000: + return str(size) + elif size < 1000000: + return str(size)[:-3] + dec_sep + str(size)[-3:] + elif size < 1000000000: + return str(size)[:-6] + dec_sep + str(size)[-6:-3] + dec_sep + str(size)[-3:] + else: + return str(size)[:-9] + dec_sep + str(size)[-9:-6] + dec_sep + str(size)[-6:-3] + dec_sep + str(size)[-3:]

8 years

Small fix for internal helper render_main_menu()

by Mathias Kettner

Module: check_mk Branch: master Commit: 2a08d39f20de61eac23464d973c2561c0b2fa513 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a08d39f20de61… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 19 16:13:42 2016 +0200 Small fix for internal helper render_main_menu() now detects URLs instead of modes more precisely --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 04f6316..1d5d739 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5666,7 +5666,7 @@ def render_main_menu(some_modules, columns = 2): if not config.may(permission) and not config.may("wato.seeall"): continue - if '?' in mode_or_url or '/' in mode_or_url: + if '?' in mode_or_url or '/' in mode_or_url or mode_or_url.endswith(".py"): url = mode_or_url else: url = folder_preserving_link([("mode", mode_or_url)])

8 years

3639 intel_true_scale_chassis_temp, intel_true_scale_fans,

by Simon Betz

intel_true_scale_psus, intel_true_scale_sensors_temp: new checks for Intel True Fabric Scale Switches Message-ID: <57642407.QF7XK/5AzCMKADl+%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 5c9ee4b3b6efa12732b88d0f1efe218179edac09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c9ee4b3b6efa1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 17 18:21:23 2016 +0200 3639 intel_true_scale_chassis_temp, intel_true_scale_fans, intel_true_scale_psus, intel_true_scale_sensors_temp: new checks for Intel True Fabric Scale Switches --- .werks/3639 | 9 ++ ChangeLog | 1 + checkman/intel_true_scale_chassis_temp | 18 ++++ checkman/intel_true_scale_fans | 19 ++++ checkman/intel_true_scale_psus | 18 ++++ checkman/intel_true_scale_sensors_temp | 20 ++++ checks/intel_true_scale.include | 29 ++++++ checks/intel_true_scale_chassis_temp | 69 +++++++++++++ checks/intel_true_scale_fans | 104 ++++++++++++++++++++ checks/intel_true_scale_psus | 114 ++++++++++++++++++++++ checks/intel_true_scale_sensors_temp | 167 ++++++++++++++++++++++++++++++++ 11 files changed, 568 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5c9ee4b3b6…

8 years

added unit, update to werk 3638

by Simon Betz

Module: check_mk Branch: master Commit: 665dce7e6c9e3f7a1af6884295cc35110e744103 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=665dce7e6c9e3f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 17 18:02:47 2016 +0200 added unit, update to werk 3638 --- checks/cisco_qos | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/checks/cisco_qos b/checks/cisco_qos index e7fa26e..9119cc7 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -228,23 +228,27 @@ def check_cisco_qos(item, params, info): for b_key, b_value in parents.items(): if parent_value_cache[class_id] == b_value: if object_types[b_key] == "4": - try: - # 1 kbps - # 2 percentage - # 3 percentageRemaining - # 4 ratioRemaining - # 5 perThousand - # 6 perMillion - qos_unit = int(if_qos_bandwidth_units[config[b_key]]) - qos_bandwidth = saveint(if_qos_bandwidth[config[b_key]]) - if qos_unit == 1: - speed = qos_bandwidth * 1000 - elif qos_unit == 3: - remaining = (speed / 100) * qos_bandwidth - speed = speed - remaining - break - except KeyError: - pass + try: + # 1 kbps + # 2 percentage + # 3 percentageRemaining + # 4 ratioRemaining + # 5 perThousand + # 6 perMillion + qos_unit = int(if_qos_bandwidth_units[config[b_key]]) + qos_bandwidth = saveint(if_qos_bandwidth[config[b_key]]) + if qos_unit == 1: + speed = qos_bandwidth * 1000 + + elif qos_unit == 2: + speed = speed * (qos_bandwidth / 100.0) + + elif qos_unit == 3: + remaining = (speed / 100) * qos_bandwidth + speed = speed - remaining + break + except KeyError: + pass # Bandwidth needs to be in bytes for later calculations bw = speed / 8.0

8 years

3638 FIX cisco_qos: fixed wrong unit handling

by Simon Betz

Module: check_mk Branch: master Commit: a63e2e523e270054178df6922b2e287a78c66478 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a63e2e523e2700… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 17 17:50:36 2016 +0200 3638 FIX cisco_qos: fixed wrong unit handling --- .werks/3638 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_qos | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/3638 b/.werks/3638 new file mode 100644 index 0000000..8afdb04 --- /dev/null +++ b/.werks/3638 @@ -0,0 +1,10 @@ +Title: cisco_qos: fixed wrong unit handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1466178621 + + diff --git a/ChangeLog b/ChangeLog index 2a6f4a9..4da139f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -273,6 +273,7 @@ * 3545 FIX: netapp_api_vs_traffic: fixed crash when NFSv4.1 information was available * 3143 FIX: windows agent: fixed some minor memory and handle leaks * 3144 FIX: bugfix: replacing pipe symbol in plugin output was broken + * 3638 FIX: cisco_qos: fixed wrong unit handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/cisco_qos b/checks/cisco_qos index 4dee684..e7fa26e 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -235,11 +235,11 @@ def check_cisco_qos(item, params, info): # 4 ratioRemaining # 5 perThousand # 6 perMillion - unit = int(if_qos_bandwidth_units[config[b_key]]) + qos_unit = int(if_qos_bandwidth_units[config[b_key]]) qos_bandwidth = saveint(if_qos_bandwidth[config[b_key]]) - if unit == 1: + if qos_unit == 1: speed = qos_bandwidth * 1000 - elif unit == 3: + elif qos_unit == 3: remaining = (speed / 100) * qos_bandwidth speed = speed - remaining break

8 years

harmonised translatable text

by Sebastian Herbord

Module: check_mk Branch: master Commit: 2e89f38ecee9cba9dff79fc70461c4d85fae5572 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e89f38ecee9cb… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Jun 17 13:03:47 2016 +0200 harmonised translatable text --- web/plugins/dashboard/dashlets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 9061b14..6f75221 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -948,7 +948,7 @@ def dashlet_failed_notifications(nr, dashlet): '</div>' % content) dashlet_types["notify_failed_notifications"] = { - "title" : _("Failed notifications"), + "title" : _("Failed Notifications"), "description" : _("Display GUI notifications in case notification mechanism fails"), "render" : dashlet_failed_notifications, "sort_index" : 0,

8 years

← Newer
1
2
3
4
5
6
7
8
9
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016