Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

windows agent: overhauled the eventlog-related code

by Sebastian Herbord

Module: check_mk Branch: master Commit: c451cc3f6cb52aee4908b2b5dd38c9cf31b1e20b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c451cc3f6cb52a… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Feb 11 11:08:49 2016 +0100 windows agent: overhauled the eventlog-related code improvements: - cleaner code - improved performance (mostly by reducing the number of times dlls get loaded fresh) - should now be able to handle eventlogs where seeking fails due to this bug: https://support.microsoft.com/en-us/kb/177199 - dllpath-lookup now supports all environment variables, improving the likelyhood we find message texts - when loading message dlls, the dll initialization no longer happens as we only need the message table - the above also fixes problems where dependend dlls can't be loaded and subsequent error messages may pause the process --- agents/windows/EventLog.cc | 178 +++++++++ agents/windows/EventLog.h | 95 +++++ agents/windows/Makefile | 6 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 6614210 -> 906240 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 6614210 -> 906240 bytes agents/windows/check_mk_agent.cc | 428 +++++++++------------- agents/windows/check_mk_agent.exe | Bin 5267934 -> 830464 bytes agents/windows/check_mk_agent.msi | Bin 12225536 -> 1997312 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 5267934 -> 830464 bytes agents/windows/install_agent-64.exe | Bin 1558611 -> 416143 bytes agents/windows/install_agent.exe | Bin 1422553 -> 406731 bytes 12 files changed, 444 insertions(+), 265 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c451cc3f6c…

8 years, 7 months

fixed broken logwatch.ec EC forwarding. result of #2903

by Andreas Boesl

Module: check_mk Branch: master Commit: c7bc6877f365bf7fbd3148a05c96f41218349176 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7bc6877f365bf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 11 11:15:35 2016 +0100 fixed broken logwatch.ec EC forwarding. result of #2903 --- mkeventd/bin/mkeventd | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index dbfb787..e934e0b 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2265,17 +2265,13 @@ class EventServer: event["facility"] = 1 # user event["priority"] = 5 # notice - # Variant 7 + # Variant 7 and 7a if line[0] == '@' and line[11] in [ ' ', ';' ]: - if line[11] == ' ': - # Variant 7 - timestamp, event['host'], line = line.split(' ', 2) - else: - # Variant 7a - details, event['host'], line = line.split(' ', 2) - timestamp, sl = details.split(';', 1) - event["sl"] = int(sl) - + details, event['host'], line = line.split(' ', 2) + detail_tokens = details.split(';') + timestamp = detail_tokens[0] + if len(detail_tokens) > 1: + event["sl"] = int(detail_tokens[1]) event['time'] = float(timestamp[1:]) event.update(self.parse_syslog_info(line))

8 years, 7 months

#3049 FIX esx_vsphere_hostsystem.mem_usage_cluster: Fixed exception when no thresholds configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 70cac2262cbed47c7d3dcd693d611cf9d169258d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70cac2262cbed4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 08:56:09 2016 +0100 #3049 FIX esx_vsphere_hostsystem.mem_usage_cluster: Fixed exception when no thresholds configured --- .werks/3049 | 9 +++++++++ ChangeLog | 1 + checks/esx_vsphere_hostsystem | 11 +++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/3049 b/.werks/3049 new file mode 100644 index 0000000..729bebb --- /dev/null +++ b/.werks/3049 @@ -0,0 +1,9 @@ +Title: esx_vsphere_hostsystem.mem_usage_cluster: Fixed exception when no thresholds configured +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455177358 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8497636..1d8b088 100644 --- a/ChangeLog +++ b/ChangeLog @@ -264,6 +264,7 @@ * 2978 FIX: agent_appdynamics: fixed missing closing brackets for piggyback data * 3172 FIX: fjdarye100_rluns fjdarye101_rluns fjdarye60_rluns: Correctly detect RAID 0 state... * 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 Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index d687676..4077a85 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -122,9 +122,13 @@ def check_esx_vsphere_hostsystem_mem_cluster(item, params, info): level = total_memory_usage / total_memory_size * 100 label = "" state = 0 + warn_perf, crit_perf = None, None for count, levels in sorted_params: if nodes_count >= count: warn, crit = levels + warn_perf = warn * total_memory_size / 100 + crit_perf = cirt * total_memory_size / 100 + if level > crit: state = 2 label = " (Levels at %d%%/%d%%)" % (warn, crit) @@ -133,11 +137,10 @@ def check_esx_vsphere_hostsystem_mem_cluster(item, params, info): label = " (Levels at %d%%/%d%%)" % (warn, crit) break - - perf = [("usage", total_memory_usage, warn * total_memory_size / 100, - crit * total_memory_size / 100, 0, total_memory_size)] + perf = [("usage", total_memory_usage, warn_perf, crit_perf, 0, total_memory_size)] yield state, "%d%%%s used - %s/%s" % \ - (level, label, get_bytes_human_readable(total_memory_usage), get_bytes_human_readable(total_memory_size)), perf + (level, label, get_bytes_human_readable(total_memory_usage), + get_bytes_human_readable(total_memory_size)), perf check_info['esx_vsphere_hostsystem.mem_usage_cluster'] = {

8 years, 7 months

Updated bug entries #2377

by Lars Michelsen

Module: check_mk Branch: master Commit: 79143f6f98f10e5dfa929a99ffeaa0b0e9004c97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79143f6f98f10e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 08:42:17 2016 +0100 Updated bug entries #2377 --- .bugs/2377 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2377 b/.bugs/2377 index 1ee8566..8ab842b 100644 --- a/.bugs/2377 +++ b/.bugs/2377 @@ -1,9 +1,9 @@ Title: Deleting a context filter should, but does not put it back into the dropdown Component: multisite -State: open +Class: bug +State: done Date: 2015-09-16 11:58:25 Targetversion: 1.2.8 -Class: bug When you edit the Context/Search Filters section of a report, dashboard or view then for each context type (e.g. services) there is a dropdown where you @@ -14,3 +14,5 @@ not contained in the dropdown - not even grayed out. When you now delete such a filter you cannot re-add it without saving and coming back. Fix: Add the already present filters greyed out to the initial drop down. + +2016-02-11 08:42:14: changed state open -> done

8 years, 7 months

#3048 FIX It is now possible to add a context filter right after removing it from a view again

by Lars Michelsen

Module: check_mk Branch: master Commit: d540962903e299d70b38b5d3322ae993aff9f040 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d540962903e299… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 08:41:42 2016 +0100 #3048 FIX It is now possible to add a context filter right after removing it from a view again The view editor had a bug which made it impossible to add a context filter again after removing it from the view when it was already in the view during loading of the view editor. It could be worked around by saving the view and opening up the editor again to add the filter again. --- .werks/3048 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/js/checkmk.js | 18 +++++++++++++++++- web/htdocs/valuespec.py | 2 +- web/htdocs/visuals.py | 3 ++- 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.werks/3048 b/.werks/3048 new file mode 100644 index 0000000..0797333 --- /dev/null +++ b/.werks/3048 @@ -0,0 +1,12 @@ +Title: It is now possible to add a context filter right after removing it from a view again +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1455176396 +Class: fix + +The view editor had a bug which made it impossible to add a context filter again after +removing it from the view when it was already in the view during loading of the view +editor. It could be worked around by saving the view and opening up the editor again +to add the filter again. diff --git a/ChangeLog b/ChangeLog index 82ca4ab..8497636 100644 --- a/ChangeLog +++ b/ChangeLog @@ -318,6 +318,7 @@ * 3046 FIX: Acknowledging all incompatible werks when creating new sites * 2931 FIX: Do not load bookmarks, reports, view, etc. of non-existing users anymore * 3171 FIX: Logout in one site will log out of all sites sharing the same auth.secret... + * 3048 FIX: It is now possible to add a context filter right after removing it from a view again... WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 2050463..3b82665 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2069,7 +2069,9 @@ function vs_listofmultiple_toggle_fields(root, varprefix, enable) { function vs_listofmultiple_init(varprefix) { document.getElementById(varprefix + '_choice').value = ''; - // Mark fields of unused elements as disabled + vs_listofmultiple_disable_selected_options(varprefix); + + // Mark input fields of unused elements as disabled var container = document.getElementById(varprefix + '_table'); var unused = document.getElementsByClassName('unused', container); for (var i in unused) { @@ -2077,6 +2079,20 @@ function vs_listofmultiple_init(varprefix) { } } +// The <option> elements in the <select> field of the currently choosen +// elements need to be disabled. +function vs_listofmultiple_disable_selected_options(varprefix) +{ + var active_choices = document.getElementById(varprefix + '_active').value.split(";"); + + var choice_field = document.getElementById(varprefix + '_choice'); + for (var i = 0; i < choice_field.childNodes.length; i++) { + if (active_choices.indexOf(choice_field.childNodes[i].value) !== -1) { + choice_field.childNodes[i].disabled = true; + } + } +} + //#. //# .-Help Toggle--------------------------------------------------------. //# | _ _ _ _____ _ | diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 68090c5..451a918 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1081,7 +1081,7 @@ class ListOfMultiple(ValueSpec): html.write("</table>") html.write("<br>") - choosable = [('', '')] + [ (ident, vs.title()) for ident, vs in self._choices if ident not in value ] + choosable = [('', '')] + [ (ident, vs.title()) for ident, vs in self._choices ] attrs = {} if self._size != None: attrs["style"] = "width: %dex" % self._size diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 9751459..2b0c763 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1090,7 +1090,7 @@ class VisualFilterList(ListOfMultiple): self._filters = {} for info in self._infos: for fname, filter in filters_allowed_for_info(info).items(): - if fname not in fspecs: # and fname not in ubiquitary_filters: + if fname not in fspecs: fspecs[fname] = VisualFilter(fname, title = filter.title, ) @@ -1110,6 +1110,7 @@ class VisualFilterList(ListOfMultiple): def filter_names(self): return self._filters.keys() + # Realizes a Multisite/visual filter in a valuespec. It can render the filter form, get # the filled in values and provide the filled in information for persistance. class VisualFilter(ValueSpec):

8 years, 7 months

Dropped the cmcrushd

by Lars Michelsen

Module: check_mk Branch: master Commit: 7eba9a34cf9d1b236f60d49f64089d89059e20a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7eba9a34cf9d1b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 10 16:56:33 2016 +0100 Dropped the cmcrushd --- modules/automation.py | 6 +++--- modules/check_mk.py | 6 +++--- web/htdocs/watolib.py | 20 -------------------- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index dc69294..490a372 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -436,7 +436,7 @@ def automation_delete_host(args): shutil.rmtree("%s/%s" % (logwatch_dir, hostname)) -def automation_restart(job = "restart", use_rushd = True): +def automation_restart(job = "restart"): if check_plugins_have_changed(): forced = True job = "restart" @@ -486,7 +486,7 @@ def automation_restart(job = "restart", use_rushd = True): backup_path = None try: - configuration_warnings = create_core_config(use_rushd=use_rushd) + configuration_warnings = create_core_config() if "do_bake_agents" in globals() and bake_agents_on_restart: do_bake_agents() @@ -800,7 +800,7 @@ def automation_rename_hosts(): if core_was_running: global ignore_ip_lookup_failures ignore_ip_lookup_failures = True # force config generation to succeed. The core *must* start. - automation_restart("start", use_rushd = False) + automation_restart("start") if monitoring_core == "cmc": try: os.remove(var_dir + "/core/config.rush") diff --git a/modules/check_mk.py b/modules/check_mk.py index ec546ab..23247f2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3152,7 +3152,7 @@ def configuration_warning(text): sys.stdout.write("\n%sWARNING:%s %s\n" % (tty_bold + tty_yellow, tty_normal, text)) -def create_core_config(use_rushd): +def create_core_config(): global g_configuration_warnings g_configuration_warnings = [] @@ -3160,7 +3160,7 @@ def create_core_config(use_rushd): verify_non_deprecated_checkgroups() if monitoring_core == "cmc": - warnings = do_create_cmc_config(opt_cmc_relfilename, use_rushd=use_rushd) + warnings = do_create_cmc_config(opt_cmc_relfilename) else: load_module("nagios") out = file(nagios_objects_file, "w") @@ -3991,7 +3991,7 @@ NOTES: def do_create_config(with_agents=True): sys.stdout.write("Generating configuration for core (type %s)..." % monitoring_core) sys.stdout.flush() - create_core_config(use_rushd=False) + create_core_config() sys.stdout.write(tty_ok + "\n") if bake_agents_on_restart and with_agents and 'do_bake_agents' in globals(): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index aee3308..75e915d 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -212,8 +212,6 @@ def log_pending(status, linkinfo, what, message, user_id = None): if not is_distributed() and not is_wato_slave_site(): if status != SYNC: log_entry(linkinfo, what, message, "pending.log", user_id) - cmc_rush_ahead() - # Currently we add the pending to each site, regardless if # the site is really affected. This needs to be optimized @@ -275,20 +273,6 @@ def parse_audit_log(what): return [] -def cmc_rush_ahead(): - if defaults.omd_root: - socket_path = defaults.omd_root + "/tmp/run/cmcrush" - if os.path.exists(socket_path): - try: - changeid = str(random.randint(1, 100000000000000000)) - file(log_dir + "changeid", "w").write(changeid + "\n") - socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) \ - .sendto(changeid, socket_path) - except: - if config.debug: - raise - - def log_commit_pending(): pending = log_dir + "pending.log" if os.path.exists(pending): @@ -3468,10 +3452,6 @@ def synchronize_profile(site, user_id): return result -# Try to do a rush-ahead-activation -def cmc_rush_ahead_activation(): - return - def cmc_reload(): log_audit(None, "activate-config", "Reloading Check_MK Micro Core on the fly") html.live.command("[%d] RELOAD_CONFIG" % time.time())

8 years, 7 months

Updated bug entries #2327

by Lars Michelsen

Module: check_mk Branch: master Commit: b0fcd452dbcedad52e0a0a2a0d5446ad18495088 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0fcd452dbceda… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 10 16:34:08 2016 +0100 Updated bug entries #2327 --- .bugs/2327 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/2327 b/.bugs/2327 new file mode 100644 index 0000000..f1da348 --- /dev/null +++ b/.bugs/2327 @@ -0,0 +1,14 @@ +Title: Cleanup Version: output of special agents +Component: checks +State: open +Date: 2016-02-10 16:31:17 +Targetversion: future +Class: bug + +Some special agents use the Version: field of the <<<check_mk>>> section for sending +their e.g. firmware version or something different. But this version is only meant for +Check_MK agent versions. So they should leave the field empty or provide the Check_MK +version. + +The special agents which currently have a version should still provide it e.g. in a separate +agent section and have a check for it which at least displays this info.

8 years, 7 months

Updated bug entries #2421

by Mathias Kettner

Module: check_mk Branch: master Commit: ca435e27b16161718f7a1b3700e7a32d28c5e05e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca435e27b16161… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 10 14:35:22 2016 +0100 Updated bug entries #2421 --- .bugs/2421 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.bugs/2421 b/.bugs/2421 new file mode 100644 index 0000000..25e5d43 --- /dev/null +++ b/.bugs/2421 @@ -0,0 +1,22 @@ +Title: GIT mode in WATO ignores changes in subfolders +Component: wato +State: open +Date: 2016-02-10 14:34:10 +Targetversion: 1.2.8 +Class: bug + +Reason: invalid conf.d/.gitignore. + +Is: +* +!wato +!wato/* + +Should be: + +* +!wato +!wato/** + +Problem: This file is just created once when the feature is enabled. +Wenn need to fix this in existing installations!

8 years, 7 months

agent_emcvnx: Fixed broken call in special agent; Improved error handling

by Lars Michelsen

Module: check_mk Branch: master Commit: ac9eaf35ea0cb39ecc3c0adaa04ccb03dadba0b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac9eaf35ea0cb3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 10 14:21:58 2016 +0100 agent_emcvnx: Fixed broken call in special agent; Improved error handling --- agents/special/agent_emcvnx | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/agents/special/agent_emcvnx b/agents/special/agent_emcvnx index 12e3fcd..0fa0c09 100755 --- a/agents/special/agent_emcvnx +++ b/agents/special/agent_emcvnx @@ -167,9 +167,9 @@ except ValueError: if (user == None or user == '') and (password == None or password == ''): # try using security files - basecmd="naviseccli -h %s " % host_address + basecmd = "naviseccli -h %s " % host_address else: - basecmd="naviseccli -h %s -User %s -Password '%s' -Scope 0 " % (host_address, user, password) + basecmd = "naviseccli -h %s -User %s -Password '%s' -Scope 0 " % (host_address, user, password) # # check_mk section of agent output @@ -179,16 +179,22 @@ cmd = basecmd + "getall -sp" if opt_debug: sys.stderr.write("executing external command: %s\n" % cmd) -cmdout = [] -try: - p = subprocess.Popen(cmd) -except OSError: - sys.stderr.write("Failed to execute \"%s\". Maybe \"naviseccli\" is missing.\n" % cmd) - sys.exit(1) +# Now read the whole output of the command +cmdout = [ l.strip() for l in os.popen(cmd + " 2>&1").readlines() ] + +if cmdout: + if "naviseccli: not found" in cmdout[0]: + sys.stderr.write("The command \"naviseccli\" could not be found. Terminating.\n") + sys.exit(1) -for line in p.stdout.readlines(): - line = line.strip() - cmdout.append(line) + elif cmdout[0].startswith("Security file not found"): + sys.stderr.write("Could not find security file. Please provide valid user " + "credentials if you don't have a security file.\n") + sys.exit(1) + +# Try to gather the version of the agent +emcvnx_version = None +for line in cmdout: tokens = re.split("\s+", line) if tokens[0] == "Agent" and tokens[1] == "Rev:": emcvnx_version = "_".join(tokens[2:])

8 years, 7 months

Removed missleading comment

by Lars Michelsen

Module: check_mk Branch: master Commit: b5a309553e32837e713861914ac8e75564b4637b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5a309553e3283… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 10 13:33:17 2016 +0100 Removed missleading comment --- web/htdocs/js/checkmk.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 1106ba4..2050463 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -552,7 +552,6 @@ function executeJSbyObject(obj) } else { try { - // TODO: Das hier geht nicht :-( g_current_script = aScripts[i]; eval(aScripts[i].text); g_current_script = null;

8 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
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