Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: #1153 FIX Changed custom user attributes can now be used immediately

by Lars Michelsen

Module: check_mk Branch: master Commit: dc0ed31a00ec0b5e54c3614d58e8a73ddedf5668 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc0ed31a00ec0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 6 20:06:54 2014 +0200 #1153 FIX Changed custom user attributes can now be used immediately IN previous versions changed custom user attributes needed a restart of the apache process to take effect. --- .bugs/1089 | 7 +++++-- .bugs/841 | 7 +++++-- .werks/1153 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/userdb.py | 18 +++++++++++++++--- web/plugins/userdb/ldap.py | 16 ++++++++++++++-- 6 files changed, 51 insertions(+), 9 deletions(-) diff --git a/.bugs/1089 b/.bugs/1089 index d3d094f..1f80319 100644 --- a/.bugs/1089 +++ b/.bugs/1089 @@ -1,10 +1,13 @@ Title: New user custom attribute needs apache restart to work Component: wato -State: open +Class: bug +State: done Date: 2014-01-30 15:14:42 Targetversion: 1.2.5i1 -Class: bug If you create a new custom attribute for users then you need to restart Apache in order to make that attribute visible in the WATO pages. + +2014-08-06 20:05:19: changed state open -> done +Changed custom attributes are now instantly visible on user profile page and ldap sync plugin configuration diff --git a/.bugs/841 b/.bugs/841 index 3bed1c3..21f2bdf 100644 --- a/.bugs/841 +++ b/.bugs/841 @@ -1,8 +1,11 @@ Title: View Editor: It's not possible to delete a view Component: multisite -State: open +Class: bug +State: done Date: 2014-04-16 09:34:07 Targetversion: 1.2.5i1 -Class: bug Currently it is not possible to delete a view in Multisite. I think this has to do with the new security features regarding to the CVE's + +2014-08-06 19:22:15: changed state open -> done +Has already been fixed. diff --git a/.werks/1153 b/.werks/1153 new file mode 100644 index 0000000..0f4f8f9 --- /dev/null +++ b/.werks/1153 @@ -0,0 +1,11 @@ +Title: Changed custom user attributes can now be used immediately +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1407348323 +Class: fix + +IN previous versions changed custom user attributes needed a restart of the +apache process to take effect. + diff --git a/ChangeLog b/ChangeLog index bdb0be4..e9c18d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 1091 FIX: logwatch patterns: allow unicode text in pattern comment * 1092 FIX: logwatch: now able to enter unicode text into the "Pattern (Regex)" field * 0191 FIX: Added swp files to the ignore list for the WATO git feature... + * 1153 FIX: Changed custom user attributes can now be used immediately... 1.2.5i5: diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index d0dc871..197e04b 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -34,9 +34,19 @@ loaded_with_language = False # Custom user attributes user_attributes = {} +builtin_user_attribute_names = [] -# Load all login plugins +# Load all userdb plugins def load_plugins(): + # Do not cache the custom user attributes. They can be created by the user + # during runtime, means they need to be loaded during each page request. + # But delete the old definitions before to also apply removals of attributes + if user_attributes: + for attr_name in user_attributes.keys(): + if attr_name not in builtin_user_attribute_names: + del user_attributes[attr_name] + declare_custom_user_attrs() + global loaded_with_language if loaded_with_language == current_language: return @@ -45,10 +55,12 @@ def load_plugins(): global user_attributes ; user_attributes = {} global multisite_user_connectors ; multisite_user_connectors = [] - declare_custom_user_attrs() - load_web_plugins("userdb", globals()) + global builtin_user_attribute_names + builtin_user_attribute_names = user_attributes.keys() + declare_custom_user_attrs() + # This must be set after plugin loading to make broken plugins raise # exceptions all the time and not only the first time (when the plugins # are loaded). diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index e4ec3e7..0b555b0 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -833,6 +833,11 @@ ldap_attribute_plugins['pager'] = { # Register sync plugins for all custom user attributes (assuming simple data types) def register_user_attribute_sync_plugins(): + # Remove old user attribute plugins + for attr_name in ldap_attribute_plugins.keys(): + if attr_name not in ldap_builtin_attribute_plugin_names: + del ldap_attribute_plugins[attr_name] + for attr, val in get_user_attributes(): ldap_attribute_plugins[attr] = { 'title': val['valuespec'].title(), @@ -851,8 +856,6 @@ def register_user_attribute_sync_plugins(): ], } -register_user_attribute_sync_plugins() - def ldap_convert_groups_to_contactgroups(plugin, params, user_id, ldap_user, user): # 1. Fetch all existing group names in WATO cg_names = load_group_information().get("contact", {}).keys() @@ -1107,6 +1110,8 @@ def ldap_non_contact_attributes(): attrs.update(ldap_attribute_plugins.get(key, {}).get('non_contact_attributes', [])) return list(attrs) +ldap_builtin_attribute_plugin_names = [] + # Is called on every multisite http request def ldap_page(): try: @@ -1114,6 +1119,13 @@ def ldap_page(): except: last_sync_time = 0 + # Save the builtin attribute names (to be able to delete removed user attributes) + global ldap_builtin_attribute_plugin_names + if not ldap_builtin_attribute_plugin_names: + ldap_builtin_attribute_plugin_names = ldap_attribute_plugins.keys() + + register_user_attribute_sync_plugins() + # in case of sync problems, synchronize all 20 seconds, instead of the configured # regular cache livetime if os.path.exists(g_ldap_sync_fail_file):

10 years, 2 months

Check_MK Git: check_mk: mk_sap: minor fixes

by Bastian Kuhn

Module: check_mk Branch: master Commit: edcd7dea6d87f74768db3607d3b63924bb87f4f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edcd7dea6d87f7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 6 17:35:32 2014 +0200 mk_sap: minor fixes --- agents/plugins/mk_sap | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index 50e0bda..b0d9280 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -133,11 +133,12 @@ local_cfg = { # The * matches the whole following string and does not end on next "/". # For examples, take a look at the default config file (/etc/check_mk/sap.cfg). monitor_paths = [ - 'SAP CCMS Monitor Templates/Dialog Overview/*', +# 'SAP CCMS Monitor Templates/Dialog Overview/*', ] monitor_types = [] - +# henri config_file = os.getenv('MK_CONFDIR', '/etc/check_mk') + '/sap.cfg' + cfg = {} if os.path.exists(config_file): execfile(config_file) @@ -290,7 +291,7 @@ def parse_dt(d, t): else: return datetime.datetime(*time.strptime(d + t, '%Y%m%d%H%M%S')[:6]) -def mon_alerts(node): +def mon_alerts(cfg, node): f = query('BAPI_SYSTEM_MTE_GETALERTS', { 'EXTERNAL_USER_NAME': cfg['user'], 'TID': tid(node), @@ -307,7 +308,7 @@ def aid(alert): "ALERTTIME": alert["ALERTTIME"], } -def alert_details(alert): +def alert_details(cfg, alert): f = query('BAPI_SYSTEM_ALERT_GETDETAILS', { 'EXTERNAL_USER_NAME': cfg['user'], 'AID': aid(alert), @@ -317,8 +318,7 @@ def alert_details(alert): msg = f.XMI_EXT_MSG.value['MSG'].strip() return state, msg -def process_alerts(ms_name, mon_name, node, alerts): - global logs +def process_alerts(cfg, logs, ms_name, mon_name, node, alerts): sid = node["MTSYSID"].strip() or 'Other' context = node["MTMCNAME"].strip() or 'Other' path = node["PATH"] @@ -339,7 +339,7 @@ def process_alerts(ms_name, mon_name, node, alerts): if not newest_log_dt or dt > newest_log_dt: newest_log_dt = dt # store the newest log of this run - alert_state, alert_msg = alert_details(alert) + alert_state, alert_msg = alert_details(cfg, alert) # Format lines to "logwatch" format logs[hostname][logfile].append('%s %s %s' % (STATE_LOGWATCH_MAP[alert_state['VALUE']], dt.strftime("%Y-%m-%d %H:%M:%S"), alert_msg)) @@ -348,6 +348,8 @@ def process_alerts(ms_name, mon_name, node, alerts): # Write newest log age to cache to prevent double processing of logs states[(hostname, logfile)] = newest_log_dt file(STATE_FILE, 'w').write(repr(states)) + return logs + def connect(cfg): @@ -405,12 +407,13 @@ def connect(cfg): status_details = "%s: %s" % mon_msg(cfg, node) elif node['MTCLASS'] == MTE_MSG_CONTAINER: - alerts = mon_alerts(node) - process_alerts(ms_name, mon_name, node, alerts) + + alerts = mon_alerts(cfg, node) + logs = process_alerts(cfg, logs, ms_name, mon_name, node, alerts) if len(alerts) > 0: last_alert = alerts[-1] dt = parse_dt(last_alert["ALERTDATE"], last_alert["ALERTTIME"]) - alert_state, alert_msg = alert_details(last_alert) + alert_state, alert_msg = alert_details(cfg, last_alert) last_msg = '%s: %s - %s' % (dt, STATE_VALUE_MAP[alert_state['VALUE']][1], alert_msg) status_details = '%d Messages, Last: %s' % (len(alerts), last_msg)

10 years, 2 months

Check_MK Git: check_mk: raritan_pdu_plugs: Changed output of check

by Bastian Kuhn

Module: check_mk Branch: master Commit: a751a64a2a3ef1639be0f3f7a4dbce7d7e49ddcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a751a64a2a3ef1… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 6 15:48:34 2014 +0200 raritan_pdu_plugs: Changed output of check --- checks/raritan_pdu_plugs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/raritan_pdu_plugs b/checks/raritan_pdu_plugs index cff7c3a..0932c25 100644 --- a/checks/raritan_pdu_plugs +++ b/checks/raritan_pdu_plugs @@ -65,7 +65,7 @@ def check_raritan_pdu_plugs(item, params, info): elif states[outletState] != required_state: state = 2 - message = outletName + ": " + states[outletState] + message = outletName + "Status is: " + states[outletState] return (state, message)

10 years, 2 months

Check_MK Git: check_mk: Fixed typo

by Bastian Kuhn

Module: check_mk Branch: master Commit: 38bee2f758b6343103823d69eb616982f82e6be6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38bee2f758b634… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 6 14:33:12 2014 +0200 Fixed typo --- checks/veeam_client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/veeam_client b/checks/veeam_client index 547c7ba..fa480eb 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -91,7 +91,7 @@ def check_veeam_client(item, params, info): TotalSizeByte = int(data['TotalSizeByte']) perfdata.append(('totalsize', TotalSizeByte)) - infotexts.append(("Total Size: %s" % get_bytes_human_readable(AvgSpeedBps))) + infotexts.append(("Total Size: %s" % get_bytes_human_readable(TotalSizeByte))) return state, ", ".join(infotexts), perfdata

10 years, 2 months

Check_MK Git: check_mk: raritan_pdu_inlet: Fixed wrong sensor state

by Bastian Kuhn

Module: check_mk Branch: master Commit: fb112d6af1b39086526213acc8f89b23b1c9cae3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb112d6af1b390… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 6 14:03:18 2014 +0200 raritan_pdu_inlet: Fixed wrong sensor state --- checks/raritan_pdu_inlet | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet index 000d861..736329c 100644 --- a/checks/raritan_pdu_inlet +++ b/checks/raritan_pdu_inlet @@ -26,7 +26,7 @@ def raritan_pdu_inlet_convert(info): # List of tuples, sorting like the snmp output, - # each tuple contains: capabilities, Unit, digits + # each tuple contains: capabilities, digits translation = ( ( '2', 1 ), ( '1', 0 ), @@ -37,9 +37,11 @@ def raritan_pdu_inlet_convert(info): ) phases = [ 'L1', 'L2', 'L3' ] i = 0 + state = 4 # We dont know the senosr state, so we assume normal for line in info: y = 0 - state = line[1] + # loop over the current Sensor values. + # We know the units cause of the translation list for value in line[1:]: item = phases[i] + '-' + capabilities[translation[y][0]] unit = translation[y][0]

10 years, 2 months

Check_MK Git: check_mk: #0199 veeam_client: Check rewritten to get a nicer output

by Bastian Kuhn

Module: check_mk Branch: master Commit: c4cff92172edb2e0e3d2145002fbda034852ac72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4cff92172edb2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 6 11:48:01 2014 +0200 #0199 veeam_client: Check rewritten to get a nicer output --- .werks/199 | 9 ++++ ChangeLog | 4 +- checks/veeam_client | 123 ++++++++++++++++++++++++++------------------------- 3 files changed, 73 insertions(+), 63 deletions(-) diff --git a/.werks/199 b/.werks/199 new file mode 100644 index 0000000..401ec3f --- /dev/null +++ b/.werks/199 @@ -0,0 +1,9 @@ +Title: veeam_client: Check rewritten to get a nicer output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1407318452 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 70805e7..c4acf20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 1070 printer_input/printer_output: New checks to monitor input/output sub-units of printers... * 0196 esx_vsphere_hostsystem: New subcheck for maintenance mode... * 0197 check_uniserv: New Check for Uniserv Data Management Services... + * 0199 veeam_client: Check rewritten to get a nicer output * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries @@ -20,8 +21,7 @@ * 1071 FIX: oracle_rman_backups: Only inventorize ARCHIVELOG / DB FULL / DB INCR entries... * 0195 FIX: fc_port: Check temporary disabled cause of problems with automatic detection... NOTE: Please refer to the migration notes! - * 0198 FIX: cisco_temp_sensor: Removed dicey detection for temperature value. - NOTE: Please refer to the migration notes! + * 0198 FIX: cisco_temp_sensor: Removed dicey detection for temperature value.... Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/veeam_client b/checks/veeam_client index b3d02dd..547c7ba 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -24,82 +24,83 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import datetime, time - -veeam_client_default_levels = { "age": ( 108000, 172800 ) } # 30h/2d - -state = { "Success": 0, "Failed": 2, "Warning":1, "InProgress":0, "Pending":0 } +factory_settings["veeam_client"] = { + "age": ( 108000, 172800 ), # 30h/2d +} def inventory_veeam_client(info): if info[0][0] == "Status": - return [ (None, veeam_client_default_levels) ] + return [ (None, {} ) ] def check_veeam_client(item, params, info): - if params.get("age"): - warn, crit = params['age'] - else: - warn, crit = veeam_default_levels.get("age") - if not info[0][0] == "Status": return 3, "No status data found in first line of agent data" - result = "" - starttime = "" - stoptime = "" - duration_string = "" - infotxt = "" - for line in info: - if line[0] == "Status": - result = line[1] - stopstate = 0 - perfdata = [] - infotxt = line[0] + ":" + line[1] + " " - elif line[0] == "DurationDDHHMMSS" and result != "InProgress" and result != "Pending": - duration_string = line[1] - spur = map(saveint, duration_string.split(":") ) - if len(spur) == 4: - duration = str(spur[0]*86400 + spur[1] * 3600 + spur[2] * 60 + spur[3]) - else: - duration = "0" - perfdata.append(("duration", duration+"s", 0, 0, 0)) - elif line[0] == "AvgSpeedBps": - avgspeed = saveint(line[1]) - perfdata.append(("avgspeed", avgspeed, 0, 0, 0)) - elif line[0] == "TotalSizeByte": - totalsize = saveint(line[1]) - perfdata.append(("totalsize", totalsize, 0, 0, 0)) - elif line[0] == "StopTime": - if (result == "InProgress" or result == "Pending"): - infotxt += line[0] + ": - " - else: - now = datetime.datetime.now() - date, time = line[1].split(" ") - day, month, year = map(int, date.split(".")) - hour, minute, second = map(int, time.split(":")) - stoptime = datetime.datetime( year, month, day, hour, minute, second) - warndiff = datetime.timedelta(seconds=warn) - critdiff = datetime.timedelta(seconds=crit) + data = dict(info[:-1]) + + perfdata = [] + infotexts = [] + + state = 0 + # Append current Status to Output + if data['Status'] == 'Warning': + state = 1 + if data['Status'] == 'Failed': + state = 2 + infotexts.append("Status: %s" % data['Status'] ) + + # Only output the Job name + infotexts.append("Job: %s" % data['JobName'] ) + + # Check Stop time in any case, that we can catch hanging backups + if "StopTime" not in data: + state = 2 + infotexts.append("No complete Backup(!!)") + else: + stop_time = time.mktime(time.strptime( data['StopTime'], "%d.%m.%Y %H:%M:%S")) + now = time.time() + age = now - stop_time + warn, crit = params['age'] + levels = "" + label = "" + if age >= crit: + state = 2 + label = "(!!)" + levels = " (Warn/Crit: %s/%s)" % ( get_age_human_readable(warn), get_age_human_readable(crit)) + elif age >= warn: + state = max(state, 1) + label = "(!)" + levels = " (Warn/Crit: %s/%s)" % ( get_age_human_readable(warn), get_age_human_readable(crit)) + infotexts.append("Last backup: %s ago%s%s" % ( get_age_human_readable(age), label, levels )) + + # Check duration only if currently not running + if data['Status'] not in [ 'InProgress', 'Pending' ]: + # Information may missing + if data.get('DurationDDHHMMSS'): + duration = 0 + days, hours, minutes, seconds = map(int, data['DurationDDHHMMSS'].split(':')) + duration += seconds + duration += minutes * 60 + duration += hours * 60 * 60 + duration += days * 60 * 60 * 24 + infotexts.append("Duration: %s" % get_age_human_readable(duration)) + perfdata.append(('duration', duration )) + + AvgSpeedBps = int(data['AvgSpeedBps']) + perfdata.append(('avgspeed', AvgSpeedBps)) + infotexts.append(("Average Speed: %s/s" % get_bytes_human_readable(AvgSpeedBps))) - if critdiff < now - stoptime: - stopstate = 2 - stopsym = "( >%s ago)(!!)" % get_age_human_readable(crit) - elif warndiff < now - stoptime: - stopstate = 1 - stopsym = "( >%s ago)(!)" % get_age_human_readable(warn) - else: - stopstate = 0 - stopsym = "" - infotxt += line[0] + ":" + line[1] + stopsym + " " - elif len(line) == 2: - infotxt += line[0] + ":" + line[1] + " " + TotalSizeByte = int(data['TotalSizeByte']) + perfdata.append(('totalsize', TotalSizeByte)) + infotexts.append(("Total Size: %s" % get_bytes_human_readable(AvgSpeedBps))) - status = max(state[result], stopstate) - return (status, infotxt, perfdata) + return state, ", ".join(infotexts), perfdata check_info["veeam_client"] = { 'check_function': check_veeam_client, 'inventory_function': inventory_veeam_client, 'service_description': 'VEEAM Client', 'group': 'veeam_backup', + "default_levels_variable" : "veeam_client", 'has_perfdata': True, }

10 years, 2 months

Check_MK Git: check_mk: check_uniserv: Changed Service description

by Bastian Kuhn

Module: check_mk Branch: master Commit: 5c5d63ca954ea3c01908f0e50fe78d66bf2d799e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c5d63ca954ea3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 6 09:24:40 2014 +0200 check_uniserv: Changed Service description --- checks/check_uniserv | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/check_uniserv b/checks/check_uniserv index 013dc33..e6ebc58 100644 --- a/checks/check_uniserv +++ b/checks/check_uniserv @@ -45,14 +45,14 @@ def check_uniserv_arguments(params): return args def check_uniserv_desc(params): - if type(params['job']) == tuple: - job = params['job'][0] - else: - job = params['job'] + job = params['job'] + if type(job) == tuple: + job = job[0] + if job == "version": - return "Version" + return "Uniserv %s Version" % params['service'] else: - return "Address " + params['job'][1]['city'] + return "Uniserv %s Address %s " % (params['service'], params['job'][1]['city']) active_check_info['uniserv'] = {

10 years, 2 months

Check_MK Git: check_mk: cisco_temp_sensor: missing changes for werk 198

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3d607501efb2862c0e468e32690841f06fd76820 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d607501efb286… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Aug 5 17:00:01 2014 +0200 cisco_temp_sensor: missing changes for werk 198 --- .werks/198 | 5 ++++- checks/cisco_temp_sensor | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/198 b/.werks/198 index b22d797..419ee24 100644 --- a/.werks/198 +++ b/.werks/198 @@ -1,9 +1,12 @@ Title: cisco_temp_sensor: Removed dicey detection for temperature value. Level: 1 Component: checks -Compatible: incomp +Compatible: compa Version: 1.2.5i6 Date: 1407250309 Class: fix +Cause of a dicey detection, also values who are not given in tens of degrees became divided by ten. +This werk tryes to fix this + diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index c6742f4..4a0affa 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -145,6 +145,13 @@ def check_cisco_temp_sensor(item, _no_params, info): for id, descr, sensortype, value, sensorstate, levels in sensors: if item == descr: warn, crit = levels[0:2] + # poor try to find temperature values + # who are given in tens of degress. + # Seems that some new firmware show this behavier. + # A normal Temperature Sensor has only a range up to + # 60 degree, so i choiced 70. + if value > 70: + value = value / 10 if sensorstate == "2": return (3, "data from sensor currently not available") elif sensorstate == "3":

10 years, 2 months

Check_MK Git: check_mk: #0198 FIX cisco_temp_sensor: Removed dicey detection for temperature value.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 9b0e07854c25425d12fd155d7974067a290531b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b0e07854c2542… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Aug 5 16:54:09 2014 +0200 #0198 FIX cisco_temp_sensor: Removed dicey detection for temperature value. --- .werks/198 | 9 +++++++++ ChangeLog | 2 ++ checks/cisco_temp_sensor | 4 ---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.werks/198 b/.werks/198 new file mode 100644 index 0000000..b22d797 --- /dev/null +++ b/.werks/198 @@ -0,0 +1,9 @@ +Title: cisco_temp_sensor: Removed dicey detection for temperature value. +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.5i6 +Date: 1407250309 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ae3c049..70805e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ * 1071 FIX: oracle_rman_backups: Only inventorize ARCHIVELOG / DB FULL / DB INCR entries... * 0195 FIX: fc_port: Check temporary disabled cause of problems with automatic detection... NOTE: Please refer to the migration notes! + * 0198 FIX: cisco_temp_sensor: Removed dicey detection for temperature value. + NOTE: Please refer to the migration notes! Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index 7ff3d26..c6742f4 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -145,10 +145,6 @@ def check_cisco_temp_sensor(item, _no_params, info): for id, descr, sensortype, value, sensorstate, levels in sensors: if item == descr: warn, crit = levels[0:2] - if len(levels) == 4: - value = value/10.0 - warn = warn/10.0 - crit = crit/10.0 if sensorstate == "2": return (3, "data from sensor currently not available") elif sensorstate == "3":

10 years, 2 months

Check_MK Git: check_mk: Adapt outpur of akcp_daisy_temp and akcp_sensor_temp

by Bastian Kuhn

Module: check_mk Branch: master Commit: 9f250f1511185cce58ec706378ac58e61469de52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f250f1511185c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Aug 5 15:57:08 2014 +0200 Adapt outpur of akcp_daisy_temp and akcp_sensor_temp --- checks/akcp_daisy_temp | 6 +++--- checks/akcp_sensor_temp | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/checks/akcp_daisy_temp b/checks/akcp_daisy_temp index 15cd6bf..1a36e98 100644 --- a/checks/akcp_daisy_temp +++ b/checks/akcp_daisy_temp @@ -42,12 +42,12 @@ def check_akcp_daisy_temp(item, params, info): if name == item: warn, crit = params temp = savefloat(temp) / 10 - infotext = "%.1f °C " % temp + infotext = "Temperature is: %.1f °C " % temp levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) perfdata = [ ( "temperature", temp, warn, crit ) ] - if temp > crit: + if temp >= crit: return 2, infotext + levels, perfdata - if temp > warn: + if temp >= warn: return 1, infotext + levels, perfdata return 0, infotext, perfdata return 3, "Sensor not found" diff --git a/checks/akcp_sensor_temp b/checks/akcp_sensor_temp index 0da73e0..eeda696 100644 --- a/checks/akcp_sensor_temp +++ b/checks/akcp_sensor_temp @@ -40,9 +40,9 @@ def check_akcp_sensor_temp(item, params, info): for desc, degree, status, online, degreetype, degreeraw in info: if desc == item: if degreetype == "0": - type = "F" + unit = "F" else: - type = "C" + unit = "C" warn, crit = params if degreeraw != "": temp = saveint(degreeraw) / 10.0 @@ -53,20 +53,20 @@ def check_akcp_sensor_temp(item, params, info): else: if online == "1": # break temp down to celsius if it had been defined as Fahrenheit. - if type == "F": + if unit == "F": temp = to_celsius(temp) - type = "C" - infotext = "%.1f " % temp + type + " (warn/crit at %.1f/%.1f " % (warn, crit) + type + ")" + unit = "C" + infotext = "Temperature is: %.1f °%s" % ( temp, unit) + levels = " (warn/crit at %1f/%1f °%s)" % ( warn, crit, unit ) perfdata = [ ( "temperature", temp, warn, crit ) ] if temp >= crit: - return (2, "Temperature is: " + infotext, perfdata) + return 2, infotext+levels, perfdata elif temp >= warn: - return (1, "Temperature is: " + infotext, perfdata) + return 1, infotext+levels, perfdata else: - return (0, "Temperature is: " + infotext, perfdata ) - else: - return (3, "Sensor is offline") - return (3, "Sensor not found") + return 0, infotext, perfdata + return 3, "Sensor is offline" + return 3, "Sensor not found" # possible values for sensorProbeTempStatus: # noStatus(1), normal(2), highWarning(3), highCritical(4),

10 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits