Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

by Simon Betz

Module: check_mk Branch: master Commit: f90995d0b53f7dfcd4497d749964a6306fd2e9ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f90995d0b53f7d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 31 08:55:15 2017 +0200 Minor cleanup in ehterbox check plugin Change-Id: If2615e276a654961fbca5b65e8794b25f68d5de1 --- checks/etherbox | 73 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/checks/etherbox b/checks/etherbox index f91651b..371c47a 100644 --- a/checks/etherbox +++ b/checks/etherbox @@ -39,12 +39,14 @@ # TODO: insert missing snmp output + def etherbox_convert(info): sensor_data = [] for i in range(0, len(info[1])): sensor_data.append((info[1][i][1], info[2][i][1], info[3][i][1], info[4][i][1] )) return sensor_data + def inventory_etherbox(info, req_sensor_type): sensor_data = etherbox_convert(info) for index, name, sensor_type, value in sensor_data: @@ -54,6 +56,7 @@ def inventory_etherbox(info, req_sensor_type): if sensor_type == req_sensor_type: yield "%s.%s" % (index, sensor_type), None + def etherbox_get_sensor(item, item_type, info): sensor_data = etherbox_convert(info) item_index, item_type = item.split(".") @@ -64,6 +67,7 @@ def etherbox_get_sensor(item, item_type, info): return name, value raise Exception("Sensor not found") + def etherbox_scan(oid): # Older firmware version of Etherbox do not answer on # .1.3.6.1.2.1. (sysDescr). Yurks. We need to fetch @@ -79,6 +83,17 @@ etherbox_info = [ ( ".1.3.6.1.4.1.14848.2.1.2.1.5", [ OID_END, '' ]), # value * 10 ] + +# .--temperature---------------------------------------------------------. +# | _ _ | +# | | |_ ___ _ __ ___ _ __ ___ _ __ __ _| |_ _ _ _ __ ___ | +# | | __/ _ \ '_ ` _ \| '_ \ / _ \ '__/ _` | __| | | | '__/ _ \ | +# | | || __/ | | | | | |_) | __/ | | (_| | |_| |_| | | | __/ | +# | \__\___|_| |_| |_| .__/ \___|_| \__,_|\__|\__,_|_| \___| | +# | |_| | +# '----------------------------------------------------------------------' + + def check_etherbox_temp(item, params, info): try: name, value = etherbox_get_sensor(item, "1", info) @@ -87,7 +102,8 @@ def check_etherbox_temp(item, params, info): uom = { "0": "c", "1": "f", "2": "k" }[info[0][0][0]] temp = int(value) / 10.0 - return check_temperature(temp, params, "etherbox_temp_%s" % item, uom) + state, infotext, perfdata = check_temperature(temp, params, "etherbox_temp_%s" % item, uom) + return state, "[%s] %s" % (name, infotext), perfdata check_info["etherbox.temp"] = { @@ -101,6 +117,18 @@ check_info["etherbox.temp"] = { "includes" : [ "temperature.include" ], } + +#. +# .--humidity------------------------------------------------------------. +# | _ _ _ _ _ | +# | | |__ _ _ _ __ ___ (_) __| (_) |_ _ _ | +# | | '_ \| | | | '_ ` _ \| |/ _` | | __| | | | | +# | | | | | |_| | | | | | | | (_| | | |_| |_| | | +# | |_| |_|\__,_|_| |_| |_|_|\__,_|_|\__|\__, | | +# | |___/ | +# '----------------------------------------------------------------------' + + def check_etherbox_humidity(item, params, info): try: name, value = etherbox_get_sensor(item, "3", info) @@ -108,27 +136,28 @@ def check_etherbox_humidity(item, params, info): return 3, error.message state = 0 - temp = int(value) / 10.0 + humid = int(value) / 10.0 levels_info = "" if params: crit_low, warn_low, warn_high, crit_high = params levels_info = " (warn/crit below %.1f/%.1f %%RH / warn/crit at %.1f/%.1f %%RH )" %\ (crit_low, warn_low, warn_high, crit_high) - if temp <= crit_low: + if humid <= crit_low: state = 2 - elif temp >= crit_high: + elif humid >= crit_high: state = 2 - elif temp <= warn_low: + elif humid <= warn_low: state = 1 - elif temp >= warn_high: + elif humid >= warn_high: state = 1 else: crit_low, warn_low, warn_high, crit_high = None, None, None, None - perfdata = [ ("humidity", temp, crit_low, warn_low, warn_high, crit_high) ] - infotext = "%s: Humidity %.1f %%RH %s" % (name, temp, levels_info) + perfdata = [ ("humidity", humid, crit_low, warn_low, warn_high, crit_high) ] + infotext = "[%s] Humidity %.1f %%RH %s" % (name, humid, levels_info) return (state, infotext, perfdata) + check_info["etherbox.humidity"] = { "check_function" : check_etherbox_humidity, "inventory_function" : lambda x: inventory_etherbox(x, "3"), @@ -140,6 +169,17 @@ check_info["etherbox.humidity"] = { } +#. +# .--switch contact------------------------------------------------------. +# | _ _ _ _ _ | +# | _____ _(_) |_ ___| |__ ___ ___ _ __ | |_ __ _ ___| |_ | +# | / __\ \ /\ / / | __/ __| '_ \ / __/ _ \| '_ \| __/ _` |/ __| __| | +# | \__ \\ V V /| | || (__| | | | | (_| (_) | | | | || (_| | (__| |_ | +# | |___/ \_/\_/ |_|\__\___|_| |_| \___\___/|_| |_|\__\__,_|\___|\__| | +# | | +# '----------------------------------------------------------------------' + + def check_etherbox_switch_contact(item, params, info): try: name, value = etherbox_get_sensor(item, "4", info) @@ -157,7 +197,7 @@ def check_etherbox_switch_contact(item, params, info): state = 2 extra_info = ", should be %s" % params - infotext = "%s: Switch contact %s%s" % (name, switch_state, extra_info) + infotext = "[%s] Switch contact %s%s" % (name, switch_state, extra_info) return (state, infotext, perfdata) check_info["etherbox.switch"] = { @@ -171,6 +211,17 @@ check_info["etherbox.switch"] = { } +#. +# .--smoke---------------------------------------------------------------. +# | _ | +# | ___ _ __ ___ ___ | | _____ | +# | / __| '_ ` _ \ / _ \| |/ / _ \ | +# | \__ \ | | | | | (_) | < __/ | +# | |___/_| |_| |_|\___/|_|\_\___| | +# | | +# '----------------------------------------------------------------------' + + def check_etherbox_smoke(item, no_params, info): try: name, value = etherbox_get_sensor(item, "6", info) @@ -184,7 +235,8 @@ def check_etherbox_smoke(item, no_params, info): extra_info = " - Smoke alarm!" state = 2 - return (state, "%s: Smoke sensor%s" % (name, extra_info), perfdata) + return (state, "[%s] Smoke sensor%s" % (name, extra_info), perfdata) + check_info["etherbox.smoke"] = { "check_function" : check_etherbox_smoke, @@ -194,4 +246,3 @@ check_info["etherbox.smoke"] = { "snmp_scan_function" : etherbox_scan, "snmp_info" : etherbox_info, } -

7 years, 3 months

Changed error message in test to new message of API

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f7637305895ec4f73441a95a13c0a56b0d8f2bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f7637305895ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 31 08:58:42 2017 +0200 Changed error message in test to new message of API Change-Id: I6b38c099d4d2aa29108d9a83b327e5e89e67d7f4 --- tests/web/test_webapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/web/test_webapi.py b/tests/web/test_webapi.py index 3469243..5d5c471 100644 --- a/tests/web/test_webapi.py +++ b/tests/web/test_webapi.py @@ -48,7 +48,7 @@ def test_add_host_no_folder_create(web): ) exc_msg = "%s" % e - assert "Folder not existing" in exc_msg + assert "Unable to create parent folder" in exc_msg def test_get_all_hosts_basic(web):

7 years, 3 months

Small test change for (hopefully) easier debugging

by Lars Michelsen

Module: check_mk Branch: master Commit: e91aa996192355d4de9fc96ab4188a6a6a53951a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e91aa996192355… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 30 15:45:53 2017 +0200 Small test change for (hopefully) easier debugging Change-Id: I76246b19b30b6e1a72418c0030b89fe9c35daac2 --- tests/web/test_webapi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/web/test_webapi.py b/tests/web/test_webapi.py index d4bbf35..3469243 100644 --- a/tests/web/test_webapi.py +++ b/tests/web/test_webapi.py @@ -47,7 +47,8 @@ def test_add_host_no_folder_create(web): expect_error=True, ) - assert "Folder not existing" in "%s" % e + exc_msg = "%s" % e + assert "Folder not existing" in exc_msg def test_get_all_hosts_basic(web):

7 years, 3 months

Fixed render_help.

by Sven Panne

Module: check_mk Branch: master Commit: 586184453a8fc313b180ad566a627830b67c5d62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=586184453a8fc3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 30 14:24:21 2017 +0200 Fixed render_help. Change-Id: I168ad28ccc22076438a8214ef53e0175a2cf649a --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a5359a6..085a5ab 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1682,7 +1682,7 @@ class html(HTMLGenerator, RequestHandler): def render_help(self, text): if text and text.strip(): self.have_help = True - style = "display: %s;" % "block" if self.help_visible else "none" + style = "display: %s;" % ("block" if self.help_visible else "none") c = self.render_div(text.strip(), class_="help", style=style) return c else:

7 years, 3 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: c709d46a96eb40c2610a2cae6c243b8e8c967f1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c709d46a96eb40… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 30 12:19:18 2017 +0200 Reserved 20 Werk IDS Change-Id: I5a061f20d42d0ce93b3eaf0d2e52499e1e784037 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 7441b0b..d6e7d98 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4766 +4786

7 years, 3 months

corrected date and version

by Marcel Arentz

Module: check_mk Branch: master Commit: 0e4f74e8bfcd206d4e26c682a20149f20e65e167 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e4f74e8bfcd20… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue May 30 11:55:23 2017 +0200 corrected date and version Change-Id: Ic8e7b1d7212156cd45eb87ae87ea9f5f7e4fa1c9 --- .werks/4440 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/4440 b/.werks/4440 index ee0f013..62aa791 100644 --- a/.werks/4440 +++ b/.werks/4440 @@ -5,8 +5,8 @@ Class: feature Compatible: compat Edition: cre State: unknown -Version: 1.4.0b9 -Date: 1488271633 +Version: 1.5.0i1 +Date: 1496137983 With this new active check you are able to verify successful logins and optionally a timestamp of a file or operability of getting/putting a file.

7 years, 3 months

4440 check_sftp: New Check for SFTP Connections

by Marcel Arentz

Module: check_mk Branch: master Commit: 4a80f2dd2fa463dc48ebd7dabda27b8fb21efcbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a80f2dd2fa463… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Feb 28 09:50:05 2017 +0100 4440 check_sftp: New Check for SFTP Connections With this new active check you are able to verify successfull logins and optionally a timestamp of a file or operability of getting/putting a file. This plugin needs the python libary paramiko and is therefore not out of the box compatible with older releases of Check_MK. Change-Id: If476f67177e82aad52b509ea8b7a141b4281bb82 --- .werks/4440 | 15 +++ active_checks/check_sftp | 248 ++++++++++++++++++++++++++++++++++++++ checkman/check_sftp | 12 ++ checks/check_sftp | 62 ++++++++++ web/plugins/wato/active_checks.py | 87 +++++++++++++ 5 files changed, 424 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4a80f2dd2f…

7 years, 3 months

Fixed new skel makefile target

by Lars Michelsen

Module: check_mk Branch: master Commit: d9470094b970aa96ac4a9a45a81c38d0e797cd1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9470094b970aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 30 11:01:13 2017 +0200 Fixed new skel makefile target Change-Id: Id8d039c5b54bde2c807960e69616005a236d8574 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 86790f3..4cb7e6c 100644 --- a/Makefile +++ b/Makefile @@ -127,7 +127,7 @@ PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs check-version clean cppcheck dist documentation format \ GTAGS headers healspaces help install iwyu mrproper \ optimize-images packages setup setversion tidy version \ - am--refresh + am--refresh skel all: dist packages

7 years, 3 months

4702 FIX Quicksearch: fixed minor parsing issue when using specific filters

by Andreas Boesl

Module: check_mk Branch: master Commit: a8e33592b14b1f7248789c232d652d4720a32e03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8e33592b14b1f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 30 11:04:12 2017 +0200 4702 FIX Quicksearch: fixed minor parsing issue when using specific filters The first character of the entered search text was not evaluated correctly, whenever specific filters, e.g. <tt>s: Check_MK</tt> where used. This didn't cause much trouble, since the search itself was an infix search. Change-Id: I2f9e83fca24e92e2d7fab22bcfda64bf1d0fde12 --- .werks/4702 | 14 ++++++++++++++ web/htdocs/sidebar.py | 16 +++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.werks/4702 b/.werks/4702 new file mode 100644 index 0000000..e8de533 --- /dev/null +++ b/.werks/4702 @@ -0,0 +1,14 @@ +Title: Quicksearch: fixed minor parsing issue when using specific filters +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496134731 +Class: fix + +The first character of the entered search text was not evaluated correctly, +whenever specific filters, e.g. <tt>s: Check_MK</tt> where used. +This didn't cause much trouble, since the search itself was an infix search. + + diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 9b1db5b..c369f4a 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -1055,24 +1055,23 @@ class LivestatusQuicksearch(object): def _determine_search_objects(self): - filter_names = set(map(lambda x: "(%s)" % x.get_filter_shortname(), quicksearch_match_plugins)) + filter_names = set(map(lambda x: "%s" % x.get_filter_shortname(), quicksearch_match_plugins)) filter_regex = "|".join(filter_names) - # Goal: "(^| )((hg)|h|(sg)|s|(al)|(tg)|(ad)):" - regex = "(^| )(%(filter_regex)s):" % {"filter_regex": filter_regex} + # Goal: "((^| )(hg|h|sg|s|al|tg|ad):)" + regex = "((^| )(%(filter_regex)s):)" % {"filter_regex": filter_regex} found_filters = [] matches = re.finditer(regex, self._query) for match in matches: - found_filters.append((match.group(2), match.start())) + found_filters.append((match.group(1), match.start())) if found_filters: - # I wasn't able to include the filter text into the regex match.. filter_spec = {} current_string = self._query for filter_type, offset in found_filters[-1::-1]: - filter_text = to_regex(current_string[offset+len(filter_type)+2:]).strip() - filter_spec.setdefault(filter_type.strip(), []) - filter_spec[filter_type.strip()].append(filter_text) + filter_text = to_regex(current_string[offset+len(filter_type):]).strip() + filter_name = filter_type.strip().rstrip(":") + filter_spec.setdefault(filter_name, []).append(filter_text) current_string = current_string[:offset] self._search_objects.append(LivestatusSearchConductor(filter_spec, "continue")) else: @@ -1125,7 +1124,6 @@ class LivestatusQuicksearch(object): if not search_object.num_rows(): continue elements = search_object.get_elements() - logger.error(elements) elements.sort(key = lambda x: x["display_text"]) if show_match_topics: match_topic = search_object.get_match_topic()

7 years, 3 months

4559 Prevent Check_MK agent updater from running multiple times

by Andreas Umbreit

Module: check_mk Branch: master Commit: d6f1bc7d803be7cf6473aea6ef9eac64ead09351 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6f1bc7d803be7… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue May 30 10:07:01 2017 +0200 4559 Prevent Check_MK agent updater from running multiple times Change-Id: I1a1877caa77487e09e0519e0bfc0649b64a326f0 --- .werks/4559 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/4559 b/.werks/4559 new file mode 100644 index 0000000..51d8a92 --- /dev/null +++ b/.werks/4559 @@ -0,0 +1,10 @@ +Title: Prevent Check_MK agent updater from running multiple times +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1496131433 +Class: feature + +

7 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017