Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

by Roland Halbig

Module: check_mk Branch: master Commit: a9c85b49e36d9be9ccd283fe23c9090572377795 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9c85b49e36d9b… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Jan 10 16:26:33 2017 +0100 Fixed bug. Change-Id: I30de183cd6934a157ca1beb71abc317f8cf450c7 --- web/htdocs/table.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 3a15d85..f006ac8 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -184,7 +184,7 @@ def end(): rows = rows[:limit] # Render header - _write_table(table, rows, actions_enabled, actions_visible, search_term) + _write_table(table, rows, num_cols, actions_enabled, actions_visible, search_term) if limit is not None and num_rows_unlimited > limit: html.message(_('This table is limited to show only %d of %d rows. ' @@ -249,7 +249,7 @@ def _evaluate_user_opts(table, rows): return rows, actions_enabled, actions_visible, search_term, user_opts -def _write_table(table, rows, actions_enabled, actions_visible, search_term): +def _write_table(table, rows, num_cols, actions_enabled, actions_visible, search_term): table_id = table["id"]

7 years, 8 months

Refactored login.

by Roland Halbig

Module: check_mk Branch: master Commit: dd0e6ecd0e2c588900799af689dbac03d64eeb61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd0e6ecd0e2c58… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 5 16:45:47 2017 +0100 Refactored login. Change-Id: Iafad75d24316089221cc45bb1489a923dd9ec056 --- web/htdocs/login.py | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index eabc5fc..a189574 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -424,37 +424,42 @@ def normal_login_page(called_directly = True): if html.myfile == 'login' and check_auth(html.req): html.http_redirect(origtarget and origtarget or 'index.py') - html.write('<div id="login">\n') - html.write('<img id="login_window" src="images/login_window.png" />\n') - html.write('<div id="version">%s</div>\n' % cmk.__version__) + html.open_div(id_="login") + html.img(id_="login_window", src="images/login_window.png") + html.div(cmk.__version__, id_="version") html.begin_form("login", method = 'POST', add_transid = False, action = 'login.py') html.hidden_field('_login', '1') html.hidden_field('_origtarget', origtarget) - html.write('<label id="label_user" class="legend" for="_username">%s:</label><br />\n' % _('Username')) + html.label("%s:" % _('Username'), id_="label_user", class_=["legend"], for_="_username") + html.br() html.text_input("_username", id_="input_user") - html.write('<label id="label_pass" class="legend" for="_password">%s:</label><br />\n' % _('Password')) + html.label("%s:" % _('Password'), id_="label_pass", class_=["legend"], for_="_password") + html.br() html.password_input("_password", id_="input_pass", size=None) if html.has_user_errors(): - html.write('<div id="login_error">') + html.open_div(id_="login_error") html.show_user_errors() - html.write('</div>\n') + html.close_div() - html.write('<div id="button_text">') + html.open_div(id_="button_text") html.button("_login", _('Login')) - html.write("</div>\n") + html.close_div() - html.write('<div id="foot">Version: %s - © ' - '<a href="https://mathias-kettner.com">Mathias Kettner</a><br /><br />' % cmk.__version__) + html.open_div(id_="foot") + html.write("Version: %s - © " % cmk.__version__) + html.a("Mathias Kettner", href="https://mathias-kettner.com") + html.br() + html.br() html.write(_('You can use, modify and distribute Check_MK under the terms of the <a href="%s">' 'GNU GPL Version 2</a>.') % "https://mathias-kettner.com/gpl.html") - html.write("</div>\n") + html.close_div() html.set_focus('_username') html.hidden_fields() html.end_form() - html.write("</div>\n") + html.close_div() html.footer()

7 years, 8 months

Refactored valuespec.

by Roland Halbig

Module: check_mk Branch: master Commit: 5200a2f9eb967483c67d3c5479fb4b5231eeaf88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5200a2f9eb9674… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 22 15:09:51 2016 +0100 Refactored valuespec. Change-Id: I4ea8ecb1386525336e127c0c91a6257daf0edc09 --- web/htdocs/valuespec.py | 627 +++++++++++++++++++++++++++--------------------- 1 file changed, 356 insertions(+), 271 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5200a2f9eb…

7 years, 8 months

Refactored mobile.py

by Roland Halbig

Module: check_mk Branch: master Commit: d7f1b72393eb07f4303b4056137b0b8b7a34d4cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7f1b72393eb07… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 12 13:32:53 2017 +0100 Refactored mobile.py Change-Id: I7e489541f7d24d76d8a44cf39260e03ce9942859 --- web/htdocs/mobile.py | 169 +++++++++++++++++++++++++++------------------------ 1 file changed, 90 insertions(+), 79 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d7f1b72393…

7 years, 8 months

fixed params type in discovery function

by Simon Betz

Module: check_mk Branch: master Commit: 0760350feeeac145f377481760af8c5ff2ca1235 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0760350feeeac1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 12 14:16:06 2017 +0100 fixed params type in discovery function Change-Id: Ic02b052252909a0ef9a1ce0b26b4a55e5b79abc9 --- checks/local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/local b/checks/local index a73f548..c8d9f0d 100644 --- a/checks/local +++ b/checks/local @@ -102,7 +102,7 @@ def inventory_local(info): nodename = line[0] stripped_line = line[1:] if len(stripped_line) >= 4 or len(stripped_line) == 3 and stripped_line[0] == 'P': - inventory.append( (stripped_line[1], None) ) + inventory.append( (stripped_line[1], {}) ) else: raise MKGeneralException("Invalid line in agent section <<<local>>>: %s" % " ".join(stripped_line)) return inventory

7 years, 8 months

Changed naming of EC script environment vars

by Lars Michelsen

Module: check_mk Branch: master Commit: 6a69385e48d781ce7908163be2fc6727c680fa41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a69385e48d781… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 12:04:20 2017 +0100 Changed naming of EC script environment vars Change-Id: I34d4fbbbda45d83add54ec9f763ffe8142d09ea0 --- bin/mkeventd | 2 +- web/plugins/wato/mkeventd.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 8461815..be4acda 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3940,7 +3940,7 @@ def execute_script(body, event): key = key.encode("utf-8") if type(value) == unicode: value = value.encode("utf-8") - script_env["EVENT_" + key.upper()] = value + script_env["CMK_" + key.upper()] = value # Traps can contain 0-Bytes. We need to remove this from the script # body. Otherwise suprocess.Popen will crash. diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index bbab703..9bdb87d 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -182,8 +182,8 @@ vs_mkeventd_actions = \ + substitute_help \ + "<br>" \ + _("These information are also available as environment variables with the prefix " - "<tt>EVENT_</tt>. For example the text of the event is available as " - "<tt>EVENT_TEXT</tt> as environment variable."), + "<tt>CMK_</tt>. For example the text of the event is available as " + "<tt>CMK_TEXT</tt> as environment variable."), cols = 64, rows = 10, attrencode = True,

7 years, 8 months

changed werk text

by Lars Michelsen

Module: check_mk Branch: master Commit: e5ea549bf644cfd09e84174e03e1122319af1690 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5ea549bf644cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 12:06:11 2017 +0100 changed werk text Change-Id: I74da0f4cd5dc2400883411495f4ed6db50c85581 --- .werks/4276 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/4276 b/.werks/4276 index 644b9b8..ee8768f 100644 --- a/.werks/4276 +++ b/.werks/4276 @@ -10,5 +10,5 @@ In previous versios the actions of the Event Console could only get the variables of the events via substitution of macros. These information are now also available as environment variables with -the prefix <tt>EVENT_</tt>. For example the text of the event is available as -<tt>EVENT_TEXT</tt> as environment variable. +the prefix <tt>CMK_</tt>. For example the text of the event is available as +<tt>CMK_TEXT</tt> as environment variable.

7 years, 8 months

4277 Script actions: New event macro ORIG_HOST

by Lars Michelsen

Module: check_mk Branch: master Commit: 3bfc98bbc0e0a0136a9393dce75569f36421e685 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bfc98bbc0e0a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 12:01:55 2017 +0100 4277 Script actions: New event macro ORIG_HOST The scripts can now access a macros $ORIG_HOST$ (or environment var CMK_ORIG_HOST) to get the original host name when host name has been rewritten. The value is empty when not doing host name rewrite. Change-Id: I6ca609383e1cc085af0d1716e5a021c0f46fb4f3 --- .werks/4277 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4277 b/.werks/4277 index b842a47..7c38104 100644 --- a/.werks/4277 +++ b/.werks/4277 @@ -6,6 +6,6 @@ Version: 1.4.0i4 Date: 1484218852 Class: feature -The scripts can now access a macros $ORIG_HOST$ (or environment var EVENT_ORIG_HOST) +The scripts can now access a macros $ORIG_HOST$ (or environment var CMK_ORIG_HOST) to get the original host name when host name has been rewritten. The value is empty when not doing host name rewrite.

7 years, 8 months

Bugfix: None attribute in buttons.

by Roland Halbig

Module: check_mk Branch: master Commit: 9b04cdd37a0e6c36090ea5f86ad4c8cb9bc0850b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b04cdd37a0e6c… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 12 12:52:00 2017 +0100 Bugfix: None attribute in buttons. Change-Id: I415138fc1bd4e502c49f2dd48efaa91e626aba85 --- web/htdocs/htmllib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c9fdaf1..a7e472d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1770,7 +1770,8 @@ class html(DeprecationWrapper): def button(self, varname, title, cssclass = '', style=None): if style: style = ' style="%s"' % style - + else: + style = '' self.write("<input type=\"submit\" name=\"%s\" id=\"%s\" value=\"%s\" " "class=\"button %s\"%s />\n" % \ (varname, varname, title, cssclass, style))

7 years, 8 months

winperf_if check now uses agent timestamp if available

by Simon Betz

Module: check_mk Branch: master Commit: 7f62799301954c21f2d14bc94c9fc2c3ec7dff05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f62799301954c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 12 12:10:36 2017 +0100 winperf_if check now uses agent timestamp if available Change-Id: Icb23ae48769c317ebd4b9866e049f8996b01c5bc --- checks/if.include | 18 ++++++++++++++---- checks/winperf_if | 13 +++++++++---- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/checks/if.include b/checks/if.include index 1d6de0d..f742e67 100644 --- a/checks/if.include +++ b/checks/if.include @@ -496,7 +496,12 @@ def _convert_old_if_group_params(params): return params -def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Group"): +def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Group", timestamp = None): + if timestamp is None: + this_time = time.time() + else: + this_time = timestamp + # If this item is in an ifgroup create a pseudo interface and # pass its data to the common instance. # This is done by simply adding the additional group_info data @@ -557,7 +562,6 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou # TODO Now we're done and have all matching interfaces # Accumulate info over matching_interfaces wrapped = False - this_time = time.time() group_info = {"ifSpeed" : 0, "ifInOctets" : 0, "inucast" : 0, "inmcast" : 0, "inbcast" : 0, "ifInDiscards" : 0, @@ -707,7 +711,14 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou # TODO: Check what the relationship between Errors, Discards, and ucast/mcast actually is. # One case of winperf_if appeared to indicate that in that case Errors = Discards. def check_if_common_single(item, params, info, force_counter_wrap = False, - has_nodeinfo = False, group_members = None, group_name = "Group"): + has_nodeinfo = False, group_members = None, + group_name = "Group", timestamp = None): + + if timestamp is None: + this_time = time.time() + else: + this_time = timestamp + # Params now must be a dict. Some keys might # be set to None targetspeed = params.get("speed") @@ -889,7 +900,6 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, return state, infotext # Performance counters - this_time = time.time() rates = [] wrapped = False perfdata = [] diff --git a/checks/winperf_if b/checks/winperf_if index 116aa07..a905a6d 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -93,6 +93,11 @@ def parse_winperf_if(info): nic_names = map(winperf_if_canonize_nic_name, info[1][2:]) nic_index = winperf_if_get_nic_index_map(nic_names) + try: + agent_timestamp = int(info[0][0]) + except (IndexError, ValueError): + agent_timestamp = None + lines = iter(info) lines.next() # skip line with timestamp and counter number lines.next() # skip interface line (already evaluated) @@ -286,7 +291,7 @@ def parse_winperf_if(info): mac, )) - return converted, dhcp_lines, nic_names, nic_index + return agent_timestamp, converted, dhcp_lines, nic_names, nic_index def winperf_if_get_nic_index_map(nic_names): @@ -327,16 +332,16 @@ def check_if_dhcp(item, _no_params, info, nic_names, nic_index): def inventory_winperf_if(parsed): - perf, dhcp, nic_names, nic_index = parsed + agent_timestamp, perf, dhcp, nic_names, nic_index = parsed # dhcp info irrelevant to inventory return inventory_if_common(perf) def check_winperf_if(item, params, parsed): - perf, dhcp, nic_names, nic_index = parsed + agent_timestamp, perf, dhcp, nic_names, nic_index = parsed - yield check_if_common(item, params, perf, group_name = "Teaming") + yield check_if_common(item, params, perf, group_name = "Teaming", timestamp = agent_timestamp) yield check_if_dhcp(item, params, dhcp, nic_names, nic_index)

7 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017