Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: 04054b28756dcc67cb377b54d6c8bd7df26c66c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04054b28756dcc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 9 09:40:34 2015 +0200 fixed broken manpages --- checkman/icom_repeater.pll_volt | 2 +- checkman/jolokia_metrics.gc | 27 ++++++++++++++------------- checkman/kaspersky_av_client | 12 +++--------- checkman/mcafee_av_client | 8 ++------ 4 files changed, 20 insertions(+), 29 deletions(-) diff --git a/checkman/icom_repeater.pll_volt b/checkman/icom_repeater.pll_volt index dc9f556..4fe5a4c 100644 --- a/checkman/icom_repeater.pll_volt +++ b/checkman/icom_repeater.pll_volt @@ -16,7 +16,7 @@ inventory: One check per PLL is created. [parameters] - parameters(dict): This checks parameters are a dictionary with the +parameters(dict): This checks parameters are a dictionary with the (optional) keys {"rx"} and {"tx"}, under each of which lies a list of tuples (frequency, (warn_lower, crit_lower, warn, crit)), where frequency is the upper boundary of the frequency range for which the parameters diff --git a/checkman/jolokia_metrics.gc b/checkman/jolokia_metrics.gc index ef33f2d..0fd1dac 100644 --- a/checkman/jolokia_metrics.gc +++ b/checkman/jolokia_metrics.gc @@ -15,6 +15,9 @@ description: To use this plugin, Jolokia and the agent plugin need to be installed on the monitored server. + By default no levels are set because each virtual machine requires its own + individual parameters. + item: The name of the application server instance and name of the garbage collection as sent by the agent. @@ -28,19 +31,17 @@ inventory: One check is created per garbage collector sent by the Jolokia agent. [parameters] -Collection count - warn (int): a WARN state is triggered by to many collections per minute - crit (int): a CRITICAL state is triggered by to many collections per minute -Collection time - warn (int): a WARN state is triggered by assuming to many time for +Tuple(int, int): Collection count + + warn: a WARN state is triggered by to many collections per minute + + crit: a CRITICAL state is triggered by to many collections per minute + +Tuple(int, int): Collection time + + warn: a WARN state is triggered by assuming to many time for collections per minute - crit (int): a CRITICAL state is triggered by assuming to many time for + + crit: a CRITICAL state is triggered by assuming to many time for collections per minute -[configuration] -jolokia_metrics_gc_default_levels = { - 'CollectionTime': (None, None), - 'CollectionCount': (None, None) - } - By default no levels are set because each virtual machine requieres its own - individual parameters. diff --git a/checkman/kaspersky_av_client b/checkman/kaspersky_av_client index 4dd4f13..5db6a17 100644 --- a/checkman/kaspersky_av_client +++ b/checkman/kaspersky_av_client @@ -17,15 +17,9 @@ inventory: One checks is created for each windows host. [parameters] - parameters(dict): A dictionary with the following keys: +parameters(dict): A dictionary with the following keys: - { 'signature_age' } : A tuple of warn and crit, - { 'fullscan_age' } : A tuple of warn and crit. + { 'signature_age' } : A tuple of warn and crit, default values are (86400, 7*86400) -[configuration] - kaspersky_av_client_default_levels(dict): - Default levels, preset to { - 'signature_age' : ( 86400, 7*86400), - 'fullscan_age' : ( 86400, 7*86400) - } + { 'fullscan_age' } : A tuple of warn and crit, default values are (86400, 7*86400) diff --git a/checkman/mcafee_av_client b/checkman/mcafee_av_client index 50ab1e6..808c185 100644 --- a/checkman/mcafee_av_client +++ b/checkman/mcafee_av_client @@ -16,10 +16,6 @@ inventory: One check is created for each windows host. [parameters] - parameters(dict): A dictionary with the following keys: +parameters(dict): A dictionary with the following key: - { 'signature_age' } : A tuple of warn and crit. - -[configuration] - mcafee_av_client_default_levels(dict): - Default levels, preset to { 'levels' : ( 86400, 7*86400) } + { 'signature_age' } : A tuple of warn and crit, default values are (86400, 7*86400)

8 years, 11 months

fixed inventory function in ucd_mem check

by Simon Betz

Module: check_mk Branch: master Commit: 6eff2082b9ce70fb2602f044f820d5c6fc337da8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6eff2082b9ce70… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 9 08:58:18 2015 +0200 fixed inventory function in ucd_mem check --- checks/ucd_mem | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/ucd_mem b/checks/ucd_mem index 06d9b83..8ef9902 100644 --- a/checks/ucd_mem +++ b/checks/ucd_mem @@ -35,11 +35,10 @@ factory_settings["ucd_mem_default_levels"] = { def inventory_ucd_mem(info): - if len(info[0]) > 1: + if info and len(info[0]) > 1: for line in info[0]: if line == "": return [] - return [ ("", {}) ]

8 years, 11 months

#2675 FIX checkpoint_connections checkpoint_packets: Fixed wrong discovered services on non checkpoint devices

by Lars Michelsen

Module: check_mk Branch: master Commit: 35d2ed8d6ae2a0eb103f3ca27bb85be4a79b9f06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35d2ed8d6ae2a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 9 08:51:20 2015 +0200 #2675 FIX checkpoint_connections checkpoint_packets: Fixed wrong discovered services on non checkpoint devices --- .werks/2675 | 9 +++++++++ ChangeLog | 1 + checks/checkpoint.include | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/2675 b/.werks/2675 new file mode 100644 index 0000000..4850895 --- /dev/null +++ b/.werks/2675 @@ -0,0 +1,9 @@ +Title: checkpoint_connections checkpoint_packets: Fixed wrong discovered services on non checkpoint devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1444373412 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index bc8ee0c..c21e520 100644 --- a/ChangeLog +++ b/ChangeLog @@ -214,6 +214,7 @@ * 2619 FIX: services_summary: Fixed exception on WATO services summary page * 2654 FIX: logwatch: fixed high memory and cpu usage caused by too many unacknowledged messages... * 2622 FIX: postfix_mailq: Fixed exception when postfix is installed but not configured properly + * 2675 FIX: checkpoint_connections checkpoint_packets: Fixed wrong discovered services on non checkpoint devices Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/checkpoint.include b/checks/checkpoint.include index 7155e99..3d58994 100644 --- a/checks/checkpoint.include +++ b/checks/checkpoint.include @@ -26,7 +26,7 @@ def scan_checkpoint(oid): - sys_descr = oid(".1.3.6.1.2.1.1.1.0") + sys_descr = oid(".1.3.6.1.2.1.1.1.0", "") return ( # Entry in sysDescr, varies a bit (len(sys_descr.split(" ")) >= 3 and sys_descr.split(" ")[2].endswith("cp")) or @@ -34,4 +34,4 @@ def scan_checkpoint(oid): (sys_descr.startswith("Linux") and "cpx" in sys_descr)) \ and \ - oid(".1.3.6.1.4.1.2620.1.1.21.0").lower().startswith('firewall') + oid(".1.3.6.1.4.1.2620.1.1.21.0", "").lower().startswith('firewall')

8 years, 11 months

Merge mathias-kettner.de:check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f4d497595c51e12fa0dae556860ba18b2cc25f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f4d497595c51e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 9 08:51:29 2015 +0200 Merge mathias-kettner.de:check_mk ---

8 years, 11 months

fixed inventory function in ucd_mem check

by Simon Betz

Module: check_mk Branch: master Commit: 91cbfcb6b71fec34c9ee83798b2d859dded1cd04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91cbfcb6b71fec… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 9 08:31:21 2015 +0200 fixed inventory function in ucd_mem check --- checks/ucd_mem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ucd_mem b/checks/ucd_mem index f26ebfc..06d9b83 100644 --- a/checks/ucd_mem +++ b/checks/ucd_mem @@ -35,7 +35,7 @@ factory_settings["ucd_mem_default_levels"] = { def inventory_ucd_mem(info): - if len(info) > 1: + if len(info[0]) > 1: for line in info[0]: if line == "": return []

8 years, 11 months

fixed value error in check etherbox2_temp

by Simon Betz

Module: check_mk Branch: master Commit: c27382bad633b09be2ba4a741e207b7a23b3f4d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c27382bad633b0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 8 15:33:06 2015 +0200 fixed value error in check etherbox2_temp --- checks/etherbox2_temp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/checks/etherbox2_temp b/checks/etherbox2_temp index d1f1fbc..e8f4eff 100644 --- a/checks/etherbox2_temp +++ b/checks/etherbox2_temp @@ -40,12 +40,12 @@ # suggested by customer -factory_settings['etherbox_temp_default_levels'] = { +factory_settings['etherbox2_temp_default_levels'] = { 'levels' : (30, 35), } -def parse_etherbox_temp(info): +def parse_etherbox2_temp(info): # We have to use xxx.7.1.2.a to know if a temperature sensor # is connected: # - if oid(xxx.7.1.2.{a}) == 5.fff and oid(xxx.7.1.2.{a+1}) == 2.fff @@ -58,26 +58,26 @@ def parse_etherbox_temp(info): sensor_indicators, sensors = info for sensor_index in range(0, len(sensors)): indicator_index = 2 * sensor_index - if float(sensor_indicators[indicator_index][0].split(" ")[0]) > 4 and \ - float(sensor_indicators[indicator_index + 1][0].split(" ")[0]) > 1: + if float((sensor_indicators[indicator_index][0].split("Volt")[0]).strip()) > 4 and \ + float((sensor_indicators[indicator_index + 1][0].split("Volt")[0]).strip()) > 1: parsed["Sensor %s" % sensors[sensor_index][0]] = float(sensors[sensor_index][1]) / 10 return parsed -def inventory_etherbox_temp(parsed): +def inventory_etherbox2_temp(parsed): return [ (sensor, {}) for sensor in parsed ] -def check_etherbox_temp(item, params, parsed): +def check_etherbox2_temp(item, params, parsed): if item in parsed: return check_temperature(parsed[item], params) check_info['etherbox2_temp'] = { - 'parse_function' : parse_etherbox_temp, - 'inventory_function' : inventory_etherbox_temp, - 'check_function' : check_etherbox_temp, + 'parse_function' : parse_etherbox2_temp, + 'inventory_function' : inventory_etherbox2_temp, + 'check_function' : check_etherbox2_temp, 'service_description' : 'Temperature %s', 'has_perfdata' : True, 'snmp_info' : [(".1.3.6.1.4.1.14848.2.1.7.1.2", [ "" ]), @@ -88,7 +88,7 @@ check_info['etherbox2_temp'] = { # disk space reasons. 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "" and \ "Version 1.2" in oid(".1.3.6.1.4.1.14848.2.1.1.1.0", ""), - 'default_levels_variable' : 'etherbox_temp_default_levels', + 'default_levels_variable' : 'etherbox2_temp_default_levels', 'group' : 'temperature', 'includes' : [ "temperature.include" ], }

8 years, 11 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 3af63a7505ee0700ddd0df48676918a4d4f93fe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3af63a7505ee07… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 8 14:53:55 2015 +0200 Testcommit --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index a517c94..50b2214 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,6 @@ HEAL_SPACES_IN = checkman/* modules/* checks/* notifications/* inventory/* \ agents/check_mk_*agent* agents/*.c agents/cfg_examples/* \ agents/special/* $$(find agents/plugins -type f) - .PHONY: help install clean all: dist packages

8 years, 11 months

Check_MK Git: check_mk: Fixed GCC warning about writable strings.

by Sven Panne

Module: check_mk Branch: master Commit: 472f4a97b83edb65b0a7478b9973c6cfa34017ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=472f4a97b83edb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 8 14:41:39 2015 +0200 Fixed GCC warning about writable strings. --- livestatus/src/StringColumnFilter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/StringColumnFilter.cc b/livestatus/src/StringColumnFilter.cc index 4dde056..658d65a 100644 --- a/livestatus/src/StringColumnFilter.cc +++ b/livestatus/src/StringColumnFilter.cc @@ -67,7 +67,7 @@ StringColumnFilter::~StringColumnFilter() bool StringColumnFilter::accepts(void *data) { bool pass = true; - char *act_string = _column->getValue(data); + const char *act_string = _column->getValue(data); if (!act_string) act_string = ""; // e.g. current_service_perf_data in host entry in log table

8 years, 11 months

Check_MK Git: check_mk: #2673 FIX SNMP-Traps: Fixed translation of OIDs which are parts of trap values

by Lars Michelsen

Module: check_mk Branch: master Commit: 073fd27f39632bd236f5919ab40bedf1b7c01a6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=073fd27f39632b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 8 14:38:10 2015 +0200 #2673 FIX SNMP-Traps: Fixed translation of OIDs which are parts of trap values Some traps send SNMP OIDs as values of traps which were not translated correctly in the past. For example default SNMPv2 traps had a non-translated numeric OID in the "Application" field of the events. This has now been changed to be translated too. Please note: If you already have created rules which refer to the numeric OIDs while having trap translation enabled, you will need to update the rules. --- .werks/2673 | 15 +++++++++++++++ ChangeLog | 2 ++ mkeventd/bin/mkeventd | 41 +++++++++++++++-------------------------- 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.werks/2673 b/.werks/2673 new file mode 100644 index 0000000..8176e33 --- /dev/null +++ b/.werks/2673 @@ -0,0 +1,15 @@ +Title: SNMP-Traps: Fixed translation of OIDs which are parts of trap values +Level: 1 +Component: ec +Compatible: incomp +Version: 1.2.7i3 +Date: 1444307734 +Class: fix + +Some traps send SNMP OIDs as values of traps which were not translated correctly +in the past. For example default SNMPv2 traps had a non-translated numeric OID +in the "Application" field of the events. This has now been changed to be +translated too. + +Please note: If you already have created rules which refer to the numeric OIDs +while having trap translation enabled, you will need to update the rules. diff --git a/ChangeLog b/ChangeLog index 2cd26f9..bc8ee0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -336,6 +336,8 @@ * 2534 FIX: Fixed implementation of skipping rule packs * 2614 FIX: Fixed exception when processing events with umlaut in names from history * 2644 FIX: Fix exception in executing actions or notifications when match groups contain non-ASCII characters + * 2673 FIX: SNMP-Traps: Fixed translation of OIDs which are parts of trap values... + NOTE: Please refer to the migration notes! Livestatus: * 2493 FIX: Fixed wrong JSON format when using stats queries together with header columns... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 611862b..3612007 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1212,32 +1212,14 @@ class EventServer: def snmptrap_translate_varbinds(self, var_bind_list): var_binds = [] for oid, value in var_bind_list: - mib_var = MibVariable(oid).resolveWithMib(self._mib_resolver) - - if not mib_var.isFullyResolved(): - log('MIB for %s is not loaded' % oid.prettyPrint()) - var_binds.append((str(oid), value)) # add untranslated - else: - # MIB node object (like OBJECT-TYPE or other SMI MACROs) - node = mib_var.getMibNode() - - mod, sym, indices = mib_var.getMibSymbol() - # Only care about the first indice reported. Why should we care about multiple? - # Do we have such cases here? - if not indices: - translated_oid = '%s::%s' % (mod, sym) - else: - translated_oid = '%s::%s.%s' % (mod, sym, indices[0].prettyPrint()) - - # This MACRO supports SYNTAX clause? - if hasattr(node, 'getSyntax'): - # Cast value to MIB SYNTAX type (TEXTUAL-CONVENTION) - value = node.getSyntax().clone(value) - units = node.getUnits() + try: + mib_var = ObjectType(ObjectIdentity(oid), value).resolveWithMib(self._mib_resolver) + node = mib_var[0].getMibNode() + translated_oid = mib_var[0].prettyPrint().replace("\"", "") + translated_value = mib_var[1].prettyPrint() - translated_value = value.prettyPrint() + ' ' + units - else: - translated_value = value + if hasattr(node, "getUnits"): + translated_value += ' ' + node.getUnits() if hasattr(node, "getDescription") \ and type(g_config["translate_snmptraps"]) == tuple \ @@ -1245,6 +1227,12 @@ class EventServer: translated_value += "(%s)" % node.getDescription() var_binds.append((translated_oid, translated_value)) + + except SmiError, e: + # Failed to translate? add untranslated + log('Failed to translate OID %s: %s' % (oid.prettyPrint(), e)) + var_binds.append((str(oid), str(value))) # add untranslated + return var_binds def process_snmptrap(self, (whole_msg, (ipaddress, port))): @@ -3851,9 +3839,10 @@ try: from pyasn1.codec.ber import decoder as pyasn_decoder import pysnmp.proto.proxy.rfc2576 # Needed for trap translation - from pysnmp.entity.rfc3413.oneliner.mibvar import MibVariable from pysnmp.smi.builder import MibBuilder, DirMibSource from pysnmp.smi.view import MibViewController + from pysnmp.smi.rfc1902 import ObjectType, ObjectIdentity + from pysnmp.smi.error import SmiError if not g_pipe_path: bail_out("Please specify the path to the pipe (using -P).")

8 years, 11 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 794876189c311d87c1d8fddfe8f5d0df713f5604 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=794876189c311d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 8 14:35:27 2015 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6338b19..fb6ecda 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2673 +2693

8 years, 11 months

← Newer
1
...
22
23
24
25
26
27
28
29
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