Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: #1173 cisco_secure: Check creates now a summary instead one service by port

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3e799bd24fcc4e3989fc199b6824bc1d170faaaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e799bd24fcc4e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 11 17:35:46 2014 +0200 #1173 cisco_secure: Check creates now a summary instead one service by port With this new behavier it's much easyer to handle fussy enviroments whith many portstate changes. A re-service detection for the switch's with port security is necessary after Update. --- .werks/1173 | 12 ++++++++++++ ChangeLog | 2 ++ checkman/cisco_secure | 7 +++---- checks/cisco_secure | 28 ++++++++++++---------------- 4 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.werks/1173 b/.werks/1173 new file mode 100644 index 0000000..3a2f618 --- /dev/null +++ b/.werks/1173 @@ -0,0 +1,12 @@ +Title: cisco_secure: Check creates now a summary instead one service by port +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.5i6 +Date: 1407771069 +Class: feature + +With this new behavier it's much easyer to handle fussy enviroments whith many portstate changes. + +A re-service detection for the switch's with port security is necessary after Update. + diff --git a/ChangeLog b/ChangeLog index 4f12d8f..62aabde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ * 0200 arris_cmts_cpu,arris_cmts_temp: New Checks for Arris CMTS Devices ( Temperature and CPU Utilization) * 0202 cisco_temp_sensor: It is now possible to configure this check in WATO.... * 1172 New check sap.value_groups... + * 1173 cisco_secure: Check creates now a summary instead one service by port... + NOTE: Please refer to the migration notes! * 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 diff --git a/checkman/cisco_secure b/checkman/cisco_secure index 41a508f..c084d47 100644 --- a/checkman/cisco_secure +++ b/checkman/cisco_secure @@ -6,12 +6,11 @@ distribution: check_mk description: This check monitors the port Security feature of cisco_switches. It returns a {CRITICAL} state for each port which is locked due a security isse. If is port security configured but cant be enabled - the check returns {WARNING}. If a port goes down, the check ignores that and only shows a information in the - check output. + the check returns {WARNING}. item: - The description of the Port + None inventory: - One check for each port with enabled port security which is also up will be created + One summary check will be created diff --git a/checks/cisco_secure b/checks/cisco_secure index aa7e030..e82d7ec 100644 --- a/checks/cisco_secure +++ b/checks/cisco_secure @@ -35,12 +35,12 @@ def cisco_secure_convert(info): def inventory_cisco_secure(info): info = cisco_secure_convert(info) - inventory = [] + # search for at least one port with security for name, op_state, enabled, status, violationCount, lastmac in info: #if portsecurity enabled and port up OR currently there is sercurity issue` if ( enabled == 1 and op_state == 1) or status == 3: - inventory.append( (name, None) ) - return inventory + return [ (None, None) ] + return [] def check_cisco_secure(item, params, info): secure_states = { @@ -50,21 +50,17 @@ def check_cisco_secure(item, params, info): } info = cisco_secure_convert(info) + failed = [] for name, op_state, enabled, status, violationCount, lastmac in info: - if name == item: - message = "Port Security %s (Violation Count: %s, Last Mac: %s)" % \ - ( secure_states[status], violationCount, lastmac ) + message = "Port %s: %s (Violation Count: %s, Last Mac: %s)" % \ + ( name, secure_states[status], violationCount, lastmac ) - # If port cant be enabled and is up - if status == 2 and op_state == 1: - return 1, message - # Port cant be enabled but is down, so no error state - elif status == 2: - return 0, "Port is down" - # Security issue - elif status == 3: - return 2, message - return 0, message + # If port cant be enabled and is up + if status == 2 and op_state == 1: + yield 1, message + # Security issue + elif status == 3: + yield 2, message check_info["cisco_secure"] = { "check_function" : check_cisco_secure,

10 years, 2 months

Check_MK Git: check_mk: #1172 New check sap.value_groups

by Bastian Kuhn

Module: check_mk Branch: master Commit: e3a92f4d402a4015244931d9fe51c5f090b9a7c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3a92f4d402a40… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 11 16:06:53 2014 +0200 #1172 New check sap.value_groups With this check it's possible to create groups of SAP values to avoid dozen of service checks. --- .werks/1172 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/1172 b/.werks/1172 new file mode 100644 index 0000000..941ecee --- /dev/null +++ b/.werks/1172 @@ -0,0 +1,10 @@ +Title: New check sap.value_groups +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1407765950 +Class: feature + +With this check it's possible to create groups of SAP values to avoid dozen of service checks. + diff --git a/ChangeLog b/ChangeLog index b373406..4f12d8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 0199 veeam_client: Check rewritten to get a nicer output * 0200 arris_cmts_cpu,arris_cmts_temp: New Checks for Arris CMTS Devices ( Temperature and CPU Utilization) * 0202 cisco_temp_sensor: It is now possible to configure this check in WATO.... + * 1172 New check sap.value_groups... * 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

10 years, 2 months

Check_MK Git: check_mk: Reserved 200 Werk IDS

by Bastian Kuhn

Module: check_mk Branch: master Commit: 582d7e8cac8ef4313dde74c10d54c55fd88b796c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=582d7e8cac8ef4… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 11 16:05:17 2014 +0200 Reserved 200 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 15c1c7c..4adbd2b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1172 +1372

10 years, 2 months

Check_MK Git: check_mk: New check sap.value_groups

by Bastian Kuhn

Module: check_mk Branch: master Commit: 64721b5a2c60818f085eab255d93f4168a5ec649 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64721b5a2c6081… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 11 16:04:43 2014 +0200 New check sap.value_groups --- checkman/sap.value_groups | 20 +++++++++ checks/sap | 78 +++++++++++++++++++++++++++++++++- web/plugins/wato/check_parameters.py | 31 ++++++++++++++ 3 files changed, 128 insertions(+), 1 deletion(-) diff --git a/checkman/sap.value_groups b/checkman/sap.value_groups new file mode 100644 index 0000000..f7d39ca --- /dev/null +++ b/checkman/sap.value_groups @@ -0,0 +1,20 @@ +title: SAP Single Value Monitoring Groups +agents: linux +catalog: app/sap +license: GPL +distribution: check_mk +description: + Please refer to {sap.value} for details. + This check is only a subchecks who enables you to create Groups of values. + + The rule "SAP R/3 Single Value Inventory" is not necessary for that, you + only need the rule "SAP Value Grouping Patterns" to define a name and an include + nor and exclusion list. + After the service detection, the check will display the total number of OK and Critical values, + in case of Critical values also these. + +item: + The Name of the Group + +inventory: + The check does not inventory all available values by default. diff --git a/checks/sap b/checks/sap index 5af2b49..8ee8f3b 100644 --- a/checks/sap +++ b/checks/sap @@ -78,7 +78,7 @@ check_info['sap.dialog'] = { # at the moment the following parameters are supported: # 1. match: the sap-path matching definition inventory_sap_values = [] - +sap_value_groups = [] def inventory_sap_value(info): inv = [] @@ -157,3 +157,79 @@ check_info['sap.value'] = { "service_description" : "%s", "has_perfdata" : True, } + +def sap_value_groups_precompile(hostname, item, _unused): + return host_extra_conf(hostname, sap_value_groups) + +def sap_groups_of_value( value_name, patterns=False ): + groups = [] + if not patterns: + patterns = host_extra_conf(g_hostname, sap_value_groups) + + for line in patterns: + for group_name, pattern in line: + no_match = False + inclusion, exclusion = pattern + # Exclude: + if exclusion: + reg = compiled_regexes.get(exclusion) + if not reg: + reg = re.compile(exclusion) + compiled_regexes[exclusion] = reg + if reg.match(value_name): + no_match = True + break + #no match for this group, go on with the next group + if no_match: + break + + # Include + reg = compiled_regexes.get(inclusion) + if not reg: + reg = re.compile(inclusion) + compiled_regexes[inclusion] = reg + if reg.match(value_name): + groups.append(group_name) + return groups + +def inventory_sap_value_groups( info ): + inventory = [] + found_groups = [] + for line in info: + path = line[3] + for group in sap_groups_of_value( path ): + if group not in found_groups: + inventory.append(( group, None )) + found_groups.append(group) + return inventory + +def check_sap_value_groups( item, params, info ): + frontend = [] + backend = [] + count_ok = 0 + count_crit = 0 + state = 0 + for line in info: + path = line[3] + if item in sap_groups_of_value( path, params ): + status = sap_nagios_state_map[int(line[1])] + output = '' + if line[4] == '-': + output = ' '.join(line[6:]) + backend.append( path + output + " " + nagios_state_names[status] ) + state = max(state, status) + if status > 0: + count_crit += 1 + frontend.append( path + output + " " + nagios_state_names[status] ) + else: + count_ok += 1 + + return state, "%s OK, %s Crit %s\n%s" % ( count_ok, count_crit, ", ".join(frontend), "\n".join(backend) ) + + +check_info['sap.value-groups'] = { + 'check_function': check_sap_value_groups, + 'inventory_function': inventory_sap_value_groups, + 'service_description': "%s", +} +precompile_params['sap.value-groups'] = sap_value_groups_precompile diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6036366..82c660a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -476,6 +476,37 @@ register_rule(group + '/' + subgroup_inventory, ) register_rule(group + '/' + subgroup_inventory, + varname = "sap_value_groups", + title = _('SAP Value Grouping Patterns'), + help = _('The check <tt>sap.value</tt> normaly creates one service for each sap value ' + 'By defining grouping patterns you can switch to the check <tt>sap.value-groups</tt>. ' + 'That check monitors a list of SAP values at once. This is usefull if you have ' + 'a very big list of values which do you want to monitor'), + valuespec = ListOf( + Tuple( + help = _("This defines one value grouping pattern"), + show_titles = True, + orientation = "horizontal", + elements = [ + TextAscii( + title = _("Name of group"), + ), + Tuple( + show_titles = True, + orientation = "vertical", + elements = [ + RegExpUnicode(title = _("Include Pattern")), + RegExpUnicode(title = _("Exclude Pattern")) + ], + ), + ], + ), + add_label = _("Add pattern group"), + ), + match = 'all', +) + +register_rule(group + '/' + subgroup_inventory, varname = "inventory_heartbeat_crm_rules", title = _("Heartbeat CRM Inventory"), valuespec = Dictionary(

10 years, 2 months

Check_MK Git: check_mk: Dashboards: Fixed transformation of old iframe based dashlets

by Lars Michelsen

Module: check_mk Branch: master Commit: 336cdabc52a355fa545011cbee511952eb86c114 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=336cdabc52a355… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 11 12:57:03 2014 +0200 Dashboards: Fixed transformation of old iframe based dashlets --- web/htdocs/dashboard.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c20cc4c..b0fa5f3 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -116,10 +116,14 @@ def transform_builtin_dashboards(): dashlet['type'] = dashlet['url'][8:-3] del dashlet['url'] - elif dashlet.get('url', '') != '' or dashlet.get('urlfunc'): + elif dashlet.get('url', '') != '' or dashlet.get('urlfunc') or dashlet.get('iframe'): # Normal URL based dashlet dashlet['type'] = 'url' + if dashlet.get('iframe'): + dashlet['url'] = dashlet['iframe'] + del dashlet['iframe'] + elif dashlet.get('view', '') != '': # Transform views # There might be more than the name in the view definition

10 years, 2 months

Check_MK Git: check_mk: cisco_qos: massive speed optimation

by Bastian Kuhn

Module: check_mk Branch: master Commit: 471a9409b9a75876dfbe22807fd2f670e11503b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=471a9409b9a758… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 11 11:25:36 2014 +0200 cisco_qos: massive speed optimation --- checks/cisco_qos | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/checks/cisco_qos b/checks/cisco_qos index c9b66e8..410e1a0 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -217,22 +217,20 @@ def check_cisco_qos(item, params, info): drop_b = drop_bytes.get(policy_id+'.'+objects_id, 0) speed = saveint(if_speeds[if_id]) - # might not have a specific speed. Skip these. - # FIXME: Maybe ignore speed checking on them or similar - does it make sense? - speed_found = False + parent_value_cache = {} for a_key, a_value in config.items(): - if speed_found: - break - if a_value == class_id: - parent_value = a_key.split(".")[1] - for b_key, b_value in parents.items(): - if parent_value == b_value: - if object_types[b_key] == "4": - try: - speed = saveint(if_qos_bandwidth[config[b_key]]) * 1000 - speed_found = True - except KeyError: - pass + parent_value_cache.update({ a_value : a_key.split(".")[1] }) + + # if a_value == class_id: + # parent_value = a_key.split(".")[1] + for b_key, b_value in parents.items(): + if parent_value_cache[class_id] == b_value: + if object_types[b_key] == "4": + try: + speed = saveint(if_qos_bandwidth[config[b_key]]) * 1000 + break + except KeyError: + pass # Bandwidth needs to be in bytes for later calculations bw = speed / 8.0 @@ -314,6 +312,7 @@ def check_cisco_qos(item, params, info): state = max(1, state) infotext += '(!)' + if policy_name: infotext += ', Policy-Name: %s, Int-Bandwidth: %s' % (policy_name, format_value(bw)) else:

10 years, 2 months

Check_MK Git: check_mk: oracle_recovery_status: Added missing Wato configuration

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3a0a85344c73c866e2086bec5d8e6542732101bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a0a85344c73c8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Aug 8 17:14:14 2014 +0200 oracle_recovery_status: Added missing Wato configuration --- web/plugins/wato/check_parameters.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1d78d16..6036366 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3075,6 +3075,30 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "oracle_recovery_status", + _("Oracle Recovery Status"), + Dictionary( + elements = [ + ("levels", + Tuple( + title = _("Levels for oldest Checkpoint"), + elements = [ + Age(title = _("warning at"), default_value = 3600 ), + Age(title = _("critical at"), default_value = 1800 ), + ] + ) + ) + ] + ), + TextAscii( + title = _("Database SID"), + size = 12, + allow_empty = False), + "dict", +) + +register_check_parameters( + subgroup_applications, "oracle_undostat", _("Oracle Undo Retention"), Dictionary(

10 years, 2 months

Check_MK Git: check_mk: diskstat.include can now also handle bytes as input , not only sectors

by Bastian Kuhn

Module: check_mk Branch: master Commit: 65729e03a61cf573c721e26b056ce758853fa363 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65729e03a61cf5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Aug 8 15:46:37 2014 +0200 diskstat.include can now also handle bytes as input, not only sectors --- checks/aix_diskiod | 2 +- checks/diskstat.include | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/checks/aix_diskiod b/checks/aix_diskiod index 7a8d3e3..f014c68 100644 --- a/checks/aix_diskiod +++ b/checks/aix_diskiod @@ -56,7 +56,7 @@ def inventory_aix_diskiod(info): def check_aix_diskiod(item, params, info): - return check_diskstat_generic(item, params, time.time(), aix_diskiod_convert(info)) + return check_diskstat_generic(item, params, time.time(), aix_diskiod_convert(info), mode='bytes') check_info["aix_diskiod"] = { 'check_function': check_aix_diskiod, diff --git a/checks/diskstat.include b/checks/diskstat.include index 08b909e..47eb6d7 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -89,7 +89,7 @@ def inventory_diskstat_generic(info): -def check_diskstat_line(this_time, item, params, line): +def check_diskstat_line(this_time, item, params, line, mode): average_range = params.get("average") perfdata = [] infos = [] @@ -105,9 +105,13 @@ def check_diskstat_line(this_time, item, params, line): else: warn, crit = None, None - # compute IO rate in bytes/sec - timedif, sectors_per_sec = get_counter(countername, this_time, int(ctr)) - bytes_per_sec = sectors_per_sec * 512 + timedif, per_sec = get_counter(countername, this_time, int(ctr)) + if mode == 'sectors': + # compute IO rate in bytes/sec + bytes_per_sec = per_sec * 512 + elif mode == 'bytes': + bytes_per_sec = per_sec + infos.append("%s/sec %s" % (get_bytes_human_readable(bytes_per_sec), what)) perfdata.append( (what, bytes_per_sec, warn, crit) ) dsname = what @@ -197,7 +201,7 @@ def check_diskstat_line(this_time, item, params, line): return (status, ", ".join(infos) , perfdata) -def check_diskstat_generic(item, params, this_time, info): +def check_diskstat_generic(item, params, this_time, info, mode='sectors'): # legacy version if item is "read" or "write" if item in [ 'read', 'write' ]: return check_diskstat_old(item, params, this_time, info) @@ -212,12 +216,12 @@ def check_diskstat_generic(item, params, this_time, info): if ' ' in devname: continue summary_line = map(lambda e: e[0] + int(e[1]), zip(summary_line, line[1:])) - return check_diskstat_line(this_time, "SUMMARY", params, [''] + summary_line) + return check_diskstat_line(this_time, "SUMMARY", params, [''] + summary_line, mode) # single mode for line in info: if line[0] == item: - return check_diskstat_line(this_time, item, params, line) + return check_diskstat_line(this_time, item, params, line, mode) return (3, "device missing")

10 years, 2 months

Check_MK Git: check_mk: New arris checks, changed service description

by Bastian Kuhn

Module: check_mk Branch: master Commit: 9d6f2c21d653b1f1d53fa19c01413aa7617e2e32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d6f2c21d653b1… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Aug 8 15:18:53 2014 +0200 New arris checks, changed service description --- checks/arris_cmts_cpu | 2 +- checks/arris_cmts_temp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/arris_cmts_cpu b/checks/arris_cmts_cpu index a091337..0a005a3 100644 --- a/checks/arris_cmts_cpu +++ b/checks/arris_cmts_cpu @@ -64,7 +64,7 @@ def check_arris_cmts_cpu(item, params, info): check_info["arris_cmts_cpu"] = { "check_function" : check_arris_cmts_cpu, "inventory_function" : inventory_arris_cmts_cpu, - "service_description" : "CPU utilization Slot %s", + "service_description" : "CPU utilization Module %s", "has_perfdata" : True, "snmp_scan_function" : arris_cmts_scan_function, "snmp_info" : ( ".1.3.6.1.4.1.4998.1.1.5.3.1.1.1", [ diff --git a/checks/arris_cmts_temp b/checks/arris_cmts_temp index a6eadfe..af5ec89 100644 --- a/checks/arris_cmts_temp +++ b/checks/arris_cmts_temp @@ -52,7 +52,7 @@ def check_arris_cmts_temp(item, params, info): check_info["arris_cmts_temp"] = { "check_function" : check_arris_cmts_temp, "inventory_function" : inventory_arris_cmts_temp, - "service_description" : "Temperature %s", + "service_description" : "Temperature Module %s", "has_perfdata" : True, "snmp_scan_function" : arris_cmts_scan_function, "snmp_info" : ( ".1.3.6.1.4.1.4998.1.1.10.1.4.2.1", [

10 years, 2 months

Check_MK Git: check_mk: cisco_temp_sensor: Changed check to work with old cmk versions

by Bastian Kuhn

Module: check_mk Branch: master Commit: 6d25e2b87a6d71f1a8b9422f9c95e4d845e1c22d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d25e2b87a6d71… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Aug 8 15:16:25 2014 +0200 cisco_temp_sensor: Changed check to work with old cmk versions --- checks/cisco_temp_sensor | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index f41cdaf..d393715 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -141,10 +141,12 @@ def parse_cisco_temp_sensor(info): def inventory_cisco_temp_sensor(info): sensors = parse_cisco_temp_sensor(info) + inventory = [] for id, descr, sensortype, value, sensorstate, levels in sensors: # Use all temperature sensors with a non-empty description and valid threshold if descr != None and sensortype == '8' and len(levels) in [ 2, 4 ]: - yield descr, levels[0:2] + inventory.append(( descr, levels[0:2] )) + return inventory def check_cisco_temp_sensor(item, params, info): sensors = parse_cisco_temp_sensor(info)

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