Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: f02cdc9257a8f53943d11d54def3eab09723f5e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f02cdc9257a8f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 6 17:23:57 2013 +0100 Fixed syntax --- checks/cisco_temp_perf | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index f50e876..3017fec 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -92,5 +92,6 @@ snmp_info['cisco_temp_perf'] = ( ".1.3.6.1.4.1.9.9.13.1.3.1", [ 2, 3, 4, 6, OID_ snmp_scan_functions['cisco_temp_perf'] = \ lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None and \ - oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") == None # the using cisco_sensor_temp + # the using cisco_sensor_temp + oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") == None, checkgroup_of["cisco_temp_perf"] = "temperature_auto"

11 years, 3 months

Check_MK Git: check_mk: Migrated to new check api

by Lars Michelsen

Module: check_mk Branch: master Commit: 249351e091275ac8ed3f9bc4bc09a9544417a948 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=249351e091275a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 17:25:45 2013 +0100 Migrated to new check api --- checks/lsi | 28 ++++++++++++++++++++-------- checks/smart | 23 +++++++++++++++++++---- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/checks/lsi b/checks/lsi index f5523d7..cc9c35d 100644 --- a/checks/lsi +++ b/checks/lsi @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - - def inventory_lsi(check_type, info): # convert [ 0, 1, 2, 3, 4, 5, ...] into [ (0,1), (2,3), (4,5), ... ] @@ -46,6 +44,7 @@ def inventory_lsi(check_type, info): else: return [(id, '"%s"' % state) for (id, state) in disks] + def check_lsi_array(item, _no_params, info): volumeid = -1 for line in info: @@ -59,6 +58,16 @@ def check_lsi_array(item, _no_params, info): return (2, 'CRIT - Status is %s' % (status,)) return (2, 'CRIT - RAID volume %d not existing' % item) +check_info["lsi.array"] = {'check_function': check_lsi_array, + 'default_levels_variable': None, + 'group': 'raid', + 'has_perfdata': False, + 'inventory_function': lambda info: inventory_lsi('lsi.array', info), + 'node_info': False, + 'service_description': 'RAID array %s', + 'snmp_info': None, + 'snmp_scan_function': None} + def check_lsi_disk(item, target_state, info): target_id = -1 @@ -73,9 +82,12 @@ def check_lsi_disk(item, target_state, info): return (2, 'CRIT - disk has state %s (should be %s)' % (state, target_state)) return (2, 'CRIT - disk not present') - -check_info['lsi.array'] = (check_lsi_array, "RAID array %s", 0, lambda info: inventory_lsi('lsi.array', info)) -checkgroup_of['lsi.array'] = "raid" - -check_info['lsi.disk'] = (check_lsi_disk, "RAID disk %s", 0, lambda info: inventory_lsi('lsi.disk', info)) -checkgroup_of['lsi.disk'] = "raid_disk" +check_info["lsi.disk"] = {'check_function': check_lsi_disk, + 'default_levels_variable': None, + 'group': 'raid_disk', + 'has_perfdata': False, + 'inventory_function': lambda info: inventory_lsi('lsi.disk', info), + 'node_info': False, + 'service_description': 'RAID disk %s', + 'snmp_info': None, + 'snmp_scan_function': None} diff --git a/checks/smart b/checks/smart index a605e86..f36e0d2 100644 --- a/checks/smart +++ b/checks/smart @@ -117,6 +117,16 @@ def check_smart_stats(item, params, info): return (status, '%s - %s' % (nagios_state_names[status], ', '.join(output)), perfdata) +check_info["smart.stats"] = {'check_function': check_smart_stats, + 'default_levels_variable': None, + 'group': 'smart.stats', + 'has_perfdata': True, + 'inventory_function': lambda info: inventory_smart("smart.stats", info), + 'node_info': False, + 'service_description': 'SMART %s Stats', + 'snmp_info': None, + 'snmp_scan_function': None} + # Written by Benjamin Odenthal # http://exchange.check-mk.org/index.php?option=com_remository&Itemid=53&func… @@ -135,7 +145,12 @@ def check_smart_temp(item, params, info): return (0, "OK - Temperature is %dC" % celsius, perfdata) return (3, "UNKNOWN - Temperature_Celsius not found in agent output for disk %s" % item) - -check_info['smart.stats'] = (check_smart_stats, "SMART %s Stats", 1, lambda info: inventory_smart("smart.stats", info)) -check_info['smart.temp'] = (check_smart_temp, "Temperature SMART %s", 1, lambda info: inventory_smart("smart.temp", info)) -checkgroup_of['smart.temp'] = "hw_temperature" +check_info["smart.temp"] = {'check_function': check_smart_temp, + 'default_levels_variable': None, + 'group': 'hw_temperature', + 'has_perfdata': True, + 'inventory_function': lambda info: inventory_smart("smart.temp", info), + 'node_info': False, + 'service_description': 'Temperature SMART %s', + 'snmp_info': None, + 'snmp_scan_function': None}

11 years, 3 months

Check_MK Git: check_mk: Next step in check api migration (

by Lars Michelsen

migrated snmp based checks with comments) Message-ID: <5138ca56.YEUqktzbw+n8L2wl%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: d84db15ce0c1490a25f0cf79d4fb2f579c7bec1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d84db15ce0c149… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 16:08:39 2013 +0100 Next step in check api migration (migrated snmp based checks with comments) --- checks/aironet_clients | 37 ++++++++++---------- checks/aironet_errors | 30 +++++++++------- checks/akcp_sensor_humidity | 30 ++++++++++------ checks/akcp_sensor_temp | 38 ++++++++++---------- checks/blade_bays | 21 ++++++----- checks/blade_blades | 27 ++++++++------ checks/brocade_fcport | 71 +++++++++++++++++++------------------- checks/cmctc_psm_m | 64 +++++++++++++++++------------------ checks/f5_bigip_cluster | 23 ++++++------ checks/f5_bigip_pool | 27 +++++++-------- checks/f5_bigip_vserver | 23 +++++------- checks/hp_eml_sum | 26 ++++++++------ checks/hp_proliant_cpu | 25 ++++++++----- checks/hp_proliant_da_cntlr | 36 +++++++++++--------- checks/hp_proliant_da_phydrv | 35 +++++++++++-------- checks/hp_proliant_fans | 32 ++++++++++------- checks/hp_proliant_mem | 29 +++++++++------ checks/hp_proliant_psu | 27 +++++++++------ checks/hp_proliant_temp | 29 +++++++++------ checks/hp_sts_drvbox | 39 +++++++++++---------- checks/hpux_lunstats | 4 +-- checks/hr_fs | 34 ++++++++++--------- checks/hr_mem | 31 ++++++++++------- checks/if | 62 +++++++++++++++++---------------- checks/if64 | 65 +++++++++++++++++++---------------- checks/if_lancom | 77 ++++++++++++++++++++++-------------------- checks/lgp_info | 44 +++++++++--------------- checks/lgp_pdu_info | 35 ++++++++----------- checks/lparstat_aix | 9 +++-- checks/mbg_lantime_refclock | 29 +++++++++------- checks/mbg_lantime_state | 29 ++++++++-------- checks/mcdata_fcport | 40 +++++++++++---------- checks/mem | 20 ++++++++--- checks/netapp_cluster | 37 +++++++++----------- checks/netapp_volumes | 26 ++++++++------ checks/nvidia | 17 ++++++--- checks/printer_alerts | 26 ++++++++------ checks/printer_supply | 31 ++++++++++------- checks/snmp_uptime | 16 ++++++--- checks/strem1_sensors | 52 +++++++++++++++------------- checks/vms_sys | 14 ++++++- 41 files changed, 733 insertions(+), 634 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d84db15ce0…

11 years, 3 months

Check_MK Git: check_mk: Fixed syntax

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b2dc6921deeec82f43088729bc2f71ce86861a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b2dc6921deeec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 6 17:27:39 2013 +0100 Fixed syntax --- checks/cisco_temp_perf | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index 3017fec..67e56ed 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -92,6 +92,5 @@ snmp_info['cisco_temp_perf'] = ( ".1.3.6.1.4.1.9.9.13.1.3.1", [ 2, 3, 4, 6, OID_ snmp_scan_functions['cisco_temp_perf'] = \ lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None and \ - # the using cisco_sensor_temp oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") == None, checkgroup_of["cisco_temp_perf"] = "temperature_auto"

11 years, 3 months

Check_MK Git: check_mk: Automatic check API migration, step #1

by Lars Michelsen

11 years, 3 months

Check_MK Git: check_mk: Some check code formating

by Lars Michelsen

Module: check_mk Branch: master Commit: 0f46f3d45708c47383a0a805b1a007a000149565 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f46f3d45708c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 16:15:24 2013 +0100 Some check code formating --- checks/wmic_process | 1 - checks/wut_webio_io | 12 +++++------- checks/wut_webtherm | 9 ++++----- checks/zfsget | 1 - checks/zpool_status | 1 - checks/zypper | 2 -- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/checks/wmic_process b/checks/wmic_process index 0f578f6..67f780f 100644 --- a/checks/wmic_process +++ b/checks/wmic_process @@ -94,7 +94,6 @@ def check_wmic_process(item, params, info): infotext = "".join(infos) return (state, nagios_state_names[state] + infotext, perfdata) - check_info["wmic_process"] = { 'check_function': check_wmic_process, 'service_description': 'proc_%s', diff --git a/checks/wut_webio_io b/checks/wut_webio_io index 7d91ba8..1234b10 100644 --- a/checks/wut_webio_io +++ b/checks/wut_webio_io @@ -99,15 +99,13 @@ check_info['wut_webio_io.inputs'] = { "inventory_function" : inventory_wut_webio_io_inputs, "service_description": "INPUT %s", "has_perfdata" : False, - # "group" : "", - # "default_levels_variable" : "services_default_levels", - # first check we have a vendor mib from W&T, then check for the model in their MIB. - "snmp_scan_function" : lambda oid: \ - ".1.3.6.1.4.1.5040" in oid("1.3.6.1.2.1.1.2.0") and - oid(".1.3.6.1.4.1.5040.1.2.4.3.3.5.0").lower().startswith("web-io"), "snmp_info" : (".1.3.6.1.4.1.5040.1.2.4", [ "3.1.5.2.1.1", # io port index. (bugged) "3.2.1.1.1", # user defined description. "1.3.1.4", # the low/high state. - ]), + ]), + # first check we have a vendor mib from W&T, then check for the model in their MIB. + "snmp_scan_function" : lambda oid: \ + ".1.3.6.1.4.1.5040" in oid("1.3.6.1.2.1.1.2.0") and + oid(".1.3.6.1.4.1.5040.1.2.4.3.3.5.0").lower().startswith("web-io"), } diff --git a/checks/wut_webtherm b/checks/wut_webtherm index bde37f5..06eea20 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -56,16 +56,15 @@ def detect_webtherm(oid): ".1.3.6.1.4.1.5040.1.2.8", ".1.3.6.1.4.1.5040.1.2.16" ] - - - - check_info["wut_webtherm"] = { 'check_function': check_webtherm, 'inventory_function': inventory_webtherm, 'service_description': 'Thermograph Sensor %s', 'has_perfdata': True, - 'snmp_info': ('.1.3.6.1.4.1.5040.1.2', ['1', '2', '3', '6', '8', '16'], ['1.2.1.1', '1.3.1.1']), + 'snmp_info': ('.1.3.6.1.4.1.5040.1.2', + ['1', '2', '3', '6', '8', '16'], + ['1.2.1.1', '1.3.1.1'] + ), 'snmp_scan_function': detect_webtherm, 'group': 'room_temperature', } diff --git a/checks/zfsget b/checks/zfsget index 4b5d514..aacbb12 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -178,7 +178,6 @@ def check_zfsget(item, params, info): return df_check_filesystem_list(item, params, fslist) - check_info['zfsget'] = { "check_function" : check_zfsget, "inventory_function" : inventory_zfsget, diff --git a/checks/zpool_status b/checks/zpool_status index 20d384c..93cc3fb 100644 --- a/checks/zpool_status +++ b/checks/zpool_status @@ -116,7 +116,6 @@ def check_zpool_status(_no_item, _no_params, info): if len(message) == 0: message = ['No critical errors'] return (state, nagios_state_names[state] + " - " + ", ".join(message)) -# check_info["zpool_status"] = { 'check_function': check_zpool_status, diff --git a/checks/zypper b/checks/zypper index 14d7535..7ea882f 100644 --- a/checks/zypper +++ b/checks/zypper @@ -79,10 +79,8 @@ def check_zypper(_no_item, _no_params, info): return state, nagios_state_names[state] + infotext - check_info['zypper'] = { "check_function" : check_zypper, "inventory_function" : inventory_zypper, "service_description" : "Zypper Updates", } -

11 years, 3 months

Check_MK Git: check_mk: livestatus: FIX: possible crash with VERY long downtime comments

by Andreas Boesl

Module: check_mk Branch: master Commit: cff302d3da5f9a6fcfe25f957584e6be0c41d89a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cff302d3da5f9a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 7 17:17:01 2013 +0100 livestatus: FIX: possible crash with VERY long downtime comments --- ChangeLog | 4 ++++ livestatus/src/module.c | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd4af74..ce91457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,10 @@ logwatch_ec ruleset. With this option the forwarding can now be enabled for each logfile on a host +1.2.2b5: + livestatus: + * FIX: possible crash with VERY long downtime comments + 1.2.2b4: Core: * FIX: Fix output of cmk -D: datasource programs were missing diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 74c0510..f528052 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -480,9 +480,8 @@ void livestatus_log_initial_states() while (h) { if (h->scheduled_downtime_depth > 0) { - sprintf(buffer,"HOST DOWNTIME ALERT: %s;STARTED;%s", h->name, get_downtime_comment(h->name, NULL)); + snprintf(buffer, sizeof(buffer), "HOST DOWNTIME ALERT: %s;STARTED;%s", h->name, get_downtime_comment(h->name, NULL)); write_to_all_logs(buffer, LG_INFO); - } h = h->next; } @@ -490,7 +489,7 @@ void livestatus_log_initial_states() service *s = (service *)service_list; while (s) { if (s->scheduled_downtime_depth > 0) { - sprintf(buffer,"SERVICE DOWNTIME ALERT: %s;%s;STARTED;%s", s->host_name, s->description, + snprintf(buffer, sizeof(buffer), "SERVICE DOWNTIME ALERT: %s;%s;STARTED;%s", s->host_name, s->description, get_downtime_comment(s->host_name, s->description)); write_to_all_logs(buffer, LG_INFO); } @@ -509,8 +508,8 @@ int broker_event(int event_type __attribute__ ((__unused__)), void *data) { if (g_thread_running == 1 ) livestatus_log_initial_states(); - else if (log_initial_states == 1) - write_to_all_logs("logging intitial states", LG_INFO); + else if (log_initial_states == 1) // initi + write_to_all_logs("logging intitial states", LG_INFO); // initial info during startup } update_timeperiods_cache(ts->timestamp.tv_sec); return 0;

11 years, 3 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: bab9f24444af8363afe86340c0361e5352613bb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bab9f24444af83… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 7 17:17:08 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: BI: fixed bug in aggregation count

by Andreas Boesl

Module: check_mk Branch: master Commit: e40d6749fb3d1815548d5d6f3a00ca72041906e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e40d6749fb3d18… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 7 21:16:43 2013 +0100 BI: fixed bug in aggregation count --- ChangeLog | 3 +++ web/htdocs/bi.py | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46b2f88..bd4af74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -572,6 +572,9 @@ Checks & Agents: * FIX: windows agent: fixed possible crash in eventlog section + BI: + * FIX: fixed bug in aggregation count (thanks Neil) + 1.2.0p4: WATO: * FIX: fixed detection of existing groups when creating new groups diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 2439f1b..74fc22d 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1232,7 +1232,7 @@ config.aggregation_functions["worst"] = aggr_worst config.aggregation_functions["best"] = aggr_best def aggr_countok_convert(num, count): - if num.endswith('%'): + if str(num).endswith('%'): return int(num[:-1]) / 100.0 * count else: return int(num)

11 years, 3 months

Check_MK Git: check_mk: Availability: More flexible configuration of notification period

by Mathias Kettner

Module: check_mk Branch: master Commit: a1d9a1e1203b7dad9487a8a3f544cade72595a83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1d9a1e1203b7d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 7 08:50:59 2013 +0100 Availability: More flexible configuration of notification period --- web/plugins/views/availability.py | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 68d16aa..2586bf1 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -149,9 +149,6 @@ avoption_entries = [ ( "host_down", Checkbox(label = _("Consider times where the host is down")), ), - ( "notification_period", - Checkbox(label = _("Consider notification period")), - ), ( "unmonitored", Checkbox(label = _("Include unmonitored time")), ), @@ -205,6 +202,20 @@ avoption_entries = [ optional_keys = False, ), ), + + # How to deal with times out of the notification period + ( "notification_period", + "single", + DropdownChoice( + title = _("Notification Period"), + choices = [ + ( "honor", _("Honor notification period") ), + ( "ignore", _("Ignore notification period") ), + ( "exclude", _("Exclude notification period" ) ), + ] + ) + ), + # Format of numbers ( "timeformat", "single", @@ -267,10 +278,10 @@ def render_availability_options(): "include" : "honor", "exclude_ok" : False, }, + "notification_period" : "honor", "consider" : { "flapping" : True, "host_down" : True, - "notification_period" : True, "unmonitored" : True, }, "timeformat" : "percentage_2", @@ -284,6 +295,9 @@ def render_availability_options(): "dont_merge" : False, "summary" : "sum", }) + # Make sure that parameters are set that have not been present in the + # original version. This code can be dropped in a couple of years. + avoptions.setdefault("notification_period", "honor") is_open = False html.begin_form("avoptions") @@ -498,7 +512,9 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): s = "unmonitored" if not avoptions["consider"]["unmonitored"]: continue - elif span["in_notification_period"] == 0 and avoptions["consider"]["notification_period"]: + elif span["in_notification_period"] == 0 and avoptions["notification_period"] == "exclude": + continue + elif span["in_notification_period"] == 0 and avoptions["notification_period"] == "honor": s = "outof_notification_period" elif (span["in_downtime"] or span["in_host_downtime"]) and not \ (avoptions["downtimes"]["exclude_ok"] and state == 0) and not \ @@ -697,7 +713,7 @@ def render_availability_table(availability, from_time, until_time, range_title, # Helper function, needed in row and in summary line def cell_active(sid): - if sid == "outof_notification_period" and not avoptions["consider"]["notification_period"]: + if sid == "outof_notification_period" and avoptions["notification_period"] != "honor": return False elif sid == "in_downtime" and avoptions["downtimes"]["include"] != "honor": return False

11 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013