Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

Fixed exception when using set_focus on Dictionary() with specific key

by Lars Michelsen

Module: check_mk Branch: master Commit: b486f47db95d11030a983603181a9f1ef536bd29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b486f47db95d11… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 11:30:02 2016 +0100 Fixed exception when using set_focus on Dictionary() with specific key --- web/htdocs/valuespec.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index f8b6f6c..28b455e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2975,9 +2975,9 @@ class Dictionary(ValueSpec): if key == None: elements[0][1].set_focus(varprefix + "_p_" + elements[0][0]) else: - for element in elements: - if element[0] == key: - element[1].set_focus(varprefix + "_p_" + name) + for element_key, element_vs in elements: + if element_key == key: + element_vs.set_focus(varprefix + "_p_" + key) def canonical_value(self): return dict([

8 years, 4 months

Fixed invalid exception catching of os.OSError; Fixed broken

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d7d791912e76f2f60d5f7645da3729a933531aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d7d791912e76f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 09:16:13 2016 +0100 Fixed invalid exception catching of os.OSError; Fixed broken literal_eval in Python <2.5 --- web/htdocs/lib.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 508944b..1b9d3f1 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -120,7 +120,7 @@ def make_nagios_directories(name): if head and tail and not os.path.exists(head): try: make_nagios_directories(head) - except os.OSError, e: + except OSError, e: # be happy if someone already created the path if e.errno != errno.EEXIST: raise @@ -756,41 +756,39 @@ try: import ast literal_eval = ast.literal_eval except ImportError: - # python <2.5 compatibility + # Python <2.5 compatibility try: from compiler import parse import compiler.ast def literal_eval(node_or_string): - _safe_names = {'none': none, 'true': true, 'false': false} + _safe_names = {'None': None, 'True': True, 'False': False} if isinstance(node_or_string, basestring): node_or_string = parse(node_or_string, mode='eval') - if isinstance(node_or_string, compiler.ast.expression): + if isinstance(node_or_string, compiler.ast.Expression): node_or_string = node_or_string.node def _convert(node): - if isinstance(node, compiler.ast.const) and isinstance(node.value, + if isinstance(node, compiler.ast.Const) and isinstance(node.value, (basestring, int, float, long, complex)): return node.value - elif isinstance(node, compiler.ast.tuple): + elif isinstance(node, compiler.ast.Tuple): return tuple(map(_convert, node.nodes)) - elif isinstance(node, compiler.ast.list): + elif isinstance(node, compiler.ast.List): return list(map(_convert, node.nodes)) - elif isinstance(node, compiler.ast.dict): + elif isinstance(node, compiler.ast.Dict): return dict((_convert(k), _convert(v)) for k, v in node.items) - elif isinstance(node, compiler.ast.name): + elif isinstance(node, compiler.ast.Name): if node.name in _safe_names: return _safe_names[node.name] - elif isinstance(node, compiler.ast.unarysub): + elif isinstance(node, compiler.ast.UnarySub): return -_convert(node.expr) - raise valueerror('malformed string') + raise ValueError('malformed string') return _convert(node_or_string) except: - literal_eval = none - - + literal_eval = None #. # .--Various Constants---------------------------------------------------.

8 years, 4 months

#3187 notification view: new filter for log command via regex

by Simon Betz

Module: check_mk Branch: master Commit: bd1959f7cce33b880bb4467449464e1faed88de9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd1959f7cce33b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 17 09:08:03 2016 +0100 #3187 notification view: new filter for log command via regex --- .werks/3187 | 9 +++++++++ ChangeLog | 1 + web/plugins/visuals/filters.py | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/3187 b/.werks/3187 new file mode 100644 index 0000000..b56c68a --- /dev/null +++ b/.werks/3187 @@ -0,0 +1,9 @@ +Title: notification view: new filter for log command via regex +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.9i1 +Date: 1455696400 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 388e42d..6a3ec05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ NOTE: Please refer to the migration notes! Multisite: + * 3187 notification view: new filter for log command via regex * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index d6dfdfa..8d6b34a 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -875,6 +875,7 @@ declare_filter(204, FilterText("log_state_type", _("Log: state type"), "log" declare_filter(260, FilterText("log_contact_name", _("Log: contact name (exact match)"), "log", "log_contact_name", "log_contact_name", "="), _("Exact match, used for linking")) declare_filter(261, FilterText("log_contact_name_regex", _("Log: contact name"), "log", "log_contact_name", "log_contact_name_regex", "~~", negateable=True)) +declare_filter(262, FilterText("log_command_name_regex", _("Log: command"), "log", "log_command_name", "log_command_name_regex", "~~", negateable=True)) class FilterLogState(Filter): def __init__(self):

8 years, 4 months

fixed "NoneType has no attribute values" when opening BI view

by Sebastian Herbord

Module: check_mk Branch: master Commit: e5d8ba1d806dde859ab390195a4efe44e49f0748 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5d8ba1d806dde… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Feb 16 16:39:23 2016 +0100 fixed "NoneType has no attribute values" when opening BI view --- web/htdocs/sites.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index 9b1b784..6fde86d 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -57,6 +57,8 @@ def state(site_id, deflt=None): # Returns dictionary of all known site states def states(): + if _live == None: + connect() return _site_status

8 years, 4 months

solved some merge conflicts

by Simon Betz

Module: check_mk Branch: master Commit: bfcf58b5373c72edca5dcda43551719372d4346e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfcf58b5373c72… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 16 16:31:33 2016 +0100 solved some merge conflicts --- .werks/3186 | 9 +++ ChangeLog | 2 + checks/fortigate_node | 175 ++++++++++++++++++++++++++++++++----------------- 3 files changed, 125 insertions(+), 61 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bfcf58b537…

8 years, 4 months

#3221 FIX Fixed broken nagios config because of missing contact group check-mk-notify with rule based notifications enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d37cb9f00685761ded512f6d240c27193b7ed45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d37cb9f006857… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 16 15:35:21 2016 +0100 #3221 FIX Fixed broken nagios config because of missing contact group check-mk-notify with rule based notifications enabled Fixes the error "Could not find any contactgroup matching 'check-mk-notify'" when starting the nagios core. --- .werks/3221 | 10 ++++++++++ ChangeLog | 1 + modules/nagios.py | 7 ++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/3221 b/.werks/3221 new file mode 100644 index 0000000..eacd56d --- /dev/null +++ b/.werks/3221 @@ -0,0 +1,10 @@ +Title: Fixed broken nagios config because of missing contact group check-mk-notify with rule based notifications enabled +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455633251 + +Fixes the error "Could not find any contactgroup matching 'check-mk-notify'" when starting the nagios core. diff --git a/ChangeLog b/ChangeLog index 73716ed..c8218d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 3193 FIX: Fixed fake check results for hosts... * 3214 FIX: Removing SNMP checks for non SNMP hosts and agent based checks for non agent hosts... * 3220 FIX: Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts + * 3221 FIX: Fixed broken nagios config because of missing contact group check-mk-notify with rule based notifications enabled... Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/nagios.py b/modules/nagios.py index a76cb5c..0769a2a 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -734,9 +734,9 @@ define servicegroup { """ % (make_utf8(sg), make_utf8(alias))) def create_nagios_config_contactgroups(outfile): - if define_contactgroups: - cgs = list(contactgroups_to_define) - cgs.sort() + cgs = list(contactgroups_to_define) + cgs.sort() + if cgs: outfile.write("\n# ------------------------------------------------------------\n") outfile.write("# Contact groups (controlled by define_contactgroups)\n") outfile.write("# ------------------------------------------------------------\n\n") @@ -870,6 +870,7 @@ def create_nagios_config_contacts(outfile, hostnames): outfile.write("}\n\n") if enable_rulebased_notifications and hostnames: + contactgroups_to_define.add("check-mk-notify") outfile.write( "# Needed for rule based notifications\n" "define contact {\n"

8 years, 4 months

Service metrics cannot be rendered in PDF report currently

by Mathias Kettner

Module: check_mk Branch: master Commit: 61a3bbb09976d81bf931c713112d965d2d563fd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61a3bbb09976d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 16 15:24:46 2016 +0100 Service metrics cannot be rendered in PDF report currently --- web/plugins/views/painters.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 4fb62ca..00b6827 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -583,6 +583,7 @@ multisite_painters["svc_metrics"] = { "short" : _("Metrics"), "columns" : [ "service_check_command", "service_perf_data"], "paint" : paint_service_metrics, + "printable" : False, } def get_perfdata_nth_value(row, n, remove_unit = False):

8 years, 4 months

Prepare rendering of inline-graphs in reports

by Mathias Kettner

Module: check_mk Branch: master Commit: c148ef8e20d1365ee71282cc22da05a92e3dc1b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c148ef8e20d136… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 16 15:25:04 2016 +0100 Prepare rendering of inline-graphs in reports --- web/plugins/views/painters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 00b6827..645d296 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -990,7 +990,7 @@ multisite_painters["svc_pnpgraph" ] = { "columns" : [ "host_name", "service_description", "service_perf_data", "service_metrics", "service_check_command" ], "options" : [ 'pnp_timerange' ], "paint" : paint_time_graph, - "printable" : False, + "printable" : "time_graph", } @@ -1345,7 +1345,7 @@ multisite_painters["host_pnpgraph" ] = { "columns" : [ "host_name", "host_perf_data", "host_metrics", "host_check_command" ], "options" : [ 'pnp_timerange' ], "paint" : paint_time_graph, - "printable" : False, + "printable" : "time_graph", } def paint_host_black(row):

8 years, 4 months

#3220 FIX Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: fed1e5c666473a39f472cae88cc714e35cffc7af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fed1e5c666473a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 16 14:59:02 2016 +0100 #3220 FIX Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts --- .werks/3220 | 10 ++++++++++ ChangeLog | 1 + modules/nagios.py | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.werks/3220 b/.werks/3220 new file mode 100644 index 0000000..766755c --- /dev/null +++ b/.werks/3220 @@ -0,0 +1,10 @@ +Title: Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455631116 + + diff --git a/ChangeLog b/ChangeLog index 8b90914..73716ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 3193 FIX: Fixed fake check results for hosts... * 3214 FIX: Removing SNMP checks for non SNMP hosts and agent based checks for non agent hosts... + * 3220 FIX: Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/nagios.py b/modules/nagios.py index 7591a1d..a76cb5c 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -468,6 +468,11 @@ define service { for acttype, rules in active_checks.items(): entries = host_extra_conf(hostname, rules) if entries: + # Skip Check_MK HW/SW Inventory for all ping hosts, even when the user has enabled + # the inventory for ping only hosts + if acttype == "cmk_inv" and is_ping_host(hostname): + continue + active_checks_to_define.add(acttype) act_info = active_check_info[acttype] for params in entries:

8 years, 4 months

#3219 FIX lnx_distro: Now detecting Oracle VM Server correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 2507b21b2108d137edc3e24050aa289791ce6a9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2507b21b2108d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 16 14:35:14 2016 +0100 #3219 FIX lnx_distro: Now detecting Oracle VM Server correctly --- .werks/3219 | 10 ++++++++++ ChangeLog | 3 +++ inventory/lnx_distro | 18 +++++++++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.werks/3219 b/.werks/3219 new file mode 100644 index 0000000..d45a031 --- /dev/null +++ b/.werks/3219 @@ -0,0 +1,10 @@ +Title: lnx_distro: Now detecting Oracle VM Server correctly +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455629695 + + diff --git a/ChangeLog b/ChangeLog index 6a43416..8b90914 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,9 @@ Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... + HW/SW-Inventory: + * 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly + 1.2.8b1: Core & Setup: diff --git a/inventory/lnx_distro b/inventory/lnx_distro index c8fc2ed..d647dbe 100644 --- a/inventory/lnx_distro +++ b/inventory/lnx_distro @@ -34,6 +34,9 @@ # <<<lnx_distro:sep(124)>>> # /etc/redhat-release|Red Hat Enterprise Linux Server release 6.5 (Santiago) +# <<<lnx_distro:sep(124)>>> +# /etc/redhat-release|Oracle VM server release x.x.x + # <<<lnx_distro:sep(124):persist(1399310551)>>> # /etc/SuSE-release|SUSE Linux Enterprise Server 11 (x86_64)|VERSION = 11|PATCHLEVEL = 2 @@ -46,7 +49,10 @@ def inv_lnx_distro(info): elif line[0] == '/etc/debian_version': inv_lnx_parse_debian(node, line[1]) elif line[0] == '/etc/redhat-release': - inv_lnx_parse_redhat_release(node, line[1]) + if line[1].startswith("Oracle"): + inv_lnx_parse_oracle_vm_server_release(node, line[1]) + else: + inv_lnx_parse_redhat_release(node, line[1]) elif line[0] == '/etc/SuSE-release': inv_lnx_parse_suse_release(node, line[1:]) elif line[0] == '/usr/share/cma/version': @@ -77,6 +83,16 @@ def inv_lnx_parse_suse_release(node, line): node["code_name"] = "Bottle" +# <<<lnx_distro:sep(124)>>> +# /etc/redhat-release|Oracle VM server release x.x.x +def inv_lnx_parse_oracle_vm_server_release(node, line): + node["type"] = "linux" + parts = line.split(" ") + node["vendor"] = parts.pop(0) + node["version"] = parts.pop(-1) + node["name"] = " ".join(parts[:-1]) + + def inv_lnx_parse_redhat_release(node, line): node["type"] = "linux" parts = line.split("(")

8 years, 4 months

← Newer
1
...
7
8
9
10
11
12
13
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016