Checkmk git commits September 2013

checkmk-commits@lists.checkmk.com

6 participants
227 discussions

Check_MK Git: check_mk: restructured / cleaned up inline_snmp code

by Lars Michelsen

Module: check_mk Branch: master Commit: d9e88270d73819984b134f37ae517246e838443f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9e88270d73819… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 13 14:43:19 2013 +0200 restructured / cleaned up inline_snmp code --- modules/check_mk.py | 21 ++-- modules/snmp.py | 157 +--------------------------- web/plugins/wato/check_mk_configuration.py | 31 +++--- 3 files changed, 32 insertions(+), 177 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d9e88270d7…

11 years, 1 month

Check_MK Git: check_mk: Implemented bulk walk mode for inline snmp

by Lars Michelsen

Module: check_mk Branch: master Commit: 3714d6bf14ab8dc8af45b29672d4e28936bcbe12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3714d6bf14ab8d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 13 11:40:09 2013 +0200 Implemented bulk walk mode for inline snmp --- modules/snmp.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index 064d6a8..e42871a 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -135,11 +135,57 @@ def init_snmp_host(hostname): g_snmp_sessions[hostname] = s return s +# The net-snmp python bindings used by the new inline snmp method +# does not provide a bulkwalk functionality. Though we need to +# implement this on our own. +def inline_bulkwalk(s, oid): + # Start from index 0, and use getbulk operations + startindex = 0 + thistree = oid + results = [] + while thistree == oid: + if startindex == 0: + var_list = netsnmp.VarList(netsnmp.Varbind(oid)) + else: + var_list = netsnmp.VarList(netsnmp.Varbind(oid, startindex)) + result = s.getbulk(0, 10, var_list) + for i in var_list: + if i.tag == thistree: + results.append(i) + + # Proceed with another bulkget request or finished? + + # If startindex is null + if not var_list[-1].iid: + break + else: + # Refresh thistree name and increment startindex + thistree = var_list[-1].tag + startindex = int(var_list[-1].iid) + + # If startindex still 0 + if startindex == 0: + break + + return results + +def inline_walk(s, oid): + var_list = netsnmp.VarList(netsnmp.Varbind(oid)) + res = s.walk(var_list) + results = [] + for var in var_list: + if var.iid is not None: + results.append(var) + return results + def inline_snmpwalk_on_suboid(hostname, oid, strip_values = True): s = init_snmp_host(hostname) - # FIXME: handle bulkwalk/getnext walk. At the moment it seems only - # a getnext walk is done in all cases. + bulkwalk = is_bulkwalk_host(hostname) + if bulkwalk: + what = 'BULKWALK' + else: + what = 'WALK' # Remove trailing .0 for walks # .1.3.6.1.2.1.1.5.0 but receive the value for 1.3.6.1.2.1.1.6.0. @@ -147,10 +193,12 @@ def inline_snmpwalk_on_suboid(hostname, oid, strip_values = True): oid = oid[:-2] if opt_debug: - sys.stdout.write("Executing SNMPWALK of \"%s\" on %s\n" % (oid, hostname)) + sys.stdout.write("Executing %s of \"%s\" on %s\n" % (what, oid, hostname)) - var_list = netsnmp.VarList(netsnmp.Varbind(oid)) - res = s.walk(var_list) + if bulkwalk: + res = inline_bulkwalk(s, oid) + else: + res = inline_walk(s, oid) if s.ErrorNum != 0: if opt_verbose: # s.ErrorStr, s.ErrorNum, s.ErrorInd @@ -158,7 +206,7 @@ def inline_snmpwalk_on_suboid(hostname, oid, strip_values = True): raise MKSNMPError('SNMP Error on %s while walking %s.' % (hostname, oid)) results = [] - for var in var_list: + for var in res: if var.iid is None: continue

11 years, 1 month

Check_MK Git: check_mk: Updated changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: da98a7ddaeb63fec850a9c5fe65da258ef6d83a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da98a7ddaeb63f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 13 14:53:39 2013 +0200 Updated changelog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index daa3f94..fb90209 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ to Karl Golland) * New man page browser for console (cmk -m) * New option explicit_snmp_communities to override rule based SNMP settings + * Preparations for significant SNMP monitoring performance improvement + (It's named Inline SNMP, which is available as special feature via subscriptions) * livestatus: new service column staleness: indicator for outdated service checks * livestatus: new host column staleness: indicator for outdated host checks

11 years, 1 month

Check_MK Git: check_mk: re-added old snmp implementation to make it switchable by configuration

by Lars Michelsen

Module: check_mk Branch: master Commit: 29832f21947f1c35801cde65d81abe6de4e36752 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29832f21947f1c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 10 15:35:49 2013 +0200 re-added old snmp implementation to make it switchable by configuration --- modules/check_mk.py | 223 ++++++++++++++++++++++------ modules/snmp.py | 85 ++++++++--- web/plugins/wato/check_mk_configuration.py | 13 ++ 3 files changed, 256 insertions(+), 65 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=29832f2194…

11 years, 1 month

Check_MK Git: check_mk: snmp: Added timestamp parsing

by Lars Michelsen

Module: check_mk Branch: master Commit: 27552f55f25eafe2daab7bea214ef58fb5087f0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27552f55f25eaf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 2 13:00:10 2013 +0200 snmp: Added timestamp parsing --- modules/check_mk.py | 11 +---------- modules/snmp.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index f022468..96723a3 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3901,16 +3901,7 @@ def do_snmpwalk_on(hostname, filename): sys.stdout.flush() results = snmpwalk_on_suboid(hostname, oid, strip_values = False) for oid, value in results: - # FIXME: Need to parse some datatypes to have a compatible data format - # with older versions: - # .1.3.6.1.2.1.1.3.0 0:1:43:32.82 - # -> - # .1.3.6.1.2.1.1.3.0 620972 - # - # .1.3.6.1.2.1.1.8.0 0:0:00:00.00 - # -> - # .1.3.6.1.2.1.1.8.0 0 - out.write("%s %s\n" % (oid, value.strip())) + out.write("%s %s\n" % (oid, value)) if opt_verbose: sys.stdout.write("%d variables.\n" % len(results)) diff --git a/modules/snmp.py b/modules/snmp.py index 638b4f5..7f982c5 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -30,6 +30,14 @@ OID_END = 0 OID_STRING = -1 OID_BIN = -2 +# 0:2:01:20.13 -> seconds +def parse_snmp_ticks(value): + days, hours, minutes, seconds = map(float, value.split(':')) + seconds += days * 8640000 + seconds += hours * 360000 + seconds += minutes * 6000 + return seconds + def strip_snmp_value(value): v = value.strip() if v.startswith('"'): @@ -148,8 +156,13 @@ def snmpwalk_on_suboid(hostname, oid, strip_values = True): continue this_oid = var.tag + '.' + var.iid - if strip_values: + + if var.type == 'TICKS': + value = parse_snmp_ticks(var.val) + + elif strip_values: value = strip_snmp_value(var.val) + else: value = var.val

11 years, 1 month

Check_MK Git: check_mk: agent_vsphere.fast: fixed incorred hostsystem name

by Andreas Boesl

Module: check_mk Branch: master Commit: 5bb6b35aa5621aae66a1ce4c33a744207e0c80ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bb6b35aa5621a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 13 13:31:49 2013 +0200 agent_vsphere.fast: fixed incorred hostsystem name --- agents/special/agent_vsphere.fast | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/special/agent_vsphere.fast b/agents/special/agent_vsphere.fast index b1da2dc..35cfe6e 100755 --- a/agents/special/agent_vsphere.fast +++ b/agents/special/agent_vsphere.fast @@ -517,7 +517,8 @@ if not error: print "<<<<>>>>" print "<<<esx_vsphere_objects:sep(9)>>>" if "hostsystem" in query_objects: - print "hostsystem\t%s\t\t%s" % ( opt_hostname or host_address, "".join(hostsystem_propsets["runtime.powerState"]) ) + print "hostsystem\t%s\t\t%s" % ( hostsystem_propsets["name"][0], "".join(hostsystem_propsets["runtime.powerState"]) ) + if "virtualmachine" in query_objects: for key in sorted(vms.keys()):

11 years, 1 month

Check_MK Git: check_mk: livestatus: fixed error in staleness when nagios interval_length differed from 60

by Andreas Boesl

Module: check_mk Branch: master Commit: 8e9a09aa8f9d7cd1fecc8c7aee2bf7e6080a7d7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e9a09aa8f9d7c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 13 11:41:24 2013 +0200 livestatus: fixed error in staleness when nagios interval_length differed from 60 --- livestatus/src/HostSpecialDoubleColumn.cc | 4 +++- livestatus/src/ServiceSpecialDoubleColumn.cc | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/livestatus/src/HostSpecialDoubleColumn.cc b/livestatus/src/HostSpecialDoubleColumn.cc index 07467a6..2426821 100644 --- a/livestatus/src/HostSpecialDoubleColumn.cc +++ b/livestatus/src/HostSpecialDoubleColumn.cc @@ -27,6 +27,8 @@ #include "logger.h" #include "time.h" +extern int interval_length; + double HostSpecialDoubleColumn::getValue(void *data) { data = shiftPointer(data); @@ -37,7 +39,7 @@ double HostSpecialDoubleColumn::getValue(void *data) switch (_type) { case HSDC_STALENESS: { - return (time(0) - hst->last_check) / ((hst->check_interval == 0 ? 1 : hst->check_interval) * 60); + return (time(0) - hst->last_check) / ((hst->check_interval == 0 ? 1 : hst->check_interval) * interval_length); } } return -1; // Never reached diff --git a/livestatus/src/ServiceSpecialDoubleColumn.cc b/livestatus/src/ServiceSpecialDoubleColumn.cc index 205f7ff..952a152 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.cc +++ b/livestatus/src/ServiceSpecialDoubleColumn.cc @@ -27,6 +27,8 @@ #include "logger.h" #include "time.h" +extern int interval_length; + double ServiceSpecialDoubleColumn::getValue(void *data) { data = shiftPointer(data); @@ -49,7 +51,7 @@ double ServiceSpecialDoubleColumn::getValue(void *data) while (svc_member != 0) { tmp_svc = svc_member->service_ptr; if (!strncmp(tmp_svc->check_command_ptr->name, "check-mk", 9)) { - return check_result_age / ((tmp_svc->check_interval == 0 ? 1 : tmp_svc->check_interval) * 60); + return check_result_age / ((tmp_svc->check_interval == 0 ? 1 : tmp_svc->check_interval) * interval_length); } svc_member = svc_member->next; } @@ -57,7 +59,7 @@ double ServiceSpecialDoubleColumn::getValue(void *data) } else // Other non-cmk passive and active checks { - return check_result_age / ((svc->check_interval == 0 ? 1 : svc->check_interval) * 60); + return check_result_age / ((svc->check_interval == 0 ? 1 : svc->check_interval) * interval_length); } } }

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1051

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 7ec08ada1a3ef44a4ea6e7c8565968a719e4fb34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ec08ada1a3ef4… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Sep 13 11:49:51 2013 +0200 Updated bug entries #1051 --- .bugs/1051 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/1051 b/.bugs/1051 new file mode 100644 index 0000000..810b01a --- /dev/null +++ b/.bugs/1051 @@ -0,0 +1,12 @@ +Title: cache problem after adding service levels +Component: multisite +State: open +Date: 2013-09-13 11:45:17 +Targetversion: 1.2.3i2 +Class: nastiness + +after adding service levels, they are not displayed in configuration dialog of +custom notification for a user +restart of apache is required before using the service levels +should work without restart +cache invalidation required

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1050

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: a83fc1369d645c5474780d77996d08d72a2d786c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a83fc1369d645c… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Sep 13 11:16:42 2013 +0200 Updated bug entries #1050 --- .bugs/1050 | 1 + 1 file changed, 1 insertion(+) diff --git a/.bugs/1050 b/.bugs/1050 index 47f0cfe..8967bb2 100644 --- a/.bugs/1050 +++ b/.bugs/1050 @@ -6,5 +6,6 @@ Targetversion: 1.2.3i2 Class: bug version is 2013.09.09 +Event Console check does not find events anymore when matching is done by hostname if matching via IP is configured, everything works root problem seems to be: eventconsole displays hostname in all lower case, uses internally mixed Upper/lower case instead

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1050

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 62a6138b6dea14523ac6ddd7401c806163cdf50c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62a6138b6dea14… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Sep 13 11:15:56 2013 +0200 Updated bug entries #1050 --- .bugs/1050 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/1050 b/.bugs/1050 new file mode 100644 index 0000000..47f0cfe --- /dev/null +++ b/.bugs/1050 @@ -0,0 +1,10 @@ +Title: Event Console check does not find events anymore when matching is done by hostname +Component: checks +State: open +Date: 2013-09-13 11:09:44 +Targetversion: 1.2.3i2 +Class: bug + +version is 2013.09.09 +if matching via IP is configured, everything works +root problem seems to be: eventconsole displays hostname in all lower case, uses internally mixed Upper/lower case instead

11 years, 1 month

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2013