Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: fixed werk syntax

by Andreas Boesl

Module: check_mk Branch: master Commit: 2c9a64a451200f93eb8ed5dcddf9297857a9420f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c9a64a451200f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 20 08:40:31 2015 +0100 fixed werk syntax --- .werks/2061 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/2061 b/.werks/2061 index ed2266c..415c48b 100644 --- a/.werks/2061 +++ b/.werks/2061 @@ -21,7 +21,7 @@ The plugin output is processed by the following new checks <tr><td>db2_connections</td><td>Number of database connections</td><td>X</td></tr> <tr><td>db2_counters</td><td>Deadlocks and Lockwaits per Second</td><td>X</td></tr> <tr><td>db2_logsize</td><td>Size and growth of database logfile</td>X<td></td></tr> -<tr><td>db2_tablespaces</td><td>Size and growth of tablespaces</td>X<td></td></tr> +<tr><td>db2_tablespaces</td><td>Size and growth of tablespaces</td><td>X</td></tr> <tr><td>db2_sort_overflow</td><td>Percentual sort overflow</td><td>X</td></tr> <tr><td>db2_version</td><td>Displays DB2 version</td><td></td></tr> </table>

9 years, 3 months

Check_MK Git: check_mk: Corrected html entity encoding Part 2

by Sven Rueß

Module: check_mk Branch: master Commit: 7ad80d83f89cdcc32d34bd4589a51a8a58638cf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ad80d83f89cdc… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Mar 20 07:32:02 2015 +0100 Corrected html entity encoding Part 2 --- 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 1adb77f..ba1cdef 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13765,7 +13765,7 @@ def mode_ruleeditor(phase): if only_host: return _("Rules effective on host ") + only_host else: - return _("Rule-Based Configuration of Host & Service Parameters") + return _("Rule-Based Configuration of Host & Service Parameters") elif phase == "buttons": global_buttons()

9 years, 3 months

Check_MK Git: check_mk: Minor code changes in code for PNP graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: 93efd34f6f31a8d29089d82dc5ad9610ef71bc8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93efd34f6f31a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 19 18:45:33 2015 +0100 Minor code changes in code for PNP graphs --- web/htdocs/check_mk.css | 1 + web/htdocs/htmllib.py | 5 +++-- web/htdocs/valuespec.py | 3 +++ web/plugins/metrics/check_mk.py | 4 ++-- web/plugins/views/painters.py | 22 ++++++++++++++++------ 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 8ff0a64..99a8146 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -551,6 +551,7 @@ table.graph { border-spacing: 0px; background-color: #f8f4f0; padding: 8px 16px 4px 8px; + margin-bottom: 5px; } table.graph td.title { diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 624941e..d5509df 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -773,9 +773,10 @@ class html: self.add_custom_style_sheet() # Load specified Javascript files - for js in [ "checkmk", "hover" ] + javascripts: + for js in [ "checkmk", "hover", "graphs" ] + javascripts: if defaults.omd_root: - fname = 'js/%s-%s.js' % (js, defaults.check_mk_version) + if os.path.exists(defaults.omd_root + "/share/check_mk/web/htdocs/js/" + js + ".js"): + fname = 'js/%s-%s.js' % (js, defaults.check_mk_version) else: fname = 'js/%s.js' % js self.write('<script type="text/javascript" src="%s"></script>\n' % fname) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 37194f8..1b55091 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2193,6 +2193,9 @@ class Timerange(CascadingDropdown): CascadingDropdown.__init__(self, **kwargs) def compute_range(self, rangespec): + if rangespec == None: + rangespec = "4h" + now = time.time() if rangespec[0] == 'age': from_time = now - rangespec[1] diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 484c5c6..fd1bcf0 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -730,7 +730,7 @@ perfometer_info.append({ "fs_used(%)", "fs_provisioning(%),fs_used(%),-#ffc030", ], - "total" : "100", + "total" : 100, "label" : ( "fs_used(%)", "%" ), }) @@ -823,7 +823,7 @@ graph_info.append({ ( "user,system,io_wait,+,+#004080", "line", _("Total") ), ], "mirror_legend" : True, - "range" : (0, 100), + # "range" : (0, 100), }) graph_info.append({ diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index fb049e4..52a8ef6 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -781,7 +781,18 @@ multisite_painters["svc_group_memberlist"] = { } # PNP Graphs -def paint_pnpgraph(sitename, host, service = "_HOST_"): +def paint_pnpgraph(row): + try: + css, htmlcode = paint_svc_time_graph(row) + if htmlcode: + return css, htmlcode + except NameError: + pass + + sitename = row["site"] + host = row["host_name"] + service = row.get("service_description", "_HOST_") + container_id = "%s_%s_%s_graph" % (sitename, host, service) pnp_url = html.site_status[sitename]["site"]["url_prefix"] + "pnp4nagios/" if 'X' in html.display_options: @@ -806,11 +817,10 @@ def paint_pnpgraph(sitename, host, service = "_HOST_"): defaults.url_prefix + "check_mk/", pnp_url, with_link, _('Add this graph to...'), from_ts, to_ts) multisite_painters["svc_pnpgraph" ] = { - "title" : _("PNP service graph"), - "short" : _("PNP graph"), - "columns" : [ "host_name", "service_description" ], + "title" : _("Service Graphs"), + "columns" : [ "host_name", "service_description", "service_perf_data", "service_check_command" ], "options" : [ 'pnp_timerange' ], - "paint" : lambda row: paint_pnpgraph(row["site"], row["host_name"], row["service_description"]), + "paint" : paint_pnpgraph, "printable" : False, } @@ -1163,7 +1173,7 @@ multisite_painters["host_pnpgraph" ] = { "short" : _("PNP graph"), "columns" : [ "host_name" ], "options" : [ 'pnp_timerange' ], - "paint" : lambda row: paint_pnpgraph(row["site"], row["host_name"]), + "paint" : paint_pnpgraph, "printable" : False, }

9 years, 3 months

Check_MK Git: check_mk: 2061 DB2 monitoring: Additional checks for AIX ( and presumably linux)

by Andreas Boesl

Module: check_mk Branch: master Commit: 05ef2b49ff69572b2c3f7fdd813cffe47c32fa8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05ef2b49ff6957… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 19 17:59:05 2015 +0100 2061 DB2 monitoring: Additional checks for AIX (and presumably linux) --- .werks/2061 | 28 ++++ ChangeLog | 1 + agents/plugins/mk_db2.aix | 200 +++++++++++++++++++++++ checkman/db2_backup | 24 +++ checkman/db2_bp_hitratios | 22 +++ checkman/db2_connections | 23 +++ checkman/db2_counters | 21 +++ checkman/db2_logsize | 22 +++ checkman/db2_sort_overflow | 20 +++ checkman/db2_tablespaces | 21 +++ checkman/db2_version | 16 ++ checks/db.include | 2 +- checks/db2.include | 49 ++++++ checks/db2_backup | 70 ++++++++ checks/db2_bp_hitratios | 72 +++++++++ checks/db2_connections | 72 +++++++++ checks/db2_counters | 94 +++++++++++ checks/db2_logsize | 64 ++++++++ checks/db2_sort_overflow | 70 ++++++++ checks/db2_tablespaces | 111 +++++++++++++ checks/db2_version | 44 +++++ web/plugins/metrics/check_mk.py | 126 +++++++++++++++ web/plugins/wato/check_parameters.py | 296 +++++++++++++++++++++++++--------- 23 files changed, 1390 insertions(+), 78 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=05ef2b49ff…

9 years, 3 months

Check_MK Git: check_mk: Corrected html entity encoding

by Sven Rueß

Module: check_mk Branch: master Commit: 6ad16c772f135f8ea3f2a731853c249f0636016a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ad16c772f135f… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Thu Mar 19 17:56:18 2015 +0100 Corrected html entity encoding --- web/plugins/dashboard/builtin.py | 2 +- web/plugins/views/inventory.py | 2 +- web/plugins/wato/builtin_modules.py | 2 +- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index e486289..649e995 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -223,7 +223,7 @@ builtin_dashboards["simple_problems"] = { "context" : {}, "mtime" : 0, "show_title" : True, - "title" : _("Host & Services Problems"), + "title" : _("Host & Services Problems"), "topic" : _("Overview"), "description" : _("A compact dashboard which lists your unhandled host and service problems."), "dashlets" : [ diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index a8d0b8b..d69315e 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -346,7 +346,7 @@ def inv_titleinfo_long(invpath, node): multisite_painters["inventory_tree"] = { - "title" : _("Hardware & Software Tree"), + "title" : _("Hardware & Software Tree"), "columns" : [], "load_inv" : True, "paint" : paint_inv_tree, diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index 5a6daaa..ed86dda 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -39,7 +39,7 @@ modules += [ ( "globalvars", _("Global Settings"), "configuration", "global", _("Global settings for Check_MK, Multisite and the monitoring core.")), - ( "ruleeditor", _("Host & Service Parameters"), "rulesets", "rulesets", + ( "ruleeditor", _("Host & Service Parameters"), "rulesets", "rulesets", _("Check parameters and other configuration variables on " "hosts and services") ), diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 2573f38..409e73f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1594,7 +1594,7 @@ register_configvar(deprecated, # '----------------------------------------------------------------------' register_rulegroup("grouping", _("Grouping"), - _("Assignment of host & services to host, service and contacts groups. ")) + _("Assignment of host & services to host, service and contacts groups. ")) group = "grouping" register_rule(group, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index fa5bd87..65c0dd3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -38,7 +38,7 @@ subgroup_storage = _("Storage, Filesystems and Files") subgroup_os = _("Operating System Resources") subgroup_printing = _("Printers") subgroup_environment = _("Temperature, Humidity, Electrical Parameters, etc.") -subgroup_applications = _("Applications, Processes & Services") +subgroup_applications = _("Applications, Processes & Services") subgroup_virt = _("Virtualization") subgroup_hardware = _("Hardware, BIOS") subgroup_inventory = _("Inventory - automatic service detection") @@ -5926,7 +5926,7 @@ register_check_parameters( Tuple( help = _("Temperature levels for external thermometers that are used " "for monitoring the temperature of a datacenter. An example " - "is the webthem from W&T."), + "is the webthem from W&T."), elements = [ Integer(title = _("warning at"), unit = u"°C", default_value = 26), Integer(title = _("critical at"), unit = u"°C", default_value = 30),

9 years, 3 months

Check_MK Git: check_mk: antother minor code cleanup

by Bastian Kuhn

Module: check_mk Branch: master Commit: e6a2490d52eddb54cb2d7fa48fba0c3c29510304 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6a2490d52eddb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Mar 19 15:48:08 2015 +0100 antother minor code cleanup --- web/plugins/wato/check_parameters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1b3669a..fa5bd87 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7103,17 +7103,17 @@ register_check_parameters( ("ok_states", ListChoice( title = _("States which result in OK"), choices = synology_update_states, - default_value = [2, 3] + default_value = [ 2 ] )), ("warn_states", ListChoice( title = _("States which result in Warning"), choices = synology_update_states, - default_value = [5] + default_value = [ 5 ] )), ("crit_states", ListChoice( title = _("States which result in Critical"), choices = synology_update_states, - default_value = [1,4] + default_value = [ 1,4 ] )), ], optional_keys = None,

9 years, 3 months

Check_MK Git: check_mk: synology_update: minor fix

by Bastian Kuhn

Module: check_mk Branch: master Commit: f2bfa7e99d7406327541f7e28f1f637d7c0e1e78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2bfa7e99d7406… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Mar 19 15:46:15 2015 +0100 synology_update: minor fix --- checks/synology_update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/synology_update b/checks/synology_update index 36b490c..ee7539a 100644 --- a/checks/synology_update +++ b/checks/synology_update @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. factory_settings["synology_update_levels"] = { - "ok_states" : [ 2, 3 ], + "ok_states" : [ 2 ], "warn_states" : [ 5 ], "crit_states" : [ 1, 4 ], }

9 years, 3 months

Check_MK Git: check_mk: synology_update: Handle connection state correctly.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0631fc17a6247128f5df4ada93ccaf04e0803963 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0631fc17a62471… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Mar 19 14:41:07 2015 +0100 synology_update: Handle connection state correctly. --- checks/synology_update | 3 +++ web/plugins/wato/check_parameters.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/synology_update b/checks/synology_update index d44298f..36b490c 100644 --- a/checks/synology_update +++ b/checks/synology_update @@ -50,6 +50,9 @@ def check_synology_update(_no_item, params, info): state = 1 elif device_state in params['crit_states']: state = 2 + elif device_state == 3: + # to prevent flapping between update avail and Connection + raise MKCounterWrap("Devices try to connect to the update server") return state, "Update Status: %s, Current Version: %s" % (states[device_state], version) check_info["synology_update"] = { diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index dff4572..1b3669a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7089,7 +7089,6 @@ register_check_parameters( synology_update_states = [ (1, "Available"), (2, "Unavailable"), - (3, "Connection"), (4, "Disconnected"), (5, "Others"), ]

9 years, 3 months

Check_MK Git: check_mk: #1236 FIX multipath: Now show correct error in case of removed multipaths instead of check crash

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7bdf6bd07fdd878fc13c2e9c947cf7201548d0bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bdf6bd07fdd87… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Mar 19 14:33:35 2015 +0100 #1236 FIX multipath: Now show correct error in case of removed multipaths instead of check crash --- .werks/1236 | 10 ++++++++++ ChangeLog | 1 + checks/multipath | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1236 b/.werks/1236 new file mode 100644 index 0000000..c2c2510 --- /dev/null +++ b/.werks/1236 @@ -0,0 +1,10 @@ +Title: multipath: Now show correct error in case of removed multipaths instead of check crash +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1426771976 + + diff --git a/ChangeLog b/ChangeLog index 7f22dfc..37858b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -265,6 +265,7 @@ * 2058 FIX: ucs_bladecenter_fans.temp, ucs_bladecenter_psu.chassis_temp: fixed broken temperature checks (nagios only)... * 2059 FIX: ucs_bladecenter_if: fixed exception when fibrechannel interfaces were not configured... * 1233 FIX: Fixed fileinfo check for solaris in case of missing files + * 1236 FIX: multipath: Now show correct error in case of removed multipaths instead of check crash Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/multipath b/checks/multipath index b212b83..64dda25 100644 --- a/checks/multipath +++ b/checks/multipath @@ -289,7 +289,7 @@ def check_multipath(item, target_numpaths, parsed): mmap = parsed[item] else: for mmap in parsed.values(): - if mmap["alias"] == item: + if mmap.get("alias") == item: break else: return 3, "Multipath device not found in agent output"

9 years, 3 months

Check_MK Git: check_mk: dict perfometer label can be set to None

by Andreas Boesl

Module: check_mk Branch: master Commit: 152d269d3f4c4f5989ead7c6baf2df00ed2f469f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=152d269d3f4c4f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 19 13:52:06 2015 +0100 dict perfometer label can be set to None --- web/htdocs/metrics.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index bc4d2ea..775841c 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -332,7 +332,7 @@ def perfometer_possible(perfometer, translated_metrics): required = perfometer["segments"][:] else: required = [] # TODO: logarithmic, etc. - if "label" in perfometer: + if "label" in perfometer and perfometer["label"] != None: required.append(perfometer["label"][0]) if "total" in perfometer: required.append(perfometer["total"]) @@ -532,11 +532,14 @@ def build_perfometer(perfometer, translated_metrics): # Use unit of first metrics for output of sum. We assume that all # stackes metrics have the same unit anyway if "label" in perfometer: - expr, unit_name = perfometer["label"] - value, unit, color = evaluate(expr, translated_metrics) - if unit_name: - unit = unit_info[unit_name] - label = unit["render"](summed) + if perfometer["label"] == None: + label = "" + else: + expr, unit_name = perfometer["label"] + value, unit, color = evaluate(expr, translated_metrics) + if unit_name: + unit = unit_info[unit_name] + label = unit["render"](summed) else: # absolute value, unit, color = evaluate(perfometer["segments"][0], translated_metrics)

9 years, 3 months

← Newer
1
...
9
10
11
12
13
14
15
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015