Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

Fixed buggy rule declaration in check_parameters

by Lars Michelsen

Module: check_mk Branch: master Commit: a35d1c724ae529228bd2c88eb0f254cebdefc464 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a35d1c724ae529… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 09:46:47 2016 +0100 Fixed buggy rule declaration in check_parameters --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f3da0da..42942a4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -711,7 +711,7 @@ register_check_parameters( ] ), None, "dict" -), +) register_check_parameters( subgroup_applications,

8 years, 7 months

Added missing but used module

by Lars Michelsen

Module: check_mk Branch: master Commit: 7ed2a8e0ce2993ec3bec2ce7157354722e752396 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ed2a8e0ce2993… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 09:47:05 2016 +0100 Added missing but used module --- livestatus/api/python/example_multisite.py | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/api/python/example_multisite.py b/livestatus/api/python/example_multisite.py index cc6a453..ab7f68d 100755 --- a/livestatus/api/python/example_multisite.py +++ b/livestatus/api/python/example_multisite.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. import os +import sys import livestatus try:

8 years, 7 months

Fixed exception when syncing to slave creates initial WATO config on remote site

by Lars Michelsen

Module: check_mk Branch: master Commit: 1206adc7eda85608e188c30fc3977bd4bc41d7cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1206adc7eda856… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 14:34:24 2016 +0100 Fixed exception when syncing to slave creates initial WATO config on remote site --- web/htdocs/config.py | 19 ++++++------------- web/htdocs/wato.py | 6 ++++++ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 2025420..2944146 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -285,7 +285,7 @@ def login_super_user(): user_id = None global user_role_ids - user_role_ids = [] + user_role_ids = [ "admin" ] global user_baserole_ids user_baserole_ids = [ "admin" ] @@ -321,12 +321,6 @@ def hide_language(lang): return lang in hide_languages def roles_of_user(user): - # Make sure, builtin roles are present, even if not modified - # and saved with WATO. - for br in builtin_role_ids: - if br not in roles: - roles[br] = {} - if user in multisite_users: return existing_role_ids(multisite_users[user]["roles"]) elif user in admin_users: @@ -422,12 +416,6 @@ def get_role_permissions(): # and for each permission loop all roles # and check wether it has the permission or not - # Make sure, builtin roles are present, even if not modified - # and saved with WATO. - for br in builtin_role_ids: - if br not in roles: - roles[br] = {} - roleids = roles.keys() for perm in permissions_by_order: for role_id in roleids: @@ -607,4 +595,9 @@ def save_site_config(): def load_plugins(force): load_web_plugins("config", globals()) + # Make sure, builtin roles are present, even if not modified and saved with WATO. + for br in builtin_role_ids: + roles.setdefault(br, {}) + + load_plugins(True) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 305012f..1aefb28 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9491,6 +9491,12 @@ def page_automation(): if secret != get_login_secret(): raise MKAuthException(_("Invalid automation secret.")) + # The automation page is accessed unauthenticated. After leaving the index.py area + # into the page handler we always want to have a user context initialized to keep + # the code free from special cases (if no user logged in, then...). So fake the + # logged in user here. + config.login_super_user() + # To prevent mixups in written files we use the same lock here as for # the normal WATO page processing. This might not be needed for some # special automation requests, like inventory e.g., but to keep it simple,

8 years, 7 months

Fixed recently introduced exception in case of a user is not a known one

by Lars Michelsen

Module: check_mk Branch: master Commit: 0b1cff454ad9fb0ad29c2da2003018960e05b1df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b1cff454ad9fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 12:00:26 2016 +0100 Fixed recently introduced exception in case of a user is not a known one --- web/htdocs/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index e461e80..2025420 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -259,7 +259,7 @@ def login(u): else: user = { "roles" : user_role_ids } user_alias = user_id - user_email = user_email + user_email = user_id # Prepare cache of already computed permissions global user_permissions

8 years, 7 months

Fixed exception after code restructuring

by Lars Michelsen

Module: check_mk Branch: master Commit: f3398c3da45f687d09c55a5872ae70287ca6933b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3398c3da45f68… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 14:33:45 2016 +0100 Fixed exception after code restructuring --- web/htdocs/werks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index f806267..f203530 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -191,7 +191,7 @@ def acknowledge_werks(werks): ack_ids = load_acknowledgements() for werk in werks: ack_ids.append(werk["id"]) - werk["compatible"] = "incomp_ack" + werk["compatible"] = "incomp_ack" save_acknowledgements(ack_ids)

8 years, 7 months

#3054 FIX ups_modulys_battery: Fixed wrong remaining minutes in some cases

by Lars Michelsen

Module: check_mk Branch: master Commit: 06148959806d62b334392d3a2115fdac229034f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06148959806d62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 16:48:25 2016 +0100 #3054 FIX ups_modulys_battery: Fixed wrong remaining minutes in some cases --- .bugs/2290 | 7 +++++-- .werks/3054 | 9 +++++++++ ChangeLog | 1 + checks/ups_modulys_battery | 4 ++-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.bugs/2290 b/.bugs/2290 index c540e44..2879da8 100644 --- a/.bugs/2290 +++ b/.bugs/2290 @@ -1,11 +1,14 @@ Title: Clarify encoding within Check_MK (core) Component: core -State: open +Class: nastiness +State: done Date: 2015-03-10 09:24:00 Targetversion: 1.2.7 -Class: nastiness We need to deal correctly with encoding within Check_MK. In Multisite we have a clear situation. Everything is decoded to unicode strings when reading into Check_MK. When writing out to external programs it's encoded with UTF-8 again. + +2016-02-11 16:39:56: changed state open -> done +should be clear now. diff --git a/.werks/3054 b/.werks/3054 new file mode 100644 index 0000000..593244d --- /dev/null +++ b/.werks/3054 @@ -0,0 +1,9 @@ +Title: ups_modulys_battery: Fixed wrong remaining minutes in some cases +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455205667 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index eff1840..8b2f8ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -268,6 +268,7 @@ * 3174 FIX: Fix exception in Check_MK agent version check if version number does not contain three parts * 3049 FIX: esx_vsphere_hostsystem.mem_usage_cluster: Fixed exception when no thresholds configured * 3052 FIX: domino_mailqueues: Fixed exception when receiving empty data from SNMP + * 3054 FIX: ups_modulys_battery: Fixed wrong remaining minutes in some cases Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ups_modulys_battery b/checks/ups_modulys_battery index 86bc48d..f9f1b21 100644 --- a/checks/ups_modulys_battery +++ b/checks/ups_modulys_battery @@ -42,7 +42,7 @@ def check_ups_modulys_battery(item, params, info): condition, elapsed_sec, capacity = map(lambda x: int(x), (condition, elapsed_sec, capacity)) if elapsed_sec == 0: # not on battery so the it will not run out - remainig_min = sys.maxint + remaining_min = sys.maxint elif not remaining_min: # The "remaining_min" value isn't always reported and we don't know why. # One theory is that it will be reported if on battery but we have no data to verify. @@ -50,7 +50,7 @@ def check_ups_modulys_battery(item, params, info): # If the theory holds true, this branch is never taken. If it doesn't then its likely # the information is only available on some variants of the device or in some # configurations. We can still report useful data based on "capacity" - remainig_min = sys.maxint + remaining_min = sys.maxint else: remaining_min = int(remaining_min)

8 years, 7 months

Replaced tab with spaces

by Lars Michelsen

Module: check_mk Branch: master Commit: ff5a4417487d5233fe5a9a8d07dce0cc10133bfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff5a4417487d52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 21:18:36 2016 +0100 Replaced tab with spaces --- checks/wmic_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/wmic_process b/checks/wmic_process index 29eeb02..84062f0 100644 --- a/checks/wmic_process +++ b/checks/wmic_process @@ -63,7 +63,7 @@ def check_wmic_process(item, params, info): msg = "%.0f%%/%.0f%% User/Kernel" % (user_perc, kernel_perc) if cpu_perc >= cpucrit: state = 2 - msg += "(!!) (critical at %d%%)" % cpucrit + msg += "(!!) (critical at %d%%)" % cpucrit elif cpu_perc >= cpuwarn: state = 1 msg += "(!) (warning at %d%%)" % cpuwarn

8 years, 7 months

Removed some unused vars

by Lars Michelsen

Module: check_mk Branch: master Commit: 1650c952f7d1d48635fef7899cd5eb86af083667 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1650c952f7d1d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 16:47:43 2016 +0100 Removed some unused vars --- checks/win_dhcp_pools | 1 - checks/winperf | 1 - checks/winperf_phydisk | 5 ----- checks/wut_webio_io | 2 -- 4 files changed, 9 deletions(-) diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index ef325d2..73f5d24 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -116,7 +116,6 @@ def inventory_win_dhcp_pools(info): def check_win_dhcp_pools(item, params, info): in_block = False pool_stats = [] - status = 0 for line in parse_win_dhcp_pools(info): if win_dhcp_pools_stats_translate.get(line[0], line[0]) == 'Subnet' and line[1] == item: in_block = True diff --git a/checks/winperf b/checks/winperf index 5312c13..7f2d25a 100644 --- a/checks/winperf +++ b/checks/winperf @@ -53,7 +53,6 @@ def check_win_cpuusage(item, params, info): # I've forgotton what's it for (idle?) num_cpus = len(line) - 4 overall_perc = 0 - counter_wrapped = False for cpu in range(0, num_cpus): ticks = int(line[2 + cpu]) ticks_per_sec = get_rate("cpuusage.%d" % cpu, this_time, ticks) diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index 912a170..580bc8e 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -98,11 +98,6 @@ def winperf_phydisk_convert(info): current_node = "" try: - # averages are calculated on two values so we always need to store one - # until the second is available - average_counters_write = [[], []] - average_counters_read = [[], []] - while True: line = lines.next() if line[2] == "instances:": diff --git a/checks/wut_webio_io b/checks/wut_webio_io index c8b242a..3ef1bcd 100644 --- a/checks/wut_webio_io +++ b/checks/wut_webio_io @@ -77,9 +77,7 @@ def inventory_wut_webio_io_inputs(info): def check_wut_webio_io_inputs(item, params, info): wut_info = parse_webio_io_inputs(info) for index in wut_info.keys(): - descr = wut_info[index][0] if wut_info[index][0] == item: - oldstate = params state = wut_info[index][1] # Compare to the state of the IO port at inventory.

8 years, 7 months

Added help texts to log event icons

by Lars Michelsen

Module: check_mk Branch: master Commit: 25bc1b3c9f9065fdcef86a7e7ac98b12cc71c656 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25bc1b3c9f9065… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 10:55:13 2016 +0100 Added help texts to log event icons --- .bugs/1001 | 7 +++++-- .bugs/2185 | 14 ++++++++++++-- .bugs/2411 | 6 ++++-- web/plugins/views/painters.py | 28 +++++++++++++++++++++++++++- 4 files changed, 48 insertions(+), 7 deletions(-) diff --git a/.bugs/1001 b/.bugs/1001 index 6c57b12..83b5e33 100644 --- a/.bugs/1001 +++ b/.bugs/1001 @@ -1,12 +1,15 @@ Title: check ups_power uses the group 'hw_temperature' which settings levels in degree celcius' Component: checks -State: open +Class: nastiness +State: done Date: 2013-08-22 13:43:24 Targetversion: future -Class: nastiness Levels for the electric power of ups devices are in watt, however the check uses the group hw_temperature to set the values with the corresponding wato check in degrees celcius. This will nevertheless work and may be in active use since the values are integers. However it may be confusing. A new group hw_power with corresponding wato rule should be added. Customers need to be aware that this fix may break their existing checks. + +2016-02-11 10:37:06: changed state open -> done +has already been fixed. diff --git a/.bugs/2185 b/.bugs/2185 index 74270aa..b257b0c 100644 --- a/.bugs/2185 +++ b/.bugs/2185 @@ -1,10 +1,20 @@ Title: Page reload with click on page title loads *.css files new Component: multisite -State: open +Class: nastiness +State: done Date: 2014-09-25 16:31:49 Targetversion: future -Class: nastiness If you initiate a page reload on a view by clicking on the page title, then all static web files are being reloaded. This is not neccessary and create extensive page requests. + +2016-02-11 10:45:29: changed state open -> done +This seems to be the standard behaviour for different situations in most browsers: + +a) Entering a new URL in the address bar +b) reloading the page (e.g. F5, ctrl + r) + +In case of following a link this the css files are not loaded. + +Seems to be ok. diff --git a/.bugs/2411 b/.bugs/2411 index 1b0cab8..823db7d 100644 --- a/.bugs/2411 +++ b/.bugs/2411 @@ -1,11 +1,13 @@ Title: Events of the last four hours: mouse hover help for icons Component: multisite -State: open +Class: nastiness +State: done Date: 2015-11-16 14:08:07 Targetversion: future -Class: nastiness All event icons should have a hover help that explain what type of event that is. For example light grey loud speaker means a core notification (and not one to the end user). This need explanation! + +2016-02-11 10:54:13: changed state open -> done diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 67664c4..7320eaf 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -2181,43 +2181,69 @@ multisite_painters["log_command"] = { "columns" : ["log_command_name"], "paint" : lambda row: ("nowrap", row["log_command_name"]), } + + def paint_log_icon(row): img = None log_type = row["log_type"] if log_type == "SERVICE ALERT": img = { 0: "ok", 1: "warn", 2:"crit", 3:"unknown" }.get(row["log_state"]) + title = _("Service Alert") + elif log_type == "HOST ALERT": img = { 0: "up", 1: "down", 2:"unreach" }.get(row["log_state"]) + title = _("Host Alert") + elif "DOWNTIME" in log_type: if row["log_state_type"] in [ "END", "STOPPED" ]: img = "downtimestop" + title = _("Downtime stopped") else: img = "downtime" + title = _("Downtime") + elif log_type.endswith("NOTIFICATION"): if row["log_command_name"] == "check-mk-notify": img = "cmk_notify" + title = _("Core produced a notification") else: img = "notify" + title = _("User notification") + elif log_type == "EXTERNAL COMMAND": img = "command" + title = _("External command") + elif "restarting..." in log_type: img = "restart" + title = _("Core restarted") + elif "Reloading configuration" in log_type: img = "reload" + title = _("Core configuration reloaded") + elif "starting..." in log_type: img = "start" + title = _("Core started") + elif "shutdown..." in log_type or "shutting down" in log_type: img = "stop" + title = _("Core stopped") + elif " FLAPPING " in log_type: img = "flapping" + title = _("Flapping") + elif "ACKNOWLEDGE ALERT" in log_type: if row["log_state_type"] == "STARTED": img = "ack" + title = _("Acknowledged") else: img = "ackstop" + title = _("Stopped acknowledgement") if img: - return "icon", '<img class=icon src="images/alert_%s.png">' % img + return "icon", '<img class=icon src="images/alert_%s.png" title="%s">' % (img, title) else: return "icon", ""

8 years, 7 months

Removed comma after rule register call

by Lars Michelsen

Module: check_mk Branch: master Commit: 28e23434d144f4124e3743a3a00ff4e0bf678745 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28e23434d144f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 10:06:53 2016 +0100 Removed comma after rule register call --- web/plugins/wato/check_mk_configuration.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 1e11af1..6b413d5 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1994,11 +1994,12 @@ register_rule(group, " always assumes UTF-8 encoding. You can declare other " " other encodings here"), choices = [ - ("utf-8", _("UTF-8") ), - ("latin1" ,_("latin1")), - ("cp437" ,_("cp437")), - ] - )), + ("utf-8", _("UTF-8") ), + ("latin1", _("latin1")), + ("cp437", _("cp437")), + ] + ) +) register_rule(group, "bulkwalk_hosts",

8 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016