Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

#2669 FIX mcdata_fcport: fix computation of in and out traffic

by Mathias Kettner

Module: check_mk Branch: master Commit: 4de572ee0cdc1a3fed45330e6ab1ce483091453c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4de572ee0cdc1a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 25 18:21:26 2015 +0100 #2669 FIX mcdata_fcport: fix computation of in and out traffic The computation of the traffic (in/out octets per seconds) was wrong after a bug fix that tried to correct the computation by the factor of 4. --- .werks/2669 | 10 ++++++++++ ChangeLog | 1 + checks/mcdata_fcport | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/2669 b/.werks/2669 new file mode 100644 index 0000000..cee417c --- /dev/null +++ b/.werks/2669 @@ -0,0 +1,10 @@ +Title: mcdata_fcport: fix computation of in and out traffic +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1445793604 +Class: fix + +The computation of the traffic (in/out octets per seconds) was wrong after +a bug fix that tried to correct the computation by the factor of 4. diff --git a/ChangeLog b/ChangeLog index 9a5b7c0..30766f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 2690 FIX: ps: Fixed processing of old inventory_processes rules in discovery function... * 2236 FIX: cups_queues: Correct not working discovery after werk #2504... * 2668 FIX: jar_signature: Handle case correctly where certificate is already expired + * 2669 FIX: mcdata_fcport: fix computation of in and out traffic... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/mcdata_fcport b/checks/mcdata_fcport index b172ee5..4715ca9 100644 --- a/checks/mcdata_fcport +++ b/checks/mcdata_fcport @@ -27,7 +27,7 @@ mcdata_fcport_speedbits = { "2": '1000000000', "3": '2000000000' } mcdata_fcport_opstatus = { "1" : "1", "2": "2", "3": "testing", "4": "faulty" } -def mcdata_bin_to_64(bin, mult = 1): +def mcdata_bin_to_64(bin): # McData encodes 64 bit counters as big endian HEX strings, # e.g. Hex-STRING: 00 00 00 01 AC C2 8C EE. Check_MK converts # such strings into binary Python strings @@ -36,7 +36,7 @@ def mcdata_bin_to_64(bin, mult = 1): for byte in bin[::-1]: value += mult * ord(byte) mult *= 256 - return str(value * mult) + return str(value) def mcdata_fcport_convert_to_if64(info): return map(mcdata_fcport_convert_line_to_if64, info) @@ -55,13 +55,13 @@ def mcdata_fcport_convert_line_to_if64(line): '6', # ifType 2 speed, # ifSpeed 3 opStatus, # ifOperStatus 4 - mcdata_bin_to_64(rxWords64, 4), # ifHCInOctets 5 + mcdata_bin_to_64(rxWords64) * 4, # ifHCInOctets 5 mcdata_bin_to_64(rxFrames64), # ifHCInUcastPkts 6 '0', # ifHCInMulticastPkts 7 '0', # ifHCInBroadcastPkts 8 '0', # ifInDiscards 9 crcs, # ifInErrors 10 - mcdata_bin_to_64(txWords64, 4), # ifHCOutOctets 11 + mcdata_bin_to_64(txWords64) * 4, # ifHCOutOctets 11 mcdata_bin_to_64(txFrames64), # ifHCOutUcastPkts 12 '0', # ifHCOutMulticastPkts 13 '0', # ifHCOutBroadcastPkts 14

8 years, 8 months

heartbeat_crm: code cleanup, get rid of import datetime

by Mathias Kettner

Module: check_mk Branch: master Commit: 096cbe11022cde2f183b89bcb725e6546ac942e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=096cbe11022cde… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 25 14:21:55 2015 +0100 heartbeat_crm: code cleanup, get rid of import datetime --- checks/heartbeat_crm | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index cbd943b..c82cd7b 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -42,8 +42,6 @@ # resource_slapmaster (ocf::heartbeat:OpenLDAP): Started mwp # resource_slapslave (ocf::heartbeat:OpenLDAP): Started smwp -import datetime - # Nails down the DC to the node which is the DC during inventory. The check # will report CRITICAL when another node becomes the DC during later checks. # If set to "False" the check will be passed. @@ -87,6 +85,17 @@ def heartbeat_crm_parse_general(info): num_resources = int(line[0]) return (last_updated, dc, num_nodes, num_resources) + +# .--CRM-----------------------------------------------------------------. +# | ____ ____ __ __ | +# | / ___| _ \| \/ | | +# | | | | |_) | |\/| | | +# | | |___| _ <| | | | | +# | \____|_| \_\_| |_| | +# | | +# +----------------------------------------------------------------------+ +# | | +# '----------------------------------------------------------------------' def inventory_heartbeat_crm(info): # Use these lines to gather the inventory and perform this check: # ============ @@ -130,11 +139,11 @@ def check_heartbeat_crm(item, params, info): # Check the freshness of the crm_mon output and terminate with CRITICAL # when too old information are found - dt = int(datetime.datetime(*time.strptime(last_updated, '%a %b %d %H:%M:%S %Y')[:6]).strftime("%s")) + dt = time.mktime(time.strptime(last_updated, '%a %b %d %H:%M:%S %Y')) now = time.time() delta = now - dt if delta > params['max_age']: - return 3, 'Ignoring reported data (Status output too old: %d secs)' % delta + return 3, 'Ignoring reported data (Status output too old: %s)' % get_age_human_readable(delta) output = '' status = 0 @@ -164,6 +173,7 @@ def check_heartbeat_crm(item, params, info): return (status, output.rstrip(', ')) + check_info["heartbeat_crm"] = { 'check_function' : check_heartbeat_crm, 'inventory_function' : inventory_heartbeat_crm, @@ -172,6 +182,7 @@ check_info["heartbeat_crm"] = { 'default_levels_variable' : 'heartbeat_crm_default_levels', } + def heartbeat_crm_parse_resources(info): blockStart = False resources = {} @@ -216,6 +227,17 @@ def heartbeat_crm_parse_resources(info): return resources + +#. +# .--Resources-----------------------------------------------------------. +# | ____ | +# | | _ \ ___ ___ ___ _ _ _ __ ___ ___ ___ | +# | | |_) / _ \/ __|/ _ \| | | | '__/ __/ _ \/ __| | +# | | _ < __/\__ \ (_) | |_| | | | (_| __/\__ \ | +# | |_| \_\___||___/\___/ \__,_|_| \___\___||___/ | +# | | +# '----------------------------------------------------------------------' + def inventory_heartbeat_crm_resources(info): # Full list of resources: # Resource Group: group_slapmaster @@ -235,6 +257,7 @@ def inventory_heartbeat_crm_resources(info): inventory.append((name, None)) return inventory + def check_heartbeat_crm_resources(item, target_node, info): output = '' status = 0 @@ -248,8 +271,11 @@ def check_heartbeat_crm_resources(item, target_node, info): output += ' (Expected node: %s (!!))' % target_node output += ', ' + if not output: + output = "no resources found" return (status, output.rstrip(', ')) + check_info["heartbeat_crm.resources"] = { 'check_function' : check_heartbeat_crm_resources, 'inventory_function' : inventory_heartbeat_crm_resources,

8 years, 8 months

New check API function get_relative_date_human_readable

by Mathias Kettner

Module: check_mk Branch: master Commit: 45041edc9169cbe8620ae180b1e5baa0839d39e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45041edc9169cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 25 14:16:34 2015 +0100 New check API function get_relative_date_human_readable --- modules/check_mk_base.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index cb61385..9986616 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2198,6 +2198,14 @@ def get_age_human_readable(secs): return "%d days %d hours" % (days, hours) return "%d days" % days + +def get_relative_date_human_readable(timestamp): + now = time.time() + if timestamp > now: + return "in " + get_age_human_readable(timestamp - now) + else: + return get_age_human_readable(now - timestamp) + " ago" + # Format perc (0 <= perc <= 100 + x) so that precision # digits are being displayed. This avoids a "0.00%" for # very small numbers

8 years, 8 months

ad_replication: code cleanup, get rid of import datetime

by Mathias Kettner

Module: check_mk Branch: master Commit: 70a655d89a5a670f5a600341e09c4cb3801bff23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70a655d89a5a67… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 25 14:16:56 2015 +0100 ad_replication: code cleanup, get rid of import datetime --- checks/ad_replication | 69 +++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/checks/ad_replication b/checks/ad_replication index 411f33f..9f19c93 100644 --- a/checks/ad_replication +++ b/checks/ad_replication @@ -36,15 +36,13 @@ # showrepl_INFO,Standardname-des-ersten-Standorts,WIN2003,"CN=Schema,CN=Configuration,DC=corp,\ #DC=de",Standardname-des-ersten-Standorts,WIN2003-DC2,RPC,0,0,2010-07-02 12:46:28,0 -import datetime - ad_replication_default_params = (15,20) def parse_ad_replication_dates(s): if s == '0' or s == '(never)': return None else: - return datetime.datetime(*time.strptime(s, '%Y-%m-%d %H:%M:%S')[:6]) + return time.mktime(time.strptime(s, '%Y-%m-%d %H:%M:%S')) def parse_ad_replication_info(info): lines = [] @@ -56,12 +54,12 @@ def inventory_ad_replication(info): inv = [] for line in parse_ad_replication_info(info): if len(line) == 11: - sourceSite = line[4] - sourceDC = line[5] + source_site = line[4] + source_dc = line[5] elif len(line) == 10: - sourceSite = line[3] - sourceDC = line[4] - entry = ('%s/%s' % (sourceSite, sourceDC), 'ad_replication_default_params') + source_site = line[3] + source_dc = line[4] + entry = ('%s/%s' % (source_site, source_dc), 'ad_replication_default_params') if line[0] == 'showrepl_INFO' and entry not in inv: inv.append(entry) return inv @@ -69,50 +67,53 @@ def inventory_ad_replication(info): def check_ad_replication(item, params, info): status = 0 output = '' - now = datetime.datetime.now() foundLine = False for l in parse_ad_replication_info(info): if len(l) == 11: - (lineType, destSite, destDC, namingContext, sourceSite, sourceDC, - transport, numFailures, timeLastFailure, timeLastSuccess, + (lineType, destSite, destDC, naming_context, source_site, source_dc, + transport, num_failures, time_last_failure, time_last_success, statusLastFailure ) = l elif len(l) == 10: - (lineType, destSite, namingContext, sourceSite, sourceDC, - transport, numFailures, timeLastFailure, timeLastSuccess, + (lineType, destSite, naming_context, source_site, source_dc, + transport, num_failures, time_last_failure, time_last_success, statusLastFailure ) = l - if lineType == 'showrepl_INFO' and sourceSite+'/'+sourceDC == item: + if lineType == 'showrepl_INFO' and source_site+'/'+source_dc == item: foundLine = True - timeLastFailure = parse_ad_replication_dates(timeLastFailure) - timeLastSuccess = parse_ad_replication_dates(timeLastSuccess) + time_last_failure = parse_ad_replication_dates(time_last_failure) + time_last_success = parse_ad_replication_dates(time_last_success) - maxFailuresWarn = params[0] - maxFailuresCrit = params[1] + max_failures_warn = params[0] + max_failures_crit = params[1] - if int(numFailures) > maxFailuresWarn: + if int(num_failures) > max_failures_warn: status = 1 output += '(!) %s/%s replication of context %s reached ' \ - ' the threshold of maximum failures (%s) (Last Success: %s, ' \ - 'LastFailure: %s NumFailures: %s Status: %s), ' % \ - (sourceSite, sourceDC, namingContext, maxFailuresWarn, timeLastSuccess, - timeLastFailure, numFailures, statusLastFailure) + ' the threshold of maximum failures (%s) (last success: %s, ' \ + 'last failure: %s, num failures: %s Status: %s), ' % \ + (source_site, source_dc, naming_context, max_failures_warn, + get_relative_date_human_readable(time_last_success), + get_relative_date_human_readable(time_last_failure), num_failures, statusLastFailure) - if int(numFailures) > maxFailuresCrit: + if int(num_failures) > max_failures_crit: status = 2 output += '(!!) %s/%s replication of context %s reached ' \ - ' the threshold of maximum failures (%s) (Last Success: %s, ' \ - 'LastFailure: %s NumFailures: %s Status: %s), ' % \ - (sourceSite, sourceDC, namingContext, maxFailuresCrit, timeLastSuccess, - timeLastFailure, numFailures, statusLastFailure) - - if timeLastFailure is not None and timeLastSuccess is not None \ - and timeLastFailure > timeLastSuccess: + ' the threshold of maximum failures (%s) (last success: %s, ' \ + 'last failure: %s, num failures: %s, status: %s), ' % \ + (source_site, source_dc, naming_context, max_failures_crit, + get_relative_date_human_readable(time_last_success), + get_relative_date_human_readable(time_last_failure), num_failures, statusLastFailure) + + if time_last_failure != None and time_last_success != None \ + and time_last_failure > time_last_success: status = 2 output += '(!!) %s/%s replication of context %s failed ' \ - '(Last Success: %s, LastFailure: %s NumFailures: %s Status: %s), ' % \ - (sourceSite, sourceDC, namingContext, timeLastSuccess, - timeLastFailure, numFailures, statusLastFailure) + '(last success: %s, last failure: %s num_failures: %s, status: %s), ' % \ + (source_site, source_dc, naming_context, + get_relative_date_human_readable(time_last_success), + get_relative_date_human_readable(time_last_failure), + num_failures, statusLastFailure) if not foundLine: return (3, 'Replication information for %s not found' % item)

8 years, 8 months

Removed bizarre and incomplete check smbios_sel

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ff918a4e491a0bad49afe7026f83712df8488f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ff918a4e491a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 25 14:03:41 2015 +0100 Removed bizarre and incomplete check smbios_sel This check only worked on CELSIUS M470 workstations and needed special tools and agent plugins that were not available in the standard distribution anyway. --- checkman/smbios_sel | 40 ------ checks/smbios_sel | 172 ------------------------- doc/treasures/fsc-celsius-m470-sel-1.2.tar.gz | Bin 10058 -> 0 bytes 3 files changed, 212 deletions(-) diff --git a/checkman/smbios_sel b/checkman/smbios_sel deleted file mode 100644 index b4355a0..0000000 --- a/checkman/smbios_sel +++ /dev/null @@ -1,40 +0,0 @@ -title: System Event Log from SMBIOS/DMI -agents: linux -catalog: os/hardware -license: GPL -distribution: check_mk -description: - This check reads the entries of the SEL (System Event Log) from - SMBIOS/DMI on FSC Celsius m470 systems (and maybe others). - - The check has been developed to detect ECC single- and multibit - memory errors on FSC Celsius systems. - - This check uses the information of the userspace utility - {fsc-celsius-m470-sel} which reads the current contents of the SEL - directly from /dev/mem. To work properly the {dmidecode} and - {fsc-celsius-m470-sel} binaries need to be installed on the - system and must be available in the PATH. - - Please note that the fsc-celsius-m470-sel is still experimental and - has not been tested on other systems. - - You need to extend your agent on the monitored system - using a check_mk_agent plugin named {fsc-celsius-m470-sel.sh}. This - agent plugin can be found in the {fsc-celsius-m470-sel-1.1.tar.gz} - archive in the {doc} directory of check_mk. - - To enable this plugin simply copy it to the plugins directory of - check_mk_agent on your target machines. By default the directory - is located here: /usr/lib/check_mk_agent/plugins. - - This plugin has been developed on FSC Celsius m470 but may also work - on other FSC hardware platforms. Please tell us when you find some - other software where this plugin outputs valid information. - - The Nagios service will show the worst state which can be found in the - SEL. Each known SEL record has a status level which is hardcoded in the - check_mk check. - -inventory: - One service named {SEL} will be created on all valid systems. diff --git a/checks/smbios_sel b/checks/smbios_sel deleted file mode 100644 index 3c38325..0000000 --- a/checks/smbios_sel +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2014 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. - -# Example output of agent: -#<<<smbios_sel>>> -#1 2010-03-29 09:30:36 Single-bit ECC memory error -#1 2010-03-29 09:30:36 Single-bit ECC memory error -#1 2010-03-29 09:30:37 Single-bit ECC memory error -#1 2010-03-29 09:30:38 Single-bit ECC memory error -#1 2010-03-29 09:30:38 Single-bit ECC memory error -#1 2010-03-29 09:30:39 Single-bit ECC memory error -#1 2010-03-29 09:30:39 Single-bit ECC memory error -#1 2010-03-29 09:30:40 Single-bit ECC memory error -# -# Known message types: -#struct message messages[] = { -# {0x00, "Unknown message type" }, -# {0x01, "Single-bit ECC memory error" }, -# {0x02, "Multi-bit ECC memory error" }, -# {0x03, "Parity memory error" }, -# {0x04, "Bus time-out" }, -# {0x05, "I/O Channel Check" }, -# {0x06, "Software NMI" }, -# {0x07, "POST Memory Resize" }, -# {0x08, "POST Error" }, -# {0x09, "PCI Parity Error" }, -# {0x0A, "PCI System Error" }, -# {0x0B, "CPU Failure" }, -# {0x0C, "EISA FailSafe Timer time-out" }, -# {0x0D, "Correctable memory log disabled" }, -# {0x0E, "Logging disabled for a specific Event Type - too many errors of the same type received in a short amount of time" }, -# {0x0F, "Unknown message type" }, -# {0x10, "System Limit Exceeded (e.g. voltage or temperature threshold)" }, -# {0x11, "Asynchronous hardware timer expired and issued a system reset" }, -# {0x12, "System configuration information" }, -# {0x13, "Hard-disk information" }, -# {0x14, "System reconfigured" }, -# {0x15, "Uncorrectable CPU-complex error" }, -# {0x16, "Log Area Reset/Cleared" }, -# {0x17, "System boot" } -# 0x18-0x7F Unused, available for assignment by this specification. -# 0x80-0xFE Available for system- and OEM-specific assignments. -# 0xFF End-of-Log -#}; - -import datetime - -smbios_sel_msg_types = { - #Type: (Number-of-Entries Threshold, Status-Code, Current Count, Last Entry, Alias) - 0: [1, 1, 0, None, None], - 1: [5, 2, 0, None, None], - 2: [1, 2, 0, None, None], - 3: [1, 2, 0, None, None], - 4: [1, 2, 0, None, None], - 5: [1, 1, 0, None, None], - 6: [1, 0, 0, None, None], - 7: [1, 0, 0, None, None], - 8: [1, 2, 0, None, None], - 9: [1, 2, 0, None, None], - 10: [1, 2, 0, None, None], - 11: [1, 2, 0, None, None], - 12: [1, 0, 0, None, None], - 13: [1, 2, 0, None, None], - 14: [1, 1, 0, None, None], - 15: [1, 0, 0, None, None], - 16: [1, 2, 0, None, None], - 17: [1, 1, 0, None, None], - 18: [1, 0, 0, None, None], - 19: [1, 0, 0, None, None], - 20: [1, 0, 0, None, None], - 21: [1, 2, 0, None, None], - 22: [1, 0, 0, None, None], - 23: [1, 0, 0, None, None], -} - -def inventory_smbios_sel(info): - if len(info) > 0: - return [(None, "None")] - -def check_smbios_sel(_no_item, _no_params, info): - if len(info) == 0: - return (0, "The System Event Log is empty") - - sum_status = 0 - num_errors = 0 - - for line in info: - type = line[0] - isodate = " ".join(line[1:3]) - msg = " ".join(line[3:]) - - # Errors reported by the agent result in CRITICAL state - # Each error will be listed as single log - if type == "E": - sum_status = 2 - num_errors += 1; - smbios_sel_msg_types["E%d"%num_errors] = [1, 2, 1, datetime.datetime.now(), msg] - continue - - # Informational messages are explicit created by our binary when the - # sel is empty. This is needed to create the smbios_sel service in Nagios. - if type == "I": - sum_status = 0 - smbios_sel_msg_types["I%d"%num_errors] = [1, 0, 1, datetime.datetime.now(), msg] - continue - - type = int(type) - if type in smbios_sel_msg_types: - # Increase counter - smbios_sel_msg_types[type][2] = smbios_sel_msg_types[type][2]+1; - - # Dynamically set the alias if none set yet - if smbios_sel_msg_types[type][4] == None: - smbios_sel_msg_types[type][4] = msg - - # Check if num threshold reached and set new sum_status - # when this status is worse than the current sum_status - if smbios_sel_msg_types[type][0] <= smbios_sel_msg_types[type][2]: - if smbios_sel_msg_types[type][1] > sum_status: - sum_status = smbios_sel_msg_types[type][1] - - # Save the date when the current entry is newer - dt = datetime.datetime(*time.strptime(isodate, "%Y-%m-%d %H:%M:%S")[:6]) - if smbios_sel_msg_types[type][3] == None or smbios_sel_msg_types[type][3] < dt: - smbios_sel_msg_types[type][3] = dt; - else: - # Unknown types will result in UNKNOWN state - sum_status = 3 - smbios_sel_msg_types[type] = [1, 3, 1, - datetime.datetime.now(), - "Unknown log type (%s)" % type] - - sum_output = "" - for type in smbios_sel_msg_types: - if smbios_sel_msg_types[type][2] > 0: - sum_output += "%s (Num: %d Last: %s) " % \ - (smbios_sel_msg_types[type][4], - smbios_sel_msg_types[type][2], - smbios_sel_msg_types[type][3]) - - return (sum_status, sum_output) - - -check_info["smbios_sel"] = { - 'check_function': check_smbios_sel, - 'inventory_function': inventory_smbios_sel, - 'service_description': 'SMBIOS Event Log', - 'group': 'hw_errors', -} diff --git a/doc/treasures/fsc-celsius-m470-sel-1.2.tar.gz b/doc/treasures/fsc-celsius-m470-sel-1.2.tar.gz deleted file mode 100644 index 49f2835..0000000 Binary files a/doc/treasures/fsc-celsius-m470-sel-1.2.tar.gz and /dev/null differ

8 years, 8 months

#2668 FIX jar_signature: Handle case correctly where certificate is already expired

by Mathias Kettner

Module: check_mk Branch: master Commit: 28eb7e4ae1e0c5b76f11d8a4d5f75dc35dc45079 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28eb7e4ae1e0c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 25 13:55:02 2015 +0100 #2668 FIX jar_signature: Handle case correctly where certificate is already expired --- .werks/2668 | 9 ++++++++ ChangeLog | 1 + checks/jar_signature | 53 ++++++++++++++++++++++++++++++++++------------ modules/check_mk_base.py | 5 ++--- 4 files changed, 52 insertions(+), 16 deletions(-) diff --git a/.werks/2668 b/.werks/2668 new file mode 100644 index 0000000..4c85ed7 --- /dev/null +++ b/.werks/2668 @@ -0,0 +1,9 @@ +Title: jar_signature: Handle case correctly where certificate is already expired +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1445777668 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 52df68d..9a5b7c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 1296 FIX: aix_memory: Check can now handle systems without swap partition * 2690 FIX: ps: Fixed processing of old inventory_processes rules in discovery function... * 2236 FIX: cups_queues: Correct not working discovery after werk #2504... + * 2668 FIX: jar_signature: Handle case correctly where certificate is already expired Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/jar_signature b/checks/jar_signature index cbe0440..58d04a3 100644 --- a/checks/jar_signature +++ b/checks/jar_signature @@ -24,7 +24,25 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import datetime +# Example output from agent +# <<<jar_signature>>> +# [[[bluecove-1.2.3-signed.jar]]] +# sm 308 Fri May 11 01:42:04 CEST 2007 javax/microedition/io/StreamConnectionNotifier.class +# +# X.509, CN=MicroEmulator Team +# [certificate expired on 2/10/12 6:19 PM] +# +# +# s = signature was verified +# m = entry is listed in manifest +# k = at least one certificate was found in keystore +# i = at least one certificate was found in identity scope +# +# jar verified. +# +# Warning: +# This jar contains entries whose signer certificate has expired. + def inventory_jar_signature(info): inventory = [] @@ -34,7 +52,7 @@ def inventory_jar_signature(info): inventory.append((f, {})) return inventory -def check_jar_signature(item, params, info): +def check_jar_signature(item, _no_params, info): in_block = False details = [] in_cert = False @@ -60,24 +78,33 @@ def check_jar_signature(item, params, info): # [certificate is valid from 3/26/12 11:26 AM to 3/26/17 11:36 AM] # [certificate will expire on 7/4/13 4:13 PM] + # [certificate expired on 2/10/12 6:19 PM] if "will expire on " in cert_valid: - to = cert_valid.split("will expire on ", 1)[1][:-1] + expiry_date_text = cert_valid.split("will expire on ", 1)[1][:-1] + elif "expired on" in cert_valid: + expiry_date_text = cert_valid.split("expired on ", 1)[1][:-1] else: - to = cert_valid.split("to ", 1)[1][:-1] - to_dt = datetime.datetime(*time.strptime(to, '%m/%d/%y %I:%M %p')[:6]) + expiry_date_text = cert_valid.split("to ", 1)[1][:-1] + expiry_date = time.mktime(time.strptime(expiry_date_text, '%m/%d/%y %I:%M %p')) + expired_since = time.time() - expiry_date - warn, crit = 60, 30 + warn, crit = 60 * 86400, 30 * 86400 state = 0 - status_txt = "" - if to_dt < datetime.datetime.now() + datetime.timedelta(days = crit): + if expired_since >= 0: state = 2 - status_txt = " (less than %d days)" % crit - elif to_dt < datetime.datetime.now() + datetime.timedelta(days = warn): - state = 1 - status_txt = " (less than %d days)" % warn + status_text = "Certificate expired on %s (%s ago) " % (expiry_date_text, get_age_human_readable(expired_since)) + else: + status_text = "Certificate will expire on %s (in %s)" % (expiry_date_text, get_age_human_readable(-expired_since)) + if -expired_since <= crit: + state = 2 + status_txt = "(less than %s)" % (get_age_human_readable(crit)) + elif -expired_since <= warn: + state = 1 + status_txt = "(less than %s)" % (get_age_human_readable(warn)) + + return state, status_text - return state, "Certificate expires on %s%s (%s)" % (to, status_txt, cert_dn) check_info['jar_signature'] = { "service_description" : "Jar-Signature %s", diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 9cc0afe..cb61385 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -51,6 +51,7 @@ import signal import math import tempfile import traceback +import subprocess # PLANNED CLEANUP: # - central functions for outputting verbose information and bailing @@ -769,9 +770,7 @@ def get_agent_info(hostname, ipaddress, max_cache_age): def get_agent_info_program(commandline): exepath = commandline.split()[0] # for error message, hide options! - import subprocess - if opt_verbose: - sys.stderr.write("Calling external program %s\n" % commandline) + vverbose("Calling external program %s\n" % commandline) try: p = subprocess.Popen(commandline, shell = True, stdout = subprocess.PIPE, stderr = subprocess.PIPE) stdout, stderr = p.communicate()

8 years, 8 months

#2236 FIX cups_queues: Correct not working discovery after werk #2504

by Sven Rue??

Module: check_mk Branch: master Commit: e3a3a258994ac191d22d093717475f069aee5539 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3a3a258994ac1… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Sun Oct 25 01:40:04 2015 +0200 #2236 FIX cups_queues: Correct not working discovery after werk #2504 Corrected not working discovery of cups_queues after werk #2504. APC uses a equal service name which ends with cupsd. A strict matching is needed to get both working. --- .werks/2236 | 13 +++++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2236 b/.werks/2236 new file mode 100644 index 0000000..01ad9a3 --- /dev/null +++ b/.werks/2236 @@ -0,0 +1,13 @@ +Title: cups_queues: Correct not working discovery after werk #2504 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445729860 + +Corrected not working discovery of cups_queues after werk #2504. +APC uses a equal service name which ends with cupsd. A strict matching +is needed to get both working. + diff --git a/ChangeLog b/ChangeLog index 32aa5e0..52df68d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 2697 FIX: hp_msa_controller.io, hp_msa_disk.io, hp_msa_volume.io: fixed broken I/O calculation * 1296 FIX: aix_memory: Check can now handle systems without swap partition * 2690 FIX: ps: Fixed processing of old inventory_processes rules in discovery function... + * 2236 FIX: cups_queues: Correct not working discovery after werk #2504... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index f52cf08..811147c 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -440,7 +440,7 @@ fi # Status of CUPS printer queues if type lpstat > /dev/null 2>&1; then - if pgrep -x cups > /dev/null 2>&1; then + if pgrep -f "\bcupsd" > /dev/null 2>&1; then # first define a function to check cups function cups_queues () { CPRINTCONF=/etc/cups/printers.conf

8 years, 8 months

Ignore .DS_Store on MAC

by Sven Rue??

Module: check_mk Branch: master Commit: f334a39b22a8a33b795dd291130b764cbfe82fb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f334a39b22a8a3… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Sun Oct 25 01:35:07 2015 +0200 Ignore .DS_Store on MAC --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6b8333b..a71e808 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ check-mk-agent-*.msi .metadata RemoteSystemsTempFiles .directory +.DS_Store

8 years, 8 months

Code cleanup: remove some unneccessary imports in checks

by Mathias Kettner

Module: check_mk Branch: master Commit: a72861bad1efdab3ec8f212a63fb87c3baf96188 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a72861bad1efda… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 24 15:47:09 2015 +0200 Code cleanup: remove some unneccessary imports in checks --- checks/ad_replication | 2 +- checks/fileinfo | 8 ++++---- checks/heartbeat_crm | 2 +- checks/jar_signature | 2 +- checks/smbios_sel | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/ad_replication b/checks/ad_replication index c89a740..411f33f 100644 --- a/checks/ad_replication +++ b/checks/ad_replication @@ -36,7 +36,7 @@ # showrepl_INFO,Standardname-des-ersten-Standorts,WIN2003,"CN=Schema,CN=Configuration,DC=corp,\ #DC=de",Standardname-des-ersten-Standorts,WIN2003-DC2,RPC,0,0,2010-07-02 12:46:28,0 -import datetime, time +import datetime ad_replication_default_params = (15,20) diff --git a/checks/fileinfo b/checks/fileinfo index 43c6a29..a1c3f2d 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -146,7 +146,6 @@ def check_fileinfo_groups(item, params, info): outof_range_txt = fileinfo_check_timeranges(params) - # TODO: import in check functions is not allowed reftime = int(info[0][0]) count_all = 0 @@ -207,8 +206,6 @@ def check_fileinfo_groups(item, params, info): return fileinfo_check_function(check_definition, params, outof_range_txt) def fileinfo_check_function(check_definition, params, outof_range_txt): - # TODO: use lambda a, b: a<b instead.... - import operator state = 0 infos = [] perfdata = [] @@ -216,7 +213,10 @@ def fileinfo_check_function(check_definition, params, outof_range_txt): infos.append("%s is %s" % (what, verbfunc(val))) 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) ]: + for how, comp, cfunc in [ + ("min", "<", lambda a, b: a < b), + ("max", ">", lambda a, b: a > b), + ]: p = params.get(how + what) if p: warn, crit = p diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index c567a59..cbd943b 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -42,7 +42,7 @@ # resource_slapmaster (ocf::heartbeat:OpenLDAP): Started mwp # resource_slapslave (ocf::heartbeat:OpenLDAP): Started smwp -import time, datetime +import datetime # Nails down the DC to the node which is the DC during inventory. The check # will report CRITICAL when another node becomes the DC during later checks. diff --git a/checks/jar_signature b/checks/jar_signature index 8070cb2..cbe0440 100644 --- a/checks/jar_signature +++ b/checks/jar_signature @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import datetime, time +import datetime def inventory_jar_signature(info): inventory = [] diff --git a/checks/smbios_sel b/checks/smbios_sel index 380124d..3c38325 100644 --- a/checks/smbios_sel +++ b/checks/smbios_sel @@ -66,7 +66,7 @@ # 0xFF End-of-Log #}; -import datetime, time +import datetime smbios_sel_msg_types = { #Type: (Number-of-Entries Threshold, Status-Code, Current Count, Last Entry, Alias)

8 years, 8 months

Code cleanup: fnmatch now generally imported, remove import from checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 205d3799e6771625d3ec2ac8dcc438b0e69fbd8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=205d3799e67716… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 24 15:39:28 2015 +0200 Code cleanup: fnmatch now generally imported, remove import from checks --- checks/df.include | 3 --- checks/fileinfo | 2 -- checks/logwatch | 1 - modules/check_mk_base.py | 1 + 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/checks/df.include b/checks/df.include index 3785a96..fc67469 100644 --- a/checks/df.include +++ b/checks/df.include @@ -66,7 +66,6 @@ factory_settings["filesystem_default_levels"] = { } def df_inventory(mplist): - import fnmatch group_patterns = {} for line in host_extra_conf(g_hostname, filesystem_groups): for group_name, pattern in line: @@ -248,8 +247,6 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, reserved_mb, pa # New function for checks that support groups. def df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes = None): if "patterns" in params: - import fnmatch - patterns = params["patterns"] count = 0 total_size_mb = 0 diff --git a/checks/fileinfo b/checks/fileinfo index f030189..43c6a29 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -70,7 +70,6 @@ def fileinfo_process_date(pattern,reftime): return pattern def fileinfo_groups_of_file(check_filename,reftime): - import fnmatch groups = [] for line in host_extra_conf(g_hostname, fileinfo_groups): for group_name, pattern in line: @@ -148,7 +147,6 @@ def check_fileinfo_groups(item, params, info): outof_range_txt = fileinfo_check_timeranges(params) # TODO: import in check functions is not allowed - import fnmatch reftime = int(info[0][0]) count_all = 0 diff --git a/checks/logwatch b/checks/logwatch index 34e7707..a768b51 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -280,7 +280,6 @@ def logwatch_group_precompile(hostname, item, _unused): return logwatch_precompile(hostname, item, None), host_extra_conf(hostname, logwatch_groups) def logwatch_groups_of_logfile(filename, params=False): - import fnmatch groups = [] if not params: params = host_extra_conf(g_hostname, logwatch_groups) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 5a8099f..9cc0afe 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -44,6 +44,7 @@ sys.path.pop(0) import socket import os +import fnmatch import time import re import signal

8 years, 8 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 October 2015