Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64687 discussions

Check_MK Git: check_mk: Updated bug entries #2228, #2229

by Mathias Kettner

Module: check_mk Branch: master Commit: 42327ea175d442eac8d0f529c94f0ee09faf09e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42327ea175d442… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 20 15:40:57 2014 +0100 Updated bug entries #2228, #2229 --- .bugs/2228 | 9 +++++++++ .bugs/2229 | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/.bugs/2228 b/.bugs/2228 new file mode 100644 index 0000000..482810b --- /dev/null +++ b/.bugs/2228 @@ -0,0 +1,9 @@ +Title: WATO context button in a service view show not go to host properties +Component: multisite +State: open +Date: 2014-11-20 15:39:15 +Targetversion: 1.2.5i1 +Class: nastiness + +If we really want this button then better point it to the list of service +of the host. diff --git a/.bugs/2229 b/.bugs/2229 new file mode 100644 index 0000000..91f8990 --- /dev/null +++ b/.bugs/2229 @@ -0,0 +1,10 @@ +Title: WATO button for service parameters +Component: multisite +State: open +Date: 2014-11-20 15:40:05 +Targetversion: 1.2.5i1 +Class: todo + +When you are at the details of a service there should be a context button for +going to the parameters of that service. And also a button for going to the +monitoring parameters (all rulesets) for that service.

9 years, 10 months

Check_MK Git: check_mk: Fix icon for link to services of host view

by Mathias Kettner

Module: check_mk Branch: master Commit: 93936ed5e4bd45cda77b100defe20435b9beff73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93936ed5e4bd45… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 20 15:36:14 2014 +0100 Fix icon for link to services of host view --- web/plugins/views/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index efa9c92..2d44ed5 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -529,7 +529,7 @@ multisite_builtin_views.update({ ('stp', 'on')], 'hidden': True, 'hide_filters': ['site', 'host'], - 'icon': 'services', + 'icon': 'status', 'layout': 'boxed', 'mustsearch': False, 'name': 'host',

9 years, 10 months

Check_MK Git: check_mk: #1514 FIX Try harder to detect previous hard state in notification when using Nagios as core

by Mathias Kettner

Module: check_mk Branch: master Commit: a036c511b5d54c76cf1bbfeb1f3941f000e41ca6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a036c511b5d54c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 20 15:09:17 2014 +0100 #1514 FIX Try harder to detect previous hard state in notification when using Nagios as core In the case where you have more than one check attempt then now the previous hard state is assumed to be the previous soft state when the new state is OK or UP. This avoids some cases where the previous state had been set to <tt>?</tt> in previous versions. The CMC does not have these problems anyway. --- .werks/1514 | 12 ++++++++++++ ChangeLog | 1 + modules/notify.py | 10 +++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/1514 b/.werks/1514 new file mode 100644 index 0000000..2cb0041 --- /dev/null +++ b/.werks/1514 @@ -0,0 +1,12 @@ +Title: Try harder to detect previous hard state in notification when using Nagios as core +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i7 +Date: 1416492466 +Class: fix + +In the case where you have more than one check attempt then now the previous +hard state is assumed to be the previous soft state when the new state is +OK or UP. This avoids some cases where the previous state had been set to +<tt>?</tt> in previous versions. The CMC does not have these problems anyway. diff --git a/ChangeLog b/ChangeLog index 1552b86..40ccb50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... * 1168 FIX: HTML mails can now be configured to display graphs among each other... + * 1514 FIX: Try harder to detect previous hard state in notification when using Nagios as core... BI: * 1435 FIX: Saving BI aggregations: No longer reports 'Request-URI Too Large'... diff --git a/modules/notify.py b/modules/notify.py index 89ac7a8..87e94c9 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1733,8 +1733,11 @@ def complete_raw_context(raw_context): # Here We do not know. The transition might be OK -> WARN -> CRIT and # the initial OK is completely lost. We use the artificial state "?" # here, which matches all states and makes sure that when in doubt a - # notification is being sent out. - prev_state = "?" + # notification is being sent out. But when the new state is UP, then + # we know that the previous state was a hard state (otherwise there + # would not have been any notification) + if raw_context["HOSTSTATE"] != "UP": + prev_state = "?" notify_log("Previous host hard state not known. Allowing all states.") raw_context["PREVIOUSHOSTHARDSTATE"] = prev_state @@ -1745,7 +1748,8 @@ def complete_raw_context(raw_context): prev_state = "OK" elif "SERVICEATTEMPT" not in raw_context or \ ("SERVICEATTEMPT" in raw_context and raw_context["SERVICEATTEMPT"] != "1"): - prev_state = "?" + if raw_context["SERVICESTATE"] != "OK": + prev_state = "?" notify_log("Previous service hard state not known. Allowing all states.") raw_context["PREVIOUSSERVICEHARDSTATE"] = prev_state

9 years, 10 months

Check_MK Git: check_mk: cisco_asa_failover: Check now can deal with more status codes

by Konstantin Büttner

Module: check_mk Branch: master Commit: 92e7057b2128d1f469a52f008dee515ca58e3c3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92e7057b2128d1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Nov 20 14:56:49 2014 +0100 cisco_asa_failover: Check now can deal with more status codes --- checks/cisco_asa_failover | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/checks/cisco_asa_failover b/checks/cisco_asa_failover index a080f6e..9a4222e 100644 --- a/checks/cisco_asa_failover +++ b/checks/cisco_asa_failover @@ -46,12 +46,22 @@ def inventory_cisco_asa_failover(info): if "this device" in deviceentry[0]: # Return the Cluster role ID of the device. return [ (None, int(info[1][1])) ] - return [] def check_cisco_asa_failover(item, params, info): - asa_state_names = { 9: "active", 10 : "standby" } + asa_state_names = { + 1 : "other", + 2 : "up", + 3 : "down", + 4 : "error", + 5 : "overTemp", + 6 : "busy", + 7 : "noMedia", + 8 : "backup", + 9 : "active", + 10 : "standby", + } for deviceentry in info[-2:]: @@ -77,9 +87,6 @@ def check_cisco_asa_failover(item, params, info): return (state, msgtxt) - return (3, "Data not in SNMP output") - - check_info["cisco_asa_failover"] = { "check_function" : check_cisco_asa_failover, "inventory_function" : inventory_cisco_asa_failover,

9 years, 10 months

Check_MK Git: check_mk: Removed two uneeded table headers from WATO host table

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e3be87b46be3136aea5b46a136f004b1a89154d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e3be87b46be31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 14:03:31 2014 +0100 Removed two uneeded table headers from WATO host table --- web/htdocs/table.py | 2 ++ web/htdocs/wato.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index c0fbdb4..c8ca35a 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -99,6 +99,8 @@ def add_row(css=None, state=0, collect_headers=True, fixed=False): table["collect_headers"] = True elif table["collect_headers"] == True: table["collect_headers"] = "finished" + elif not collect_headers and table["collect_headers"]: + table["collect_headers"] = False # Intermediate title, shown as soon as there is a following row. # We store the group headers in the list of rows, with css None diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c411961..fa121bf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1388,7 +1388,7 @@ def show_hosts(folder): for attr, topic in host_attributes: if attr.show_in_table(): colspan += 1 - if config.may("wato.edit_hosts") and config.may("wato.move_hosts"): + if not g_folder.get(".lock_hosts") and config.may("wato.edit_hosts") and config.may("wato.move_hosts"): colspan += 1 if show_checkboxes: colspan += 1

9 years, 10 months

Check_MK Git: check_mk: Fix too small input field in SNMP timing settings

by Mathias Kettner

Module: check_mk Branch: master Commit: 2b809eff1f3a00bd0aa7ed078e9cc98d6d4f746e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b809eff1f3a00… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 20 12:39:40 2014 +0100 Fix too small input field in SNMP timing settings --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 35446b2..782cb0d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2343,12 +2343,12 @@ register_rule(group, maxvalue = 60, allow_int = True, unit = _("sec"), + size = 6, ), ), ( "retries", Integer( title = _("Number of retries"), - help = _("The default is 5."), default_value = 5, minvalue = 0, maxvalue = 50,

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #1008, #2193

by Lars Michelsen

Module: check_mk Branch: master Commit: 909d614f01ac527f166f65a04ad2336438c8fbfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=909d614f01ac52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 11:31:38 2014 +0100 Updated bug entries #1008, #2193 --- .bugs/1008 | 7 +++++-- .bugs/2193 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/1008 b/.bugs/1008 index 0496e6e..02305a9 100644 --- a/.bugs/1008 +++ b/.bugs/1008 @@ -1,9 +1,9 @@ Title: dashboards: dashboard of a single hostgroup cannot be edited Component: multisite -State: open +Class: bug +State: works4me Date: 2014-11-05 21:35:53 Targetversion: future -Class: bug after creating a dashboard for a single hostgroup, saving it and editing it again, the following traceback occurs at the and and the dashboard cannot @@ -34,3 +34,6 @@ Traceback (most recent call last): File "/omd/sites/heute/share/check_mk/web/htdocs/visuals.py", line 854, in set_value html.set_var(varname, value.get(varname)) AttributeError: 'unicode' object has no attribute 'get' + +2014-11-20 11:31:33: changed state open -> works4me +Already fixed. diff --git a/.bugs/2193 b/.bugs/2193 index 70f27d8..a1cf48a 100644 --- a/.bugs/2193 +++ b/.bugs/2193 @@ -1,10 +1,13 @@ Title: Dashboard: after going to a dashlet detail, edit mode is lost Component: multisite -State: open +Class: nastiness +State: works4me Date: 2014-10-06 19:00:53 Targetversion: future -Class: nastiness When you are in dashboard edit mode and go to the details of a dashlet and then got back - either by saving or by the back button - then the edit mode of the dashboard is lost. But it should keep in edit mode. + +2014-11-20 11:26:10: changed state open -> works4me +Unable to reproduce this. Already fixed.

9 years, 10 months

Check_MK Git: check_mk: Fixed dashlet deletion after latest confirm dialog change

by Lars Michelsen

Module: check_mk Branch: master Commit: 16da594edf2cb8d3d426ec14ef0a3427d55d4d64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16da594edf2cb8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 11:37:02 2014 +0100 Fixed dashlet deletion after latest confirm dialog change --- web/htdocs/dashboard.py | 2 +- web/htdocs/htmllib.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 77cd07c..b8834b4 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -977,7 +977,7 @@ def page_delete_dashlet(): html.context_button(_('Back'), back_url, 'back') html.end_context_buttons() - result = html.confirm(_('Do you really want to delete this dashlet?'), method = 'GET') + result = html.confirm(_('Do you really want to delete this dashlet?'), method='GET', add_transid=True) if result == False: html.footer() return # confirm dialog shown diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d2f20ad..c43be21 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1128,7 +1128,12 @@ class html: else: return False - def confirm(self, msg, method="POST", action=None): + # The confirm dialog is normally not a dialog which need to be protected + # by a transid itselfs. It is only a intermediate step to the real action + # But there are use cases where the confirm dialog is used during rendering + # a normal page, for example when deleting a dashlet from a dashboard. In + # such cases, the transid must be added by the confirm dialog. + def confirm(self, msg, method="POST", action=None, add_transid=False): if self.var("_do_actions") == _("No"): # User has pressed "No", now invalidate the unused transid self.check_transaction() @@ -1137,9 +1142,7 @@ class html: if self.mobile: self.write('<center>') self.write("<div class=really>%s" % msg) - # The confirm dialog is never a dialog which need to be protected - # by a transid itselfs. It is only a intermediate step to the real action - self.begin_form("confirm", method=method, action=action, add_transid=False) + self.begin_form("confirm", method=method, action=action, add_transid=add_transid) self.hidden_fields(add_action_vars = True) self.button("_do_confirm", _("Yes!"), "really") self.button("_do_actions", _("No"), "")

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2227

by Mathias Kettner

Module: check_mk Branch: master Commit: 6628989df281314123789cd733827440c1092c1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6628989df28131… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 20 11:22:10 2014 +0100 Updated bug entries #2227 --- .bugs/2227 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2227 b/.bugs/2227 new file mode 100644 index 0000000..6ad1e59 --- /dev/null +++ b/.bugs/2227 @@ -0,0 +1,8 @@ +Title: Multisite connections: move persistent connection option to TCP +Component: multisite +State: open +Date: 2014-11-20 11:21:24 +Targetversion: 1.2.5i1 +Class: nastiness + +This checkbox does not make sense for Livestatus-Proxy and local connections.

9 years, 10 months

Check_MK Git: check_mk: #1529 FIX Mobile-GUI: Fixed "all host problems" view not showing all problems

by Lars Michelsen

Module: check_mk Branch: master Commit: 6176dc990935bb0ce2d2fc9616bf219151d6c840 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6176dc990935bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 11:14:14 2014 +0100 #1529 FIX Mobile-GUI: Fixed "all host problems" view not showing all problems The view was not showing all problems. Instead it was filtering acknowledged hosts. --- .werks/1529 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/mobile.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1529 b/.werks/1529 new file mode 100644 index 0000000..40eda92 --- /dev/null +++ b/.werks/1529 @@ -0,0 +1,10 @@ +Title: Mobile-GUI: Fixed "all host problems" view not showing all problems +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416478405 + +The view was not showing all problems. Instead it was filtering acknowledged hosts. diff --git a/ChangeLog b/ChangeLog index 5dfe667..37877bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 1501 FIX: Legacy view formats created with 2014-09 snapshots are now converted... * 1506 FIX: Fixed randomly hidden dashboard title... * 1527 FIX: Fixed views missing values of some filters (serviceregex, hostgroup filters, ...)... + * 1529 FIX: Mobile-GUI: Fixed "all host problems" view not showing all problems... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index 936a698..2e97c47 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -392,7 +392,7 @@ multisite_builtin_views.update({ ('hst1', 'on'), ('hst2', 'on'), ('hstp', ''), - ('is_host_acknowledged', '0'), + ('is_host_acknowledged', '-1'), ('host', ''), ('is_summary_host', '0'), ('opthostgroup', '')

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits