Checkmk git commits

checkmk-commits@lists.checkmk.com

64380 discussions

Check_MK Git: check_mk: FIX: Added error handling when trying to --restore with a non existant file

by Lars Michelsen

Module: check_mk Branch: master Commit: d86195274f695575121ce71f9461f4d2d1f787b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d86195274f6955… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 10:12:27 2013 +0100 FIX: Added error handling when trying to --restore with a non existant file --- .bugs/807 | 7 +++++-- ChangeLog | 1 + modules/check_mk.py | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.bugs/807 b/.bugs/807 index 75ab120..f5a42e8 100644 --- a/.bugs/807 +++ b/.bugs/807 @@ -1,9 +1,12 @@ Title: cmk --restore does report errors Component: core -State: open +Class: cleanup +State: done Date: 2012-10-10 12:58:08 Targetversion: 1.2.0 -Class: cleanup cmk --restore does not set an returncode != 1 or print errors if the restore failed if the input file was unreadable or missing or somehow else troubled. + +2013-01-04 10:11:48: changed state open -> done +Added error message when the file given to restore does not exist diff --git a/ChangeLog b/ChangeLog index 6ae1cc0..9230d87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * Do object cache precompile for monitoring core on cmk -R/-O * Avoid duplicate verification of monitoring config on cmk -R/-O * FIX: Parameter --cleanup-autochecks (long for -u) works now like suggested in help + * FIX: Added error handling when trying to --restore with a non existant file Notifications: * Fix flexible notifications on non-OMD systems diff --git a/modules/check_mk.py b/modules/check_mk.py index a35e1cb..ad39048 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3278,6 +3278,9 @@ def do_restore(tarname): if opt_verbose: sys.stderr.write("Restoring from '%s'...\n" % tarname) + if not os.path.exists(tarname): + raise MKGeneralException("Unable to restore: File does not exist") + for name, path, canonical_name, descr, is_dir, owned_by_nagios, group_www in backup_paths: absdir = os.path.abspath(path) if is_dir:

11 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0771

by Lars Michelsen

Module: check_mk Branch: master Commit: 7798a56179490d0f0a694ef0a26f9d2834576441 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7798a56179490d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 13:27:37 2013 +0100 Updated bug entries #0771 --- .bugs/771 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/771 b/.bugs/771 index 51c9dc1..51ab36e 100644 --- a/.bugs/771 +++ b/.bugs/771 @@ -1,11 +1,15 @@ Title: Services in Hosttables: wrong headings Component: multisite -State: open +Class: nastiness +State: done Date: 2012-06-14 13:29:43 Targetversion: 1.2.0 -Class: nastiness When adding service columns to host tables the column headers of those columns should be the service name, not the title of the painter. The latter one is for example "Perf-O-Meter". Better would be "CPU load". (if this is not specified by the user in the first place). + +2013-01-04 13:27:34: changed state open -> done +Just implemented this change. Using service description (join index) when no title defined in +the view for this column.

11 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0820

by Lars Michelsen

Module: check_mk Branch: master Commit: 5044b588c157b2b94df9484e3074b4814c48b85c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5044b588c157b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 10:17:09 2013 +0100 Updated bug entries #0820 --- .bugs/820 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/820 b/.bugs/820 index e325b99..3b9f6de 100644 --- a/.bugs/820 +++ b/.bugs/820 @@ -1,8 +1,11 @@ Title: Refreshing of row count in multisite Component: multisite -State: open +Class: nastiness +State: done Date: 2012-10-24 11:54:14 Targetversion: future -Class: nastiness The count of row in the upper corner of Mulisite show 0/n Rows after automatic refresh, even when the checkboxes not activated. + +2013-01-04 10:16:00: changed state open -> done +Seems to already be solved.

11 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0739

by Lars Michelsen

Module: check_mk Branch: master Commit: 35ab0c891f1d8257b33ed4ce23c6ef1184443507 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35ab0c891f1d82… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 10:00:10 2013 +0100 Updated bug entries #0739 --- .bugs/739 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/739 b/.bugs/739 index 2a27e83..235345e 100644 --- a/.bugs/739 +++ b/.bugs/739 @@ -1,9 +1,9 @@ Title: KeyError in check_info when check is removed Component: core -State: open +Class: bug +State: done Date: 2012-09-03 12:07:34 Targetversion: 1.1.12 -Class: bug If a check is removed witch used default_levels, cmk breaks on each action with an key error: cmk --flush apc-ap7930 @@ -17,3 +17,7 @@ Traceback (most recent call last): File "/omd/sites/aaa/share/check_mk/modules/check_mk.py", line 4451, in compute_check_parameters def_levels_varname = check_info[checktype].get("default_levels_variable") KeyError: 'apc_battery_status' + +2013-01-04 10:00:08: changed state open -> done +This handling seems to be already fixed. Removed an inventorized check without problems +using --flush and -II.

11 years, 8 months

Check_MK Git: check_mk: FIX: Services in hosttables now use the service name as header ( if no custom title set)

by Lars Michelsen

Module: check_mk Branch: master Commit: fc7fc9e4fdb98f1598c48e5785e2ca64b3aa434e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc7fc9e4fdb98f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 13:27:39 2013 +0100 FIX: Services in hosttables now use the service name as header (if no custom title set) --- ChangeLog | 1 + web/htdocs/views.py | 3 ++- web/plugins/views/layouts.py | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9230d87..53d0026 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ * FIX: Views: toggling forms does not disable the checkbox button anymore * FIX: Dashboard: Fixed wrong display options in links after data reloads * FIX: Fixed "remove all downtimes" button in views when no downtimes to be deleted + * FIX: Services in hosttables now use the service name as header (if no custom title set) WATO: * FIX: Fixed generated manual check definitions for checks without items diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 04ad94f..89d9ada 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2440,8 +2440,9 @@ def paint_header(view, p): t = painter.get("short", painter["title"]) if len(p) >= 4: # join column join_index = p[3] + t = p[3] # use join index (service name) as title if len(p) >= 5 and p[4]: - t = p[4] + t = p[4] # use custom defined title # Optional: Sort link in title cell # Use explicit defined sorter or implicit the sorter with the painter name diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index cd6d3fd..1d63b5a 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -78,6 +78,8 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig painter, link = p[0:2] if len(p) >= 5 and p[4]: title = p[4] # Use custom title + elif len(p) == 4 and p[3]: + title = p[3] # Use the join index (service name) as title else: title = painter["title"]

11 years, 8 months

Check_MK Git: check_mk: Fixed sorting problem in dashboard after yesterdays change

by Lars Michelsen

Module: check_mk Branch: master Commit: 4dd7106f44dc4cf053d4a23f157ce4359d0b1781 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dd7106f44dc4c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 13:46:29 2013 +0100 Fixed sorting problem in dashboard after yesterdays change --- web/htdocs/views.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 89d9ada..b6a0dbe 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1138,6 +1138,7 @@ def prepare_display_options(): display_options = html.var("_display_options", "") display_options = apply_display_option_defaults(display_options) html.display_options = display_options + html.title_display_options = display_options # But there is one special case: The sorter links! These links need to know # about the provided display_option parameter. The links could use

11 years, 8 months

Check_MK Git: check_mk: FIX: Fixed "remove all downtimes"

by Lars Michelsen

button in views when no downtimes to be deleted Message-ID: <50e6cf2c.rvCsRx2apPz6Fx2f%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 84cd77327d6e8dd9a1dd78eecf890560cdff037a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84cd77327d6e8d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 09:43:35 2013 +0100 FIX: Fixed "remove all downtimes" button in views when no downtimes to be deleted --- .bugs/662 | 9 +++++++-- ChangeLog | 1 + web/htdocs/views.py | 13 ++++++++++--- web/plugins/views/commands.py | 1 + 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.bugs/662 b/.bugs/662 index 850773b..ab19dce 100644 --- a/.bugs/662 +++ b/.bugs/662 @@ -1,9 +1,9 @@ Title: "Remove All" downtimes command button selection problem Component: multisite -State: open +Class: bug +State: done Date: 2012-10-26 10:55:14 Targetversion: 1.2.0 -Class: bug Set a downtime for multiple services within a view @@ -11,3 +11,8 @@ Try to remove these downtimes with the "Remove all" button, but additionally sel downtime set -> Shows error "Sorry. This function is not implemented" Select exactly the services in downtime and press "Remove all" -> working + +2013-01-04 09:42:59: changed state open -> done +Has been changed to work even if there was no downtime available to delete. The "success" message shows +up a note "no data row", means no downtime has been deleted. But this is no error message, since the +result is as expected: No downtimes (anymore). diff --git a/ChangeLog b/ChangeLog index d0f941d..6ae1cc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * Views: Commands/Checkboxes buttons are now activated dynamically (depending on data displayed) * FIX: Views: toggling forms does not disable the checkbox button anymore * FIX: Dashboard: Fixed wrong display options in links after data reloads + * FIX: Fixed "remove all downtimes" button in views when no downtimes to be deleted WATO: * FIX: Fixed generated manual check definitions for checks without items diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 615604e..04ad94f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2126,7 +2126,10 @@ def core_command(what, row): commands, title = result break - if not commands: + # Use the title attribute to determine if a command exists, since the list + # of commands might be empty (e.g. in case of "remove all downtimes" where) + # no downtime exists in a selection of rows. + if not title: raise MKUserError(None, _("Sorry. This command is not implemented.")) # Some commands return lists of commands, others @@ -2176,15 +2179,19 @@ def do_actions(view, what, action_rows, backurl): executor(command, row["site"]) count += 1 + message = None if command: message = _("Successfully sent %d commands.") % count if config.debug: message += _("The last one was: <pre>%s</pre>") % command + elif count == 0: + message = _("No matching data row. No command sent.") + + if message: if html.output_format == "html": # sorry for this hack message += '<br><a href="%s">%s</a>' % (backurl, _('Back to view')) html.message(message) - elif count == 0: - html.message(_("No matching data row. No command sent.")) + return True def get_selected_rows(view, rows, sel_var): diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index a9b4998..3bb02e3 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -367,6 +367,7 @@ def command_downtime(cmdtag, spec, row): for id in row[prefix + "downtimes"]: if id != "": downtime_ids.append(int(id)) + commands = [] for dtid in downtime_ids: commands.append("DEL_%s_DOWNTIME;%d\n" % (cmdtag, dtid))

11 years, 8 months

Check_MK Git: check_mk: FIX: Changed logging output " Time to process request" to be debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a69c5b644b26634c265b847ca11f5f9e930fcb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a69c5b644b266… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 08:57:41 2013 +0100 FIX: Changed logging output "Time to process request" to be debug output --- .bugs/867 | 7 +++++-- .bugs/870 | 7 +++++-- ChangeLog | 3 +++ livestatus/src/Store.cc | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.bugs/867 b/.bugs/867 index 0f6210a..a965154 100644 --- a/.bugs/867 +++ b/.bugs/867 @@ -1,8 +1,11 @@ Title: All rules get the dict key "docu_url" - is it really wanted? Component: wato -State: open +Class: cleanup +State: done Date: 2012-10-25 15:45:59 Targetversion: future -Class: cleanup Since the comment and docu url have been implemented, the rules always get the dict added with an empty 'docu_url' key/value. + +2013-01-04 08:52:03: changed state open -> done +Has already been fixed diff --git a/.bugs/870 b/.bugs/870 index 89b9435..b1b8dd4 100644 --- a/.bugs/870 +++ b/.bugs/870 @@ -1,12 +1,15 @@ Title: livestatus.log is spammed with "Time to process request" Component: livestatus -State: open +Class: cleanup +State: done Date: 2012-10-26 12:31:04 Targetversion: future -Class: cleanup Seems on each livestatus request a log entry "2012-10-26 12:25:49 Time to process request" is sent to the livestatus logfile. This entry is not very informative, why not simply drop it? + +2013-01-04 08:56:47: changed state open -> done +Seems to be debug outout. Added if (g_debug_level > 0). diff --git a/ChangeLog b/ChangeLog index d7115e4..d0f941d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,9 @@ * FIX: remove event pipe on program shutdown, prevents syslog freeze * FIX: hostnames in livestatus query now being utf8 encoded + Livestatus: + * FIX: Changed logging output "Time to process request" to be debug output + 1.2.1i3: Core: * added HOST/SERVICEPROBLEMID to notification macros diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 269059a..fee45ee 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -156,7 +156,8 @@ void Store::answerCommandRequest(const char *command) void Store::answerGetRequest(InputBuffer *input, OutputBuffer *output, const char *tablename) { output->reset(); - logger(LG_INFO, "Time to process request"); + if (g_debug_level > 0) + logger(LG_INFO, "Time to process request"); if (!tablename[0]) { output->setError(RESPONSE_CODE_INVALID_REQUEST, "Invalid GET request, missing tablename"); }

11 years, 8 months

Check_MK Git: check_mk: FIX: Dashboard: Fixed wrong display options in links after data reloads

by Lars Michelsen

Module: check_mk Branch: master Commit: 02e8988b06a16304fda9f6dca8e3682201e372ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02e8988b06a163… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 3 14:42:10 2013 +0100 FIX: Dashboard: Fixed wrong display options in links after data reloads --- ChangeLog | 1 + web/htdocs/dashboard.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09abe5d..d7115e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,7 @@ * FIX: Speedometer: Terminating data updates when snapin is removed from sidebar * Views: Commands/Checkboxes buttons are now activated dynamically (depending on data displayed) * FIX: Views: toggling forms does not disable the checkbox button anymore + * FIX: Dashboard: Fixed wrong display options in links after data reloads WATO: * FIX: Fixed generated manual check definitions for checks without items diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 38cb324..7587ccf 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -211,7 +211,7 @@ def render_dashlet(nr, dashlet, wato_folder): # The method "view" is a shortcut for "iframe" with a certain url if "view" in dashlet: - dashlet["iframe"] = "view.py?view_name=%s&display_options=HRSIXL&_body_class=dashlet" % dashlet["view"] + dashlet["iframe"] = "view.py?view_name=%s&_display_options=HRSIXL&_body_class=dashlet" % dashlet["view"] # The content is rendered only if it is fixed. In the # other cases the initial (re)-size will paint the content.

11 years, 9 months

Check_MK Git: check_mk: FIX: Views: toggling forms does not disable the checkbox button anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 87c62cae6e99f69c65b85d1593efe8ad90322bc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87c62cae6e99f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 3 12:57:33 2013 +0100 FIX: Views: toggling forms does not disable the checkbox button anymore --- ChangeLog | 3 ++- web/htdocs/js/checkmk.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8741afb..09abe5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,7 +74,8 @@ * FIX: Sidebar not raising exceptions on configured but not available snapins * FIX: Quicksearch: Fixed Up/Down arrow handling in chrome * FIX: Speedometer: Terminating data updates when snapin is removed from sidebar - * Commands/Checkboxes buttons are now activated dynamically (depending on data displayed) + * Views: Commands/Checkboxes buttons are now activated dynamically (depending on data displayed) + * FIX: Views: toggling forms does not disable the checkbox button anymore WATO: * FIX: Fixed generated manual check definitions for checks without items diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 4d86f79..1f135e6 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1689,11 +1689,11 @@ function view_toggle_form(oButton, idForm) { if (oForm) oForm.style.display = display; - // Make all other buttons inactive + // Make other buttons inactive var allbuttons = document.getElementsByClassName('togglebutton'); for (var i=0; i<allbuttons.length; i++) { var b = allbuttons[i]; - if (b != oButton && !has_class(b, "empth")) { + if (b != oButton && !has_class(b, "empth") && !has_class(b, "checkbox")) { remove_class(b, "down") add_class(b, "up") }

11 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits