Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

tinkerforge: plugin now also works as a special agent

by Sebastian Herbord

Module: check_mk Branch: master Commit: 790f7605426ccf2a52593fec82e70671eff55425 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=790f7605426ccf… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Jan 29 16:31:34 2016 +0100 tinkerforge: plugin now also works as a special agent --- agents/plugins/mk_tinkerforge | 61 ++++-- agents/special/agent_tinkerforge | 331 +++++++++++++++++++++++++++++++ checks/agent_tinkerforge | 40 ++++ web/plugins/wato/datasource_programs.py | 31 +++ 4 files changed, 451 insertions(+), 12 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=790f760542…

8 years, 7 months

#2941 tinkerforge, tinkerforge.ambient, tinkerforge.humidity,

by Sebastian Herbord

tinkerforge.motion, tinkerforge.temperature: new checks to monitor tinkerforge sensors Message-ID: <56ab85ec.j/z6eCkpszkb+x0A%sh(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 8bb3d1ee48532806c1d45e02b9570ac8a8507121 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bb3d1ee485328… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Jan 29 15:43:11 2016 +0100 #2941 tinkerforge, tinkerforge.ambient, tinkerforge.humidity, tinkerforge.motion, tinkerforge.temperature: new checks to monitor tinkerforge sensors Tinkerforge is a manufacturer of buildings blocks (include many sensor blocks) that can be combined and assembled freely. The assembled devices can be connected to via usb, ethernet or wifi. The current range of checks supports the blocks (so called bricklets) included in the "Server Room Monitoring"-kit: - Ambient Light sensor - Humidity sensor - Motion sensor - Temperature sensor - Master brick The plugin can also be configured to display sensor readings on the integrated 7-segment display. --- .werks/2941 | 19 +++ ChangeLog | 1 + agents/plugins/mk_tinkerforge | 294 ++++++++++++++++++++++++++++++++++ checkman/tinkerforge | 17 ++ checkman/tinkerforge.ambient | 15 ++ checkman/tinkerforge.humidity | 14 ++ checkman/tinkerforge.motion | 21 +++ checkman/tinkerforge.temperature | 16 ++ checks/tinkerforge | 213 ++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 54 +++++++ 10 files changed, 664 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8bb3d1ee48…

8 years, 7 months

table.begin() like tables now do not need status.css anymore

by Mathias Kettner

Module: check_mk Branch: master Commit: be809db1a58c205cf3328d31d9c176dc7b9c2911 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be809db1a58c20… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 29 16:08:56 2016 +0100 table.begin() like tables now do not need status.css anymore --- web/htdocs/pages.css | 7 +++++++ web/htdocs/table.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 309c166..3975eb8 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -340,6 +340,13 @@ td.wide { width: 100%; } +table.data.oddeven > tbody > tr:nth-child(odd) { + background-color: #eee; +} + +table.data.oddeven > tbody > tr:nth-child(even) { + background-color: #ddd; +} /* Two-lined header, for example in WATO: ChangeLog->Site Status */ diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 273fbdb..e646297 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -240,7 +240,7 @@ def end(): rows = rows[:limit] if not do_csv: - html.write('<table class="data') + html.write('<table class="data oddeven') if "css" in table: html.write(" %s" % table["css"]) html.write('">\n')

8 years, 7 months

metrics: split up new helper function needed in custom graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: e3b15b34c330af987f51bf1e512253b9ba70f572 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3b15b34c330af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 29 16:10:18 2016 +0100 metrics: split up new helper function needed in custom graphs --- web/htdocs/metrics.py | 52 +++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index ec860db..2014e72 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -353,6 +353,30 @@ def parse_perf_data(perf_data_string, check_command=None): return perf_data, check_command +# Get translation info for one performance var. +def perfvar_translation(perfvar_nr, perfvar_name, check_command): + cm = check_metrics.get(check_command, {}) + + translation_entry = {} # Default: no translation neccessary + + if perfvar_name in cm: + translation_entry = cm[perfvar_name] + else: + for orig_varname, te in cm.items(): + if orig_varname[0] == "~" and regex(orig_varname[1:]).match(perfvar_name): # Regex entry + translation_entry = te + break + + metric_name = translation_entry.get("name", perfvar_name) + scale = translation_entry.get("scale", 1.0) + + return { + "name" : metric_name, + "scale" : scale, + "auto_graph" : translation_entry.get("auto_graph", True) + } + + # Convert Ascii-based performance data as output from a check plugin # into floating point numbers, do scaling if neccessary. @@ -360,27 +384,15 @@ def parse_perf_data(perf_data_string, check_command=None): # Result for this example: # { "temp" : "value" : 48.1, "warn" : 70, "crit" : 80, "unit" : { ... } } def translate_metrics(perf_data, check_command): - cm = check_metrics.get(check_command, {}) - translated_metrics = {} color_index = 0 for nr, entry in enumerate(perf_data): varname = entry[0] value_text = entry[1] - translation_entry = {} # Default: no translation neccessary + translation_entry = perfvar_translation(nr, varname, check_command) + metric_name = translation_entry["name"] - if varname in cm: - translation_entry = cm[varname] - else: - for orig_varname, te in cm.items(): - if orig_varname[0] == "~" and regex(orig_varname[1:]).match(varname): # Regex entry - translation_entry = te - break - - - # Translate name - metric_name = translation_entry.get("name", varname) if metric_name in translated_metrics: continue # ignore duplicate value @@ -396,18 +408,15 @@ def translate_metrics(perf_data, check_command): mi = metric_info[metric_name].copy() mi["color"] = parse_color_into_hexrgb(mi["color"]) - # Optional scaling - scale = translation_entry.get("scale", 1.0) - new_entry = { - "value" : float_or_int(value_text) * scale, + "value" : float_or_int(value_text) * translation_entry["scale"], "orig_name" : varname, - "scale" : scale, # needed for graph definitions + "scale" : translation_entry["scale"], # needed for graph definitions "scalar" : {}, } # Do not create graphs for ungraphed metrics if listed here - new_entry["auto_graph"] = translation_entry.get("auto_graph", True) + new_entry["auto_graph"] = translation_entry["auto_graph"] # Add warn, crit, min, max for index, key in [ (3, "warn"), (4, "crit"), (5, "min"), (6, "max") ]: @@ -416,7 +425,7 @@ def translate_metrics(perf_data, check_command): elif entry[index]: try: value = float_or_int(entry[index]) - new_entry["scalar"][key] = value * scale + new_entry["scalar"][key] = value * translation_entry["scale"] except: if config.debug: raise @@ -425,6 +434,7 @@ def translate_metrics(perf_data, check_command): new_entry.update(mi) new_entry["unit"] = unit_info[new_entry["unit"]] + translated_metrics[metric_name] = new_entry # TODO: warn, crit, min, max # if entry[2]:

8 years, 7 months

Do not create a HTTP 404 in case of missing Livestatus data anymore

by Mathias Kettner

Module: check_mk Branch: master Commit: 964f7203c3f467bd8770397947632a2a7435237b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=964f7203c3f467… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 29 15:41:45 2016 +0100 Do not create a HTTP 404 in case of missing Livestatus data anymore --- web/htdocs/index.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index d9de6d5..46b4766 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -157,8 +157,6 @@ def handler(req, fields = None, is_profiling = False): # Some exception need to set a specific HTTP status code if ty == MKUnauthenticatedException: response_code = apache.HTTP_UNAUTHORIZED - elif ty == livestatus.MKLivestatusNotFoundError: - response_code = apache.HTTP_NOT_FOUND elif ty == livestatus.MKLivestatusException: response_code = apache.HTTP_BAD_GATEWAY

8 years, 7 months

#3038 FIX Fixed invalid error message when creating service group assignment rule without having service groups

by Lars Michelsen

Module: check_mk Branch: master Commit: c84ae7adaa743c5870029b02e6a7d95a225103e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c84ae7adaa743c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 29 15:13:34 2016 +0100 #3038 FIX Fixed invalid error message when creating service group assignment rule without having service groups --- .werks/3038 | 9 +++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/3038 b/.werks/3038 new file mode 100644 index 0000000..9dda8dc --- /dev/null +++ b/.werks/3038 @@ -0,0 +1,9 @@ +Title: Fixed invalid error message when creating service group assignment rule without having service groups +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1454076806 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 87e13fa..fe7500f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -318,6 +318,7 @@ * 2964 FIX: Deleting site having hosts assigned links to list of hosts now * 2928 FIX: Fix display of rule set Do hardware/software Inventory... * 3036 FIX: Bulk discovery steps are now timing out short before HTTP request timeout... + * 3038 FIX: Fixed invalid error message when creating service group assignment rule without having service groups Notifications: * 2811 Mail notifications: Now able to add Host/Service Notes Url... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index f70ee07..187a491 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3106,6 +3106,14 @@ class ElementSelection(ValueSpec): ValueSpec.custom_validate(self, value, varprefix) def validate_datatype(self, value, varprefix): + self.load_elements() + # When no elements exists the default value is None and e.g. in wato.mode_edit_rule() + # handed over to validate_datatype() before rendering the input form. Disable the + # validation in this case to prevent validation errors. A helpful message is shown + # during render_input() + if len(self._elements) == 0 and value == None: + return + if type(value) != str: raise MKUserError(varprefix, _("The datatype must be str (string), but is %s") % type_name(value))

8 years, 7 months

really fixed broken table row styling

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ac7b4bf89467e22e460f2ab501a00d0e550a5ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ac7b4bf89467e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 29 13:48:39 2016 +0100 really fixed broken table row styling --- web/htdocs/pages.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 0e5ecd1..309c166 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -304,9 +304,6 @@ table.data th:last-child { border-right-style: none; } -table.data > tbody > tr:nth-child(odd) { background-color: #eee; } -table.data > tbody > tr:nth-child(even) { background-color: #ddd; } - table.data td.buttons { white-space: nowrap; width: 1%;

8 years, 7 months

Try to fix recently broken table styles

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b55026f9537409edaf259911cb1a428da5f79f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b55026f953740… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 29 13:47:15 2016 +0100 Try to fix recently broken table styles --- web/htdocs/pages.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 4ef69ee..0e5ecd1 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -304,8 +304,8 @@ table.data th:last-child { border-right-style: none; } -table.data tr:nth-child(odd) { background-color: #eee; } -table.data tr:nth-child(even) { background-color: #ddd; } +table.data > tbody > tr:nth-child(odd) { background-color: #eee; } +table.data > tbody > tr:nth-child(even) { background-color: #ddd; } table.data td.buttons { white-space: nowrap; @@ -475,6 +475,11 @@ table.groupheader { padding: 6px 0px 3px 0px; } +table.data tr.groupheader, +table.data tr.groupheader.td { + background-color: transparent; +} + tr.groupheader td { border-style: none; margin: 0px;

8 years, 7 months

#3037 FIX Terminate datasource programs when check timeout occurs

by Lars Michelsen

Module: check_mk Branch: master Commit: 3240e2270ea0d7c0ada63f648a79a6180e0e3d26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3240e2270ea0d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 29 13:23:22 2016 +0100 #3037 FIX Terminate datasource programs when check timeout occurs When using datasource programs, e.g. for checking by SSH, the Check_MK process could be terminated by a reached timeout leaving the launched subprocesses open. This might have caused in processes being too long open, running and consuming resources. The datasource program process and it's sub processes are now cleaned up when a check timeout occures. --- .werks/3037 | 15 +++++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 6 +++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/3037 b/.werks/3037 new file mode 100644 index 0000000..e843806 --- /dev/null +++ b/.werks/3037 @@ -0,0 +1,15 @@ +Title: Terminate datasource programs when check timeout occurs +Level: 2 +Component: core +Compatible: compat +Version: 1.2.7i4 +Date: 1454069860 +Class: fix + +When using datasource programs, e.g. for checking by SSH, the Check_MK +process could be terminated by a reached timeout leaving the launched +subprocesses open. This might have caused in processes being too long +open, running and consuming resources. + +The datasource program process and it's sub processes are now cleaned +up when a check timeout occures. diff --git a/ChangeLog b/ChangeLog index ecd02aa..87e13fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 2894 FIX: Fixed broken cluster checks when using Nagios core... * 2926 FIX: Fix exception in WATO when a check man page has not catalog entry * 2944 FIX: Fixed exception during config activation having clusters with unresolvable node IP addresses + * 3037 FIX: Terminate datasource programs when check timeout occurs... Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 995e457..eef1b9c 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -772,10 +772,14 @@ def get_agent_info_program(commandline): vverbose("Calling external program %s\n" % commandline) try: - p = subprocess.Popen(commandline, shell = True, stdout = subprocess.PIPE, stderr = subprocess.PIPE) + p = subprocess.Popen(commandline, shell = True, stdout = subprocess.PIPE, + stderr = subprocess.PIPE, preexec_fn=os.setsid) stdout, stderr = p.communicate() exitstatus = p.returncode except MKTimeout: + # On timeout exception try to stop the process to prevent child process "leakage" + if p: + os.killpg(os.getpgid(p.pid), signal.SIGTERM) raise except Exception, e:

8 years, 7 months

Fixed just introduced bug

by Lars Michelsen

Module: check_mk Branch: master Commit: ca59d3ca1e2bd5b58e38d3f90432f1cd27a90fdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca59d3ca1e2bd5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 29 13:25:48 2016 +0100 Fixed just introduced bug --- modules/automation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index d477123..3fd17b3 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -40,7 +40,7 @@ def trigger_automation_timeout(signum, stackframe): def do_automation(cmd, args): # Handle generic arguments (currently only the optional timeout argument) - if args[0] == "--timeout": + if len(args) > 1 and args[0] == "--timeout": args.pop(0) timeout = int(args.pop(0))

8 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016