Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1720 FIX Remove bogus column H.Down if " Consider times where the host is down" is switch off

by Mathias Kettner

Module: check_mk Branch: master Commit: 019ac78ed318a4cd334a713937bf43219cb2f539 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=019ac78ed318a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 22:30:07 2014 +0100 #1720 FIX Remove bogus column H.Down if "Consider times where the host is down" is switch off That column would be displayed nevertheless and was also zero. --- .werks/1720 | 9 +++++++++ ChangeLog | 3 +++ web/plugins/views/availability.py | 2 ++ 3 files changed, 14 insertions(+) diff --git a/.werks/1720 b/.werks/1720 new file mode 100644 index 0000000..463e8d4 --- /dev/null +++ b/.werks/1720 @@ -0,0 +1,9 @@ +Title: Remove bogus column H.Down if "Consider times where the host is down" is switch off +Level: 1 +Component: reporting +Compatible: compat +Version: 1.2.5i7 +Date: 1418074135 +Class: fix + +That column would be displayed nevertheless and was also zero. diff --git a/ChangeLog b/ChangeLog index 5ac7b22..e09711c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -250,6 +250,9 @@ * 1559 FIX: Fix link from BI icon to BI views (aggregations affected by this host/service) * 1692 FIX: Aggregations with umlauts in title/topic can now be displayed in BI/Availability + Reporting & Availability: + * 1720 FIX: Remove bogus column H.Down if "Consider times where the host is down" is switch off... + Event Console: * 1169 Added host state type filter to "recent event history" view * 1718 Show groups of regex match of events in details views of Event Console diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index af317a0..ffdbe04 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1300,6 +1300,8 @@ def render_availability_group(group_title, range_title, group_id, availability, return False elif sid == "flapping" and not avoptions["consider"]["flapping"]: return False + elif sid == "host_down" and not avoptions["consider"]["host_down"]: + return False elif sid in [ "warn", "unknown", "host_down" ] and sid not in state_groups: return False else:

9 years, 9 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 6cd33175488e1779d2c935ba60d65a5fdbe201ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cd33175488e17… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 21:23:38 2014 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index bdc2aea..57bf58c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1717 +1727

9 years, 9 months

Check_MK Git: check_mk: #1717 Split up LDAP configuration dialog into four boxes

by Mathias Kettner

Module: check_mk Branch: master Commit: cf8ef2b6cd67d80fca37f9cc738dfbb95182a78d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf8ef2b6cd67d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 21:25:50 2014 +0100 #1717 Split up LDAP configuration dialog into four boxes This allows folding part of the configuration and easier access to the <i>Save & Test</i> button. --- .werks/1717 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 10 ++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/1717 b/.werks/1717 new file mode 100644 index 0000000..236c0fb --- /dev/null +++ b/.werks/1717 @@ -0,0 +1,9 @@ +Title: Split up LDAP configuration dialog into four boxes +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1418070310 +Class: feature + +This allows folding part of the configuration and easier access to the <i>Save & Test</i> button. diff --git a/ChangeLog b/ChangeLog index 9fd9228..9286c23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -210,6 +210,7 @@ * 1689 Creating WATO backends for each configured site now... * 1690 Pending changes can now be discarded... * 1693 Added search form to global settings page... + * 1717 Split up LDAP configuration dialog into four boxes... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7b88e45..63c9974 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7208,10 +7208,16 @@ def mode_ldap_config(phase): html.write('<div id=ldap>') html.write('<table><tr><td>') html.begin_form('ldap_config', method = "POST", action = 'wato.py?mode=ldap_config') - forms.header(_('LDAP Settings')) + need_header = True for (var, valuespec) in vs: value = current_settings.get(var, valuespec.default_value()) - forms.section(valuespec.title()) + if isinstance(valuespec, Dictionary): + valuespec._render = "form" + else: + if need_header: + forms.header(_('Other Settings')) + need_header = False + forms.section(valuespec.title()) valuespec.render_input(var, value) html.help(valuespec.help()) forms.end()

9 years, 9 months

Check_MK Git: check_mk: Fix size of icons in LDAP connection test

by Mathias Kettner

Module: check_mk Branch: master Commit: d758d231ab25d4396525bb14a278105517159037 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d758d231ab25d4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 21:23:30 2014 +0100 Fix size of icons in LDAP connection test --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7d3ec85..7b88e45 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7346,9 +7346,9 @@ def mode_ldap_config(phase): msg = _('Exception: %s') % html.attrencode(e) if state: - img = '<img src="images/icon_success.png" alt="%s" />' % _('Success') + img = html.render_icon("success", _('Success')) else: - img = '<img src="images/icon_failed.png" alt="%s" />' % _('Failed') + img = html.render_icon("failed", _("Failed")) table.cell(_("Test"), title) table.cell(_("State"), img)

9 years, 9 months

Check_MK Git: check_mk: #1716 FIX windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now

by Mathias Kettner

Module: check_mk Branch: master Commit: 775619ca0fee7525f1b427851ce1823e83b4f642 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=775619ca0fee75… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 18:10:42 2014 +0100 #1716 FIX windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now --- .werks/1716 | 9 +++++++++ ChangeLog | 1 + checks/windows_tasks | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/1716 b/.werks/1716 new file mode 100644 index 0000000..b90f2b5 --- /dev/null +++ b/.werks/1716 @@ -0,0 +1,9 @@ +Title: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418058616 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a28ed89..9fd9228 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,6 +130,7 @@ * 1711 FIX: win_printers.ps1: ignore temporary printers created by RDP terminal sessions... * 1712 FIX: hyper_vms: fixed for snapshot VMs with (...) in their names... * 1713 FIX: check_fstab_mounts: now correctly ignores swap space... + * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/windows_tasks b/checks/windows_tasks index b921361..2c520b2 100644 --- a/checks/windows_tasks +++ b/checks/windows_tasks @@ -38,6 +38,8 @@ # Last Result : 1 # Scheduled Task State : Disabled +# A list of all task state can be found here: +# http://msdn.microsoft.com/en-us/library/aa383604%28VS.85%29.aspx def windows_tasks_convert(info): data = {} @@ -65,12 +67,14 @@ def check_windows_tasks(item, _no_params, info): state = 0 label = "" msg = [] - if last_result not in [ 0, 0x00041301 ]: # SCHED_S_TASK_RUNNING + if last_result not in [ 0, 0x00041301, 0x00041325 ]: # SCHED_S_TASK_RUNNING, SCHED_S_TASK_QUEUED state = 2 label = "(!!)" msg.append("Service in state: %s%s" % ( last_result, label ) ) if last_result == 0x00041301: msg[-1] += " (currently running)" + elif last_result == 0x00041325: + msg[-1] += " (queued)" if values['Scheduled Task State'] != 'Enabled': msg.append("Task not Enabled(!!)")

9 years, 9 months

Check_MK Git: check_mk: #1715 Output icon information in CSV/JSON/ Python export of views

by Mathias Kettner

Module: check_mk Branch: master Commit: e94cc003ab9abb662aac615a5f33cf7ee03820bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e94cc003ab9abb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 17:57:55 2014 +0100 #1715 Output icon information in CSV/JSON/Python export of views When exporting views to JSON, Python or CSV the column with the icons is now no longer empty but is a space separated list of all icon names of the host/sevice in question - without path information or the suffixes of the file type. That way you now can get additional information about the objects. --- .werks/1715 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 10 +++++++--- web/plugins/icons/builtin.py | 2 +- web/plugins/views/painters.py | 18 +++++++++++++++++- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/.werks/1715 b/.werks/1715 new file mode 100644 index 0000000..019e372 --- /dev/null +++ b/.werks/1715 @@ -0,0 +1,13 @@ +Title: Output icon information in CSV/JSON/Python export of views +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1418057797 +Class: feature + +When exporting views to JSON, Python or CSV the column with the icons +is now no longer empty but is a space separated list of all icon names +of the host/sevice in question - without path information or the suffixes +of the file type. That way you now can get additional information about +the objects. diff --git a/ChangeLog b/ChangeLog index 45bb972..a28ed89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -146,6 +146,7 @@ * 1700 Enable icon for link to host/service parameters per default now... * 1705 Better styling of dashboard designer * 1714 Add support for jsonp export (next to json and python)... + * 1715 Output icon information in CSV/JSON/Python export of views... * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups * 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files) * 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9d7740a..d0c0b16 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -328,10 +328,14 @@ class html: def icon(self, help, icon): self.write(self.render_icon(icon, help)) - def render_icon(self, icon, help, middle=True): + def render_icon(self, icon, help="", middle=True): align = middle and ' align=absmiddle' or '' - return '<img%s class=icon title="%s" src="images/icon_%s.png" />' % \ - (align, self.attrencode(help), icon) + title = help and ' title="%s"' % self.attrencode(help) or "" + if "/" in icon: + src = "images/" + icon + else: + src = "images/icon_%s.png" % icon + return '<img src="%s" class=icon%s%s />' % (src, align, title) def empty_icon(self): self.write('<img class=icon src="images/trans.png" />') diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index d25f979..1b4af8d 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -68,7 +68,7 @@ def paint_icon_image(what, row, tags, custom_vars): if row[what + '_icon_image']: - return '<img align=absmiddle class=icon src="images/icons/%s">' % row[what + '_icon_image'] + return html.render_icon("icons/" + row[what + '_icon_image']) multisite_icons.append({ 'columns': [ 'icon_image' ], diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 448d033..fe896e2 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -151,7 +151,23 @@ def paint_icons(what, row): except Exception, e: output += 'Exception in icon plugin!<br />' + traceback.format_exc() - return "icons", output + if html.output_format == "html": + return "icons", output + else: + # Strip icon names out of HTML code that is generated by htmllib.render_icon() + icon_rename_regex = regex('<img src="([^"]*)"[^>]*>') + icons = [] + for n in icon_rename_regex.findall(output): + if n.startswith("images/"): + n = n[7:] + if n.startswith("icon_"): + n = n[5:] + if n.endswith(".png"): + n = n[:-4] + elif n.endswith(".gif"): + n = n[:-4] + icons.append(n.encode('utf-8')) + return "icons", " ".join(icons) def iconpainter_columns(what): cols = set(['site',

9 years, 9 months

Check_MK Git: check_mk: Fix recent error in precompiled Python files for Nagios core

by Mathias Kettner

Module: check_mk Branch: master Commit: a74fe5db7ca2178c9c341ba4446164a680cf0e27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a74fe5db7ca217… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 17:56:18 2014 +0100 Fix recent error in precompiled Python files for Nagios core --- modules/check_mk.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 3f24123..9b5e8ef 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3559,17 +3559,17 @@ no_inventory_possible = None # debug logging output.write("\n") - output.write(" l = file(log_dir + \"/crashed-checks.log\", \"a\")\n") - output.write(" l.write((\"Exception in precompiled check:\\n\"\n") - output.write(" \" Check_MK Version: %s\\n\"\n") - output.write(" \" Date: %s\\n\"\n") - output.write(" \" Host: %s\\n\"\n") - output.write(" \" %s\\n\") % (\n") - output.write(" check_mk_version,\n") - output.write(" time.strftime(\"%Y-%d-%m %H:%M:%S\"),\n") - output.write(" \"%s\",\n" % hostname) - output.write(" traceback.format_exc().replace('\\n', '\\n ')))\n") - output.write(" l.close()\n") + output.write(" l = file(log_dir + \"/crashed-checks.log\", \"a\")\n") + output.write(" l.write((\"Exception in precompiled check:\\n\"\n") + output.write(" \" Check_MK Version: %s\\n\"\n") + output.write(" \" Date: %s\\n\"\n") + output.write(" \" Host: %s\\n\"\n") + output.write(" \" %s\\n\") % (\n") + output.write(" check_mk_version,\n") + output.write(" time.strftime(\"%Y-%d-%m %H:%M:%S\"),\n") + output.write(" \"%s\",\n" % hostname) + output.write(" traceback.format_exc().replace('\\n', '\\n ')))\n") + output.write(" l.close()\n") output.write(" sys.exit(3)\n") output.close()

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2264

by Mathias Kettner

Module: check_mk Branch: master Commit: c354a43b7401fa193d6105dda65edab4fd798a4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c354a43b7401fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 17:03:57 2014 +0100 Updated bug entries #2264 --- .bugs/2264 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.bugs/2264 b/.bugs/2264 new file mode 100644 index 0000000..0ea47d7 --- /dev/null +++ b/.bugs/2264 @@ -0,0 +1,16 @@ +Title: Use fixed variable name for perfdata of df check +Component: checks +State: open +Date: 2014-12-08 17:02:38 +Targetversion: 1.2.5i1 +Class: nastiness + +Currently it uses the mount point as variable name. This is nonsense and leads +to problems. In one case we even get too long filenames for the resulting RRDs +in MULTIPLE mode. + +Resolution: + +- Change to simple variable name +- Create some deprecated global option that simulates the old behaviour for some + time.

9 years, 9 months

Check_MK Git: check_mk: #1714 Add support for jsonp export (

by Mathias Kettner

next to json and python) Message-ID: <5485c7f8.ou8gFvdxf10RJdsD%mk(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: bc8fa431110c12662902bbb32bcffdb4bef9f9e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc8fa431110c12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 16:46:55 2014 +0100 #1714 Add support for jsonp export (next to json and python) The web service for exporting data from views now also supports JSONP. This is basically the same as JSON, but everything is wrapped into <tt>parseJSON(</tt>...<tt>)</tt>. You can select this by adding <tt>&output_format=jsonp</tt> to the URL of a Multisite view. --- .werks/1714 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/webservice.py | 12 ++++++++++++ 3 files changed, 24 insertions(+) diff --git a/.werks/1714 b/.werks/1714 new file mode 100644 index 0000000..b0fb92b --- /dev/null +++ b/.werks/1714 @@ -0,0 +1,11 @@ +Title: Add support for jsonp export (next to json and python) +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1418053509 +Class: feature + +The web service for exporting data from views now also supports JSONP. This +is basically the same as JSON, but everything is wrapped into <tt>parseJSON(</tt>...<tt>)</tt>. +You can select this by adding <tt>&output_format=jsonp</tt> to the URL of a Multisite view. diff --git a/ChangeLog b/ChangeLog index e6651da..45bb972 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,6 +145,7 @@ * 1636 Crash checks now have an icon for viewing and sending a crash dump... * 1700 Enable icon for link to host/service parameters per default now... * 1705 Better styling of dashboard designer + * 1714 Add support for jsonp export (next to json and python)... * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups * 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files) * 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index c4622df..753c8f1 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -121,6 +121,17 @@ multisite_layouts["json"] = { "hide" : True, } +def render_jsonp(rows, view, group_painters, painters, num_columns, show_checkboxes): + html.write("parseJSON(\n"); + render_json(rows, view, group_painters, painters, num_columns, show_checkboxes) + html.write(");\n"); + +multisite_layouts["jsonp"] = { + "title" : _("JSONP data output"), + "render" : render_jsonp, + "group" : False, + "hide" : True, +} def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxes, export = False): if export: @@ -168,3 +179,4 @@ multisite_layouts["csv"] = { "group" : False, "hide" : True, } +

9 years, 9 months

Check_MK Git: check_mk: Fixed setting of attributes when creating a new folder

by Mathias Kettner

Module: check_mk Branch: master Commit: 4f56eadb9a5297ad9d2561734c4a5e0a955a145c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f56eadb9a5297… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 16:39:23 2014 +0100 Fixed setting of attributes when creating a new folder Attributes had been saved in the parent folder instead of the folder itself. This was due to a bug fix from last week. --- web/htdocs/wato.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e2fcadf..7d3ec85 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1804,10 +1804,7 @@ def mode_editfolder(phase, new): if new: check_folder_permissions(g_folder, "write") check_user_contactgroups(attributes.get("contactgroups", (False, []))) - create_wato_folder(g_folder, name, title) - g_folder["attributes"] = attributes - save_folder(g_folder) - log_audit(g_folder, "new-folder", _("Created new folder %s") % title) + create_wato_folder(g_folder, name, title, attributes) else: # TODO: migrate this block into own function edit_wato_folder(..) @@ -17535,7 +17532,7 @@ def create_wato_folders(path): # Creates and returns an empty wato folder with the given title # Write permissions are NOT checked! -def create_wato_folder(parent, name, title): +def create_wato_folder(parent, name, title, attributes={}): if parent and parent[".path"]: newpath = parent[".path"] + "/" + name else: @@ -17545,7 +17542,7 @@ def create_wato_folder(parent, name, title): ".name" : name, ".path" : newpath, "title" : title or name, - "attributes" : {}, + "attributes" : attributes, ".folders" : {}, ".hosts" : {}, "num_hosts" : 0,

9 years, 9 months

← Newer
1
...
22
23
24
25
26
27
28
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014