Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 8ce7b83deeb42d7f66fa910b29d8a7dfa6898219 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ce7b83deeb42d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 17 12:11:33 2016 +0100 adapted netgear checks --- checks/netgear_fans | 63 ++++++++++++++++++++++++++++++++++++++++++----------- checks/netgear_temp | 40 +++++++++++++++++++++++++++------- 2 files changed, 82 insertions(+), 21 deletions(-) diff --git a/checks/netgear_fans b/checks/netgear_fans index 5fe5b2c..170204e 100644 --- a/checks/netgear_fans +++ b/checks/netgear_fans @@ -57,9 +57,50 @@ factory_settings["netgear_fans_default_levels"] = { } +def netgear_map_state_txt_to_int(state_nr, version): + map_state_txt_to_int = { + "operational" : 0, + "failed" : 2, + "powering" : 0, + "not powering" : 1, + "not present" : 1, + "no power" : 2, + "incompatible" : 2, + } + + if version.startswith("8."): + map_states = { + "1" : "operational", + "2" : "failed", + "3" : "powering", + "4" : "not powering", + "5" : "not present", + } + elif version.startswith("10."): + map_states = { + "1" : "notpresent", + "2" : "operational", + "3" : "failed", + "4" : "powering", + "5" : "no power", + "6" : "not powering", + "7" : "incompatible", + } + else: + map_states = { + "1" : "not present", + "2" : "operational", + "3" : "failed", + } + + state_txt = map_states.get(state_nr, "unknown(%s)" % state_nr) + return map_state_txt_to_int.get(state_txt, 3), state_txt + + def parse_netgear_fans(info): - parsed = {} - for oid_end, sstate, reading_str in info: + versioninfo, sensorinfo = info + parsed = { "__version__" : versioninfo[0][0] } + for oid_end, sstate, reading_str in sensorinfo: parsed.setdefault("%s" % oid_end.replace(".", "/"), { "state" : sstate, "reading_str" : reading_str, @@ -76,17 +117,12 @@ def inventory_netgear_fans(parsed): def check_netgear_fans(item, params, parsed): - map_states = { - "1" : (1, "not present"), - "2" : (0, "operational"), - "3" : (2, "failed"), - } if item in parsed: data = parsed[item] reading_str = data["reading_str"] if reading_str != "Not Supported": yield check_fan(int(data["reading_str"]), params) - yield map_states[data["state"]] + yield netgear_map_state_txt_to_int(data["state"], parsed["__version__"]) check_info['netgear_fans'] = { @@ -94,11 +130,12 @@ check_info['netgear_fans'] = { 'inventory_function' : inventory_netgear_fans, 'check_function' : check_netgear_fans, 'service_description' : 'Fan %s', - 'snmp_info' : ('.1.3.6.1.4.1.4526.10.43.1.6.1', [ - OID_END, - "3", # FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesFanItemState - "4", # FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesFanSpeed - ]), + 'snmp_info' : [('.1.3.6.1.4.1.4526.10.1.1.1.13', ['']), + ('.1.3.6.1.4.1.4526.10.43.1.6.1', [ + OID_END, + "3", # FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesFanItemState + "4", # FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesFanSpeed + ])], 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.4526.100"), 'default_levels_variable' : 'netgear_fans_default_levels', 'includes' : [ 'fan.include' ], diff --git a/checks/netgear_temp b/checks/netgear_temp index 17137fe..4170eda 100644 --- a/checks/netgear_temp +++ b/checks/netgear_temp @@ -43,6 +43,22 @@ # .1.3.6.1.4.1.4526.10.43.1.8.1.4.2.0 58 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorTemperature.2.0 # .1.3.6.1.4.1.4526.10.43.1.8.1.4.2.1 37 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorTemperature.2.1 # .1.3.6.1.4.1.4526.10.43.1.8.1.4.2.2 30 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorTemperature.2.2 +# .1.3.6.1.4.1.4526.10.43.1.8.1.5.1.0 1 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorsEntry.5.1.0 +# .1.3.6.1.4.1.4526.10.43.1.8.1.5.1.1 1 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorsEntry.5.1.1 +# .1.3.6.1.4.1.4526.10.43.1.8.1.5.1.2 1 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorsEntry.5.1.2 +# .1.3.6.1.4.1.4526.10.43.1.8.1.5.2.0 2 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorsEntry.5.2.0 +# .1.3.6.1.4.1.4526.10.43.1.8.1.5.2.1 2 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorsEntry.5.2.1 +# .1.3.6.1.4.1.4526.10.43.1.8.1.5.2.2 2 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorsEntry.5.2.2 + +# BUT (!!) +# .1.3.6.1.4.1.4526.10.43.1.8.1.2.1.0 0 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorType.1.0 +# .1.3.6.1.4.1.4526.10.43.1.8.1.2.2.0 0 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorType.2.0 +# .1.3.6.1.4.1.4526.10.43.1.8.1.3.1.0 1 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorState.1.0 +# .1.3.6.1.4.1.4526.10.43.1.8.1.3.2.0 1 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorState.2.0 +# .1.3.6.1.4.1.4526.10.43.1.8.1.4.1.0 1 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorTemperature.1.0 +# .1.3.6.1.4.1.4526.10.43.1.8.1.4.2.0 1 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorTemperature.2.0 +# .1.3.6.1.4.1.4526.10.43.1.8.1.5.1.0 35 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorsEntry.5.1.0 +# .1.3.6.1.4.1.4526.10.43.1.8.1.5.2.0 37 --> FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorsEntry.5.2.0 def parse_netgear_temp(info): @@ -51,12 +67,18 @@ def parse_netgear_temp(info): "2" : "removable", } + versioninfo, sensorinfo = info parsed = {} - for oid_end, sensor_ty, sstate, reading_str in info: + for oid_end, sensor_ty, sstate, reading_str, reading_str_10 in sensorinfo: + if versioninfo[0][0].startswith("10."): + reading = float(reading_str_10) + else: + reading = float(reading_str) + parsed.setdefault("Sensor %s" % oid_end.replace(".", "/"), { "type" : map_types.get(sensor_ty), "state" : sstate, - "reading" : float(reading_str), + "reading" : reading, }) return parsed @@ -91,12 +113,14 @@ check_info['netgear_temp'] = { 'check_function' : check_netgear_temp, 'service_description' : 'Temperature %s', 'has_perfdata' : True, - 'snmp_info' : ('.1.3.6.1.4.1.4526.10.43.1.8.1', [ - OID_END, - "2", # FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorType - "3", # FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorState - "4", # FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorTemperature - ]), + 'snmp_info' : [('.1.3.6.1.4.1.4526.10.1.1.1.13', ['']), + ('.1.3.6.1.4.1.4526.10.43.1.8.1', [ + OID_END, + "2", # FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorType + "3", # FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorState + "4", # FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorTemperature + "5", # FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorTemperature + ])], 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.4526.100"), 'includes' : [ 'temperature.include' ], 'group' : 'temperature',

7 years, 10 months

TextAreaUnicode can now use available width, if Browser supports it

by Mathias Kettner

Module: check_mk Branch: master Commit: 0e349288694922eca45db6309740fb1201731252 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e349288694922… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 12:10:32 2016 +0100 TextAreaUnicode can now use available width, if Browser supports it The ValueSpec TextAreaUnicode has the new argument "try_max_width". If it is set to True, then the size of the area is allowed to grow beyond the arguments cols (which is now a minimum size). This is done by using calc() in CSS. Older browsers that do not handle calc() should simply ignore this and keep to the old behaviour. --- web/htdocs/htmllib.py | 9 ++++++--- web/htdocs/valuespec.py | 5 ++++- web/htdocs/wato.py | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 63acf26..a74d3ad 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1828,15 +1828,18 @@ class html(DeprecationWrapper): self.text_input(varname, default_value, type="password", size = size, **args) - def text_area(self, varname, deflt="", rows=4, cols=30, attrs = {}): + def text_area(self, varname, deflt="", rows=4, cols=30, attrs = {}, try_max_width=False): value = self.var(varname, deflt) error = self.user_errors.get(varname) if error: self.write("<x class=inputerror>") attributes = ' ' + ' '.join([ '%s="%s"' % (k, v) for k, v in attrs.iteritems() ]) - self.write("<textarea style=\"width: %d.8ex\" rows=%d cols=%d name=\"%s\"%s>%s</textarea>\n" % ( - cols, rows, cols, varname, attributes, self.attrencode(value))) + style = "width: %d.8ex;" % cols + if try_max_width: + style += "width: calc(100%% - 10px); min-width: %d.8ex;" % cols + self.write("<textarea style=\"%s\" rows=%d cols=%d name=\"%s\"%s>%s</textarea>\n" % ( + style, rows, cols, varname, attributes, self.attrencode(value))) if error: self.write("</x>") self.set_focus(varname) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 9313257..b15b446 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -956,6 +956,7 @@ class TextAreaUnicode(TextUnicode): def __init__(self, **kwargs): TextUnicode.__init__(self, **kwargs) self._cols = kwargs.get("cols", 60) + self._try_max_width = kwargs.get("try_max_width", False) # If set, uses calc(100%-10px) self._rows = kwargs.get("rows", 20) # Allowed: "auto" -> Auto resizing self._minrows = kwargs.get("minrows", 0) # Minimum number of initial rows when "auto" self._monospaced = kwargs.get("monospaced", False) # select TT font @@ -986,7 +987,9 @@ class TextAreaUnicode(TextUnicode): if self._prefix_buttons: html.write('<div style="white-space: nowrap;">') - html.text_area(varprefix, value, rows=rows, cols=self._cols, attrs = attrs) + + html.text_area(varprefix, value, rows=rows, cols=self._cols, + attrs = attrs, try_max_width=self._try_max_width) if self._prefix_buttons: self.render_buttons() html.write('</div>') diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7f1356c..e42770f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4852,7 +4852,8 @@ class ModeActivateChanges(WatoMode, ActivateChanges): elements = [ ("comment", TextAreaUnicode( title = _("Comment (optional)"), - cols = 93, + cols = 40, + try_max_width = True, rows = 3, help = _("You can provide an optional comment for the current activation. " "This can be useful to document the reason why the changes you "

7 years, 10 months

fixed description of rule for ping

by Marcel Arentz

Module: check_mk Branch: master Commit: 4b2a59092b86f616b10c418e3a00f547a25177e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b2a59092b86f6… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Nov 17 11:56:37 2016 +0100 fixed description of rule for ping The description was not correct. The thresholds for packet loss are activated if equal or above and not above only. --- web/plugins/wato/active_checks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index d5096d4..894ff91 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -46,8 +46,8 @@ check_icmp_params = [ "is 100%. That means that the check is only critical if <b>all</b> packets " "are lost."), elements = [ - Percentage(title = _("Warning if above"), default_value = 80.0), - Percentage(title = _("Critical if above"), default_value = 100.0), + Percentage(title = _("Warning at"), default_value = 80.0), + Percentage(title = _("Critical at"), default_value = 100.0), ])), ( "packets",

7 years, 10 months

Synched iwyu script with upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 6df1892cec0e97246fae8afbc4641e80445d5bb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6df1892cec0e97… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 17 11:24:51 2016 +0100 Synched iwyu script with upstream. --- tests/iwyu_tool_jenkins.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/iwyu_tool_jenkins.py b/tests/iwyu_tool_jenkins.py index 69d2d17..19de45b 100755 --- a/tests/iwyu_tool_jenkins.py +++ b/tests/iwyu_tool_jenkins.py @@ -38,7 +38,7 @@ SHOULD_ADD_RE = re.compile(r'^(.*?) should add these lines:$') SHOULD_REMOVE_RE = re.compile(r'^(.*?) should remove these lines:$') FULL_LIST_RE = re.compile(r'The full include-list for (.*?):$') END_RE = re.compile(r'^---$') -LINES_RE = re.compile(r'.*// lines ([0-9]+)-[0-9]+$') +LINES_RE = re.compile(r'^- (.*?) // lines ([0-9]+)-[0-9]+$') GENERAL, ADD, REMOVE, LIST = range(4) @@ -50,7 +50,7 @@ def clang_formatter(output): for line in output: match = CORRECT_RE.match(line) if match: - print('%s has correct #includes/fwd-decls' % match.groups(1)) + print('%s:1:1: note: #includes/fwd-decls are correct' % match.groups(1)) continue match = SHOULD_ADD_RE.match(line) if match: @@ -63,21 +63,20 @@ def clang_formatter(output): match = FULL_LIST_RE.match(line) if match: state = (LIST, match.group(1)) - print('%s:1:1: error: full include list follows' % state[1]) elif END_RE.match(line): state = (GENERAL, None) - elif state[0] != GENERAL and not line.strip(): + elif not line.strip(): continue + elif state[0] == GENERAL: + print(line) elif state[0] == ADD: print('%s:1:1: error: add the following line' % state[1]) print(line) elif state[0] == REMOVE: match = LINES_RE.match(line) - line_no = match.group(1) if match else '1' + line_no = match.group(2) if match else '1' print('%s:%s:1: error: remove the following line' % (state[1], line_no)) - print(line[2:]) - else: - print(line) + print(match.group(1)) DEFAULT_FORMAT = 'iwyu'

7 years, 10 months

adapted netgear_fans check

by Simon Betz

Module: check_mk Branch: master Commit: 6cddae2665d7d128025994d5538e9e337ff1ec9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cddae2665d7d1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 17 11:19:12 2016 +0100 adapted netgear_fans check --- checks/netgear_fans | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/checks/netgear_fans b/checks/netgear_fans index 902822c..5fe5b2c 100644 --- a/checks/netgear_fans +++ b/checks/netgear_fans @@ -71,7 +71,7 @@ def inventory_netgear_fans(parsed): for sensorname, sensorinfo in parsed.items(): state = sensorinfo["state"] if state != "1" and not ( state == "2" and \ - sensorinfo["reading_str"] in [ "0", "Not Supported" ] ): + sensorinfo["reading_str"] in [ "0" ] ): yield sensorname, {} @@ -83,7 +83,9 @@ def check_netgear_fans(item, params, parsed): } if item in parsed: data = parsed[item] - yield check_fan(int(data["reading_str"]), params) + reading_str = data["reading_str"] + if reading_str != "Not Supported": + yield check_fan(int(data["reading_str"]), params) yield map_states[data["state"]]

7 years, 10 months

adapted netgear checks

by Simon Betz

Module: check_mk Branch: master Commit: bab2b54ddaa1b69b6ac325f497b9afc4c8a070c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bab2b54ddaa1b6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 17 10:29:13 2016 +0100 adapted netgear checks --- checks/netgear_fans | 12 ++++++------ checks/netgear_powersupplies | 3 +-- checks/netgear_temp | 3 +-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/checks/netgear_fans b/checks/netgear_fans index d266f0f..902822c 100644 --- a/checks/netgear_fans +++ b/checks/netgear_fans @@ -60,10 +60,9 @@ factory_settings["netgear_fans_default_levels"] = { def parse_netgear_fans(info): parsed = {} for oid_end, sstate, reading_str in info: - group, idx = oid_end.split(".") - parsed.setdefault("%s/%s" % (group, idx), { - "state" : sstate, - "reading" : int(reading_str), + parsed.setdefault("%s" % oid_end.replace(".", "/"), { + "state" : sstate, + "reading_str" : reading_str, }) return parsed @@ -71,7 +70,8 @@ def parse_netgear_fans(info): def inventory_netgear_fans(parsed): for sensorname, sensorinfo in parsed.items(): state = sensorinfo["state"] - if state != "1" and not ( state == "2" and sensorinfo["reading"] == 0 ): + if state != "1" and not ( state == "2" and \ + sensorinfo["reading_str"] in [ "0", "Not Supported" ] ): yield sensorname, {} @@ -83,7 +83,7 @@ def check_netgear_fans(item, params, parsed): } if item in parsed: data = parsed[item] - yield check_fan(data["reading"], params) + yield check_fan(int(data["reading_str"]), params) yield map_states[data["state"]] diff --git a/checks/netgear_powersupplies b/checks/netgear_powersupplies index dd51a87a..d0cad61 100644 --- a/checks/netgear_powersupplies +++ b/checks/netgear_powersupplies @@ -34,8 +34,7 @@ def parse_netgear_powersupplies(info): parsed = {} for oid_end, sstate in info: - group, idx = oid_end.split(".") - parsed.setdefault("%s/%s" % (group, idx), sstate ) + parsed.setdefault("%s" % oid_end.replace(".", "/"), sstate ) return parsed diff --git a/checks/netgear_temp b/checks/netgear_temp index 891a8fb..17137fe 100644 --- a/checks/netgear_temp +++ b/checks/netgear_temp @@ -53,8 +53,7 @@ def parse_netgear_temp(info): parsed = {} for oid_end, sensor_ty, sstate, reading_str in info: - group, idx = oid_end.split(".") - parsed.setdefault("Sensor %s/%s" % (group, idx), { + parsed.setdefault("Sensor %s" % oid_end.replace(".", "/"), { "type" : map_types.get(sensor_ty), "state" : sstate, "reading" : float(reading_str),

7 years, 10 months

Fix more than 10 occurrances of notifcation -> notification

by Mathias Kettner

Module: check_mk Branch: master Commit: 50fd5d4ed6ab963b1b6e328a4605d4cbf89594ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50fd5d4ed6ab96… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 16 14:10:33 2016 +0100 Fix more than 10 occurrances of notifcation -> notification --- .bugs/2306 | 2 +- .bugs/2312 | 2 +- .bugs/2316 | 2 +- .bugs/2321 | 2 +- .bugs/2337 | 2 +- .bugs/config | 2 +- .werks/1121 | 2 +- .werks/1702 | 2 +- .werks/2652 | 2 +- .werks/759 | 2 +- ChangeLog | 2 +- checkman/check_notify_count | 2 +- notifications/spectrum | 2 +- web/htdocs/wato.py | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.bugs/2306 b/.bugs/2306 index bde367e..3410e6c 100644 --- a/.bugs/2306 +++ b/.bugs/2306 @@ -1,5 +1,5 @@ Title: Notification bulking seems to sometimes duplicate notification emails -Component: notifcation +Component: notification State: open Date: 2015-02-25 12:07:45 Targetversion: future diff --git a/.bugs/2312 b/.bugs/2312 index 07d39d1..29f8eb6 100644 --- a/.bugs/2312 +++ b/.bugs/2312 @@ -1,5 +1,5 @@ Title: Notifications: on exception send a notification mail to fallback address -Component: notifcation +Component: notification State: open Date: 2015-04-09 10:09:22 Targetversion: future diff --git a/.bugs/2316 b/.bugs/2316 index d2b2e4e..cf14faf 100644 --- a/.bugs/2316 +++ b/.bugs/2316 @@ -1,5 +1,5 @@ Title: Make notifications mechanics synchronous (improve reliability) -Component: notifcation +Component: notification State: open Date: 2015-06-29 11:09:35 Targetversion: 1.2.7 diff --git a/.bugs/2321 b/.bugs/2321 index 2ae9c1a..8acbeb5 100644 --- a/.bugs/2321 +++ b/.bugs/2321 @@ -1,5 +1,5 @@ Title: notify.py: subprocess p.communicate() calls may block when plugins output a lot -Component: notifcation +Component: notification Class: bug State: works4me Date: 2015-11-19 13:38:58 diff --git a/.bugs/2337 b/.bugs/2337 index 03c1ef2..3b9db01 100644 --- a/.bugs/2337 +++ b/.bugs/2337 @@ -1,5 +1,5 @@ Title: Better handling of situation where /sbin/sendmail is missing -Component: notifcation +Component: notification State: open Date: 2015-06-02 15:16:00 Targetversion: future diff --git a/.bugs/config b/.bugs/config index ca4eac7..5c874ac 100644 --- a/.bugs/config +++ b/.bugs/config @@ -10,7 +10,7 @@ states = { components = [ ( "core", "Core Modules, Setup, etc." ), ( "checks", "Checks and Agent plugins" ), - ( "notifcation", "Notification system" ), + ( "notification", "Notification system" ), ( "multisite", "Multisite GUI" ), ( "livestatus", "Livestatus" ), ( "ec", "Event Console" ), diff --git a/.werks/1121 b/.werks/1121 index 0a7d70a..98fcf03 100644 --- a/.werks/1121 +++ b/.werks/1121 @@ -6,7 +6,7 @@ Version: 1.2.5i6 Date: 1412070448 Class: fix -If you wanted to create/edit a rule based notifcation and the formular itself had too much +If you wanted to create/edit a rule based notification and the formular itself had too much configurable host tags, contact groups, etc. there was a problem on sending this formular to the server. The data was sent with a GET request, which only allowed a limited url length. This formular is now sent with a POST request. diff --git a/.werks/1702 b/.werks/1702 index 5d75d35..ad2555a 100644 --- a/.werks/1702 +++ b/.werks/1702 @@ -13,5 +13,5 @@ by the monitoring - and <i>user notification</i> - those being sent out to users. Note: in the rule based notifications one raw notification can create several -user notifications. Other raw notifcations might create no user notification +user notifications. Other raw notifications might create no user notification at all. diff --git a/.werks/2652 b/.werks/2652 index 6c2b960..0ccc347 100644 --- a/.werks/2652 +++ b/.werks/2652 @@ -9,4 +9,4 @@ Class: fix In case the Jolokia agent cannot be queried the Check_MK services does not any longer complain about missing agent sections. Instead on the main service of the instance goes CRIT and all other services will be skipped -and become stale. This avoids bogus notifcations. +and become stale. This avoids bogus notifications. diff --git a/.werks/759 b/.werks/759 index a11994e..11cb248 100644 --- a/.werks/759 +++ b/.werks/759 @@ -6,5 +6,5 @@ Date: 1395396860 Class: feature Check the number of sent notifications per contact using the plugin <tt>check_notify_count</tt> -provided with Check_MK. This plugin counts the total number of notifcations sent by the local +provided with Check_MK. This plugin counts the total number of notifications sent by the local monitoring core and creates graphs for each individual contact. diff --git a/ChangeLog b/ChangeLog index e50094c..ed38bbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5004,7 +5004,7 @@ * Add: plesk_domains - List domains configured in plesk installations * Add: plesk_backups - Monitor backup spaces configured for domains in plesk * Add: mysql_connections - Monitor number of parallel connections to mysql daemon - * Add: flexible notifcations: filter by hostname + * Add: flexible notifications: filter by hostname * New script multisite_to_mrpe for exporting services from a remote system * FIX: postgres_sessions: handle case of no active/no idle sessions * FIX: correct backslash representation of windows logwatch files diff --git a/checkman/check_notify_count b/checkman/check_notify_count index 905da03..ba28b99 100644 --- a/checkman/check_notify_count +++ b/checkman/check_notify_count @@ -5,7 +5,7 @@ license: GPL distribution: check_mk description: Check the number of sent notifications per contact using the plugin check_notify_count - provided with Check_MK. This plugin counts the total number of notifcations sent by the local + provided with Check_MK. This plugin counts the total number of notifications sent by the local monitoring core and creates graphs for each individual contact. You can configure thresholds on the number of notifications per contact in a defined time interval. diff --git a/notifications/spectrum b/notifications/spectrum index 2118fb0..dbb6cd5 100755 --- a/notifications/spectrum +++ b/notifications/spectrum @@ -52,7 +52,7 @@ def main(): for (var, value) in os.environ.items()]) - # check if configured via flexible notifcations + # check if configured via flexible notifications if "PARAMETER_1" in context: context["PARAMETER_COMMUNITY"] = context["PARAMETER_1"] context["PARAMETER_DESTINATION"] = context["PARAMETER_2"] diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2cc9fe6..7f1356c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1904,7 +1904,7 @@ def rename_host_in_event_rules(oldname, newname): actions += [ "alert_rules" ] * num_changed save_alert_handler_rules(rules) - # Notification channels of flexible notifcations also can have host conditions + # Notification channels of flexible notifications also can have host conditions for userid, user in users.items(): method = user.get("notification_method") if method and type(method) == tuple and method[0] == "flexible": @@ -7412,7 +7412,7 @@ def notification_rule_match_conditions(): orientation = "float", elements = [ Integer( - label = _("beginning from notifcation number"), + label = _("beginning from notification number"), default_value = 10, minvalue = 1, ),

7 years, 10 months

4043 Add missing metric definition for 15 minute CPU load prediction

by Mathias Kettner

Module: check_mk Branch: master Commit: d9b9dc37b62acb338fee003b063551c4d138a17e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9b9dc37b62acb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 16 11:39:32 2016 +0100 4043 Add missing metric definition for 15 minute CPU load prediction --- .werks/4043 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/4043 b/.werks/4043 new file mode 100644 index 0000000..80d96fa --- /dev/null +++ b/.werks/4043 @@ -0,0 +1,10 @@ +Title: Add missing metric definition for 15 minute CPU load prediction' +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1479292658 + + diff --git a/ChangeLog b/ChangeLog index 083c8ad..e50094c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 3963 FIX: check_mk_agent.linux: fixed strayed output of postfix status command * 3940 FIX: aix_hacmp_services: fixed broken check in case of agent section showing extra information before the "Status(...)" line... * 3941 FIX: zypper: fixed broken check for sections since agent OS SLES12... + * 4043 FIX: Add missing metric definition for 15 minute CPU load prediction' Multisite: * 3974 FIX: Sorting comments in hover menu of comments icon by time now diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 05545bf..2968be9 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -875,6 +875,13 @@ metric_info["load15"] = { "color" : "#2c5766", } +metric_info["predict_load15"] = { + "title" : _("Predicted average for 15 minute CPU load"), + "unit" : "", + "color" : "#a0b0c0", +} + + metric_info["context_switches"] = { "title" : _("Context switches"), "unit" : "1/s",

7 years, 10 months

We ship pip pip 9.0.1 nowadays.

by Sven Panne

Module: check_mk Branch: master Commit: b74fd8124b3eb6533f79d91523a4ce3a9bfc6799 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b74fd8124b3eb6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 16 09:19:11 2016 +0100 We ship pip pip 9.0.1 nowadays. --- tests/omd/test_python.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/omd/test_python.py b/tests/omd/test_python.py index 918376f..1a16238 100644 --- a/tests/omd/test_python.py +++ b/tests/omd/test_python.py @@ -52,4 +52,4 @@ def test_03_pip_interpreter_version(site): p = site.execute(["pip", "-V"], stdout=subprocess.PIPE) version = p.stdout.read() - assert version.startswith("pip 8.") + assert version.startswith("pip 9.")

7 years, 10 months

adapted discovery function

by Simon Betz

Module: check_mk Branch: master Commit: 80e5b8b0799e96b62cbcd080119888a31b8afe82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80e5b8b0799e96… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 16 08:24:01 2016 +0100 adapted discovery function --- checks/netgear_fans | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/checks/netgear_fans b/checks/netgear_fans index 430ebed..d266f0f 100644 --- a/checks/netgear_fans +++ b/checks/netgear_fans @@ -69,8 +69,10 @@ def parse_netgear_fans(info): def inventory_netgear_fans(parsed): - return [ (sensorname, {}) for sensorname, sensorinfo in parsed.items() - if sensorinfo["state"] not in [ "1" ] ] + for sensorname, sensorinfo in parsed.items(): + state = sensorinfo["state"] + if state != "1" and not ( state == "2" and sensorinfo["reading"] == 0 ): + yield sensorname, {} def check_netgear_fans(item, params, parsed):

7 years, 10 months

← Newer
1
...
9
10
11
12
13
14
15
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016