Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

4952 FIX Fixed broken alert statistics view (regression since 1.4.0p8)

by Lars Michelsen

Module: check_mk Branch: master Commit: fbbf9bce1de920012eaa0b3d3c1cd5eaf4f4781e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbbf9bce1de920… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 7 08:01:12 2017 +0200 4952 FIX Fixed broken alert statistics view (regression since 1.4.0p8) Change-Id: Idc5f09137a37dc493a9b2c039fa72a22ac406b18 --- .werks/4952 | 11 +++++++++++ web/htdocs/views.py | 2 +- web/plugins/views/mkeventd.py | 7 ++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/4952 b/.werks/4952 new file mode 100644 index 0000000..fbded9a --- /dev/null +++ b/.werks/4952 @@ -0,0 +1,11 @@ +Title: Fixed broken alert statistics view (regression since 1.4.0p8) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499407251 + + diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 282e6a3..d1c0bd6 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2245,7 +2245,7 @@ def query_data(datasource, columns, add_columns, add_headers, def do_query_data(query, columns, add_columns, merge_column, add_headers, only_sites, limit, auth_domain): - query += "Columns: %s\n" % " ".join(columns + add_columns) + query += "Columns: %s\n" % " ".join(columns) query += add_headers sites.live().set_prepend_site(True) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index fcef27e..d07365a 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -45,6 +45,10 @@ except: def query_ec_table(datasource, columns, add_columns, query, only_sites, limit, tablename): + for c in [ "event_contact_groups", "host_contact_groups", "event_host" ]: + if c not in columns: + columns.append(c) + rows = query_data(datasource, columns, add_columns, query, only_sites, limit, tablename=tablename) @@ -139,8 +143,6 @@ if mkeventd_enabled: "keys" : [], "idkeys" : [ 'site', 'host_name', 'event_id' ], "time_filters" : [ "event_first" ], - "add_columns" :[ "event_contact_groups", "host_contact_groups", "event_host" ], - } multisite_datasources["mkeventd_history"] = { @@ -151,7 +153,6 @@ if mkeventd_enabled: "keys" : [], "idkeys" : [ 'site', 'host_name', 'event_id', 'history_line' ], "time_filters" : [ "history_time" ], - "add_columns" :[ "event_contact_groups", "host_contact_groups", "event_host" ], }

6 years, 12 months

Updated werk

by Mathias Kettner

Module: check_mk Branch: master Commit: 6bcdd039c93145adf1763c08a657fb8f44415669 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bcdd039c93145… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 6 15:03:48 2017 +0200 Updated werk Change-Id: I4a01b468f9bb6a7660445ba6b6f2c969c9145a62 --- .werks/4834 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4834 b/.werks/4834 index 3be150e..0d29d7c 100644 --- a/.werks/4834 +++ b/.werks/4834 @@ -1,4 +1,4 @@ -Title: Quicksearch: fixed quoting problem with \ in service description +Title: Quicksearch: Fix Livestatus error when using \ in search expression Level: 1 Component: multisite Compatible: compat

6 years, 12 months

4951 FIX Added missing host custom variables to notifications created by the EC

by Lars Michelsen

Module: check_mk Branch: master Commit: 4cccd2391a66aa640d5ad620f6f7f96f5d4f7063 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cccd2391a66aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 6 13:52:24 2017 +0200 4951 FIX Added missing host custom variables to notifications created by the EC When creating notifications with the Event Console custom host attributes (HOST_*) were not added to the notification context. In notifications created by the core the attributes were available. This has been consolidated now, making the EC notifications have variables like HOST_MYVAR when having a custom attribute named MYVAR. Change-Id: I150e38548a3de0847989b1c9b0f55d2fd2b186ba --- .werks/4951 | 14 ++++++++++++++ bin/mkeventd | 20 +++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.werks/4951 b/.werks/4951 new file mode 100644 index 0000000..bf9158c --- /dev/null +++ b/.werks/4951 @@ -0,0 +1,14 @@ +Title: Added missing host custom variables to notifications created by the EC +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499341808 +Class: fix + +When creating notifications with the Event Console custom host attributes (HOST_*) +were not added to the notification context. In notifications created by the core +the attributes were available. This has been consolidated now, making the EC +notifications have variables like HOST_MYVAR when having a custom attribute named +MYVAR. diff --git a/bin/mkeventd b/bin/mkeventd index b202dbe..cec1e88 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -4121,6 +4121,11 @@ def add_infos_from_monitoring_host(context, event): "CONTACTS" : ",".join(host_info["contacts"]), "SERVICECONTACTGROUPNAMES" : ",".join(host_info["contact_groups"]), }) + + # Add custom variables to the notification context + for key, val in host_info["custom_variables"].items(): + context["HOST_%s" % key] = val + else: # Host not known in active monitoring. Create articial host context # as good as possible. @@ -4176,13 +4181,14 @@ def find_host_in_monitoring(event_host_name): contacts.remove("check-mk-notify") return { - "name" : row[0], - "alias" : row[1], - "address" : row[2], - "tags" : row[3].get("TAGS", ""), - "in_downtime" : bool(row[4]), - "contacts" : contacts, - "contact_groups" : row[6], + "name" : row[0], + "alias" : row[1], + "address" : row[2], + "tags" : row[3].get("TAGS", ""), + "custom_variables" : row[3], + "in_downtime" : bool(row[4]), + "contacts" : contacts, + "contact_groups" : row[6], }

6 years, 12 months

Fixed configuration of notification_backlog and notification_logging

by Lars Michelsen

Module: check_mk Branch: master Commit: 118f6d116144bc93659cf4b82e37850187e3e015 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=118f6d116144bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 6 13:42:19 2017 +0200 Fixed configuration of notification_backlog and notification_logging Change-Id: If10166fbe54f83fbab618d454a856e05af8005f3 --- cmk_base/default_config/notify.py | 7 +++++++ cmk_base/notify.py | 24 +++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/cmk_base/default_config/notify.py b/cmk_base/default_config/notify.py index be5291f..367d79e 100644 --- a/cmk_base/default_config/notify.py +++ b/cmk_base/default_config/notify.py @@ -26,6 +26,13 @@ import cmk as _cmk +# Log level of notifications +# 0 -> deprecated (transformed to 1) +# 1 -> normal logging +# 2 -> full dump of all variables and command +notification_logging = 1 +notification_backlog = 10 # keep the last 10 notification contexts for reference + # Settings for new rule based notifications enable_rulebased_notifications = False notification_fallback_email = "" diff --git a/cmk_base/notify.py b/cmk_base/notify.py index 7e16989..0c97dfb 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -83,8 +83,6 @@ notification_spooldir = cmk.paths.var_dir + "/notify/spool" notification_bulkdir = cmk.paths.var_dir + "/notify/bulk" notification_core_log = cmk.paths.var_dir + "/notify/nagios.log" # Fallback for history if no CMC running notification_log = cmk.paths.log_dir + "/notify.log" -notification_logging = 1 -notification_backlog = 10 # keep the last 10 notification contexts for reference notification_log_template = \ u"$CONTACTNAME$ - $NOTIFICATIONTYPE$ - " \ @@ -176,9 +174,8 @@ def do_notify(options, args): convert_legacy_configuration() - global notify_mode, notification_logging - if notification_logging == 0: - notification_logging = 1 # transform deprecated value 0 to 1 + global notify_mode + try: if not os.path.exists(notification_logdir): os.makedirs(notification_logdir) @@ -253,6 +250,11 @@ def convert_legacy_configuration(): else: config.notification_spooling = "remote" + # transform deprecated value 0 to 1 + if config.notification_logging == 0: + config.notification_logging = 1 + + # This function processes one raw notification and decides wether it # should be spooled or not. In the latter cased a local delivery # is being done. @@ -270,11 +272,11 @@ def notify_notify(raw_context, analyse=False): # Add some further variable for the conveniance of the plugins - if notification_logging >= 2: + if config.notification_logging >= 2: notify_log(events.render_context_dump(raw_context)) _complete_raw_context_with_notification_vars(raw_context) - events.complete_raw_context(raw_context, with_dump = notification_logging >= 2, event_log = notify_log) + events.complete_raw_context(raw_context, with_dump = config.notification_logging >= 2, event_log = notify_log) # Spool notification to remote host, if this is enabled if config.notification_spooling in ("remote", "both"): @@ -1618,13 +1620,13 @@ def call_bulk_notification_script(plugin, context_text): # backlock already encoded. def store_notification_backlog(raw_context): path = notification_logdir + "/backlog.mk" - if not notification_backlog: + if not config.notification_backlog: if os.path.exists(path): os.remove(path) return try: - backlog = eval(file(path).read())[:notification_backlog-1] + backlog = eval(file(path).read())[:config.notification_backlog-1] except: backlog = [] @@ -1713,12 +1715,12 @@ def dead_nagios_variable(value): def notify_log(message): - if notification_logging >= 1: + if config.notification_logging >= 1: events.event_log(notification_log, message) def notify_log_debug(message): - if notification_logging >= 2: + if config.notification_logging >= 2: notify_log(message) def fresh_uuid():

6 years, 12 months

Improved selection of virtual host tree elements a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 1cc3b5d920aad9d3209a456b41a738b99d716132 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cc3b5d920aad9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 6 13:25:56 2017 +0200 Improved selection of virtual host tree elements a bit Change-Id: Ie5c992ca0fc8172c0c9c93361a5683063f8872e0 --- web/plugins/wato/check_mk_configuration.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index aa91c4a..39663cd 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -452,6 +452,17 @@ def validate_virtual_host_trees(value, varprefix): raise MKUserError(varprefix, _("The ID needs to be unique.")) tree_ids.add(tree["id"]) + # Validate that each element is selected once + seen = set() + for element in tree["tag_groups"]: + if element in seen: + raise MKUserError(varprefix, + _("Found '%s' a second time in tree '%s'. Each element can only be " + "choosen once.") % (element, tree["id"])) + + seen.add(element) + + register_configvar(group, "virtual_host_trees", @@ -467,12 +478,12 @@ register_configvar(group, title = _("Title of the tree"), allow_empty = False, )), - ("tag_groups", DualListChoice( + ("tag_groups", ListOf( + DropdownChoice( + choices = virtual_host_tree_choices, + ), + title = _("Tree levels"), allow_empty = False, - custom_order = True, - choices = virtual_host_tree_choices, - rows = 10, - size = 80, )), ], optional_keys = [],

6 years, 12 months

4884 FIX oracle_logswitches: Fixed missing oracle.include

by Simon Betz

Module: check_mk Branch: master Commit: 795582f41bc8a308922285cffecb5d0eeda24d06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=795582f41bc8a3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 6 12:05:15 2017 +0200 4884 FIX oracle_logswitches: Fixed missing oracle.include Change-Id: If330167f4265947875278852bbffc2e9449b8804 --- .werks/4884 | 11 +++++++++++ checks/oracle_logswitches | 1 + checks/oracle_version | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4884 b/.werks/4884 new file mode 100644 index 0000000..972f31e --- /dev/null +++ b/.werks/4884 @@ -0,0 +1,11 @@ +Title: oracle_logswitches: Fixed missing oracle.include +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499335234 + + diff --git a/checks/oracle_logswitches b/checks/oracle_logswitches index eb5aee8..45827f8 100644 --- a/checks/oracle_logswitches +++ b/checks/oracle_logswitches @@ -67,4 +67,5 @@ check_info["oracle_logswitches"] = { 'service_description': 'ORA %s Logswitches', 'has_perfdata': True, 'group': 'oracle_logswitches', + 'includes': ['oracle.include'], } diff --git a/checks/oracle_version b/checks/oracle_version index 7215743..fb85bb0 100644 --- a/checks/oracle_version +++ b/checks/oracle_version @@ -47,5 +47,5 @@ check_info['oracle_version'] = { "check_function" : check_oracle_version, "inventory_function" : inventory_oracle_version, "service_description" : "ORA Version %s", - "includes" : [ "oracle.include" ], + "includes" : ["oracle.include"], }

6 years, 12 months

Check API: Add pprint to default modules

by Lars Michelsen

Module: check_mk Branch: master Commit: 01064c6ccff88eba986df8554ac15b9f117b276c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01064c6ccff88e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 6 12:00:18 2017 +0200 Check API: Add pprint to default modules Change-Id: I30f0e5cd350b82d2e189a4a8c87ac24382b289f7 --- cmk_base/check_api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 9f61d2c..250a830 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -120,6 +120,7 @@ import socket import sys import os import time +import pprint from cmk.regex import regex import cmk.render as render

6 years, 12 months

Virtual host tree: Another syling fix

by Lars Michelsen

Module: check_mk Branch: master Commit: f782f188af49e347f1aa511e8104aa69c53ac4dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f782f188af49e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 6 11:59:10 2017 +0200 Virtual host tree: Another syling fix Change-Id: I3993210f29061ed0a75fa017cd0dbcff546ea442 --- web/plugins/sidebar/shipped.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index a97213b..f77f32d 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -2136,7 +2136,9 @@ def render_tag_tree(): tag_groups = trees[choices[0][0]]["tag_groups"] tree = compute_tag_tree(tag_groups) + html.open_div(class_="tag_tree") render_tag_tree_level(tag_groups, [], cwd, _("Virtual Host Tree"), tree) + html.close_div() sidebar_snapins["tag_tree"] = { "title" : _("Virtual Host Tree"), @@ -2170,6 +2172,10 @@ sidebar_snapins["tag_tree"] = { display: inline-box; } +#snapin_tag_tree div.tag_tree { + clear: both; +} + #snapin_tag_tree div.statebullet { position: relative; top: 3px;

6 years, 12 months

Virtual host trees: Fixed rendering issue of "make top level button root" button

by Lars Michelsen

Module: check_mk Branch: master Commit: c1b538e232606120552f98c79bb0bcd18c36ad84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1b538e2326061… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 6 11:52:32 2017 +0200 Virtual host trees: Fixed rendering issue of "make top level button root" button Change-Id: Id19aed8f9b0832fe5b5eb823cdd9fbc88825ee2c --- web/plugins/sidebar/shipped.py | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index e6d0300..a97213b 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -2115,14 +2115,16 @@ def render_tag_tree(): html.begin_form("vtree") - # Give chance to change one level up, if we are in a subtree cwd = tree_conf["cwd"].get(tree_conf["tree"]) + + html.dropdown("vtree", choices, deflt="%s" % tree_conf["tree"], + onchange='virtual_host_tree_changed(this)', style="width:210px" if cwd else None) + + # Give chance to change one level up, if we are in a subtree if cwd: upurl = "javascript:virtual_host_tree_enter('%s')" % "|".join(cwd[:-1]) html.icon_button(upurl, _("Go up one tree level"), "back") - html.dropdown("vtree", choices, deflt="%s" % tree_conf["tree"], - onchange='virtual_host_tree_changed(this)') html.br() html.end_form() html.final_javascript(virtual_host_tree_js) @@ -2146,9 +2148,6 @@ sidebar_snapins["tag_tree"] = { "allowed" : [ "admin", "user", "guest" ], "styles" : """ -#snapin_tag_tree img.iconbutton { -} - #snapin_tag_tree select { background-color: #6DA1B8; border-color: #123A4A; @@ -2159,6 +2158,16 @@ sidebar_snapins["tag_tree"] = { margin-top: -2px; padding: 0; width: 230px; + + float: right; + width: 100%; +} + +#snapin_tag_tree form img.iconbutton { + width: 16px; + height: 16px; + float: right; + display: inline-box; } #snapin_tag_tree div.statebullet { @@ -2176,6 +2185,7 @@ sidebar_snapins["tag_tree"] = { #snapin_tag_tree ul > div.statebullet.leaf { margin-left: 16px; } + #snapin_tag_tree b { font-weight: normal; } @@ -2185,18 +2195,5 @@ sidebar_snapins["tag_tree"] = { top: 0px; left: 0px; } -#snapin_tag_tree form img.iconbutton { - width: 16px; - height: 16px; - float: none; - display: inline-box; - position: absolute; - top: 9px; - left: 14px; -} -#snapin_tag_tree select { - width: 198px; - margin-left: 17px; -} """ }

6 years, 12 months

4950 FIX Virtual host tree: Fixed navigating back to root of tree

by Lars Michelsen

Module: check_mk Branch: master Commit: 6698f24491d37bc2e0b48fc2c13bd70615a7de26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6698f24491d37b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 6 11:42:18 2017 +0200 4950 FIX Virtual host tree: Fixed navigating back to root of tree Change-Id: I170f6490cc0175f64a09c2e2445e6573cbce120a --- .werks/4950 | 10 ++++++++++ web/htdocs/sidebar.py | 2 +- web/plugins/sidebar/shipped.py | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/4950 b/.werks/4950 new file mode 100644 index 0000000..af34f14 --- /dev/null +++ b/.werks/4950 @@ -0,0 +1,10 @@ +Title: Virtual host tree: Fixed navigating back to root of tree +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499334098 +Class: fix + + diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index b1a8b9f..e60c1cc 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -651,7 +651,7 @@ def ajax_tag_tree(): html.write("OK") def ajax_tag_tree_enter(): - path = html.var("path").split("|") if html.has_var("path") else [] + path = html.var("path").split("|") if html.var("path") else [] tree_conf = config.user.load_file("virtual_host_tree", {"tree": 0, "cwd": {}}) tree_conf["cwd"][tree_conf["tree"]] = path config.user.save_file("virtual_host_tree", tree_conf) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 4bf3e13..e6d0300 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1835,7 +1835,8 @@ def compute_tag_tree(taglist): try: sites.live().set_prepend_site(True) query = "GET hosts\n" \ - "Columns: host_name filename state num_services_ok num_services_warn num_services_crit num_services_unknown custom_variables" + "Columns: host_name filename state num_services_ok num_services_warn " \ + "num_services_crit num_services_unknown custom_variables" hosts = sites.live().query(query) finally: sites.live().set_prepend_site(False)

6 years, 12 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017