Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3370 FIX check_mail: Fixed mail parsing bug when using POP3

by Lars Michelsen

Module: check_mk Branch: master Commit: e050c7661bdcb273043e26ac21e9a6c51e7da6ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e050c7661bdcb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 15:18:00 2016 +0200 3370 FIX check_mail: Fixed mail parsing bug when using POP3 --- .werks/3370 | 10 ++++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_mail | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3370 b/.werks/3370 new file mode 100644 index 0000000..11d9a09 --- /dev/null +++ b/.werks/3370 @@ -0,0 +1,10 @@ +Title: check_mail: Fixed mail parsing bug when using POP3 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459948670 + + diff --git a/ChangeLog b/ChangeLog index 3f2770d..592535a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * 3323 FIX: kernel.util: fix graph template in case steal is present but guest not * 3367 FIX: nginx_status: Fixed local instance detection for IPv6 loopback address * 3368 FIX: Fixed regression since 1.2.8b9 which broke all SNMP checks with Nagios core + * 3370 FIX: check_mail: Fixed mail parsing bug when using POP3 Multisite: * 3187 notification view: new filter for log command via regex diff --git a/doc/treasures/active_checks/check_mail b/doc/treasures/active_checks/check_mail index 6592aa2..306a07e 100755 --- a/doc/treasures/active_checks/check_mail +++ b/doc/treasures/active_checks/check_mail @@ -208,7 +208,7 @@ def fetch_mails(): for i in range(num_messages): index = i+1 lines = g_M.retr(index)[1] - mails[i] = email.message_from_string("".join(lines)) + mails[i] = email.message_from_string("\n".join(lines)) else: retcode, messages = g_M.search(None, 'NOT', 'DELETED') if retcode == 'OK' and messages[0].strip():

8 years, 5 months

3369 FIX Printing configuration warning when host references itself as parent

by Lars Michelsen

Module: check_mk Branch: master Commit: 58f7087984650c19adba1033e7b3d1175827299a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58f7087984650c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 15:08:39 2016 +0200 3369 FIX Printing configuration warning when host references itself as parent --- .werks/3369 | 10 ++++++++++ ChangeLog | 1 + web/plugins/wato/builtin_attributes.py | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/3369 b/.werks/3369 new file mode 100644 index 0000000..8c57742 --- /dev/null +++ b/.werks/3369 @@ -0,0 +1,10 @@ +Title: Printing configuration warning when host references itself as parent +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459948099 + + diff --git a/ChangeLog b/ChangeLog index 009e0f0..3f2770d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -227,6 +227,7 @@ * 3325 FIX: WATO CSV import: fix missing first line in preview after user error * 3365 FIX: Cleaned up wrong counting of parents when renaming a host * 3366 FIX: Fixed renaming of hosts not updating parents configured in folders + * 3369 FIX: Printing configuration warning when host references itself as parent Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index c838488..8e8b4ff 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -124,6 +124,9 @@ declare_host_attribute(ParentsAttribute(), def validate_host_parents(host): for parent_name in host.parents(): + if parent_name == host.name(): + raise MKUserError(None, _("You configured the host to be it's own parent, which is not allowed.")) + parent = Host.host(parent_name) if not parent: raise MKUserError(None, _("You defined the non-existing host '%s' as a parent.") % parent_name)

8 years, 5 months

3368 FIX Fixed regression since 1.2.8b9 which broke all SNMP checks with Nagios core

by Lars Michelsen

Module: check_mk Branch: master Commit: 85e7ca2ecd17f2a31f1278a10e283b0e4c8a10fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85e7ca2ecd17f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 14:45:31 2016 +0200 3368 FIX Fixed regression since 1.2.8b9 which broke all SNMP checks with Nagios core --- .werks/3368 | 10 ++++++++++ ChangeLog | 1 + modules/nagios.py | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/3368 b/.werks/3368 new file mode 100644 index 0000000..84cf63c --- /dev/null +++ b/.werks/3368 @@ -0,0 +1,10 @@ +Title: Fixed regression since 1.2.8b9 which broke all SNMP checks with Nagios core +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459946702 + + diff --git a/ChangeLog b/ChangeLog index da45c7d..009e0f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,6 +130,7 @@ * 3113 FIX: windows agent: fixed process handle weren't freed when using wmi-based ps check * 3323 FIX: kernel.util: fix graph template in case steal is present but guest not * 3367 FIX: nginx_status: Fixed local instance detection for IPv6 loopback address + * 3368 FIX: Fixed regression since 1.2.8b9 which broke all SNMP checks with Nagios core Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/nagios.py b/modules/nagios.py index debe7f1..8219f81 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -1131,6 +1131,7 @@ no_discovery_possible = None output.write("def is_tcp_host(hostname):\n return % r\n\n" % is_tcp_host(hostname)) output.write("def is_usewalk_host(hostname):\n return % r\n\n" % is_usewalk_host(hostname)) output.write("def snmpv3_contexts_of_host(hostname):\n return % r\n\n" % snmpv3_contexts_of_host(hostname)) + output.write("def is_inline_snmp_host(hostname):\n return % r\n\n" % is_inline_snmp_host(hostname)) if is_inline_snmp_host(hostname): output.write("def is_snmpv2c_host(hostname):\n return % r\n\n" % is_snmpv2c_host(hostname)) output.write("def is_bulkwalk_host(hostname):\n return % r\n\n" % is_bulkwalk_host(hostname))

8 years, 5 months

3326 FIX Fixed white text on white background in mobile GUI

by Mathias Kettner

Module: check_mk Branch: master Commit: ae8a3b7fad862de30a83dd9a566b8e8b649c24dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae8a3b7fad862d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 6 13:43:44 2016 +0200 3326 FIX Fixed white text on white background in mobile GUI --- .werks/3326 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/mobile.css | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/.werks/3326 b/.werks/3326 new file mode 100644 index 0000000..f7cab75 --- /dev/null +++ b/.werks/3326 @@ -0,0 +1,10 @@ +Title: Fixed white text on white background in mobile GUI +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459943006 + + diff --git a/ChangeLog b/ChangeLog index b669333..da45c7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -171,6 +171,7 @@ * 3320 FIX: Fix bogus interfering snapins Tree of folders and Folders... * 3321 FIX: Globes in dashboards now correctly reflect selected WATO folder... * 3364 FIX: Fixed exception when creating a view of a single log entry... + * 3326 FIX: Fixed white text on white background in mobile GUI WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css index aaf8f7d..a0ef3e5 100644 --- a/web/htdocs/mobile.css +++ b/web/htdocs/mobile.css @@ -82,7 +82,9 @@ body.mobile table.dataset { } body.mobile table.dataset tr.header { + color: black; } + body.mobile table.dataset tr.header th { } @@ -222,13 +224,44 @@ img.logomk { } +td.icons { + vertical-align: middle; +} + +div.popup_trigger { + display: inline-block; +} + td.icons img { height: 40px; width: 40px; + margin-left: 5px; } td.icons a { padding-left: 8px; } +div.popup_trigger > div.popup_menu { + display: inline-block; +} +div.popup_trigger > div.popup_menu a { + width: 40px; + display: inline-block; + overflow: hidden; + color: black; +} +div.popup_trigger > div.popup_menu a img { + margin-left: 0px; +} + +div.popup_trigger > div.popup_menu ul { + padding: 0; + margin: 0; +} + +div.popup_trigger > div.popup_menu li { + display: inline-block; + margin: 0px; +}

8 years, 5 months

3367 FIX nginx_status: Fixed local instance detection for IPv6 loopback address

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ffb64c7de52a495d44e89e8f2b80714a41704a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ffb64c7de52a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 13:14:14 2016 +0200 3367 FIX nginx_status: Fixed local instance detection for IPv6 loopback address --- .werks/3367 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3367 b/.werks/3367 new file mode 100644 index 0000000..68f1c34 --- /dev/null +++ b/.werks/3367 @@ -0,0 +1,10 @@ +Title: nginx_status: Fixed local instance detection for IPv6 loopback address +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459941206 + + diff --git a/ChangeLog b/ChangeLog index 83c0f91..b669333 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,7 @@ * 3112 FIX: esx_vsphere_counters: made levels configurable * 3113 FIX: windows agent: fixed process handle weren't freed when using wmi-based ps check * 3323 FIX: kernel.util: fix graph template in case steal is present but guest not + * 3367 FIX: nginx_status: Fixed local instance detection for IPv6 loopback address Multisite: * 3187 notification view: new filter for log command via regex

8 years, 5 months

3311 apc_netbotz_sensors, apc_netbotz_sensors.dewpoint,

by Simon Betz

apc_netbotz_sensors.humidity: new checks for APC Netbotz devices which support the NETBOTZV2 MIB Message-ID: <5704e015.qTEhhYUd/HX1v4Uc%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: a00ec145500c008c4a3f38c95dca523ef56213a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a00ec145500c00… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 6 12:07:14 2016 +0200 3311 apc_netbotz_sensors, apc_netbotz_sensors.dewpoint, apc_netbotz_sensors.humidity: new checks for APC Netbotz devices which support the NETBOTZV2 MIB --- .werks/3311 | 9 ++ ChangeLog | 1 + checkman/apc_netbotz_other_sensors | 23 ++++ checkman/apc_netbotz_sensors | 17 +++ checkman/apc_netbotz_sensors.dewpoint | 17 +++ checkman/apc_netbotz_sensors.humidity | 17 +++ checks/apc_netbotz_other_sensors | 75 +++++++++++++ checks/apc_netbotz_sensors | 190 +++++++++++++++++++++++++++++++++ 8 files changed, 349 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a00ec14550…

8 years, 5 months

3366 FIX Fixed renaming of hosts not updating parents configured in folders

by Lars Michelsen

Module: check_mk Branch: master Commit: 0f9223decb9382f0ca6b83e85723f3769f9a53dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f9223decb9382… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 12:02:14 2016 +0200 3366 FIX Fixed renaming of hosts not updating parents configured in folders --- .werks/3366 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/3366 b/.werks/3366 new file mode 100644 index 0000000..77b3d20 --- /dev/null +++ b/.werks/3366 @@ -0,0 +1,10 @@ +Title: Fixed renaming of hosts not updating parents configured in folders +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459936916 + + diff --git a/ChangeLog b/ChangeLog index da3035b..153b0e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -222,6 +222,7 @@ * 3324 FIX: Do not crash whole catalog of check plugins if one man page is broken * 3325 FIX: WATO CSV import: fix missing first line in preview after user error * 3365 FIX: Cleaned up wrong counting of parents when renaming a host + * 3366 FIX: Fixed renaming of hosts not updating parents configured in folders Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 546a7e1..a5822e3 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1611,6 +1611,7 @@ class Folder(BaseFolder): changed = rename_host_in_list(self._attributes["parents"], oldname, newname) self.mark_hosts_dirty() self.save_hosts() + self.save() return changed

8 years, 5 months

3365 FIX Cleaned up wrong counting of parents when renaming a host

by Lars Michelsen

Module: check_mk Branch: master Commit: 004c970e71ec1a48a6dd4e38e27786168c38cca4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=004c970e71ec1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 11:58:30 2016 +0200 3365 FIX Cleaned up wrong counting of parents when renaming a host --- .werks/3365 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 11 +++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/3365 b/.werks/3365 new file mode 100644 index 0000000..25774ec --- /dev/null +++ b/.werks/3365 @@ -0,0 +1,10 @@ +Title: Cleaned up wrong counting of parents when renaming a host +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459936688 + + diff --git a/ChangeLog b/ChangeLog index 89f2fe3..da3035b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -221,6 +221,7 @@ * 3363 FIX: Exceptions in WATO Web-API are now rendered as plain text messages * 3324 FIX: Do not crash whole catalog of check plugins if one man page is broken * 3325 FIX: WATO CSV import: fix missing first line in preview after user error + * 3365 FIX: Cleaned up wrong counting of parents when renaming a host Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3aef798..20e4c24 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1739,6 +1739,11 @@ def rename_host_as_cluster_node(all_hosts, oldname, newname): return [] +def rename_host_in_parents(oldname, newname): + parents = rename_host_as_parent(oldname, newname) + return [ "parents" ] * len(parents) + + def rename_host_as_parent(oldname, newname, in_folder=None): if in_folder == None: in_folder = Folder.root_folder() @@ -1753,9 +1758,6 @@ def rename_host_as_parent(oldname, newname, in_folder=None): if in_folder.rename_parent(oldname, newname): parents.append(in_folder.name()) - if parents: - parents = [ "parents" ] * len(parents) - for subfolder in in_folder.subfolders().values(): parents += rename_host_as_parent(oldname, newname, subfolder) @@ -1937,7 +1939,7 @@ def rename_hosts(renamings): this_host_actions = [] this_host_actions += rename_host_in_folder(folder, oldname, newname) this_host_actions += rename_host_as_cluster_node(all_hosts, oldname, newname) - this_host_actions += rename_host_as_parent(oldname, newname) + this_host_actions += rename_host_in_parents(oldname, newname) this_host_actions += rename_host_in_rulesets(folder, oldname, newname) this_host_actions += rename_host_in_bi(oldname, newname) actions += this_host_actions @@ -2003,6 +2005,7 @@ def render_renaming_actions(action_counts): "Please update your DNS or configure an IP address for the affected host.") % what.split("-", 1)[1] else: text = action_titles.get(what, what) + if count > 1: text += _(" (%d times)" % count) texts.append(text)

8 years, 5 months

3325 FIX WATO CSV import: fix missing first line in preview after user error

by Mathias Kettner

Module: check_mk Branch: master Commit: 790d990042b3ce7382d484f9659e829ad8a9134c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=790d990042b3ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 6 11:57:06 2016 +0200 3325 FIX WATO CSV import: fix missing first line in preview after user error --- .werks/3325 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/3325 b/.werks/3325 new file mode 100644 index 0000000..ba23183 --- /dev/null +++ b/.werks/3325 @@ -0,0 +1,10 @@ +Title: WATO CSV import: fix missing first line in preview after user error +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459936602 + + diff --git a/ChangeLog b/ChangeLog index 8c68020..89f2fe3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -220,6 +220,7 @@ * 3362 FIX: Fixed reload of Event Console in distributed monitoring slave site * 3363 FIX: Exceptions in WATO Web-API are now rendered as plain text messages * 3324 FIX: Do not crash whole catalog of check plugins if one man page is broken + * 3325 FIX: WATO CSV import: fix missing first line in preview after user error Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1c443e5..3aef798 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3179,6 +3179,7 @@ class ModeBulkImport(WatoMode): attributes = self._attribute_choices() + self._read_csv_file() # first line could be missing in situation of import error if not self._csv_reader: return # don't try to show preview when CSV could not be read

8 years, 5 months

3324 FIX Do not crash whole catalog of check plugins if one man page is broken

by Mathias Kettner

Module: check_mk Branch: master Commit: 08fde23dcd28084677857dc90eaa2cbef6851b3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08fde23dcd2808… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 6 11:35:29 2016 +0200 3324 FIX Do not crash whole catalog of check plugins if one man page is broken --- .werks/3324 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 16 ++++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.werks/3324 b/.werks/3324 new file mode 100644 index 0000000..2846fc0 --- /dev/null +++ b/.werks/3324 @@ -0,0 +1,10 @@ +Title: Do not crash whole catalog of check plugins if one man page is broken +Level: 2 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459935309 + + diff --git a/ChangeLog b/ChangeLog index 77563e8..8c68020 100644 --- a/ChangeLog +++ b/ChangeLog @@ -219,6 +219,7 @@ * 3361 FIX: Event Console files not synced to remote site nor backed up with WATO snapshot * 3362 FIX: Fixed reload of Event Console in distributed monitoring slave site * 3363 FIX: Exceptions in WATO Web-API are now rendered as plain text messages + * 3324 FIX: Do not crash whole catalog of check plugins if one man page is broken Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/modules/check_mk.py b/modules/check_mk.py index b3e4e92..9e5df42 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2482,8 +2482,7 @@ def read_manpage_catalog(): except Exception, e: if opt_debug: raise - raise MKGeneralException('ERROR: Skipping invalid manpage: %s: %s\n' % (checkname, e)) - continue + parsed = create_fallback_manpage(checkname, path, e) if "catalog" in parsed: cat = parsed["catalog"] @@ -2587,6 +2586,19 @@ def dialog_menu(title, text, choices, defvalue, oktext, canceltext): return run_dialog(args) +def create_fallback_manpage(checkname, path, error_message): + return { + "name" : checkname, + "path" : path, + "description" : file(path).read().strip(), + "title" : "%s: Cannot parse man page: %s" % (checkname, error_message), + "agents" : "", + "license" : "unknown", + "distribution" : "unknown", + "catalog" : [ "generic" ], + } + + def parse_man_header(checkname, path): parsed = {} parsed["name"] = checkname

8 years, 5 months

← Newer
1
...
27
28
29
30
31
32
33
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016