Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d54323b562dcb5849cc210b664cfa16a4d9ce72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d54323b562dcb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 18 20:11:21 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 10 months

Check_MK Git: check_mk: Updated internal doku

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2b653620c5b94ec9f30969156a61aa139b85c520 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b653620c5b94e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 18 11:55:06 2010 +0100 Updated internal doku --- LIESMICH.zutun | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 109a927..d0bd000 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -1,3 +1,6 @@ +Livestatus: is_contact_member_of_contactgroup selbst programmieren, + da diese Funktion in Nagios rausfliegen wird. + Doku: Check_MK und OMD: Installieren von MKPs, local-Hierarchie Multisite: Kontextknöpfe Services: OK, Services: Crit usw. unsichtbar

13 years, 10 months

Check_MK Git: check_mk: cisco_temp_perf: Do not crash if device does not send current temperature

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ab4d92bc4847c948ea7a40d627f207ead35afa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ab4d92bc4847c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 18 16:32:40 2010 +0100 cisco_temp_perf: Do not crash if device does not send current temperature --- ChangeLog | 1 + checks/cisco_temp_perf | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39d657f..9cf7980 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * cisco_power: Not using power source as threshold anymore. Improved output * cisco_fan: Does not inventorize 'notPresent' sensors anymore. Improved output * cisco_power: Not using power source as threshold anymore. Improved output + * cisco_temp_perf: Do not crash if device does not send current temperature * tcp_conn_stats: new check for monitoring number of current TCP connections * blade_*: Added snmp scan functions for better automatic inventory * blade_bays: Also inventorizes standby blades and has a little more diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index 958695c..a76ebec 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -61,18 +61,24 @@ def inventory_cisco_temp_perf(checkname, info): def check_cisco_temp_perf(item, params, info): for line in info: if line[0] == item: - temp = int(line[1]) - perfdata = [("temp", temp)] + temp = saveint(line[1]) + if temp != 0: + perfdata = [("temp", temp)] + temptext = ", %d degrees (critical at %d)" % (temp, saveint(line[2])) + else: + perfdata = [] + temptext = "" + state = int(line[3]) statename = cisco_temp_perf_envmon_states.get(state, "(invalid)") if state == 1: - return (0, "OK - %s degrees" % temp, perfdata) + return (0, "OK - state is normal%s" % temptext, perfdata) elif state == 2: - return (0, "WARN - state is %s, %s degrees" % (statename, temp), perfdata) + return (0, "WARN - state is %s%s" % (statename, temptext), perfdata) elif state in [ 5, 6 ]: return (3, "UNKNOWN - state is %s" % statename) else: - return (2, "CRIT - state is %s, %d degrees (max is %s)" % (statename, temp, line[2]), perfdata) + return (2, "CRIT - state is %s%s" % (statename, temptext), perfdata) return (3, "UNKNOWN - Item %s not found in SNMP data" % item) check_info['cisco_temp_perf'] = (check_cisco_temp_perf, "%s", 1, inventory_cisco_temp_perf)

13 years, 10 months

Check_MK Git: check_mk: Fixed some global vars after reports of validate_checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4c1f2890eb220b937af897f7501c3e7602a28789 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c1f2890eb220b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 16 08:10:47 2010 +0100 Fixed some global vars after reports of validate_checks --- checks/blade_bays | 4 ++-- checks/heartbeat_crm | 5 ++--- doc/helpers/validate_checks | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/checks/blade_bays b/checks/blade_bays index 80413da..672f423 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -blade_bay_module_state = { +blade_bays_module_state = { 0: 'standby', 1: 'on', 2: 'notPresent', @@ -42,7 +42,7 @@ def check_blade_bays(item, params, info): type = line[2] if state == 1: return (0, "OK - State %s (Type: %s, ID: %s)" % - (blade_bay_module_state.get(state, 'Unhandled'), type, line[3])) + (blade_bays_module_state.get(state, 'Unhandled'), type, line[3])) elif state == 2: return (1, "WARNING - Not present") elif state == 0: diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index 7e74547..566b731 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -44,8 +44,7 @@ # resource_slapmaster (ocf::heartbeat:OpenLDAP): Started mwp # resource_slapslave (ocf::heartbeat:OpenLDAP): Started smwp -from datetime import datetime, timedelta -import time +import time, 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. @@ -98,7 +97,7 @@ 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(*time.strptime(lastUpdated, '%a %b %d %H:%M:%S %Y')[0:5]).strftime("%s")) + dt = int(datetime.datetime(*time.strptime(lastUpdated, '%a %b %d %H:%M:%S %Y')[0:5]).strftime("%s")) now = time.time() delta = now - dt if delta > param_max_age: diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index 5850bd0..0d2ab6c 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -110,7 +110,7 @@ def usage(): print "No real help available... The only option is -v|--verbose." sys.exit(0) -ignored_variables = [] +ignored_variables = [ 'datetime', ] # Load all checks and record global var definitions # Also read the man pages

13 years, 10 months

Check_MK Git: check_mk: Cleaned up global var names of several checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d48583f5059c5dfba846025fd826e2336962d618 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d48583f5059c5d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 16 08:30:03 2010 +0100 Cleaned up global var names of several checks --- ChangeLog | 1 + checks/cisco_temp_perf | 4 ++-- checks/fsc_ipmi_mem_status | 4 +--- checks/hp_blade_psu | 4 ++-- checks/j4p_performance | 4 ++-- checks/netctr | 6 +++--- checks/smbios_sel | 4 +--- checks/statgrab_net | 4 ++-- checks/tcp_conn_stats | 4 ++-- doc/helpers/validate_checks | 7 ++++++- 10 files changed, 22 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index b48d32e..fffc53b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * j4p_performance: Added experimental agent plugin fetching data via jmx4perl agent (does not need jmx4perl on Nagios) * j4p_performance.mem: added new experimental check for memory usage via JMX. + * Cleaned up several checks to meet the variable naming conventions Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index b5a306f..958695c 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -46,7 +46,7 @@ # sensor generates a abnormal data like # 1000 C. -cisco_envmon_states = { +cisco_temp_perf_envmon_states = { 1: "normal", 2: "warning", 3: "critical", @@ -64,7 +64,7 @@ def check_cisco_temp_perf(item, params, info): temp = int(line[1]) perfdata = [("temp", temp)] state = int(line[3]) - statename = cisco_envmon_states.get(state, "(invalid)") + statename = cisco_temp_perf_envmon_states.get(state, "(invalid)") if state == 1: return (0, "OK - %s degrees" % temp, perfdata) elif state == 2: diff --git a/checks/fsc_ipmi_mem_status b/checks/fsc_ipmi_mem_status index 4f367c6..67e29b5 100644 --- a/checks/fsc_ipmi_mem_status +++ b/checks/fsc_ipmi_mem_status @@ -48,8 +48,6 @@ fsc_ipmi_mem_status_levels = [ (2, 'Prefail (module exceeded the correctable errors threshold)'), ] -statname = [ "OK", "WARN", "CRIT" ] - def inventory_fsc_ipmi_mem_status(checkname, info): # Skip all lines which have # a) An error (Begin with "E") @@ -64,7 +62,7 @@ def check_fsc_ipmi_mem_status(name, _no_params, info): elif line[1] == name: level = int(line[2]) return (fsc_ipmi_mem_status_levels[level][0], "%s: %s" % ( - statname[fsc_ipmi_mem_status_levels[level][0]], + nagios_state_names[fsc_ipmi_mem_status_levels[level][0]], fsc_ipmi_mem_status_levels[level][1])) return (3, "UNKNOWN - item %s not found" % name) diff --git a/checks/hp_blade_psu b/checks/hp_blade_psu index 9c84e34..76818dc 100644 --- a/checks/hp_blade_psu +++ b/checks/hp_blade_psu @@ -57,7 +57,7 @@ hp_blade_psu_status = { 15: 'nvramInvalid', 16: 'calibrationTableInvalid', } -hp_blade_inputline_status = { +hp_blade_psu_inputline_status = { 1: 'noError', 2: 'lineOverVoltage', 3: 'lineUnderVoltage', 4: 'lineHit', 5: 'brownOut', 6: 'linePowerLoss', @@ -82,7 +82,7 @@ def check_hp_blade_psu(item, params, info): detail_output = ', Output: %sW' % line[3] else: detail_output = int(line[4]) >= 1 and ' (%s)' % hp_blade_psu_status[4] or '' - detail_output = int(line[5]) >= 1 and ', Inputline: %s' % hp_blade_inputline_status[5] or '' + detail_output = int(line[5]) >= 1 and ', Inputline: %s' % hp_blade_psu_inputline_status[5] or '' perfdata = [ ('output', line[3]) ] diff --git a/checks/j4p_performance b/checks/j4p_performance index b11d40c..3e8feec 100644 --- a/checks/j4p_performance +++ b/checks/j4p_performance @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -j4p_mem_default_levels = ( 1000, 2000 ) # MB +j4p_performance_mem_default_levels = ( 1000, 2000 ) # MB def j4p_performance_parse(info): parsed = {} @@ -36,7 +36,7 @@ def j4p_performance_parse(info): def inventory_j4p_performance_mem(checktype, info): parsed = j4p_performance_parse(info) - return [ (k, "j4p_mem_default_levels") for k in parsed ] + return [ (k, "j4p_performance_mem_default_levels") for k in parsed ] def check_j4p_performance_mem(item, params, info): warn, crit = params diff --git a/checks/netctr b/checks/netctr index 03513c9..10ec00a 100644 --- a/checks/netctr +++ b/checks/netctr @@ -33,7 +33,7 @@ netctr_counters = [ 'rx_bytes', 'tx_bytes', 'rx_packets', 'tx_packets', 'rx_err # Item is devicename.countername, eg, # eth0.tx_collisions. Available are: -counter_indices = { +netctr_counter_indices = { # Receive 'rx_bytes' : 0, 'rx_packets' : 1, @@ -64,7 +64,7 @@ def check_netctr_combined(nic, params, info): except: warn, crit = (0.01, 0.1) - global counter_indices + global netctr_counter_indices this_time = int(info[0][0]) # Look for line describing this nic @@ -76,7 +76,7 @@ def check_netctr_combined(nic, params, info): packets_per_sec = 0.0 counter_wrapped = None for countername in netctr_counters: - index = counter_indices[countername] + index = netctr_counter_indices[countername] value = int(nicline[index + 1]) try: timedif, items_per_sec = get_counter( "netctr." + nic + "." + countername, this_time, value) diff --git a/checks/smbios_sel b/checks/smbios_sel index e07e2ca..a356056 100644 --- a/checks/smbios_sel +++ b/checks/smbios_sel @@ -69,8 +69,6 @@ from datetime import datetime import time -statname = [ "OK", "WARN", "CRIT" ] - smbios_sel_msg_types = { #Type: (Number-of-Entries Threshold, Status-Code, Current Count, Last Entry, Alias) 0: [1, 1, 0, None, None], @@ -166,6 +164,6 @@ def check_smbios_sel(_no_item, _no_params, info): smbios_sel_msg_types[type][2], smbios_sel_msg_types[type][3]) - return (sum_status, "%s: %s" % (statname[sum_status], sum_output)) + return (sum_status, "%s: %s" % (nagios_state_names[sum_status], sum_output)) check_info['smbios_sel'] = (check_smbios_sel, "SMBIOS Event Log", 0, inventory_smbios_sel) diff --git a/checks/statgrab_net b/checks/statgrab_net index 21eda10..536e8f9 100644 --- a/checks/statgrab_net +++ b/checks/statgrab_net @@ -27,7 +27,7 @@ inventory_netctr_counters = [ 'rx_bytes', 'tx_bytes', 'rx_packets', 'tx_packets', 'rx_errors', 'tx_errors', 'tx_collisions' ] -statgrab_netif_counternames = { +statgrab_net_counternames = { "collisions" : "tx_collisions", "ierrors" : "rx_errors", "ipackets" : "rx_packets", @@ -131,7 +131,7 @@ def check_statgrab_net_ctr(nic, _no_params, info): nicname, ctr = var.split('.') if nicname != nic: continue - countername = statgrab_netif_counternames.get(ctr, None) + countername = statgrab_net_counternames.get(ctr, None) if countername == None: continue value = int(value) diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index 3f9cf18..712c650 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -tcp_conn_states = [ +tcp_conn_stats_states = [ "ESTABLISHED", # connection up and passing data "SYN_SENT", # session has been requested by us; waiting for reply from remote endpoint "SYN_RECV", # session has been requested by a remote endpoint for a socket on which we were listening @@ -50,7 +50,7 @@ def check_tcp_conn_stats(item, params, info): worst_state = 0 info = [] perfdata = [] - for state in tcp_conn_states: + for state in tcp_conn_stats_states: num = int(stats.get(state, 0)) if num > 0: infotext = "%s: %d" % (state, num) diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index 0d2ab6c..7dd074d 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -110,7 +110,12 @@ def usage(): print "No real help available... The only option is -v|--verbose." sys.exit(0) -ignored_variables = [ 'datetime', ] +ignored_variables = [ + # Python Module + 'datetime', 'timedelta', + # Misc vars + 'vars_before_check', +] # Load all checks and record global var definitions # Also read the man pages

13 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c5a62b8203b0e806c7f28a320d78390f4b371281 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5a62b8203b0e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 16 22:56:03 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk Conflicts: ChangeLog ---

13 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9ee5969d863d09e915e1de091fbef37c100e500f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ee5969d863d09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 14 22:52:15 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog checkman/if checks/if ---

13 years, 10 months

Check_MK Git: check_mk: Switch sitesvcs to boxed layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a0a44115da9f65f9af7a3d64aeef191d0e97cf9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0a44115da9f65… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 13 14:25:57 2010 +0100 Switch sitesvcs to boxed layout --- web/plugins/views/builtin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 2d3987f..a136055 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1711,7 +1711,7 @@ multisite_builtin_views = { ('service_output', '')], 'hidden': True, 'hide_filters': ['site'], - 'layout': 'table', + 'layout': 'boxed', 'linktitle': 'Services of Site', 'mustsearch': False, 'name': 'sitesvcs',

13 years, 10 months

Check_MK Git: check_mk: Multisite view "Recently changed services": sort newest first

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ad57dacc59083c99c1dbf7cc89b4b1fbaff6dbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ad57dacc59083… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 14 14:34:43 2010 +0100 Multisite view "Recently changed services": sort newest first --- ChangeLog | 1 + web/plugins/views/builtin.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c08d82..197dacc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ * Fixed resize bug on refresh in chrome * New view for all services of a site * Sidebar snapin site_status: make link target configurable + * Multisite view "Recently changed services": sort newest first 1.1.8: Core, Setup, etc.: diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index a136055..eb2b8d0 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1466,7 +1466,7 @@ multisite_builtin_views = { 'play_sounds': False, 'public': True, 'show_filters': ['svc_last_state_change', 'svcstate'], - 'sorters': [('stateage', False)], + 'sorters': [('stateage', True)], 'title': 'Recently changed services', 'topic': 'Services'}, 'uncheckedsvc': {'browser_reload': 30,

13 years, 10 months

Check_MK Git: check_mk: if/if64: allow to ignore target speed

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cb660c13fa81d3ec4056bb5d9a832b678db803c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb660c13fa81d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 14 09:36:26 2010 +0100 if/if64: allow to ignore target speed --- ChangeLog | 1 + checkman/if | 3 ++- checks/if | 7 +++---- checks/if64 | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c18255..7c08d82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now * if/if64: Added expected interface speed to warning output + * if/if64: Allow to ignore speed setting (set target speed to None) * wut_webtherm: handle more variants of WuT Webtherms (thanks to Lefty) * cisco_fan: Does not inventorize 'notPresent' sensors anymore. Improved output * cisco_power: Not using power source as threshold anymore. Improved output diff --git a/checkman/if b/checkman/if index 271b9ee..9e04cbf 100644 --- a/checkman/if +++ b/checkman/if @@ -42,7 +42,8 @@ err_warn (float): The percentage of errors + discards at which a warning should triggered. Default is {0.01} percent (one of 10.000). err_crit (float): The percentage of errors + discards at which a critical state is reached. Default is {0.1} percent (one of 1.000). -targetspeed (int): The target speed in bits per second of the interface. +targetspeed (int): The target speed in bits per second of the interface. You can set this to {None} if you + do not want to check for a certain speed setting. bw_warn (float): Optional: The in/out rate to raise a WARNING state. Defaults to {None}. bw_crit (float): Optional: The in/out rate to raise a CRITICAL state. Defaults to {None}. allowed_operstates (tuple): Optional: A list of allowed operstates. All other states diff --git a/checks/if b/checks/if index e08c247..fe903bc 100644 --- a/checks/if +++ b/checks/if @@ -108,12 +108,11 @@ def check_if(item, params, info): # Check speed speed = saveint(ifSpeed) + infotext += get_nic_speed_human_readable(speed) bandwidth = speed / 8.0 # in Bytes / sec - if speed != targetspeed: - infotext += "%s (wrong speed! expected: %s)" % (speed, get_nic_speed_human_readable(targetspeed)) + if not targetspeed is None and speed != targetspeed: + infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) state = 1 - else: - infotext += get_bytes_human_readable(speed, 1000)+'it/s' # Performance counters this_time = time.time() diff --git a/checks/if64 b/checks/if64 index 897787b..72be2eb 100644 --- a/checks/if64 +++ b/checks/if64 @@ -122,7 +122,7 @@ def check_if64(item, params, info): speed = saveint(ifSpeed) infotext += get_nic_speed_human_readable(speed) bandwidth = speed / 8.0 # in Bytes / sec - if speed != targetspeed: + if not targetspeed is None and speed != targetspeed: infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) state = 1

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits