Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

4135 View CSV export: Group cells are added in front of the regular cells for each row

by Lars Michelsen

Module: check_mk Branch: master Commit: 0639c51d0124a3ee8bd58f36c0d762a0dc2899de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0639c51d0124a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 8 09:59:40 2016 +0100 4135 View CSV export: Group cells are added in front of the regular cells for each row The group cells were missing in the export. So it was not possible to reproduce the grouping with the exported data. --- .werks/4135 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/webservice.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/4135 b/.werks/4135 new file mode 100644 index 0000000..da912b5 --- /dev/null +++ b/.werks/4135 @@ -0,0 +1,10 @@ +Title: View CSV export: Group cells are added in front of the regular cells for each row +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i3 +Date: 1481187505 +Class: feature + +The group cells were missing in the export. So it was not possible to reproduce the grouping +with the exported data. diff --git a/ChangeLog b/ChangeLog index a9d73a4..ec66a46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * 4107 Now you are able to search for check plugins * 3997 New metric for mrpe/check_icmp... * 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... * 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/views/webservice.py b/web/plugins/views/webservice.py index 32cbaa8..84705f5 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -130,7 +130,7 @@ def render_csv(rows, view, group_cells, cells, num_columns, show_checkboxes, exp csv_separator = html.var("csv_separator", ";") first = True - for cell in cells: + for cell in group_cells + cells: if first: first = False else: @@ -143,7 +143,7 @@ def render_csv(rows, view, group_cells, cells, num_columns, show_checkboxes, exp for row in rows: html.write("\n") first = True - for cell in cells: + for cell in group_cells + cells: if first: first = False else:

7 years, 6 months

WATO: Unified ineffective rulesets view with other ruleset list views

by Lars Michelsen

Module: check_mk Branch: master Commit: 8160c151503a658bd4b140f6af5a4bf432a5ee87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8160c151503a65… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 8 09:34:47 2016 +0100 WATO: Unified ineffective rulesets view with other ruleset list views --- web/htdocs/wato.css | 13 +++++ web/htdocs/wato.py | 154 +++++++++++++++------------------------------------- 2 files changed, 58 insertions(+), 109 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8160c15150…

7 years, 6 months

4134 FIX Unified ineffective rulesets view with other ruleset list views

by Lars Michelsen

Module: check_mk Branch: master Commit: 6c17ee95900757284048bd658eb871f2c95d35a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c17ee95900757… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 8 09:35:05 2016 +0100 4134 FIX Unified ineffective rulesets view with other ruleset list views --- .werks/4134 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/4134 b/.werks/4134 new file mode 100644 index 0000000..f35666f --- /dev/null +++ b/.werks/4134 @@ -0,0 +1,9 @@ +Title: Unified ineffective rulesets view with other ruleset list views +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i3 +Date: 1481186096 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 41dc7e2..a9d73a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ * 4130 FIX: Improved error handling when trying to edit not existant rules * 4131 FIX: Fixed broken WATO site login when using password containing special characters... * 4133 FIX: Do not suppress site specific global issues during WATO activation + * 4134 FIX: Unified ineffective rulesets view with other ruleset list views Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications...

7 years, 6 months

improved netscaler health status rule

by Simon Betz

Module: check_mk Branch: master Commit: 66dcbcf68f7c0f65baf3439a8480b4eca4e13662 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66dcbcf68f7c0f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 8 09:00:35 2016 +0100 improved netscaler health status rule --- checks/netscaler_vserver | 33 ++++++++++++++++++++++----------- web/plugins/wato/check_parameters.py | 5 ++++- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/checks/netscaler_vserver b/checks/netscaler_vserver index 557c61f..1e1c761 100644 --- a/checks/netscaler_vserver +++ b/checks/netscaler_vserver @@ -78,10 +78,15 @@ netscaler_vserver_entitytypes = { } +factory_settings["netscaler_vserver_default_levels"] = { + "health_levels" : (100.0, 0.1), +} + + def inventory_netscaler_vserver(info): for line in info: if line[0]: - yield line[0], None + yield line[0], {} def check_netscaler_vserver(item, params, info): @@ -91,28 +96,33 @@ def check_netscaler_vserver(item, params, info): for name, ip, port, svr_type, svr_state,\ svr_health, svr_entitytype in info: if name == item: - svr_state, svr_state_readable = netscaler_vserver_states.get(svr_state, ("unknown", 1)) + svr_state, svr_state_readable = \ + netscaler_vserver_states.get(svr_state, ("unknown", 1)) yield svr_state, "Status: %s" % svr_state_readable if svr_entitytype in [ "1", "2" ]: - health_perc = int(svr_health) + health_perc = float(svr_health) health_state = 0 + infotext = "Health: %s" % get_percent_human_readable(health_perc) + warn, crit = params["health_levels"] - if health_perc == 0: + if health_perc < crit: health_state = 2 - elif health_perc < 100: + elif health_perc < warn: health_state = 1 - if "map_health_status" in params: - health_state = params["map_health_status"] + if health_state > 0: + infotext += " (warn/crit at %s/%s)" % \ + (get_percent_human_readable(warn), + get_percent_human_readable(crit)) - yield health_state, "Health: %s" % get_percent_human_readable(health_perc),\ + yield health_state, infotext, \ [("health_perc", health_perc, None, None, 0, 100)] yield 0, "Type: %s, Protocol: %s, Socket: %s:%s" % ( - netscaler_vserver_entitytypes.get(svr_entitytype , "unknown (%s)" % svr_entitytype), - netscaler_vserver_types.get(svr_type, "service unknown (%s)" % svr_type), - ip, port) + netscaler_vserver_entitytypes.get(svr_entitytype , "unknown (%s)" % svr_entitytype), + netscaler_vserver_types.get(svr_type, "service unknown (%s)" % svr_type), + ip, port) check_info["netscaler_vserver"] = { @@ -131,4 +141,5 @@ check_info["netscaler_vserver"] = { "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5951.1"), "group" : "netscaler_vserver", + "default_levels_variable" : "netscaler_vserver_default_levels", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 614d8b0..2815bb9 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6692,7 +6692,10 @@ register_check_parameters( _("Netscaler VServer States"), Dictionary( elements = [ - ("map_health_status", MonitoringState(title=_("Health Status"))) + ("health_status", Tuple(title = _("Health status"), elements = [ + Percentage(title = _("Warning below"), default_value = 100.0), + Percentage(title = _("Critical below"), default_value = 0.1), + ])), ] ), TextAscii( title = _("Name of VServer") ),

7 years, 6 months

updated werk text

by Simon Betz

Module: check_mk Branch: master Commit: 88b48669c7203dfca8c4cf5b8801f27c88b9167f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88b48669c7203d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 8 09:02:35 2016 +0100 updated werk text --- .werks/4110 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/4110 b/.werks/4110 index f5591d6..2a8dbc1 100644 --- a/.werks/4110 +++ b/.werks/4110 @@ -1,4 +1,4 @@ -Title: netscaler_vserver: health status is now configurable +Title: netscaler_vserver: now lower levels for health are configurable Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index 09e9bb6..41dc7e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,7 +18,7 @@ * 3996 agent_netapp clustermode: now uses a fallback query to determine the node name if the intial query fails * 4108 ipmi_sensors: new options available... * 4109 websphere_mq_instance, websphere_mq_instance.manager: new checks for Websphere MQ - * 4110 netscaler_vserver: health status is now configurable + * 4110 netscaler_vserver: now lower levels for health are configurable * 4098 ups_cps_battery, ups_cps_battery.temp, ups_cps_inphase, ups_cps_outphase: Several checks to monitor CPS UPS devices * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias...

7 years, 6 months

EC: fix HTML tag in help text

by Mathias Kettner

Module: check_mk Branch: master Commit: 68e64696e5606581e7af9a9cc8ce0b1471e96950 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68e64696e56065… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 15:10:35 2016 +0100 EC: fix HTML tag in help text --- web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 8038fed..66a16ef 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -54,7 +54,7 @@ The following macros will be substituted by value from the actual event: <tr><td class=tt>$TEXT$</td><td>Message text</td></tr> <tr><td class=tt>$FIRST$</td><td>Time of the first occurrance (time stamp)</td></tr> <tr><td class=tt>$LAST$</td><td>Time of the most recent occurrance</td></tr> -<tr><td class=tt>$COMMENT$</td><td>Event comment/td></tr> +<tr><td class=tt>$COMMENT$</td><td>Event comment</td></tr> <tr><td class=tt>$SL$</td><td>Service Level</td></tr> <tr><td class=tt>$HOST$</td><td>Host name (as sent by syslog)</td></tr> <tr><td class=tt>$CONTACT$</td><td>Contact information</td></tr>

7 years, 7 months

EC: correct labelling of button for adding an action

by Mathias Kettner

Module: check_mk Branch: master Commit: 07d2f25cb7013af65eb98d0108df1f359f4ad98f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07d2f25cb7013a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 15:07:23 2016 +0100 EC: correct labelling of button for adding an action --- web/plugins/wato/mkeventd.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 04757db..8038fed 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -196,6 +196,7 @@ vs_mkeventd_actions = \ help = _("Configure that possible actions that can be performed when a " "rule triggers and also manually by a user."), totext = _("%d actions"), + add_label = _("Add new action"), )

7 years, 7 months

htmllib:Fixed utf-8 bug.

by Roland Halbig

Module: check_mk Branch: master Commit: e41b1c479cb4010729d47805c20f1b3ed38e93d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e41b1c479cb401… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Dec 7 14:58:16 2016 +0100 htmllib:Fixed utf-8 bug. --- web/htdocs/htmllib.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 8cd91f7..4e33594 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -160,7 +160,10 @@ class HTML(unicode, Escaper): def __new__(self, value = ''): - return unicode.__new__(self, value) + try: + return unicode.__new__(self, value) + except UnicodeDecodeError as e: + return unicode.__new__(self, value.decode('utf-8')) def __repr__(self):

7 years, 7 months

4147 FIX Always show rule analyser result on Generate, not only after previous Try out

by Mathias Kettner

Module: check_mk Branch: master Commit: 90c75443e8208e347c4a860ae63136ca006716b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90c75443e8208e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 13:41:40 2016 +0100 4147 FIX Always show rule analyser result on Generate, not only after previous Try out In the Event Console configuration there is the event simulator. If you first did {{Try out}} with a message and after that {{Generate}}, then still the event would be analysed and the rules marked according to the matches. Previously this did not work when you did not {{Try out}} before. This has been fixed. --- .werks/4147 | 15 +++++++++++++++ ChangeLog | 1 + web/plugins/wato/mkeventd.py | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4147 b/.werks/4147 new file mode 100644 index 0000000..ab5edeb --- /dev/null +++ b/.werks/4147 @@ -0,0 +1,15 @@ +Title: Always show rule analyser result on Generate, not only after previous Try out +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1481114369 + +In the Event Console configuration there is the event simulator. If you first did +{{Try out}} with a message and after that {{Generate}}, then still the event +would be analysed and the rules marked according to the matches. + +Previously this did not work when you did not {{Try out}} before. This has been +fixed. diff --git a/ChangeLog b/ChangeLog index 8f74116..09e9bb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ Event Console: * 4132 Monitoring notifications: Add EC_ORIG_HOST to notifiation context... * 4097 FIX: Event console: Make writing of status file more robust... + * 4147 FIX: Always show rule analyser result on Generate, not only after previous Try out... Livestatus: * 3651 FIX: Fixed potential segfault with Nagios core when accessing log/commands table via Livestatus.... diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index f0fe8b6..04757db 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1184,7 +1184,7 @@ def show_event_simulator(): html.end_form() html.br() - if html.var("simulate"): + if html.var("simulate") or html.var("_generate"): return vs_mkeventd_event.from_html_vars("event") else: return None

7 years, 7 months

Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 2cc342586e31e3dde09d6e4d675d2e3d98b4f5fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cc342586e31e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 13:39:15 2016 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d3a0a43..8b49a44 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4147 +4157

7 years, 7 months

← Newer
1
...
29
30
31
32
33
34
35
...
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