Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: #2451 wut_webtherm.humidity, wut_webtherm.pressure : Two new checks for humidity and air pressure sensors for WuT devices

by Konstantin Büttner

Module: check_mk Branch: master Commit: c77291c541c546336f7374424e695f6898a2cf45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c77291c541c546… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 17 14:04:34 2015 +0200 #2451 wut_webtherm.humidity, wut_webtherm.pressure: Two new checks for humidity and air pressure sensors for WuT devices --- .werks/2451 | 9 ++++++ ChangeLog | 1 + checkman/wut_webtherm.humidity | 18 ++++++++++++ checkman/wut_webtherm.pressure | 14 +++++++++ checks/wut_webtherm | 53 +++++++++++++++++----------------- web/plugins/wato/check_parameters.py | 5 ++-- 6 files changed, 71 insertions(+), 29 deletions(-) diff --git a/.werks/2451 b/.werks/2451 new file mode 100644 index 0000000..79a5025 --- /dev/null +++ b/.werks/2451 @@ -0,0 +1,9 @@ +Title: wut_webtherm.humidity, wut_webtherm.pressure: Two new checks for humidity and air pressure sensors for WuT devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1437134633 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b256165..1042139 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ NOTE: Please refer to the migration notes! * 1273 bvip_cams, bvip_fans, bvip_info, bvip_link, bvip_poe, bvip_temp, bvip_util, bvip_video_alerts: New Checks for Bosch Video over IP Cameras * 2405 New checks for UCS bladecenter: ucs_bladecenter_topsystem, ucs_bladecenter_faulinst... + * 2451 wut_webtherm.humidity, wut_webtherm.pressure: Two new checks for humidity and air pressure sensors for WuT devices * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checkman/wut_webtherm.humidity b/checkman/wut_webtherm.humidity new file mode 100644 index 0000000..08bee2d --- /dev/null +++ b/checkman/wut_webtherm.humidity @@ -0,0 +1,18 @@ +title: WuT Web-Thermograph: Humidity +agents: snmp +catalog: hw/environment/wut +license: GPL +distribution: check_mk +description: + This check monitors the humidity of sensors attached + to a WuT (Wiesemann & Theis) Web-Thermograph. + +item: + The item is the number of the sensor as string - usually {"2"}. + +perfdata: + One variable: the current humidity. + +inventory: + All available humidity sensors are automatically inventorized. + diff --git a/checkman/wut_webtherm.pressure b/checkman/wut_webtherm.pressure new file mode 100644 index 0000000..2366d9d --- /dev/null +++ b/checkman/wut_webtherm.pressure @@ -0,0 +1,14 @@ +title: WuT Web-Thermograph: Air Pressure +agents: snmp +catalog: hw/environment/wut +license: GPL +distribution: check_mk +description: + This check monitors the air pressor of sensors attached + to a WuT (Wiesemann & Theis) Web-Thermograph. + +item: + The item is the number of the sensor as string - usually {"3"}. + +inventory: + All available humidity sensors are automatically inventorized. diff --git a/checks/wut_webtherm b/checks/wut_webtherm index add64ee..fd142c5 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2015 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -36,7 +36,6 @@ def detect_webtherm(oid): ".1.3.6.1.4.1.5040.1.2.16", ".1.3.6.1.4.1.5040.1.2.18" ] -#. # .--Air Pressure--------------------------------------------------------. # | _ _ ____ | # | / \ (_)_ __ | _ \ _ __ ___ ___ ___ _ _ _ __ ___ | @@ -46,21 +45,24 @@ def detect_webtherm(oid): # | | # '----------------------------------------------------------------------' -#def inventory_wut_webtherm_pressure(info): -# for index, reading in info: -# if index.split(".")[1] == "3": -# yield "3", None -# -# -#def check_wut_webtherm_pressure(item, params, info): -# return 3, "Not implemented yet" -# -# -#check_info["wut_webtherm.pressure"] = { -# "inventory_function" : inventory_wut_webtherm_pressure, -# "check_function" : check_wut_webtherm_pressure, -# "service_description" : "Pressure %s", -#} +def inventory_wut_webtherm_pressure(info): + for index, reading in info: + if index.split(".")[1] == "3": + return [ ("3", None) ] + + +def check_wut_webtherm_pressure(item, _no_params, info): + for index, reading in info: + if index.split(".")[1] == item: + pressure = float(reading.replace(",",".")) # This value is in hPa + return 0, "%.2f hPa" % pressure + + +check_info["wut_webtherm.pressure"] = { + "inventory_function" : inventory_wut_webtherm_pressure, + "check_function" : check_wut_webtherm_pressure, + "service_description" : "Pressure %s", +} #. # .--Humidity------------------------------------------------------------. @@ -77,11 +79,13 @@ wut_webtherm_humidity_defaultlevels = (35, 40, 60, 65) def inventory_wut_webtherm_humidity(info): for index, reading in info: if index.split(".")[1] == "2": - yield "2", None + return [ ("2", "wut_webtherm_humidity_defaultlevels") ] def check_wut_webtherm_humidity(item, params, info): - humidity = float(line[1].replace(",",".")) + for index, reading in info: + if index.split(".")[1] == item: + humidity = float(reading.replace(",",".")) return check_humidity(humidity, params) @@ -110,14 +114,9 @@ factory_settings["wut_webtherm_defaultlevels"] = { def inventory_wut_webtherm(info): # line[0] is 1.1, 2.1, 3.1, 6.1, 8.1, 16.1 or 18.1 depending on MIB variant. We chop # of the first part in order to get independent of that. - for line in info: - if len(line) == 2: - temp = float(line[1].replace(",", ".")) - # If greater then 75 it can't be a temperature sensor. - # Maybe humidity - if temp > 75: - continue - yield line[0].split(".")[1], {} + for index, reading in info: + if index.split(".")[1] == "1": + return [ ("1", {}) ] def check_wut_webtherm(item, params, info): for line in info: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 50b501d..17abf91 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4274,8 +4274,9 @@ register_check_parameters( Integer(title = _("Critical at or above"), unit="%" ), ]), TextAscii( - title = _("Sensor names"), - allow_empty = False), + title = _("Sensor name") + help = _("The identifier of the sensor.") + ), match_type = "first", )

8 years, 11 months

Check_MK Git: check_mk: bvip_video_alerts: Minor fix for item, replace x00

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0b932520d1bdf7d98f8ca40ec76081904a9ba0b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b932520d1bdf7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jul 17 13:46:58 2015 +0200 bvip_video_alerts: Minor fix for item, replace x00 --- checks/bvip_video_alerts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/bvip_video_alerts b/checks/bvip_video_alerts index 3bc2cca..5b2ee12 100644 --- a/checks/bvip_video_alerts +++ b/checks/bvip_video_alerts @@ -27,11 +27,11 @@ def inventory_bvip_video_alerts(info): for cam, alerts in info: - yield cam, None + yield cam.replace('\x00',""), None def check_bvip_video_alerts(item, _no_params, info): for cam, alerts in info: - if cam == item: + if cam.replace('\x00',"") == item: if alerts != '0': return 2, "Device on Alarm State" else:

8 years, 11 months

Check_MK Git: check_mk: #2470 FIX Fixed exception in logwatch log list in rare cases

by Lars Michelsen

Module: check_mk Branch: master Commit: f23a036a88e94022dc7c98eb222068e45020c980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f23a036a88e940… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 17 13:36:20 2015 +0200 #2470 FIX Fixed exception in logwatch log list in rare cases When logfiles for a host exists which have only a log section header without related log lines, this could lead to an exception in the GUI when listing all existing logs. --- .werks/2470 | 12 ++++++++++++ ChangeLog | 3 ++- web/htdocs/logwatch.py | 8 ++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.werks/2470 b/.werks/2470 new file mode 100644 index 0000000..e75175a --- /dev/null +++ b/.werks/2470 @@ -0,0 +1,12 @@ +Title: Fixed exception in logwatch log list in rare cases +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1437132921 + +When logfiles for a host exists which have only a log section header +without related log lines, this could lead to an exception in the GUI +when listing all existing logs. diff --git a/ChangeLog b/ChangeLog index 6ef63ed..5f983df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,8 +58,8 @@ * 2403 FIX: ibm_imm_fan: fixed exception with invalid formatted fan speed information... * 2404 FIX: apache_status: now able to handle BusyServers and IdleServers... * 2406 FIX: fileinfo: fixed missing size performance data for very large (e.g 2TB) files and fileinfo groups... - * 2408 FIX: ibm_imm_fan: fixed exception while parsing fan percentage values * 2450 FIX: citrix_serverload: Changed representation of load to percent in rule and graphs, added perfometer + * 2408 FIX: ibm_imm_fan: fixed exception while parsing fan percentage values * 2469 FIX: Fixed service discovery on SNMP host having no system description OID Multisite: @@ -81,6 +81,7 @@ * 2396 FIX: LDAP: Fixed handling of LDAP trees having special chars in the path (e.g. in OU names)... * 2459 FIX: Preventing caching of all HTTP requests to dynamic pages (*.py)... * 2468 FIX: Fixed actions for duplicate host names on different sites... + * 2470 FIX: Fixed exception in logwatch log list in rare cases... WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index bd451ed..80af138 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -131,7 +131,7 @@ def list_logs(host, logfiles): logs = parse_file(host, log_file) if logs == [] or type(logs) != list: # corrupted logfile if logs == []: logs = "empty" - html.write("<tr class=%s0>\n" % (rowno % 2 == 0 and "odd" or "even")) + html.write("<tr class=\"data %s0\">\n" % (rowno % 2 == 0 and "odd" or "even")) html.write("<td>-</td><td>%s</td><td>%s</td><td>0</td></tr>\n" % (html.attrencode(logs), html.attrencode(file_display))) else: @@ -139,7 +139,7 @@ def list_logs(host, logfiles): last_log = get_last_log(logs) state = worst_log['level'] state_name = form_level(state) - html.write("<tr class=%s%d>\n" % (rowno % 2 == 0 and "odd" or "even", state)) + html.write("<tr class=\"data %s%d\">\n" % (rowno % 2 == 0 and "odd" or "even", state)) html.write("<td class=\"state%d\">%s</td>\n" % (state, state_name)) html.write("<td><a href=\"%s\">%s</a></td>\n" % @@ -148,7 +148,7 @@ def list_logs(host, logfiles): (form_datetime(last_log['datetime']), len(logs))) if rowno == 0: - html.write('<tr><td colspan=4>'+_('No logs found for this host.')+'</td></tr>\n') + html.write('<tr><td class="data" colspan=4>'+_('No logs found for this host.')+'</td></tr>\n') def ack_button(host = None, int_filename = None): @@ -292,7 +292,7 @@ def do_log_ack(host, filename): def get_worst_log(logs): worst_level = 0 - worst_log = None + worst_log = logs[0] for log in logs: for line in log['lines']:

8 years, 11 months

Check_MK Git: check_mk: #2408 FIX ibm_imm_fan: fixed exception while parsing fan percentage values

by Andreas Boesl

Module: check_mk Branch: master Commit: 9b7b5458abdea2bdd3257737b251ab58abcfccb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b7b5458abdea2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 17 13:13:54 2015 +0200 #2408 FIX ibm_imm_fan: fixed exception while parsing fan percentage values --- .werks/2408 | 10 ++++++++++ ChangeLog | 1 + checks/ibm_imm_fan | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2408 b/.werks/2408 new file mode 100644 index 0000000..877320a --- /dev/null +++ b/.werks/2408 @@ -0,0 +1,10 @@ +Title: ibm_imm_fan: fixed exception while parsing fan percentage values +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1437131588 + + diff --git a/ChangeLog b/ChangeLog index 4f4bed8..37365b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 2403 FIX: ibm_imm_fan: fixed exception with invalid formatted fan speed information... * 2404 FIX: apache_status: now able to handle BusyServers and IdleServers... * 2406 FIX: fileinfo: fixed missing size performance data for very large (e.g 2TB) files and fileinfo groups... + * 2408 FIX: ibm_imm_fan: fixed exception while parsing fan percentage values Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/ibm_imm_fan b/checks/ibm_imm_fan index 0674034..6f8d4e4 100644 --- a/checks/ibm_imm_fan +++ b/checks/ibm_imm_fan @@ -40,7 +40,7 @@ def check_ibm_imm_fan(item, _no_params, info): # speed can be "34 %", or "34%", or "34 % of maximum" # or simply a text without quotes.. - rpm_perc = int(speed.replace("[\"%]", " ").replace("%", " ").split(" ")[0]) + rpm_perc = int(speed.strip().replace("[\"%]", " ").replace("%", " ").split(" ")[0]) infotext = "%d%% of max rpm" % rpm_perc warn, crit = (28, 25) # preliminary estimates of levels

8 years, 11 months

Check_MK Git: check_mk: #2469 FIX Fixed service discovery on SNMP host having no system description OID

by Lars Michelsen

Module: check_mk Branch: master Commit: da8cf4709a76240d355504e760adec95572dd29d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da8cf4709a7624… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 17 13:25:23 2015 +0200 #2469 FIX Fixed service discovery on SNMP host having no system description OID --- .werks/2469 | 10 ++++++++++ ChangeLog | 1 + checks/snmp_info | 2 +- checks/snmp_uptime | 2 +- modules/check_mk.py | 22 +++++++++++++++------- modules/discovery.py | 5 +++++ 6 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.werks/2469 b/.werks/2469 new file mode 100644 index 0000000..e2815cb --- /dev/null +++ b/.werks/2469 @@ -0,0 +1,10 @@ +Title: Fixed service discovery on SNMP host having no system description OID +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1437132300 + + diff --git a/ChangeLog b/ChangeLog index b256165..77615e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 2404 FIX: apache_status: now able to handle BusyServers and IdleServers... * 2406 FIX: fileinfo: fixed missing size performance data for very large (e.g 2TB) files and fileinfo groups... * 2450 FIX: citrix_serverload: Changed representation of load to percent in rule and graphs, added perfometer + * 2469 FIX: Fixed service discovery on SNMP host having no system description OID Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/snmp_info b/checks/snmp_info index f038a4e..bd16052 100644 --- a/checks/snmp_info +++ b/checks/snmp_info @@ -42,5 +42,5 @@ check_info["snmp_info"] = { 'inventory_function': inventory_snmp_info, 'service_description': 'SNMP Info', 'snmp_info': ('.1.3.6.1.2.1.1', ['1.0', '4.0', '5.0', '6.0']), - 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.1.0") != None, + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.1.0") not in [ None, "" ], } diff --git a/checks/snmp_uptime b/checks/snmp_uptime index f2dde6b..a1ba8ee 100644 --- a/checks/snmp_uptime +++ b/checks/snmp_uptime @@ -40,7 +40,7 @@ check_info["snmp_uptime"] = { 'service_description' : 'Uptime', 'has_perfdata' : True, 'snmp_info' : ('.1.3.6.1.2.1.1', ['3.0']), # DISMAN-EVENT-MIB::sysUpTime - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") != None, + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") not in [ None, "" ], 'group' : 'uptime', 'includes' : [ 'uptime.include' ], } diff --git a/modules/check_mk.py b/modules/check_mk.py index 86ce3c3..38ffbc1 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -811,6 +811,19 @@ def snmp_get_oid(hostname, ipaddress, oid): value = value[1:-1] return value + +def clear_other_hosts_oid_cache(hostname): + global g_single_oid_hostname + if g_single_oid_hostname != hostname: + g_single_oid_cache.clear() + g_single_oid_hostname = hostname + + +def set_oid_cache(hostname, oid, value): + clear_other_hosts_oid_cache(hostname) + g_single_oid_cache[oid] = value + + def get_single_oid(hostname, ipaddress, oid): # New in Check_MK 1.1.11: oid can end with ".*". In that case # we do a snmpgetnext and try to find an OID with the prefix @@ -822,12 +835,7 @@ def get_single_oid(hostname, ipaddress, oid): else: oid = '.' + oid - global g_single_oid_hostname - global g_single_oid_cache - - if g_single_oid_hostname != hostname: - g_single_oid_hostname = hostname - g_single_oid_cache = {} + clear_other_hosts_oid_cache(hostname) if oid in g_single_oid_cache: return g_single_oid_cache[oid] @@ -856,7 +864,7 @@ def get_single_oid(hostname, ipaddress, oid): else: vverbose("failed.\n") - g_single_oid_cache[oid] = value + set_oid_cache(hostname, oid, value) return value #. diff --git a/modules/discovery.py b/modules/discovery.py index 24c9869..3ceb7fa 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -353,6 +353,11 @@ def snmp_scan(hostname, ipaddress, on_error = "ignore", for_inv=False): sys_descr = get_single_oid(hostname, ipaddress, sys_descr_oid) if sys_descr == None: raise MKSNMPError("Cannot fetch system description OID %s" % sys_descr_oid) + else: + # Fake OID values to prevent issues with a lot of scan functions + set_oid_cache(hostname, ".1.3.6.1.2.1.1.1.0", "") + set_oid_cache(hostname, ".1.3.6.1.2.1.1.2.0", "") + found = [] if for_inv:

8 years, 11 months

Check_MK Git: check_mk: Conflicts:

by Konstantin Büttner

Module: check_mk Branch: master Commit: 12cf8f10e570799d15e675a543d7054e1437aac0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12cf8f10e57079… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 17 12:03:44 2015 +0200 Conflicts: web/plugins/metrics/check_mk.py web/plugins/wato/check_parameters.py --- .werks/2450 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 24 ++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 32 ++++++++++++++++++-------------- 4 files changed, 53 insertions(+), 14 deletions(-) diff --git a/.werks/2450 b/.werks/2450 new file mode 100644 index 0000000..a1cb677 --- /dev/null +++ b/.werks/2450 @@ -0,0 +1,10 @@ +Title: citrix_serverload: Changed representation of load to percent in rule and graphs, added perfometer +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1437126717 + + diff --git a/ChangeLog b/ChangeLog index 4f4bed8..b256165 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 2403 FIX: ibm_imm_fan: fixed exception with invalid formatted fan speed information... * 2404 FIX: apache_status: now able to handle BusyServers and IdleServers... * 2406 FIX: fileinfo: fixed missing size performance data for very large (e.g 2TB) files and fileinfo groups... + * 2450 FIX: citrix_serverload: Changed representation of load to percent in rule and graphs, added perfometer Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 2df546f..c84811a 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2405,6 +2405,12 @@ metric_info["error_rate"] = { "color" : "14/a", } +metric_info["citrix_load"] = { + "title" : _("Citrix Load"), + "unit" : "%", + "color" : "34/c", +} + #. # .--Checks--------------------------------------------------------------. # | ____ _ _ | @@ -2456,6 +2462,10 @@ check_metrics["check_mk_active-tcp"] = { "time" : { "name": "response_time" } } +check_metrics["check_mk-citrix_serverload"] = { + "perf" : { "name" : "citrix_load", "scale" : 0.01 } +} + check_metrics["check-mk-host-tcp"] = { "time" : { "name": "response_time" } } @@ -3511,6 +3521,12 @@ perfometer_info.append({ }) perfometer_info.append({ + "type" : "linear", + "segments" : [ "citrix_load" ], + "total" : 100.0, +}) + +perfometer_info.append({ "type" : "logarithmic", "metric" : "database_size", "half_value" : GB, @@ -4241,6 +4257,14 @@ graph_info.append({ }) graph_info.append({ + "title" : _("Citrix Serverload"), + "metrics" : [ + ( "citrix_load", "area" ), + ], + "range" : (0, 100), +}) + +graph_info.append({ "title" : _("Used CPU Time"), "metrics" : [ ( "user_time", "area" ), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 65be434..50b501d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -602,20 +602,6 @@ register_check_parameters( register_check_parameters( subgroup_applications, - "citrix_load", - _("Load of Citrix Server"), - Tuple( - title = _("Citrix Server load"), - elements = [ - Integer(title = _("warning at"), default_value = 8500), - Integer(title = _("critical at"), default_value = 9500), - ]), - None, - match_type = "first", -) - -register_check_parameters( - subgroup_applications, "citrix_state", _("State of Citrix VMs"), Dictionary( @@ -8453,6 +8439,24 @@ register_check_parameters( register_check_parameters( + subgroup_applications, + "citrix_load", + _("Load of Citrix Server"), + Transform( + Tuple( + title = _("Citrix Server load"), + elements = [ + Percentage(title = _("Warning at"), default_value = 85.0, unit = "percent"), + Percentage(title = _("Critical at"), default_value = 95.0, unit = "percent"), + ]), + forth = lambda x: (x[0]/100.0, x[1]/100.0), + back = lambda x: (int(x[0]*100), int(x[1]*100)) + ), + None, + match_type = "first", +) + +register_check_parameters( subgroup_networking, "adva_ifs", _("Adva Optical Transport Laser Power"),

8 years, 11 months

Check_MK Git: check_mk: #2407 FIX WATO master/slave replication: fixed problem where the configuration from the master site was not activate on slave site

by Andreas Boesl

Module: check_mk Branch: master Commit: 80d46419c960b41ba994b74255e9c7645a9ae532 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80d46419c960b4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 17 11:00:06 2015 +0200 #2407 FIX WATO master/slave replication: fixed problem where the configuration from the master site was not activate on slave site Changes made on a distributed WATO slave site could delay a configuration update attempt from the master. Detailed information: Any changes on a slave site which lead to a pending log entry triggered the cmcrushd. The cmcrushd creates a configuration for the microcore, which takes precendence over creating the configuration anew. When a snapshot got pushed from the master site, the slave site thought that there is already a precompiled configuration available and used the cmcrushd configuration. This problem is automatically resolved on the following configuration push from the master, because the cmcrushd configuration is only used once. --- .werks/2407 | 18 ++++++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 7 ++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.werks/2407 b/.werks/2407 new file mode 100644 index 0000000..00d3674 --- /dev/null +++ b/.werks/2407 @@ -0,0 +1,18 @@ +Title: WATO master/slave replication: fixed problem where the configuration from the master site was not activate on slave site +Level: 2 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1437116656 + +Changes made on a distributed WATO slave site could delay a configuration update attempt from the master. + +Detailed information: Any changes on a slave site which lead to a pending log entry triggered the cmcrushd. +The cmcrushd creates a configuration for the microcore, which takes precendence over creating the configuration anew. +When a snapshot got pushed from the master site, the slave site thought that there is already a precompiled configuration +available and used the cmcrushd configuration. + +This problem is automatically resolved on the following configuration push from the master, +because the cmcrushd configuration is only used once. diff --git a/ChangeLog b/ChangeLog index bf7dd49..4f4bed8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * 2464 FIX: UDP ports for SNMP communication can now be configured via WATO * 2466 FIX: Fixed exception when searching for rulesets / global settings using special characters like umlauts * 2467 FIX: Fixed encoding exception occuring in localized GUI when a WATO action triggers an error message... + * 2407 FIX: WATO master/slave replication: fixed problem where the configuration from the master site was not activate on slave site... Notifications: * 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a202509..02e0142 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5119,7 +5119,9 @@ def log_pending(status, linkinfo, what, message, user_id = None): if 'need_to_bake_agents' in globals(): need_to_bake_agents() - if not is_distributed(): + # The latter one condition applies to slave sites + # Otherwise slave sites would trigger the cmcrushd + if not is_distributed() and not has_distributed_wato_file(): if status != SYNC: log_entry(linkinfo, what, message, "pending.log", user_id) cmc_rush_ahead() @@ -11999,6 +12001,9 @@ def delete_distributed_wato_file(): if os.path.exists(p): create_user_file(p, "w").write("") +def has_distributed_wato_file(): + return os.path.exists(defaults.check_mk_configdir + "/distributed_wato.mk") + #. # .--Users/Contacts------------------------------------------------------. # | _ _ ______ _ _ |

8 years, 11 months

Check_MK Git: check_mk: changed bvip checks a bit

by Bastian Kuhn

Module: check_mk Branch: master Commit: e95cca92f7a7836b1337d3119362b0006403818f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e95cca92f7a783… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 16 16:49:01 2015 +0200 changed bvip checks a bit --- checkman/bvip_cams | 12 ----------- checkman/bvip_video_alerts | 2 +- checks/bvip_cams | 47 -------------------------------------------- checks/bvip_video_alerts | 25 +++++++++++------------ 4 files changed, 12 insertions(+), 74 deletions(-) diff --git a/checkman/bvip_cams b/checkman/bvip_cams deleted file mode 100644 index e79bc94..0000000 --- a/checkman/bvip_cams +++ /dev/null @@ -1,12 +0,0 @@ -title: Bosch Video over IP: Cameras -agents: snmp -catalog: hw/environment/bosch -license: GPL -distribution: check_mk -description: - This Checks gaters the list of cameras on Bosch Videos Systems. - If multipe Cameras connected behind one IP Adress, this Check helps - to identify them and reports {CRIT} for each camera who gets lost. - -inventory: - Creates one check. diff --git a/checkman/bvip_video_alerts b/checkman/bvip_video_alerts index 3bfd4f9..22f2415 100644 --- a/checkman/bvip_video_alerts +++ b/checkman/bvip_video_alerts @@ -8,5 +8,5 @@ description: no picture from the lense), it will be reported. inventory: - Creates one check . + Creates one check per camera. diff --git a/checks/bvip_cams b/checks/bvip_cams deleted file mode 100644 index 4de2ffd..0000000 --- a/checks/bvip_cams +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# ails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - -def inventory_bvip_cams(info): - return [(None, {'cameras' : [ x[0] for x in info ]})] - -def check_bvip_cams(_no_item, params, info): - for line in info: - camera = line[0] - if camera not in params['cameras']: - yield 2, "Missing: %s" % cameras - else: - yield 0, camera - - -check_info["bvip_cams"] = { - "check_function" : check_bvip_cams, - "inventory_function" : inventory_bvip_cams, - "service_description" : "Cameras", - "snmp_scan_function" : bvip_scan_function, - "snmp_info" : (".1.3.6.1.4.1.3967.1.1.1.3", [ 1 ]), - "includes" : [ 'bvip.include' ], -} - diff --git a/checks/bvip_video_alerts b/checks/bvip_video_alerts index 035bafc..3bc2cca 100644 --- a/checks/bvip_video_alerts +++ b/checks/bvip_video_alerts @@ -26,27 +26,24 @@ def inventory_bvip_video_alerts(info): - return [(None, None)] + for cam, alerts in info: + yield cam, None + +def check_bvip_video_alerts(item, _no_params, info): + for cam, alerts in info: + if cam == item: + if alerts != '0': + return 2, "Device on Alarm State" + else: + return 0, "No alarms" -def check_bvip_video_alerts(_no_item, _no_params, info): - total = 0 - alerts = 0 - for line in info: - state = int(line[0]) - total += 1 - if state != 0: - alerts += 1 - state = 0 - if alerts != 0: - state = 2 - return state, "Cams: %s, Alerts: %s" % ( total, alerts ) check_info["bvip_video_alerts"] = { "check_function" : check_bvip_video_alerts, "inventory_function" : inventory_bvip_video_alerts, "service_description" : "Video Alerts", "snmp_scan_function" : bvip_scan_function, - "snmp_info" : (".1.3.6.1.4.1.3967.1.3.1", [ 1 ]), + "snmp_info" : (".1.3.6.1.4.1.3967.1", [ "1.1.3.1" , "3.1.1"]), "includes" : [ 'bvip.include' ], }

8 years, 11 months

Check_MK Git: check_mk: #2406 FIX fileinfo: fixed missing size performance data for very large (e.g 2TB) files and fileinfo groups

by Andreas Boesl

Module: check_mk Branch: master Commit: 1505bc9033aab64632d272765c80235c77a3ead4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1505bc9033aab6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 16 15:33:56 2015 +0200 #2406 FIX fileinfo: fixed missing size performance data for very large (e.g 2TB) files and fileinfo groups The fileinfo check failed to report the performance data value <i>size</i> for very large files. As a result the perfometer and graphs were broken. --- .werks/2406 | 12 ++++++++++++ ChangeLog | 3 ++- checks/fileinfo | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/2406 b/.werks/2406 new file mode 100644 index 0000000..02594c5 --- /dev/null +++ b/.werks/2406 @@ -0,0 +1,12 @@ +Title: fileinfo: fixed missing size performance data for very large (e.g 2TB) files and fileinfo groups +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1437053468 + +The fileinfo check failed to report the performance data value <i>size</i> for very +large files. As a result the perfometer and graphs were broken. + diff --git a/ChangeLog b/ChangeLog index 01d16a6..bf7dd49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,7 +20,7 @@ * 1272 alcatel_power, alcatel_temp Support for stacked environments... NOTE: Please refer to the migration notes! * 1273 bvip_cams, bvip_fans, bvip_info, bvip_link, bvip_poe, bvip_temp, bvip_util, bvip_video_alerts: New Checks for Bosch Video over IP Cameras - * 2405 New checks for UCS bladecenter: ucs_bladecenter_topsystem, ucs_bladecenter_faultinst... + * 2405 New checks for UCS bladecenter: ucs_bladecenter_topsystem, ucs_bladecenter_faulinst... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... @@ -57,6 +57,7 @@ * 2402 FIX: netapp_api_disk: fixed broken WATO and check configuration... * 2403 FIX: ibm_imm_fan: fixed exception with invalid formatted fan speed information... * 2404 FIX: apache_status: now able to handle BusyServers and IdleServers... + * 2406 FIX: fileinfo: fixed missing size performance data for very large (e.g 2TB) files and fileinfo groups... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/fileinfo b/checks/fileinfo index fbb92ca..e8cf6e2 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -218,7 +218,7 @@ def fileinfo_check_function(check_definition, params, outof_range_txt): perfdata = [] for what, val, verbfunc in check_definition: infos.append("%s is %s" % (what, verbfunc(val))) - if type(val) == int: # because strings go into infos but not into perfdata + if type(val) in [long, int]: # because strings go into infos but not into perfdata warn, crit = "", "" for how, comp, cfunc in [ ("min", "<", operator.lt), ("max", ">", operator.gt) ]: p = params.get(how + what)

8 years, 11 months

Check_MK Git: check_mk: remove print ...

by Andreas Boesl

Module: check_mk Branch: master Commit: ee35d4a2e9ef7088b7aeff945fd10606d14e1018 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee35d4a2e9ef70… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 16 14:28:35 2015 +0200 remove print ... --- checks/ucs_bladecenter_topsystem | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/ucs_bladecenter_topsystem b/checks/ucs_bladecenter_topsystem index fc9102b..02ff67e 100644 --- a/checks/ucs_bladecenter_topsystem +++ b/checks/ucs_bladecenter_topsystem @@ -34,7 +34,6 @@ def inventory_ucs_bladecenter_topsystem(info): def check_ucs_bladecenter_topsystem(item, _no_params, info): for entry in info[0][1:]: tokens = entry.split(" ", 1) - print tokens if len(tokens) == 2: yield 0, "%s: %s" % tuple(tokens)

8 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015