Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 173a04a34472961631df6b379b5968e8d7ab59f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=173a04a3447296… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 12:30:16 2016 +0100 Updated bug entries #2481 --- .bugs/2481 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2481 b/.bugs/2481 index 461e3b7..88572d5 100644 --- a/.bugs/2481 +++ b/.bugs/2481 @@ -1,9 +1,11 @@ Title: WATO CSV-Import: no error handling in case of empty/missing file Component: wato -State: open +Class: bug +State: done Date: 2016-03-18 11:32:29 Targetversion: 1.2.8 -Class: bug it is possible to not select any file. Nevertheless you come to the next screen which is obviously useless. + +2016-03-21 12:30:14: changed state open -> done

8 years, 6 months

WATO bulk import: relable button with Abort, not Back

by Mathias Kettner

Module: check_mk Branch: master Commit: e9e50c727c28d8f76fc64893224c5638310483f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9e50c727c28d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 12:28:53 2016 +0100 WATO bulk import: relable button with Abort, not Back --- 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 2e5a555..ecd7132 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2960,7 +2960,7 @@ class ModeBulkImport(WatoMode): def buttons(self): - html.context_button(_("Back"), folder_preserving_link([("mode", "folder")]), "back") + html.context_button(_("Abort"), folder_preserving_link([("mode", "folder")]), "abort") def action(self):

8 years, 6 months

Fixed case of title of WATO module

by Mathias Kettner

Module: check_mk Branch: master Commit: 6b38bc06c6b469482baff0e8e90b2f09661e6e0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b38bc06c6b469… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 12:28:33 2016 +0100 Fixed case of title of WATO module --- 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 2f4e479..2e5a555 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2956,7 +2956,7 @@ class ModeBulkImport(WatoMode): def title(self): - return _("Bulk Host Import") + return _("Bulk host import") def buttons(self):

8 years, 6 months

3316 FIX Fix validation of empty or missing file uploads ( such as in Bulk host import)

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ffe7c7021098acd27d82acc2a1595f73017487e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ffe7c7021098a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 12:29:23 2016 +0100 3316 FIX Fix validation of empty or missing file uploads (such as in Bulk host import) --- .werks/3316 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 14 +++++++++----- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.werks/3316 b/.werks/3316 new file mode 100644 index 0000000..87b4883 --- /dev/null +++ b/.werks/3316 @@ -0,0 +1,10 @@ +Title: Fix validation of empty or missing file uploads (such as in Bulk host import) +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458559742 + + diff --git a/ChangeLog b/ChangeLog index c3ba176..5536aff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -157,6 +157,7 @@ * 3295 FIX: Fixed exception in WATO git integration when modifying .gitingore file * 3296 FIX: Hiding pending changes related buttons after discarding changes * 3314 FIX: Correctly add custom user attribute values after change in attribute declaration... + * 3316 FIX: Fix validation of empty or missing file uploads (such as in Bulk host import) Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ae8f5be..97fd7c8 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3313,7 +3313,7 @@ class FileUpload(ValueSpec): ValueSpec.__init__(self, **kwargs) self._allow_empty = kwargs.get('allow_empty', True) self._allowed_extensions = kwargs.get('allowed_extensions') - self._allow_empty_content= kwargs.get('allow_empty_content', True) + self._allow_empty_content = kwargs.get('allow_empty_content', True) def canonical_value(self): @@ -3326,7 +3326,7 @@ class FileUpload(ValueSpec): def validate_value(self, value, varprefix): file_name, mime_type, content = value - if not self._allow_empty and (value == None or file_name == ''): + if not self._allow_empty and (content == '' or file_name == ''): raise MKUserError(varprefix, _('Please select a file.')) if not self._allow_empty_content and len(content) == 0: @@ -3358,12 +3358,16 @@ class FileUpload(ValueSpec): class UploadOrPasteTextFile(Alternative): def __init__(self, **kwargs): file_title = kwargs.get("file_title", _("File")) + allow_empty = kwargs.get("allow_empty", True) kwargs["elements"] = [ - FileUpload(title = _("Upload %s") % file_title), + FileUpload( + title = _("Upload %s") % file_title, + allow_empty = allow_empty), TextAreaUnicode( title = _("Content of %s") % file_title, - cols=80, - rows="auto"), + allow_empty = allow_empty, + cols = 80, + rows = "auto"), ] if kwargs.get("default_mode", "text") == "upload":

8 years, 6 months

3315 FIX Builtin icon visibility now can be correctly reset

by Mathias Kettner

Module: check_mk Branch: master Commit: fa17b8bc5392358d336b9b3ef06c34276ee13258 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa17b8bc539235… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 12:10:18 2016 +0100 3315 FIX Builtin icon visibility now can be correctly reset After changing an icon to {{Show in column}} you could never reset this back without a restart of the site Apache. This has been fixed. --- .werks/3315 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/painters.py | 18 ++++++++++++------ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.werks/3315 b/.werks/3315 new file mode 100644 index 0000000..e5f86cc --- /dev/null +++ b/.werks/3315 @@ -0,0 +1,11 @@ +Title: Builtin icon visibility now can be correctly reset +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458558544 + +After changing an icon to {{Show in column}} you could never reset this back +without a restart of the site Apache. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 2a8f293..c3ba176 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,6 +120,7 @@ * 3293 FIX: Fixed graphs in IE with enabled compatibility mode (for IE < 8) * 3294 FIX: Fixed mixed languages when some users have localized GUI and some not... * 3313 FIX: Set correct mime type when exporting CSV and other non-HTML formats + * 3315 FIX: Builtin icon visibility now can be correctly reset... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 46c13af..1daba9a 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -234,17 +234,23 @@ load_web_plugins('icons', globals()) def get_multisite_icons(): icons = {} - for icon_id, icon in multisite_icons_and_actions.items(): - icon.setdefault('toplevel', False) - icon.setdefault('sort_index', 30) + for icon_id, icon_config in multisite_icons_and_actions.items(): + icon = { + "toplevel" : False, + "sort_index" : 30, + } + icon.update(icon_config) icons[icon_id] = icon # multisite_icons has been deprecated, but to be compatible to old icon # plugins transform them to the new structure. We use part of the paint # function name as icon id. - for icon in multisite_icons: - icon.setdefault('toplevel', False) - icon.setdefault('sort_index', 30) + for icon_config in multisite_icons: + icon = { + "toplevel" : False, + "sort_index" : 30, + } + icon.update(icon_config) icon_id = icon['paint'].__name__.replace('paint_', '') icons[icon_id] = icon

8 years, 6 months

Updated bug entries #2480

by Mathias Kettner

Module: check_mk Branch: master Commit: 5f452e5b1b87c838167854a62fe117df75d2b4e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f452e5b1b87c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 12:10:44 2016 +0100 Updated bug entries #2480 --- .bugs/2480 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2480 b/.bugs/2480 index 0ea3940..be91ab1 100644 --- a/.bugs/2480 +++ b/.bugs/2480 @@ -1,9 +1,9 @@ Title: Builtin icon visibility is not reset correctly Component: multisite -State: open +Class: bug +State: done Date: 2016-03-18 11:07:36 Targetversion: 1.2.8 -Class: bug If you change the builtin icon visibility in global settings and want to to reset it, it is not reset back to the system default. The icons are randomly missing or shown in the @@ -11,3 +11,5 @@ wrong place. For example: place reschedule in column directly. It is shown correct. After that, if reset to default button is used, the icons are not shown in the action menu again. It is randomly shown in column or it is missing completly. + +2016-03-21 12:10:40: changed state open -> done

8 years, 6 months

3300 FIX zfsget: Fixed excluding snapshots from zfsget section

by Lars Michelsen

Module: check_mk Branch: master Commit: d90ea94d4ee704a50c88d2e06c2b2383f3469019 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d90ea94d4ee704… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 11:59:32 2016 +0100 3300 FIX zfsget: Fixed excluding snapshots from zfsget section --- .werks/3300 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.freebsd | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3300 b/.werks/3300 new file mode 100644 index 0000000..49c2bda --- /dev/null +++ b/.werks/3300 @@ -0,0 +1,10 @@ +Title: zfsget: Fixed excluding snapshots from zfsget section +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458557924 + + diff --git a/ChangeLog b/ChangeLog index 939c836..2a8f293 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * 3104 FIX: ipmi: fixed crash when using summarized output with nagios backend * 3298 FIX: winperf_processor.util: Fixed exception when CPU counters were not matched * 3299 FIX: mssql_backup: Fixed exception in case of invalid agent output + * 3300 FIX: zfsget: Fixed excluding snapshots from zfsget section Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index a5e65f9..4b5ded9 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -131,7 +131,7 @@ fi # Filesystem usage for ZFS if type zfs > /dev/null 2>&1 ; then echo '<<<zfsget>>>' - zfs get -Hp name,quota,used,avail,mountpoint,type -t filesystem,volume || \ + zfs get -t filesystem,volume -Hp name,quota,used,avail,mountpoint,type || \ zfs get -Hp name,quota,used,avail,mountpoint,type echo '[df]' df -kP -t zfs | sed 1d

8 years, 6 months

Updated bug entries #2460

by Mathias Kettner

Module: check_mk Branch: master Commit: 2d1184abcae793dfb83986fa611ccac340178559 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d1184abcae793… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 11:35:27 2016 +0100 Updated bug entries #2460 --- .bugs/2460 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.bugs/2460 b/.bugs/2460 index c8b9b7a..4fcf4d6 100644 --- a/.bugs/2460 +++ b/.bugs/2460 @@ -2,7 +2,8 @@ Title: BI Aggregation tree is not rendered in PDF reports Component: multisite State: open Date: 2016-03-01 11:16:33 -Targetversion: 1.2.8 -Class: bug +Targetversion: 1.2.9 +Class: todo -The content of the BI tree state is only shown as text. The HTML tags are stripped of the painter. +The content of the BI tree state is only shown as text. The HTML tags are +stripped of the painter.

8 years, 6 months

Updated bug entries #2428, #2429

by Mathias Kettner

Module: check_mk Branch: master Commit: 2ad60510fd496c61cc42f60c2ed213b040b01ab7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ad60510fd496c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 11:32:31 2016 +0100 Updated bug entries #2428, #2429 --- .bugs/2428 | 2 +- .bugs/2429 | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.bugs/2428 b/.bugs/2428 index a845f75..15eee87 100644 --- a/.bugs/2428 +++ b/.bugs/2428 @@ -2,7 +2,7 @@ Title: Make a clean install of the agents/ directory Component: core State: open Date: 2016-03-09 10:58:31 -Targetversion: 1.2.8 +Targetversion: 1.2.9 Class: bug The contents of the source code direcgory agents/ in the GIT cannot shipped 1:1 diff --git a/.bugs/2429 b/.bugs/2429 index 572b641..8432d13 100644 --- a/.bugs/2429 +++ b/.bugs/2429 @@ -1,10 +1,9 @@ -Title: OMD site with AUTOSTART off is partially started after server boot +Title: Service crontab survives hard crash of server Component: core State: open Date: 2016-03-15 17:04:31 Targetversion: 1.2.8 -Class: bug +Class: nastiness -If you boot your server then a site with AUTOSTART off -is partially started due to the crontab entry being started. -This prevents e.g. omd config. +We should run an own cron daemon in each site. This +needs patches to cron.

8 years, 6 months

3299 FIX mssql_backup: Fixed exception in case of invalid agent output

by Lars Michelsen

Module: check_mk Branch: master Commit: 4db998dd63f9acf937ecc902d9656b241d1d08f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4db998dd63f9ac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 11:34:43 2016 +0100 3299 FIX mssql_backup: Fixed exception in case of invalid agent output --- .werks/3299 | 10 ++++++++++ ChangeLog | 1 + checks/mssql_backup | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/3299 b/.werks/3299 new file mode 100644 index 0000000..b6d5848 --- /dev/null +++ b/.werks/3299 @@ -0,0 +1,10 @@ +Title: mssql_backup: Fixed exception in case of invalid agent output +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458556468 + + diff --git a/ChangeLog b/ChangeLog index 9fd108c..939c836 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ * 3238 FIX: if.include: Fixed handling of old-skool traffic limits * 3104 FIX: ipmi: fixed crash when using summarized output with nagios backend * 3298 FIX: winperf_processor.util: Fixed exception when CPU counters were not matched + * 3299 FIX: mssql_backup: Fixed exception in case of invalid agent output Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/mssql_backup b/checks/mssql_backup index 7e14a63..47f865b 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -38,6 +38,9 @@ def inventory_mssql_backup(info): def check_mssql_backup(item, params, info): for line in info: + if len(line) not in [3, 4]: + continue + last_backup_date = False try: inst, tablespace, last_backup_date, last_backup_time = line

8 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016