Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

Added some helper functions to detect the current Check_MK environment

by Lars Michelsen

Module: check_mk Branch: master Commit: e5c504dfcb31e31ba7cf99ce9cee88f8c8777394 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5c504dfcb31e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 11 16:45:45 2016 +0200 Added some helper functions to detect the current Check_MK environment --- lib/__init__.py | 30 ++++++++++++++++++++++++++++ tests/lib/test_base.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/lib/__init__.py b/lib/__init__.py index dad38dd..950c2d6 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -30,3 +30,33 @@ This library is currently handled as internal module of Check_MK and does not offer stable APIs. The code may change at any time.""" __version__ = "1.4.0i2" + +import os + +import cmk.paths + + +def omd_version(): + return os.path.basename(os.readlink(cmk.paths.omd_root + "/version")) + + +def edition_short(): + """Can currently either return \"cre\" or \"cee\".""" + parts = omd_version().split(".") + if parts[-1] == "demo": + return parts[-2] + else: + return parts[-1] + + +def is_enterprise_edition(): + return edition_short() == "cee" + + +def is_raw_edition(): + return edition_short() == "cre" + + +def is_demo(): + parts = omd_version().split(".") + return parts[-1] == "demo" diff --git a/tests/lib/test_base.py b/tests/lib/test_base.py new file mode 100644 index 0000000..62c8ba4 --- /dev/null +++ b/tests/lib/test_base.py @@ -0,0 +1,54 @@ +import pytest +import os + +import cmk + +def test_version(): + assert type(cmk.__version__) == str + + +def test_omd_version(tmpdir, monkeypatch): + link_path = "%s" % tmpdir.dirpath("version") + + monkeypatch.setattr(cmk.paths, 'omd_root', os.path.dirname(link_path)) + + os.symlink("/omd/versions/2016.09.12.cee", link_path) + assert cmk.omd_version() == "2016.09.12.cee" + os.unlink(link_path) + + os.symlink("/omd/versions/2016.09.12.cee.demo", link_path) + assert cmk.omd_version() == "2016.09.12.cee.demo" + os.unlink(link_path) + + +def test_is_enterprise_edition(monkeypatch): + monkeypatch.setattr(cmk, "omd_version", lambda: "1.4.0i1.cre") + assert cmk.is_enterprise_edition() == False + monkeypatch.setattr(cmk, "omd_version", lambda: "1.4.0i1.cee") + assert cmk.is_enterprise_edition() == True + monkeypatch.setattr(cmk, "omd_version", lambda: "2016.09.22.cee") + assert cmk.is_enterprise_edition() == True + monkeypatch.setattr(cmk, "omd_version", lambda: "2016.09.22.cee.demo") + assert cmk.is_enterprise_edition() == True + + +def test_is_raw_edition(monkeypatch): + monkeypatch.setattr(cmk, "omd_version", lambda: "1.4.0i1.cre") + assert cmk.is_raw_edition() == True + monkeypatch.setattr(cmk, "omd_version", lambda: "1.4.0i1.cee") + assert cmk.is_raw_edition() == False + monkeypatch.setattr(cmk, "omd_version", lambda: "2016.09.22.cee") + assert cmk.is_raw_edition() == False + monkeypatch.setattr(cmk, "omd_version", lambda: "2016.09.22.cee.demo") + assert cmk.is_raw_edition() == False + + +def test_is_demo(monkeypatch): + monkeypatch.setattr(cmk, "omd_version", lambda: "1.4.0i1.cre") + assert cmk.is_demo() == False + monkeypatch.setattr(cmk, "omd_version", lambda: "1.4.0i1.cee") + assert cmk.is_demo() == False + monkeypatch.setattr(cmk, "omd_version", lambda: "2016.09.22.cee") + assert cmk.is_demo() == False + monkeypatch.setattr(cmk, "omd_version", lambda: "2016.09.22.cee.demo") + assert cmk.is_demo() == True

7 years, 11 months

made SGA bytes readable

by Simon Betz

Module: check_mk Branch: master Commit: 1726f0ff7b067664dec4a7032958c917f6839515 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1726f0ff7b0676… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 11 16:01:04 2016 +0200 made SGA bytes readable --- web/plugins/views/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 4d537e5..b720924 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -749,7 +749,7 @@ inventory_displayhints.update({ "keyorder" : [ "id", "sga_info", "sga_size" ] }, ".software.applications.oracle.performance:*.id" : { "title" : _("ID"), }, ".software.applications.oracle.performance:*.sga_info" : { "title" : _("SGA info"), }, - ".software.applications.oracle.performance:*.sga_size" : { "title" : _("SGA size"), "paint" : "bytes" }, + ".software.applications.oracle.performance:*.sga_size" : { "title" : _("SGA size"), "paint" : "size" }, ".software.applications.vmwareesx:*." : { "title" : _("Datacenter %d") }, ".software.applications.vmwareesx:*.clusters:*." : { "title" : _("Cluster %d") },

7 years, 11 months

Removed failed notifications from main overview dashboard

by Lars Michelsen

Module: check_mk Branch: master Commit: 1f74a48f4eacc5e674e72d20b3c7b3470ff68aad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f74a48f4eacc5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 11 15:28:45 2016 +0200 Removed failed notifications from main overview dashboard --- web/plugins/dashboard/builtin.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index c4d1400..20e0062 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -55,15 +55,6 @@ builtin_dashboards["main"] = { 'single_infos' : [], }, { - "title" : _("Failed Notifications"), - "type" : 'notify_failed_notifications', - "position" : (61, 1), - "size" : (30, 18), - "refresh" : 60, - "show_title" : True, - "context" : {}, - }, - { "type" : "view", "title" : _("Host Problems (unhandled)"), "title_url" : "view.py?view_name=hostproblems&is_host_acknowledged=0",

7 years, 11 months

3898 FIX Unmonitored services: Fixed possible bug in case discovery service produces unexpected output

by Lars Michelsen

Module: check_mk Branch: master Commit: 4b14ff0babfc7cbaf4fde3f5be2590ee24853b04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b14ff0babfc7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 11 14:41:58 2016 +0200 3898 FIX Unmonitored services: Fixed possible bug in case discovery service produces unexpected output --- .werks/3898 | 9 +++++++++ ChangeLog | 1 + modules/discovery.py | 1 + web/plugins/views/datasources.py | 8 +++++++- web/plugins/views/painters.py | 6 +++--- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/3898 b/.werks/3898 new file mode 100644 index 0000000..3e00e99 --- /dev/null +++ b/.werks/3898 @@ -0,0 +1,9 @@ +Title: Unmonitored services: Fixed possible bug in case discovery service produces unexpected output +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1476189684 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 07f17fc..26bf1e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ Multisite: * 3897 FIX: Fixed possible exception in raw edition when rendering graphs + * 3898 FIX: Unmonitored services: Fixed possible bug in case discovery service produces unexpected output WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/modules/discovery.py b/modules/discovery.py index 1bc0881..5c38edb 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -342,6 +342,7 @@ def check_discovery(hostname, ipaddress=None): if need_rediscovery: infotexts.append("rediscovery scheduled") + long_infotexts.append("asd:asdasdasd: asd:") output = ", ".join(infotexts) if long_infotexts: output += "\n" + "\n".join(long_infotexts) diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index a15fb2c..058358f 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -261,7 +261,13 @@ def query_service_discovery(columns, query, only_sites, limit, all_active_filter if not service_line: continue - state, check, service_description = map(lambda s: s.strip(), service_line.split(":", 2)) + parts = map(lambda s: s.strip(), service_line.split(":", 2)) + if len(parts) != 3: + continue + + state, check, service_description = parts + if state not in ["ignored", "vanished", "unmonitored"]: + continue this_row = row.copy() this_row.update({ diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index ed4cfb4..621e086 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -957,10 +957,10 @@ def paint_time_graph(row, cell): def time_graph_params(): - if metrics.cmk_graphs_possible(row["site"]): + try: return metrics.vs_graph_render_options() - else: - return None + except AttributeError: + return None # The method is only available in CEE def paint_time_graph_cmk(row, cell, show_timeranges=False):

7 years, 11 months

3897 FIX Fixed possible exception in raw edition when rendering graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f5b19657b0ab324f56db2a95dec65f8cba07a6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f5b19657b0ab3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 11 14:29:26 2016 +0200 3897 FIX Fixed possible exception in raw edition when rendering graphs --- .werks/3897 | 9 +++++++++ ChangeLog | 3 +++ web/plugins/views/painters.py | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/3897 b/.werks/3897 new file mode 100644 index 0000000..a2d4c6b --- /dev/null +++ b/.werks/3897 @@ -0,0 +1,9 @@ +Title: Fixed possible exception in raw edition when rendering graphs +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1476188863 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a0c28f9..07f17fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,9 @@ * 3936 FIX: chrony: support new params dictionary and rule "State of NTP time synchronisation" * 3649 FIX: Added a workaround for an escaping-related bug in old bash versions... + Multisite: + * 3897 FIX: Fixed possible exception in raw edition when rendering graphs + WATO: * 3915 User access times: New icon when never logged in; New column "last seen" * 3914 FIX: Roles: Aliases are now unique during cloning diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 9ca75c4..ed4cfb4 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -957,8 +957,10 @@ def paint_time_graph(row, cell): def time_graph_params(): - # TODO: for PNP graphs return None - return metrics.vs_graph_render_options() + if metrics.cmk_graphs_possible(row["site"]): + return metrics.vs_graph_render_options() + else: + return None def paint_time_graph_cmk(row, cell, show_timeranges=False):

7 years, 11 months

3649 FIX Added a workaround for an escaping-related bug in old bash versions

by Sven Panne

Module: check_mk Branch: master Commit: a29d57ddf2deb77ae185e6123c0a287b0629b1ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a29d57ddf2deb7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Oct 11 14:24:11 2016 +0200 3649 FIX Added a workaround for an escaping-related bug in old bash versions --- .werks/3649 | 13 +++++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 11 +++++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.werks/3649 b/.werks/3649 new file mode 100644 index 0000000..dbf19a8 --- /dev/null +++ b/.werks/3649 @@ -0,0 +1,13 @@ +Title: Added a workaround for an escaping-related bug in old bash versions +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1476188198 + +Some old bash versions (up to 3.2.x) had a slightly obscure bug regarding +the escaping of special characters in regular expression matches, so a +workaround for this was necessary. + diff --git a/ChangeLog b/ChangeLog index a2b3f40..a0c28f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 3935 FIX: FIX avaya_45xx_cpu: check got UNKNOWN using Nagios core * 3896 FIX: Agent RPMs: Fixing dependency issue with old check_mk-agent-oracle-*.rpm and check_mk-agent-logwatch-*.rpm * 3936 FIX: chrony: support new params dictionary and rule "State of NTP time synchronisation" + * 3649 FIX: Added a workaround for an escaping-related bug in old bash versions... WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c44f860..9844231 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -884,7 +884,10 @@ then do interval= args="-m" - if [[ $cmdline =~ $([^$]*)\)[[:space:]](.*) ]] + # NOTE: Due to an escaping-related bug in some old bash versions + # (3.2.x), we have to use an intermediate variable for the pattern. + pattern='$([^$]*)\)[[:space:]](.*)' + if [[ $cmdline =~ $pattern ]] then parameters=${BASH_REMATCH[1]} cmdline=${BASH_REMATCH[2]} @@ -931,7 +934,11 @@ then while read descr cmdline do interval= - if [[ $cmdline =~ $([^$]*)\)[[:space:]](.*) ]] + # NOTE: Due to an escaping-related bug in some old bash + # versions (3.2.x), we have to use an intermediate variable + # for the pattern. + pattern='$([^$]*)\)[[:space:]](.*)' + if [[ $cmdline =~ $pattern ]] then parameters=${BASH_REMATCH[1]} cmdline=${BASH_REMATCH[2]}

7 years, 11 months

fixed packaging

by Simon Betz

Module: check_mk Branch: master Commit: 06bbfda1925be543f4a2da879497d15c85ffb8bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06bbfda1925be5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 11 13:28:26 2016 +0200 fixed packaging --- modules/packaging.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/packaging.py b/modules/packaging.py index 57bf6cb..f3ea54d 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -287,9 +287,9 @@ def package_pack(args): raise PackageException("Usage: check_mk -P pack NAME") # Make sure, user is not in data directories of Check_MK - p = os.path.abspath(os.curdir) + abs_curdir = os.path.abspath(os.curdir) for dir in [cmk.paths.var_dir] + [ p[-1] for p in get_package_parts() ]: - if p == dir or p.startswith(dir + "/"): + if abs_curdir == dir or abs_curdir.startswith(dir + "/"): raise PackageException("You are in %s!\n" "Please leave the directories of Check_MK before creating\n" "a packet file. Foreign files lying around here will mix up things." % p)

7 years, 11 months

3957 mail: now allows extra HTML section between body and table

by Simon Betz

Module: check_mk Branch: master Commit: a49670d73946f96ec2aef36eefb8b9a160a852ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a49670d73946f9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 11 12:53:24 2016 +0200 3957 mail: now allows extra HTML section between body and table --- .werks/3957 | 9 +++++++++ ChangeLog | 3 +++ notifications/mail | 12 ++++++++---- web/plugins/wato/notifications.py | 10 +++++++++- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/.werks/3957 b/.werks/3957 new file mode 100644 index 0000000..1072005 --- /dev/null +++ b/.werks/3957 @@ -0,0 +1,9 @@ +Title: mail: now allows extra HTML section between body and table +Level: 1 +Component: notifications +Compatible: compat +Version: 1.4.0i2 +Date: 1476183155 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9556f05..a2b3f40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ * 3914 FIX: Roles: Aliases are now unique during cloning * 3820 FIX: Network scan: no longer fails completely if hostname already exists in configuration... + Notifications: + * 3957 mail: now allows extra HTML section between body and table + BI: * 3955 BI rule ID can now be renamed diff --git a/notifications/mail b/notifications/mail index 6b3e7fe..abf9026 100755 --- a/notifications/mail +++ b/notifications/mail @@ -60,7 +60,8 @@ try: except ImportError: import json -tmpl_head_html = ''' +def tmpl_head_html(html_section): + return ''' <html> <head> <title>$SUBJECT$</title> @@ -224,8 +225,7 @@ table.context td { </style> </head> -<body> -<table>''' +<body>''' + html_section + '<table>' tmpl_foot_html = '''</table> </body> @@ -812,7 +812,11 @@ def construct_content(context): except Exception, e: sys.stderr.write("Failed to add graphs to mail. Continue without them. (%s)\n" % e) - content_html = substitute_context(tmpl_head_html, context) + \ + extra_html_section = "" + if "PARAMETER_INSERT_HTML_SECTION" in context: + extra_html_section = context['PARAMETER_INSERT_HTML_SECTION'] + + content_html = substitute_context(tmpl_head_html(extra_html_section), context) + \ content_html + \ substitute_context(tmpl_foot_html, context) diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py index c833139..e6abd28 100644 --- a/web/plugins/wato/notifications.py +++ b/web/plugins/wato/notifications.py @@ -168,7 +168,15 @@ register_notification_parameters( ], optional_keys = ["auth", "encryption"] ) - ) + ), + ("insert_html_section", + TextAreaUnicode( + title = _("Insert HTML section between body and table"), + default_value = "<HTMLTAG>CONTENT</HTMLTAG>", + cols = 40, + rows = "auto", + ), + ), ] ) )

7 years, 11 months

3936 FIX chrony: support new params dictionary and rule " State of NTP time synchronisation"

by Marcel Schulte

Module: check_mk Branch: master Commit: 71502305bd35522d626e8c2f543dc3d0cf23cf30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71502305bd3552… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Tue Oct 11 12:07:22 2016 +0200 3936 FIX chrony: support new params dictionary and rule "State of NTP time synchronisation" --- .werks/3936 | 10 ++++++++++ ChangeLog | 1 + checks/chrony | 15 +++++++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.werks/3936 b/.werks/3936 new file mode 100644 index 0000000..1b13cbf --- /dev/null +++ b/.werks/3936 @@ -0,0 +1,10 @@ +Title: chrony: support new params dictionary and rule "State of NTP time synchronisation" +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1476180339 + + diff --git a/ChangeLog b/ChangeLog index 7b0cc4a..9556f05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 3748 FIX: vertias_vcs: Fix empty agent section for standard xinetd configuration... * 3935 FIX: FIX avaya_45xx_cpu: check got UNKNOWN using Nagios core * 3896 FIX: Agent RPMs: Fixing dependency issue with old check_mk-agent-oracle-*.rpm and check_mk-agent-logwatch-*.rpm + * 3936 FIX: chrony: support new params dictionary and rule "State of NTP time synchronisation" WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/checks/chrony b/checks/chrony index 8e66547..08f2742 100644 --- a/checks/chrony +++ b/checks/chrony @@ -26,6 +26,11 @@ ntp_default_levels = (10, 200.0, 500.0) # stratum, ms offset +factory_settings["ntp_time_default_levels"] = { + "ntp_levels" : ntp_default_levels, + "alert_delay" : (300, 3600), +} + # Example output from agent: # <<<chrony>>> # Reference ID : 212.18.3.18 (ntp1.m-online.net) @@ -53,7 +58,7 @@ def parse_chrony(info): def inventory_chrony(info): parsed = parse_chrony(info) if parsed: - return [(None, "ntp_default_levels")] + return [(None, {})] def check_chrony(_no_item, params, info): @@ -63,7 +68,12 @@ def check_chrony(_no_item, params, info): return # Prepare parameters - crit_stratum, warn, crit = params + if type(params) == tuple: + params = { + "ntp_levels": params, + "alert_delay": (300, 3600), + } + crit_stratum, warn, crit = params["ntp_levels"] # Check offset and stratum, output a few info texsts offset = float(parsed["System time"].split()[0]) * 1000 # converted to ms @@ -97,4 +107,5 @@ check_info["chrony"] = { 'service_description': 'NTP Time', 'has_perfdata': True, 'group': 'ntp_time', + 'default_levels_variable': "ntp_time_default_levels", }

7 years, 11 months

fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: 5afdaffb252630734f359360eae2a3a51f1b5e1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5afdaffb252630… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 11 11:53:17 2016 +0200 fixed typo --- checks/fileinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/fileinfo b/checks/fileinfo index 5d52695..dc37936 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -89,7 +89,7 @@ def fileinfo_groups_of_file(check_filename, reftime): incl_match = fnmatch.fnmatch(check_filename, inclusion) if exclusion.startswith("~"): - reg = regex(exlusion[1:]) + reg = regex(exclusion[1:]) excl_match = reg.match( check_filename ) else: excl_match = fnmatch.fnmatch(check_filename, exclusion)

7 years, 11 months

← Newer
1
...
19
20
21
22
23
24
25
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016