Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

4154 Do not send notifications if host found and currently in downtime

by Mathias Kettner

Module: check_mk Branch: master Commit: 981ccc3319e2a627e7b23eb0869c1bd77f6c209e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=981ccc3319e2a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 11:43:15 2016 +0100 4154 Do not send notifications if host found and currently in downtime When you forward notifications from the Event Console to Check_MK then from now on these are being suppressed if the host can be found in the active monitoring and is currently in a scheduled downtime. This is very much what users except and want to happen. Please note that - however - this is an incompatible change sind now some notifications will not longer be sent that have been sent previously. Change-Id: Iee146930e13e2b382193c6f4c1abcf8e9b7d4808 --- .werks/4154 | 15 +++++++++++++++ ChangeLog | 4 ++++ bin/mkeventd | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/.werks/4154 b/.werks/4154 new file mode 100644 index 0000000..24d7135 --- /dev/null +++ b/.werks/4154 @@ -0,0 +1,15 @@ +Title: Do not send notifications if host found and currently in downtime +Level: 2 +Component: ec +Compatible: incomp +Version: 1.4.0i4 +Date: 1482144072 +Class: feature + +When you forward notifications from the Event Console to Check_MK then +from now on these are being suppressed if the host can be found in the +active monitoring and is currently in a scheduled downtime. + +This is very much what users except and want to happen. Please note that +- however - this is an incompatible change sind now some notifications +will not longer be sent that have been sent previously. diff --git a/ChangeLog b/ChangeLog index 65da6be..598017a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,10 @@ * 4142 New extended search dialog for rulesets and rules... * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery + Event Console: + * 4154 Do not send notifications if host found and currently in downtime... + NOTE: Please refer to the migration notes! + 1.4.0i3: Core & Setup: diff --git a/bin/mkeventd b/bin/mkeventd index 6462a51..ae6bb11 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3967,6 +3967,12 @@ def do_notify(event, username=None, is_cancelling=False): for varname, value in sorted(context.items()): verbose(" %-25s: %s" % (varname, value)) + if context["HOSTDOWNTIME"] != "0": + log("Host %s is currently in scheduled downtime. " + "Skipping notification of event %s." % ( + context["HOSTNAME"], event["id"])) + return + # Send notification context via stdin. context_string = to_utf8("".join([

7 years, 9 months

Fixed werk version

by Lars Michelsen

Module: check_mk Branch: master Commit: 70fdf75b9274980769cdf2b40dc37933a9517ed1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70fdf75b927498… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 11:39:37 2016 +0100 Fixed werk version Change-Id: Ibebb86a8ab833d47ffdf928b7e458f6a12256f02 --- .werks/4169 | 2 +- ChangeLog | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.werks/4169 b/.werks/4169 index 6da270d..170ce7e 100644 --- a/.werks/4169 +++ b/.werks/4169 @@ -2,7 +2,7 @@ Title: View action: Default values of sticky, notification and persistent option Level: 1 Component: multisite Compatible: compat -Version: 1.4.0i3 +Version: 1.4.0i4 Date: 1482072617 Class: feature diff --git a/ChangeLog b/ChangeLog index e6fe429..65da6be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... + Multisite: + * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... + WATO: * 4142 New extended search dialog for rulesets and rules... * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery @@ -95,7 +98,6 @@ * 4083 Web API: Always output full traceback in case of non Check_MK unhandled exceptions * 4135 View CSV export: Group cells are added in front of the regular cells for each row... * 4136 Availability CSV export: Adding grouping title as first column in case of grouped views - * 4169 View action: sticky, notification and persistent default configuration can be set for acknownledge commands in host or service views * 3974 FIX: Sorting comments in hover menu of comments icon by time now * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... * 4046 FIX: Repaired html rendering....

7 years, 9 months

4169 View action defaults: sticky, notification and persistent default configuration can be set for acknownledge commands in host or service views

by Simon Betz

Module: check_mk Branch: master Commit: 143a9867758fc81e8a312134a8c6a62b068285c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=143a9867758fc8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sun Dec 18 15:52:01 2016 +0100 4169 View action defaults: sticky, notification and persistent default configuration can be set for acknownledge commands in host or service views Change-Id: Ia72af8f0d86e9c1a3f88bd92b0a3a500c8a8aca3 --- .werks/4169 | 9 +++++++++ ChangeLog | 1 + web/plugins/config/builtin.py | 6 ++++++ web/plugins/views/commands.py | 13 ++++++++++--- web/plugins/wato/check_mk_configuration.py | 21 +++++++++++++++++++++ 5 files changed, 47 insertions(+), 3 deletions(-) diff --git a/.werks/4169 b/.werks/4169 new file mode 100644 index 0000000..6da270d --- /dev/null +++ b/.werks/4169 @@ -0,0 +1,9 @@ +Title: View action: Default values of sticky, notification and persistent options can now be configured via global settings. +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i3 +Date: 1482072617 +Class: feature + +Above default values can be configured via {{View action defaults}} in {{User interface}} in {{Global settings}}. diff --git a/ChangeLog b/ChangeLog index fa553b7..e6fe429 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * 4083 Web API: Always output full traceback in case of non Check_MK unhandled exceptions * 4135 View CSV export: Group cells are added in front of the regular cells for each row... * 4136 Availability CSV export: Adding grouping title as first column in case of grouped views + * 4169 View action: sticky, notification and persistent default configuration can be set for acknownledge commands in host or service views * 3974 FIX: Sorting comments in hover menu of comments icon by time now * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... * 4046 FIX: Repaired html rendering.... diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index bf5ce5d..c9b82ae 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -116,6 +116,12 @@ view_option_columns = [ 1, 2, 3, 4, 5, 6, 8, 10, 12 ] # MISC doculink_urlformat = "http://mathias-kettner.de/checkmk_%s.html"; +view_action_defaults = { + "ack_sticky" : True, + "ack_notify" : True, + "ack_persistent" : False, +} + # ____ _ _ _ _ # / ___| _ ___| |_ ___ _ __ ___ | | (_)_ __ | | _____ diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index cf0f0f9..d0c2f10 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -404,6 +404,7 @@ def command_acknowledgement(cmdtag, spec, row): raise MKUserError("_ack_comment", _("You need to supply a comment.")) if ";" in comment: raise MKUserError("_ack_comment", _("The comment must not contain semicolons.")) + sticky = html.var("_ack_sticky") and 2 or 0 sendnot = html.var("_ack_notify") and 1 or 0 perscomm = html.var("_ack_persistent") and 1 or 0 @@ -449,9 +450,15 @@ multisite_commands.append({ html.button("_acknowledge", _("Acknowledge")) == \ html.button("_remove_ack", _("Remove Acknowledgement")) == \ html.hr() == \ - html.checkbox("_ack_sticky", True, label=_("sticky")) == \ - html.checkbox("_ack_notify", True, label=_("send notification")) == \ - html.checkbox("_ack_persistent", False, label=_('persistent comment')) == \ + html.checkbox("_ack_sticky", + config.view_action_defaults["ack_sticky"], + label=_("sticky")) == \ + html.checkbox("_ack_notify", + config.view_action_defaults["ack_notify"], + label=_("send notification")) == \ + html.checkbox("_ack_persistent", + config.view_action_defaults["ack_persistent"], + label=_('persistent comment')) == \ html.hr() == \ Age(display=["days", "hours", "minutes"], label=_("Expire acknowledgement after")).render_input("_ack_expire", 0) == \ html.help(_("Note: Expiration of acknowledgements only works when using the Check_MK Micro Core.")) == \ diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index e7cb51b..f5c73a8 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -718,6 +718,27 @@ register_configvar(group, domain = "multisite" ) +register_configvar(group, + "view_action_defaults", + Dictionary( + title = _("View action defaults"), + elements = [ + ("ack_sticky", Checkbox( + title = _("Sticky"), label = _("Enable"), default_value = True, + )), + ("ack_notify", Checkbox( + title = _("Send notification"), label = _("Enable"), default_value = True, + )), + ("ack_persistent", Checkbox( + title = _("Persistent comment"), label = _("Enable"), default_value = False, + )), + ], + optional_keys = [], + ), + domain = "multisite" +) + + #. # .--WATO----------------------------------------------------------------. # | __ ___ _____ ___ |

7 years, 9 months

4153 FIX Fix forwarding notifications to Check_MK when no contact groups are set

by Mathias Kettner

Module: check_mk Branch: master Commit: f69a90b1ea923451dff747d10c75ed64f97d9dad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f69a90b1ea9234… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 11:20:47 2016 +0100 4153 FIX Fix forwarding notifications to Check_MK when no contact groups are set Change-Id: Ibd12eca0724e7d2883813ec2062678ce19be11da --- .werks/4153 | 9 +++++++++ ChangeLog | 1 + bin/mkeventd | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4153 b/.werks/4153 new file mode 100644 index 0000000..21a0580 --- /dev/null +++ b/.werks/4153 @@ -0,0 +1,9 @@ +Title: Fix forwarding notifications to Check_MK when no contact groups are set +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i3 +Date: 1482142829 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index cfe294f..fa553b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -153,6 +153,7 @@ * 4147 FIX: Always show rule analyser result on Generate, not only after previous Try out... * 4149 FIX: Fix notifications from Event Console if host has more than one contact... * 4152 FIX: Fix matching of hosts when forwarding notifications from Event Console... + * 4153 FIX: Fix forwarding notifications to Check_MK when no contact groups are set Livestatus: * 3651 FIX: Fixed potential segfault with Nagios core when accessing log/commands table via Livestatus.... diff --git a/bin/mkeventd b/bin/mkeventd index 9b68d71..6462a51 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -4131,7 +4131,7 @@ def base_notification_context(event, username, is_cancelling): "EC_CONTACT": event.get("contact", ""), "EC_PID": str(event.get("pid", 0)), "EC_MATCH_GROUPS": "\t".join(event["match_groups"]), - "EC_CONTACT_GROUPS": " ".join(event.get("contact_groups", [])), + "EC_CONTACT_GROUPS": " ".join(event.get("contact_groups") or []), "EC_ORIG_HOST": event.get("orig_host", event["host"]), }

7 years, 9 months

Not localizing copyright note

by Lars Michelsen

Module: check_mk Branch: master Commit: 3f92a69ece2299730492aaa9c8f7c8fce3978868 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f92a69ece2299… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 11:13:35 2016 +0100 Not localizing copyright note Change-Id: I655759416555cd8aa5d3ecbe06302fe66a630402 --- web/htdocs/sidebar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index cd78e60..9b11343 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -246,7 +246,7 @@ def sidebar_foot(): html.close_div() html.open_div(class_=["copyright"]) - html.write(_("© " + html.render_a("Mathias Kettner", target="_blank", href="http://mathias-kettner.de"))) + html.write("© " + html.render_a("Mathias Kettner", target="_blank", href="http://mathias-kettner.de")) html.close_div() html.close_div()

7 years, 9 months

4172 FIX smart.temp: fixed discovery and check function

by Simon Betz

Module: check_mk Branch: master Commit: a62c412e308513811a32bf773f358684ed93625f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a62c412e308513… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 19 11:10:16 2016 +0100 4172 FIX smart.temp: fixed discovery and check function Discovery function now detects Temperature_Celsius or Temperature_Internal keys in a right way. Now the check function handles these keys correctly. Change-Id: I656f7a6ccba836e4e75680c95f0056283a7e3dc3 --- .werks/4172 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/4172 b/.werks/4172 new file mode 100644 index 0000000..e444bca --- /dev/null +++ b/.werks/4172 @@ -0,0 +1,11 @@ +Title: smart.temp: fixed discovery and check function +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482142004 + +Discovery function now detects Temperature_Celsius or Temperature_Internal keys in a right way. +Now the check function handles these keys correctly. diff --git a/ChangeLog b/ChangeLog index 97f0ff3..cfe294f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 4104 veeam_tapejobs: New check to monitor Veeam tape jobs * 4171 FIX: perle_psmu: fixed value error... + * 4172 FIX: smart.temp: fixed discovery and check function... WATO: * 4142 New extended search dialog for rulesets and rules...

7 years, 9 months

Refactoring sidebar.

by Roland Halbig

Module: check_mk Branch: master Commit: df8122b82794363433c328301d2854f5d367d9e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df8122b8279436… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 15 15:32:49 2016 +0100 Refactoring sidebar. Change-Id: I89ea0741c4b0f8b14a1c631393fd287714b2ecad --- tests/web/test_auto_sidebar.py | 312 +++++++++++++++++++++++++++++++++++++++++ web/htdocs/sidebar.py | 153 ++++++++++---------- 2 files changed, 391 insertions(+), 74 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=df8122b827…

7 years, 9 months

4003 FIX esx_vsphere_objects: fixed check parameters display bug during WATO service discovery

by Andreas Boesl

Module: check_mk Branch: master Commit: 5884bd46c6ffdeb13a3759b9660d4b23e361d657 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5884bd46c6ffde… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 19 10:44:09 2016 +0100 4003 FIX esx_vsphere_objects: fixed check parameters display bug during WATO service discovery Change-Id: I845d47f0c32642e47ea581535f959b58b83bd9f6 --- .werks/4003 | 9 +++++++++ ChangeLog | 1 + checks/esx_vsphere_objects | 28 ++++++++++++++-------------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.werks/4003 b/.werks/4003 new file mode 100644 index 0000000..2bae7f1 --- /dev/null +++ b/.werks/4003 @@ -0,0 +1,9 @@ +Title: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1482140611 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7a469f8..97f0ff3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ WATO: * 4142 New extended search dialog for rulesets and rules... + * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery 1.4.0i3: diff --git a/checks/esx_vsphere_objects b/checks/esx_vsphere_objects index ef84316..140da6f 100644 --- a/checks/esx_vsphere_objects +++ b/checks/esx_vsphere_objects @@ -76,16 +76,7 @@ def check_esx_vsphere_objects(item, params, info): if vsphere_object_names[line[0]] + " " + line[1] == item and len(line) > 3: running_on = line[2] power_state = line[3] - state = params.get("states",{}).get(power_state) - if state == None: - if power_state == "poweredOn": - state = 0 - elif power_state == "poweredOff": - state = 1 - elif power_state == "suspended": - state = 1 - else: - state = 3 + state = params["states"].get(power_state, 3) infotext = "power state: %s" % power_state if running_on: if state == 0: @@ -102,12 +93,21 @@ def check_esx_vsphere_objects(item, params, info): else: return 3, "No data about host system %s" % name +factory_settings["esx_vsphere_objects_default_levels"] = { + "states": { + "poweredOn": 0, + "poweredOff": 1, + "suspended": 1, + "unknown": 3, + } +} check_info['esx_vsphere_objects'] = { - "inventory_function" : inventory_esx_vsphere_objects, - "check_function" : check_esx_vsphere_objects, - "service_description" : "%s", - "group" : "esx_vsphere_objects", + "inventory_function" : inventory_esx_vsphere_objects, + "check_function" : check_esx_vsphere_objects, + "service_description" : "%s", + "group" : "esx_vsphere_objects", + "default_levels_variable" : "esx_vsphere_objects_default_levels", } def inventory_esx_vsphere_objects_count(info):

7 years, 9 months

Completed rule/ruleset search form

by Lars Michelsen

Module: check_mk Branch: master Commit: 0e3604a5a376eff70b798569b1f1642d8959c14a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e3604a5a376ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 16:58:28 2016 +0100 Completed rule/ruleset search form Change-Id: I30ae9ad11dfbd79066aa301819f11513b0aaf89d --- web/htdocs/wato.css | 8 ++++++++ web/htdocs/wato.py | 8 +++++++- web/htdocs/watolib.py | 14 ++++++++++---- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index d6f86f5..075be55 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -646,6 +646,14 @@ table.validationerror img { background-color: #fcc; } +.wato table.data.ruleset.oddeven > tbody > tr.matches_search:nth-child(odd) { + background-color: #bfd; +} + +.wato table.data.ruleset.oddeven > tbody > tr.matches_search:nth-child(even) { + background-color: #afb; +} + .wato table.data.ruleset tr.ineffective td * { color: #999; text-shadow: 0px 1px 0px #fff; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 35f8021..223e0e7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12107,7 +12107,7 @@ def mode_rulesets(phase, group=None): url_vars.append(("host", only_host)) if only_ineffective: url_vars.append(("highlight_ineffective", "1")) - view_url = folder_preserving_link(url_vars) + view_url = html.makeuri(url_vars) html.a(ruleset.title(), href=view_url, class_="nonzero" if ruleset.is_empty() else "zero") html.span("." * 100, class_="dots") @@ -12347,6 +12347,8 @@ def mode_edit_ruleset(phase): match_keys = set([]) # in case if match = "dict" last_folder = None + search_options = ModeRuleSearch().search_options + skip_this_folder = False all_hosts = Host.all() for folder, rulenr, rule in ruleset.get_rules(): @@ -12376,10 +12378,14 @@ def mode_edit_ruleset(phase): css = [] if rule.is_disabled(): css.append("disabled") + if html.var("highlight_ineffective"): if rule.is_ineffective(all_hosts): css.append("ineffective") + if search_options and rule.matches_search(search_options): + css.append("matches_search") + table.row(css=" ".join(css) if css else None) # Rule matching diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 3a5493d..56cd523 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6235,9 +6235,15 @@ class Ruleset(object): if rule.matches_search(search_options): self.search_matching_rules.append(rule) + if "fulltext" not in search_options: + return bool(self.search_matching_rules) + if not match_one_of_search_expression(search_options, "fulltext", - [self.name(), self.title(), self.help()]): - return False + [self.name(), self.title(), self.help()]): + if self.search_matching_rules: + return True + else: + return False return True @@ -6376,7 +6382,7 @@ def match_search_expression(search_options, attr_name, search_in): if attr_name not in search_options: return True # not searched for this. Matching! - return search_in and re.search(search_options[attr_name], search_in, re.I) + return search_in and re.search(search_options[attr_name], search_in, re.I) != None def match_one_of_search_expression(search_options, attr_name, search_in_list): @@ -6656,7 +6662,7 @@ class Rule(object): if not match_one_of_search_expression(search_options, "rule_host_list", self.host_list()): return False - if not match_one_of_search_expression(search_options, "rule_item_list", self.item_list() or []): + if self.item_list() and not match_one_of_search_expression(search_options, "rule_item_list", self.item_list()): return False to_search = [

7 years, 9 months

Introduced rulespec class

by Lars Michelsen

Module: check_mk Branch: master Commit: d9a6e3a99d432273ee311d1b8c846897a0398338 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9a6e3a99d4322… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 18:20:08 2016 +0100 Introduced rulespec class Change-Id: I52eb4e68928d0e060ac6273f48b44567cb1c24e4 --- web/htdocs/wato.py | 85 ++++++++++++++++++----------------- web/htdocs/watolib.py | 120 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 120 insertions(+), 85 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d9a6e3a99d…

7 years, 9 months

← Newer
1
...
12
13
14
15
16
17
18
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016