Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

CSV import: Cleanup old files from upload tmp dir

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a0ad9a4312439da6ace6ef11e712d8aaf682d5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a0ad9a4312439… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 13 10:18:08 2016 +0100 CSV import: Cleanup old files from upload tmp dir --- web/htdocs/wato.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 90c2b98..65269ef 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3001,11 +3001,12 @@ class ModeBulkImport(WatoMode): # Upload the CSV file into a temporary directoy to make it available not only # for this request. It needs to be available during several potential "confirm" # steps and then through the upload step. - # FIXME: How and when to cleanup files which were not completely uploaded? def _upload_csv_file(self): if not os.path.exists(self._upload_tmp_path): make_nagios_directories(self._upload_tmp_path) + self._cleanup_old_files() + upload_info = self._vs_upload().from_html_vars("_upload") self._vs_upload().validate_value(upload_info, "_upload") file_name, mime_type, content = upload_info["file"] @@ -3022,6 +3023,14 @@ class ModeBulkImport(WatoMode): html.set_var("do_service_detection", "1") + def _cleanup_old_files(self): + for f in os.listdir(self._upload_tmp_path): + path = self._upload_tmp_path + "/" + f + mtime = os.stat(path).st_mtime + if mtime < time.time() - 3600: + os.unlink(path) + + def _read_csv_file(self): try: csv_file = file(self._file_path())

8 years, 8 months

Fixed BI Rule edit link for the second time

by Bastian Kuhn

Module: check_mk Branch: master Commit: e47501ce17bd9b339347f2bd119d89956fe5611b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e47501ce17bd9b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jan 12 19:41:16 2016 +0100 Fixed BI Rule edit link for the second time --- web/plugins/wato/bi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index d9260d7..6379005 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -651,7 +651,7 @@ class ModeBI(WatoMode): def render_rule_tree(self, ruleid, tree_path): rule = self._aggregation_rules[ruleid] - edit_url = html.makeuri([("mode", "bi_edit_rule"), ("id", ruleid)]) + edit_url = html.makeuri_contextless([("mode", "bi_edit_rule"), ("id", ruleid)]) title = "%s (%s)" % (rule["title"], ruleid) sub_rule_ids = self.aggregation_sub_rule_ids(rule)

8 years, 8 months

Finally: Enable C++11! :-)

by Sven Panne

Module: check_mk Branch: master Commit: c94bf4909f0648596f16d94f93460d10c6d510ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c94bf4909f0648… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 12 15:37:58 2016 +0100 Finally: Enable C++11! :-) --- livestatus/src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 4faea0a..4c736c2 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -50,7 +50,7 @@ livestatus_so_SOURCES = \ global_counters.c module.c logger.c waittriggers.cc TimeperiodsCache.cc pnp4nagios.cc mk_inventory.cc \ ContactgroupsColumn.cc CustomTimeperiodColumn.cc HostServiceState.cc opids.cc auth.cc -livestatus_so_CXXFLAGS = -std=gnu++0x -fPIC +livestatus_so_CXXFLAGS = -std=c++11 -fPIC livestatus_so_CFLAGS = -fPIC livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES)

8 years, 8 months

Try several increasingly older compilers.

by Sven Panne

Module: check_mk Branch: master Commit: 72875b0069735ef2bccf27ee5bb5b459b07fe3d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72875b0069735e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 12 14:58:03 2016 +0100 Try several increasingly older compilers. --- livestatus/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 0d832c3..1e33336 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) # Checks for programs. -AC_PROG_CC([gcc44 gcc clang]) -AC_PROG_CXX([g++44 g++ clang++]) +AC_PROG_CC([gcc-5 clang-3.7 clang-3.6 clang-3.5 clang-3.4 gcc-4.9 gcc-4.8 gcc clang]) +AC_PROG_CXX([g++-5 clang++-3.7 clang++-3.6 clang++-3.5 clang++-3.4 g++-4.9 g++-4.8 g++ clang++]) AC_PROG_RANLIB AM_CONDITIONAL([HAVE_DIET], [which diet >/dev/null 2>&1]) # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it. :-P

8 years, 8 months

WATO BI: reworked complete BI configuration in new class based style

by Mathias Kettner

Module: check_mk Branch: master Commit: a7856c879e185e336c27da4f643108ccf3aaeb4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7856c879e185e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 11 13:59:28 2016 +0100 WATO BI: reworked complete BI configuration in new class based style --- web/htdocs/wato.py | 1147 ----------------------------------------------- web/htdocs/watolib.py | 179 ++++++++ web/plugins/wato/bi.py | 1152 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1331 insertions(+), 1147 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a7856c879e…

8 years, 8 months

#2917 FIX cisco_asa_failover: Will no longer discover on devices where failover is disabled

by Sebastian Herbord

Module: check_mk Branch: master Commit: d8f8354cb626d8b7532eed9ef20e8ed1beaf1649 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8f8354cb626d8… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Jan 12 10:41:49 2016 +0100 #2917 FIX cisco_asa_failover: Will no longer discover on devices where failover is disabled If failover is disabled on a device, both primary and secondary units are reported as "down". check_mk reported a warning for that even though there was no problem. This change requires re-inventory of the affected devices. --- .werks/2917 | 11 +++++++++++ ChangeLog | 1 + checks/cisco_asa_failover | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/.werks/2917 b/.werks/2917 new file mode 100644 index 0000000..2e3c75c --- /dev/null +++ b/.werks/2917 @@ -0,0 +1,11 @@ +Title: cisco_asa_failover: Will no longer discover on devices where failover is disabled +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1452591537 +Class: fix + +If failover is disabled on a device, both primary and secondary units are reported as "down". +check_mk reported a warning for that even though there was no problem. +This change requires re-inventory of the affected devices. diff --git a/ChangeLog b/ChangeLog index 5fc634a..e2c3aca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,6 +178,7 @@ * 2898 FIX: smart: Using normalized value for determining reallocated events state... * 2888 FIX: citrix_controller.licensing: ignoring double data from piggy backs * 2899 FIX: ps: Finally improved performance impact of perfdata when having a lot of processes... + * 2917 FIX: cisco_asa_failover: Will no longer discover on devices where failover is disabled... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/cisco_asa_failover b/checks/cisco_asa_failover index 361bac2..fb69e36 100644 --- a/checks/cisco_asa_failover +++ b/checks/cisco_asa_failover @@ -37,6 +37,11 @@ # [['Failover LAN Interface', '2', 'LAN_FO GigabitEthernet0/0.777'], ['Primary unit', '9', 'Active unit'], ['Secondary unit (this device)', '10', 'Standby unit']] def inventory_cisco_asa_failover(info): + for name, state, state_txt in info: + if name.lower() == "failover lan interface" and state == "3": + # clustering is disabled + return None + for deviceentry in info[-2:]: if "this device" in deviceentry[0]: return [ (None, None) ]

8 years, 8 months

checkpoint checks: some fixes and improvements

by Sebastian Herbord

Module: check_mk Branch: master Commit: 3e3f65ed1999ed1cc9de9a43db821650a52ee29d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e3f65ed1999ed… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jan 11 15:07:17 2016 +0100 checkpoint checks: some fixes and improvements --- checks/checkpoint_ha_status | 52 ++++++++++++++++++++++++------------------ checks/checkpoint_svn_status | 2 +- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/checks/checkpoint_ha_status b/checks/checkpoint_ha_status index 6312f87..7f111dd 100644 --- a/checks/checkpoint_ha_status +++ b/checks/checkpoint_ha_status @@ -25,38 +25,46 @@ # Boston, MA 02110-1301 USA. +# .1.3.6.1.4.1.2620.1.5.2.0 1 +# .1.3.6.1.4.1.2620.1.5.3.0 6 +# .1.3.6.1.4.1.2620.1.5.4.0 0 +# .1.3.6.1.4.1.2620.1.5.5.0 yes +# .1.3.6.1.4.1.2620.1.5.6.0 active +# .1.3.6.1.4.1.2620.1.5.7.0 OK +# .1.3.6.1.4.1.2620.1.5.101.0 0 +# .1.3.6.1.4.1.2620.1.5.103.0 + + def inventory_checkpoint_ha_status(info): - if info: + installed, major, minor, started, state, block_state, stat_code, stat_long = info[0] + if installed != "0": return [(None, None)] -def check_checkpoint_ha_status(item, params, info): - if info: - installed, major, minor, started, state, block_state, stat_code, stat_long = info[0] - - status = 0 - messages = [] - if installed != "1": - messages.append("not installed") - else: - messages.append("installed (v%s.%s)" % (major, minor)) +def check_checkpoint_ha_status(_no_item, _no_params, info): + installed, major, minor, started, state, block_state, stat_code, stat_long = info[0] - messages.append(state) + if installed == "0": + yield 2, "Not installed" + else: + yield 0, "Installed: v%s.%s" % (major, minor) - if started == "yes": - messages.append("started") + for val, infotext, ok_vals, warn_vals in [ + (started, "Started", ["yes"], None), + (state, "Status", ["active", "standby"], None), + (block_state, "Blocking", ["ok"], ["initializing"]) + ]: + if ok_vals is None or val.lower() in ok_vals: + status = 0 + elif warn_vals is not None and val.lower() in warn_vals: + status = 1 else: - messages.append("stopped") - - if block_state != "OK": - messages.append("blocking state: %s" % block_state) status = 2 - if stat_code != "0": - messages.append("status: %s" % stat_long) - status = 2 + yield status, "%s: %s" % (infotext, val) - return status, ", ".join(messages) + if stat_code != "0": + yield 2, "Problem: %s" % stat_long check_info['checkpoint_ha_status'] = { diff --git a/checks/checkpoint_svn_status b/checks/checkpoint_svn_status index 0eedd50..453b3d9 100644 --- a/checks/checkpoint_svn_status +++ b/checks/checkpoint_svn_status @@ -35,7 +35,7 @@ def check_checkpoint_svn_status(item, params, info): major, minor, code, description = info[0] ver = "v%s.%s" % (major, minor) if int(code) != 0: - return 2, descriptiona + return 2, description else: return 0, "OK (%s)" % ver

8 years, 8 months

minor cleanup in cisco_cpu

by Simon Betz

Module: check_mk Branch: master Commit: 95aa9237c57cceb68710b3558775ee9581fb883c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95aa9237c57cce… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 11 14:46:33 2016 +0100 minor cleanup in cisco_cpu --- checks/cisco_cpu | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/checks/cisco_cpu b/checks/cisco_cpu index d548137..2d32c92 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -41,15 +41,19 @@ def check_cisco_cpu(item, params, info): util = float(info[0][1]) else: util = float(info[0][0]) - infotext = "%2.1f%% utilization in the last 5 minutes" % util + + state = 0 + infotext = "%.1f%% utilization in the last 5 minutes" % util + warn, crit = params - perfdata = [("util", util, warn, crit, 0, 100)] if util >= crit: - return (2, infotext + " (critical at %d%%)" % crit, perfdata) + state = 2 elif util >= warn: - return (1, infotext + " (warning at %d%%)" % warn, perfdata) - else: - return (0, infotext, perfdata) + state = 1 + if state > 0: + infotext += " (warn/crit at %.1f%%/%.1f%%)" % (warn, crit) + + return state, infotext, [("util", util, warn, crit, 0, 100)] check_info["cisco_cpu"] = { "check_function" : check_cisco_cpu, @@ -58,7 +62,6 @@ check_info["cisco_cpu"] = { "has_perfdata" : True, "group" : "cpu_utilization", "snmp_scan_function" : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ - and oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.*"), - "snmp_info" : ( ".1.3.6.1.4.1.9.9.109.1.1.1.1", [ 5, 8 ]), + and oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.*"), + "snmp_info" : ( ".1.3.6.1.4.1.9.9.109.1.1.1.1", [ 5, 8 ]), } -

8 years, 8 months

ps: Fixed bug in last commit

by Lars Michelsen

Module: check_mk Branch: master Commit: a01c00f6b69d21a329cf8a2a82ff867b7a93846a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a01c00f6b69d21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 11 10:04:09 2016 +0100 ps: Fixed bug in last commit --- checks/ps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ps b/checks/ps index 0721f78..897ac92 100644 --- a/checks/ps +++ b/checks/ps @@ -106,7 +106,7 @@ def ps_get_counters_to_delete(pids): if ident_type == tuple and ident[0] == "ps": check_ident = ident[2] elif ident_type != tuple and (ident.startswith("ps_stat") or ident.startswith("ps_wmic")): - check_ident = name + check_ident = ident else: continue

8 years, 8 months

#2899 FIX ps: Finally improved performance impact of perfdata when having a lot of processes

by Lars Michelsen

Module: check_mk Branch: master Commit: 0664973c5d123f7ff14b68d6c2e9c697523f7771 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0664973c5d123f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 11 09:27:19 2016 +0100 #2899 FIX ps: Finally improved performance impact of perfdata when having a lot of processes When having a lot of processes, like several thousands, on a system and monitoring them, this lead to a lot of performance counters being created in Check_MK. The management of these counters was not very optimal, because not updated counters were only deleted based on time. So systems with a lot of process creations were handling many non needed counters during every check interval. This affected CPU and memory usage during checking such systems. As we get the full process table, we have now changed the logic to automatically delete the counters of all processes that are not existant anymore. This reduces the number of counters significantly. --- .werks/2899 | 17 +++++++++++ ChangeLog | 1 + checks/ps | 73 ++++++++++++++++++++++++++++++++++++++++++++-- checks/ps.include | 2 +- modules/check_mk_base.py | 44 +--------------------------- 5 files changed, 91 insertions(+), 46 deletions(-) diff --git a/.werks/2899 b/.werks/2899 new file mode 100644 index 0000000..9b73c9d --- /dev/null +++ b/.werks/2899 @@ -0,0 +1,17 @@ +Title: ps: Finally improved performance impact of perfdata when having a lot of processes +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1452500538 +Class: fix + +When having a lot of processes, like several thousands, on a system and monitoring them, +this lead to a lot of performance counters being created in Check_MK. The management of +these counters was not very optimal, because not updated counters were only deleted based +on time. So systems with a lot of process creations were handling many non needed counters +during every check interval. This affected CPU and memory usage during checking such systems. + +As we get the full process table, we have now changed the logic to automatically delete the +counters of all processes that are not existant anymore. This reduces the number of counters +significantly. diff --git a/ChangeLog b/ChangeLog index 9329466..a1a325a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -176,6 +176,7 @@ * 1320 FIX: fjdarye60_sum: Fixed bug in discovery function * 2898 FIX: smart: Using normalized value for determining reallocated events state... * 2888 FIX: citrix_controller.licensing: ignoring double data from piggy backs + * 2899 FIX: ps: Finally improved performance impact of perfdata when having a lot of processes... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ps b/checks/ps index 78da52d..0721f78 100644 --- a/checks/ps +++ b/checks/ps @@ -78,8 +78,77 @@ ANY_USER = None GRAB_USER = False -def ps_cleanup_counters(lines): - pass +# FIXME: Direct access to g_item_state is not allowed in checks normally, +# but there is no such API to access and modify it like it is needed here. +def ps_cleanup_counters(parsed): + # remove legacy key used for some kind of caching + try: + del g_item_state["last.cleared.ps_"] + except KeyError: + pass + + pids = ps_get_current_pids(parsed) + + for ident in ps_get_counters_to_delete(pids): + del g_item_state[ident] + + +# Get the idents of the counters which can be deleted because the process id of +# the counter is not found anymore in the process table. +# +# Handle these formats of idents: +# Old string based keys: 'ps_stat.pcpu.669': (1448634267.875281, 1), +# New magic keys: ('ps', None, 'ps_wmic.kernel.692'): (1448633487.573496, 1092007), +def ps_get_counters_to_delete(pids): + counters_to_delete = [] + for ident, state in g_item_state.iteritems(): + ident_type = type(ident) + if ident_type == tuple and ident[0] == "ps": + check_ident = ident[2] + elif ident_type != tuple and (ident.startswith("ps_stat") or ident.startswith("ps_wmic")): + check_ident = name + else: + continue + + pid = check_ident.split(".")[-1] + if pid not in pids: + counters_to_delete.append(ident) + return counters_to_delete + + +def ps_get_current_pids(parsed): + pids = [] + for line in parsed: + process_info = line[1] + if ps_has_extended_perfdata(process_info): + pids.append(process_info[4]) + return pids + + +# Makes sure, that no counter with a give prefix is kept longer +# than min_keep_seconds * 2. Counter is kept at least min_keep_seconds. +def clear_counters(counter_name_prefix, min_keep_seconds): + global g_item_state + + counters_to_delete = [] + + for name, state in g_item_state.iteritems(): + if type(name) == tuple: + counter_name = name[0] # never needed, since only called by ps currently + else: + counter_name = name + + if type(state) == tuple: + timestamp, value = state + else: + continue # unable to cleanup values without timestamp info, skip + + if counter_name.startswith(counter_name_prefix): + if timestamp < remove_if_min_keep_seconds: + counters_to_delete.append(name) + + for name in counters_to_delete: + del g_item_state[name] # FIXME: Refactor this function for better readability diff --git a/checks/ps.include b/checks/ps.include index 86b3bf6..5577347 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -455,7 +455,7 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" # correct number of DSes. To just look at the first process # in the agent output to make sure. We assume that at least # one process is always present. - extended_perfdata = ps_has_extended_perfdata(parsed[0]) + extended_perfdata = ps_has_extended_perfdata(parsed[0][1]) if extended_perfdata: perfdata += [ ("vsz", virtual_size), diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index a83cccb..25a4897 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -987,14 +987,7 @@ def load_item_state(hostname): try: g_item_state = eval(file(filename).read()) except: - # Try old syntax - try: - lines = file(filename).readlines() - for line in lines: - line = line.split() - g_item_state[' '.join(line[0:-2])] = ( int(line[-2]), int(line[-1]) ) - except: - g_item_state = {} + g_item_state = {} def save_item_state(hostname): @@ -1096,41 +1089,6 @@ def last_counter_wrap(): return g_last_counter_wrap - -# Makes sure, that no counter with a give prefix is kept longer -# than min_keep_seconds * 2. Counter is kept at least min_keep_seconds. -def clear_counters(counter_name_prefix, min_keep_seconds): - global g_item_state - - cleared_key = "last.cleared." + counter_name_prefix - if cleared_key in g_item_state: - last_cleared, none = g_item_state[cleared_key] - if last_cleared + min_keep_seconds > time.time(): - return # recent enough - g_item_state[cleared_key] = (time.time(), None) - - counters_to_delete = [] - remove_if_min_keep_seconds = time.time() - min_keep_seconds - - for name, state in g_item_state.iteritems(): - if type(name) == tuple: - counter_name = name[0] # never needed, since only called by ps currently - else: - counter_name = name - - if type(state) == tuple: - timestamp, value = state - else: - continue # unable to cleanup values without timestamp info, skip - - if counter_name.startswith(counter_name_prefix): - if timestamp < remove_if_min_keep_seconds: - counters_to_delete.append(name) - - for name in counters_to_delete: - del g_item_state[name] - - # Compute average by gliding exponential algorithm # itemname : unique ID for storing this average until the next check # this_time : timestamp of new value

8 years, 8 months

← Newer
1
...
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016