Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 067b7ab5bff8bc865b9a3715bb32f3d1f1792a13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=067b7ab5bff8bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 10:58:52 2017 +0100 GUI: Cleaned up finalization code a bit Change-Id: I29bd9b8f752d2db9e7d63c2ea1da8f366138385e --- web/htdocs/html_mod_python.py | 2 +- web/htdocs/index.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 49eff00..074c80d 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -160,7 +160,7 @@ class html_mod_python(htmllib.html): # Finish the HTTP request short before handing over to mod_python - def finalize(self, is_error=False): + def finalize(self): self.disable_request_timeout() #self.finalize_guitests() diff --git a/web/htdocs/index.py b/web/htdocs/index.py index f6654a4..8c9f7f4 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -135,7 +135,6 @@ def handler(mod_python_req, fields = None, is_profiling = False): except (apache.SERVER_RETURN, (apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED), (apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY)): - finalize_request(is_error=True) raise except Exception, e: @@ -147,7 +146,9 @@ def handler(mod_python_req, fields = None, is_profiling = False): modules.get_handler("gui_crash")() response_code = apache.OK - finalize_request() + finally: + finalize_request() + return response_code @@ -194,11 +195,10 @@ def ensure_general_access(): raise MKAuthException(" ".join(reason)) -def finalize_request(is_error=False): +def finalize_request(): release_all_locks() userdb.finalize() sites.disconnect() - html.finalize(is_error=is_error) # Ajax-Functions want no HTML output in case of an error but

7 years, 7 months

4380 FIX Raw Edition: Fixed broken views that contain graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c29c47c09565d90abe80744897d44d9a4a36d2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c29c47c09565d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 11:27:34 2017 +0100 4380 FIX Raw Edition: Fixed broken views that contain graphs An error message "KeyError ('graph_render_options')" was displayed on all views that are used to display graphs. Change-Id: I12dfb43956f3d6caeee0f7c2d91856c6fa6ced65 --- .werks/4380 | 10 ++++++++++ web/plugins/views/painters.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4380 b/.werks/4380 new file mode 100644 index 0000000..0ecd5ab --- /dev/null +++ b/.werks/4380 @@ -0,0 +1,10 @@ +Title: Raw Edition: Fixed broken views that contain graphs +Level: 2 +Component: multisite +Compatible: compat +Version: 1.5.0i1 +Date: 1487586401 +Class: fix + +An error message "KeyError ('graph_render_options')" was displayed +on all views that are used to display graphs. diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 0fd1852..8c1c541 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1061,7 +1061,7 @@ def paint_time_graph_pnp(row): multisite_painters["svc_pnpgraph" ] = { "title" : _("Service Graphs"), "columns" : [ "host_name", "service_description", "service_perf_data", "service_metrics", "service_check_command" ], - "options" : [ "pnp_timerange", "graph_render_options", ], + "options" : [ "pnp_timerange" ], "paint" : paint_time_graph, "printable" : "time_graph", "params" : time_graph_params,

7 years, 7 months

Minor cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 0eeb2a5d492f6b05f268fc3be49a5c9b3a59d145 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0eeb2a5d492f6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 10:10:25 2017 +0100 Minor cleanup Change-Id: I4b7db677db7cd386c17b32739e2863da879355d8 --- web/htdocs/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4cd56fd..093355d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1884,8 +1884,9 @@ def render_view(view, rows, datasource, group_painters, painters, if config.show_livestatus_errors \ and display_options.enabled(display_options.W) \ and (html.output_format == "html" or not config.is_multisite()): - for sitename, info in sites.live().deadsites.items(): - html.show_error("%s - %s %s" % (info["site"]["alias"], _('Livestatus error'), info["exception"])) + for sitename, info in sites.live().dead_sites().items(): + html.show_error("%s - %s %s" % + (info["site"]["alias"], _('Livestatus error'), info["exception"])) # FIXME: Sauberer waere noch die Status Icons hier mit aufzunehmen if display_options.enabled(display_options.R):

7 years, 7 months

Updated bug entries #2408

by Lars Michelsen

Module: check_mk Branch: master Commit: fce524cd01625a47bd85dc5cc75d33e1a4ac3c96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fce524cd01625a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 10:10:17 2017 +0100 Updated bug entries #2408 Change-Id: Icf6d1513cf665eab6019fb4586771b549b45e46e --- .bugs/2408 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.bugs/2408 b/.bugs/2408 index 8d328ab..23b0323 100644 --- a/.bugs/2408 +++ b/.bugs/2408 @@ -5,6 +5,15 @@ Date: 2016-05-04 09:24:02 Targetversion: 1.2.9 Class: bug -Currently, the user can set the MK_CONFDIR through the agent bakery, but this will only affect the agent itself and the plugins started by it. -Other tools that require this path, i.e. the cmk_update-agent when run directly (for registration) will use the fallback path. We need to provide a way for such scripts to use the correct MK_CONFDIR value. -One solution could be to change the agent in such a way that it can be "source"d without executing any of its logic. This way a script can source the agent to get all the parameters as used by the agent. Alternatively the agent could accept a parameter "--variables" that make it output such variables and then quit. Tools would then have to parse that output, but it would be easier to use in non-bash languages. +Currently, the user can set the MK_CONFDIR through the agent bakery, but this +will only affect the agent itself and the plugins started by it. Other tools +that require this path, i.e. the cmk_update-agent when run directly (for +registration) will use the fallback path. We need to provide a way for such +scripts to use the correct MK_CONFDIR value. + +One solution could be to change the agent in such a way that it can be +"source"d without executing any of its logic. This way a script can source the +agent to get all the parameters as used by the agent. Alternatively the agent +could accept a parameter "--variables" that make it output such variables and +then quit. Tools would then have to parse that output, but it would be easier +to use in non-bash languages.

7 years, 7 months

Bump build parallelism for cmc to 3.

by Sven Panne

Module: check_mk Branch: master Commit: 3734a9455b79baa8d5195274c9386f2c650c254c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3734a9455b79ba… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 20 11:17:35 2017 +0100 Bump build parallelism for cmc to 3. Change-Id: I7e2c377da5c23d899ce27425a20cab466d355871 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index eb97640..22dff53 100644 --- a/Makefile +++ b/Makefile @@ -257,8 +257,8 @@ cmc-$(VERSION).tar.gz: config.h enterprise/.werks/werks enterprise/ChangeLog rm -rf cmc-$(VERSION) build: config.h - LANG=C $(MAKE) -C livestatus -j2 - LANG=C $(MAKE) -C enterprise/core -j2 + LANG=C $(MAKE) -C livestatus -j3 + LANG=C $(MAKE) -C enterprise/core -j3 $(MAKE) -C enterprise/locale all install:

7 years, 7 months

Fixed typo in metric title of if_out_unicast_octets

by Mathias Kettner

Module: check_mk Branch: master Commit: bf6f52e4d07af0e8846a3c5d769a5134e8c68bd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf6f52e4d07af0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 20 10:57:15 2017 +0100 Fixed typo in metric title of if_out_unicast_octets Change-Id: If6e4845e43ea80ee199855b0bd35166096e270a7 --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index c055198..c4c736c 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1860,7 +1860,7 @@ metric_info["if_out_unicast"] = { } metric_info["if_out_unicast_octets"] = { - "title" : _("Output unicast oackets"), + "title" : _("Output unicast octets"), "unit" : "bytes/s", "color" : "#00c0ff", }

7 years, 7 months

Add metric definition of outqlen

by Mathias Kettner

Module: check_mk Branch: master Commit: 2245e3981cea13aa61865847868cd6c6265819dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2245e3981cea13… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 20 10:57:43 2017 +0100 Add metric definition of outqlen Change-Id: I7c28ebd8105a8095376c671bdab7441f14f53217 --- web/plugins/metrics/check_mk.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index c4c736c..54858c1 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1877,6 +1877,16 @@ metric_info["if_out_non_unicast_octets"] = { "color" : "#0080c0", } + +# “Output Queue Length is the length of the output packet queue (in +# packets). If this is longer than two, there are delays and the bottleneck +# should be found and eliminated, if possible. +metric_info["outqlen"] = { + "title" : _("Length of output queue"), + "unit" : "count", + "color" : "25/a", +} + metric_info["wlan_physical_errors"] = { "title" : "WLAN physical errors", "unit" : "1/s",

7 years, 7 months

4379 FIX Don't show delete event icon in event history views

by Lars Michelsen

Module: check_mk Branch: master Commit: 63fe181e759e044128ef596ec11fcf7a6ed9788f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63fe181e759e04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 15:35:00 2017 +0100 4379 FIX Don't show delete event icon in event history views This icon makes only sense in regular Event Console views to delete an open event. Change-Id: I380ab177ac3c83f2fad5ae00b8cc4855ae516ca1 --- .werks/4379 | 11 +++++++++++ web/plugins/views/mkeventd.py | 24 +++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/.werks/4379 b/.werks/4379 new file mode 100644 index 0000000..7823ce8 --- /dev/null +++ b/.werks/4379 @@ -0,0 +1,11 @@ +Title: Don't show delete event icon in event history views +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487342019 + +This icon makes only sense in regular Event Console views to delete +an open event. diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 5119223..2921683 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -279,6 +279,7 @@ if mkeventd_enabled: def render_event_phase_icons(row): phase = row["event_phase"] + if phase == "ack": title = _("This event has been acknowledged.") elif phase == "counting": @@ -287,6 +288,7 @@ if mkeventd_enabled: title = _("The action of this event is still delayed in the hope of a cancelling event.") else: return '' + return html.render_icon(phase, help=title) def render_delete_event_icons(row): @@ -330,9 +332,12 @@ if mkeventd_enabled: else: return '' - def paint_event_icons(row): - htmlcode = render_event_phase_icons(row) - htmlcode += render_delete_event_icons(row) + def paint_event_icons(row, history=False): + htmlcode = render_event_phase_icons(row) + + if not history: + htmlcode += render_delete_event_icons(row) + if htmlcode: return "icons", htmlcode else: @@ -347,6 +352,15 @@ if mkeventd_enabled: } + multisite_painters["event_history_icons"] = { + "title" : _("Event Icons"), + "short" : _("Icons"), + "printable" : False, + "columns" : [ "event_phase" ], + "paint" : lambda row: paint_event_icons(row, history=True), + } + + def paint_event_contact_groups(row): cgs = row.get("event_contact_groups") if cgs == None: @@ -878,7 +892,7 @@ if mkeventd_enabled: ('event_id', 'ec_historyentry', ''), ('history_who', None, ''), ('history_what', None, ''), - ('event_icons', None, ''), + ('event_history_icons', None, ''), ('event_state', None, ''), ('event_phase', None, ''), ('event_sl', None, ''), @@ -953,7 +967,7 @@ if mkeventd_enabled: ('event_first', None, ''), ('event_last', None, ''), ('event_id', 'ec_history_of_event', ''), - ('event_icons', None, ''), + ('event_history_icons', None, ''), ('event_count', None, ''), ('event_sl', None, ''), ('event_contact', None, ''),

7 years, 7 months

bandit test: do not make the build fail on failure exit codes

by Lars Michelsen

Module: check_mk Branch: master Commit: a3e00aae7eab7bf7ac6feeb96691c4309c206c92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3e00aae7eab7b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 15:19:53 2017 +0100 bandit test: do not make the build fail on failure exit codes Change-Id: I9a61be68599712db8658fb26b0a1fc2a2b4cfc2b --- tests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 56dca32..4675a01 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -41,7 +41,7 @@ test-bandit: test-bandit-ci: OUTPUT_ARGS="-f xml -o \"$$WORKDIR/bandit_results.xml\"" \ - $(MAKE) test-bandit + $(MAKE) test-bandit || true setup:

7 years, 7 months

Reserved 1 Werk IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 9743d8287634824476c29c58b7d0b4bea9e8a9fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9743d828763482… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Feb 17 15:18:26 2017 +0100 Reserved 1 Werk IDS Change-Id: Id8b93feef846a333f3f86583acac2471981c307a --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e6a49d5..75df125 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4385 +4386

7 years, 7 months

← Newer
1
...
14
15
16
17
18
19
20
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017