Checkmk git commits August 2011

checkmk-commits@lists.checkmk.com

3 participants
272 discussions

Check_MK Git: check_mk: SNMP: Allow to specify empty OID with ""

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fb7ecf0fe3298ed75167c1d18b9cf7fdf6ad4aa0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb7ecf0fe3298e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 11 16:29:38 2011 +0200 SNMP: Allow to specify empty OID with "" --- modules/snmp.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index 8c474c2..198f143 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -199,7 +199,8 @@ def get_snmp_table(hostname, ip, oid_info): fetchoid = oid if suboid: fetchoid += "." + str(suboid) - fetchoid += "." + str(column) + if column != "": + fetchoid += "." + str(column) # column may be integer or string like "1.5.4.2.3" colno += 1

13 years, 1 month

Check_MK Git: check_mk: FIX: handle usewalk, when OIDs at the end of the walks are used

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 944babe61aebfde2593e72e958ad42aa6763a4e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=944babe61aebfd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 11 12:45:08 2011 +0200 FIX: handle usewalk, when OIDs at the end of the walks are used --- modules/snmp.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index de0ce2e..a7a165a 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -420,6 +420,12 @@ def get_stored_snmpwalk(hostname, oid): def collect_until(index, direction): rows = [] + # Handle case, where we run after the end of the lines list + if index >= len(lines): + if direction > 0: + return [] + else: + index -= 1 while True: line = lines[index] parts = line.split(None, 1)

13 years, 1 month

Check_MK Git: check_mk: SNMP: switch back END_OID handling to old style

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 243dbde760e9f1533aee95d778579ff79256bfa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=243dbde760e9f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 11 16:11:17 2011 +0200 SNMP: switch back END_OID handling to old style --- modules/snmp.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index a7a165a..cd0f2b1 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -159,10 +159,7 @@ def snmpwalk_on_suboid(hostname, ip, oid): return rowinfo def extract_end_oid(prefix, complete): - if prefix == complete: - return complete.split('.')[-1] - else: - return complete[len(prefix):].lstrip('.') + return complete[len(prefix):].lstrip('.') # sort OID strings numerically def cmp_oids(o1, o2):

13 years, 1 month

Check_MK Git: check_mk: cmk -D: output if is usewalk host

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 00d4bb6283710b741cac775d6a2b007770f8d1c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00d4bb6283710b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 11 16:16:49 2011 +0200 cmk -D: output if is usewalk host --- modules/check_mk.py | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 41bd031..2ca0482 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3076,15 +3076,18 @@ def dump_host(hostname): print tty_yellow + "Contact groups: " + tty_normal + ", ".join(host_contactgroups_of([hostname])) agenttype = "TCP (port: %d)" % agent_port_of(hostname) if is_snmp_host(hostname): - credentials = snmp_credentials_of(hostname) - if is_bulkwalk_host(hostname): - bulk = "yes" + if is_usewalk_host(hostname): + agenttype = "SNMP (use stored walk)" else: - bulk = "no" - portinfo = snmp_port_of(hostname) - if portinfo == None: - portinfo = 'default' - agenttype = "SNMP (community: '%s', bulk walk: %s, port: %s)" % (credentials, bulk, portinfo) + credentials = snmp_credentials_of(hostname) + if is_bulkwalk_host(hostname): + bulk = "yes" + else: + bulk = "no" + portinfo = snmp_port_of(hostname) + if portinfo == None: + portinfo = 'default' + agenttype = "SNMP (community: '%s', bulk walk: %s, port: %s)" % (credentials, bulk, portinfo) print tty_yellow + "Type of agent: " + tty_normal + agenttype is_aggregated = host_is_aggregated(hostname) if is_aggregated:

13 years, 1 month

Check_MK Git: check_mk: SNMP: better error message for invalid OIDs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c324d5a7e8d6f28d90e8a27ffbdbd8fc427e8224 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c324d5a7e8d6f2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 11 16:17:38 2011 +0200 SNMP: better error message for invalid OIDs --- modules/snmp.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index cd0f2b1..8c474c2 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -379,7 +379,10 @@ def get_stored_snmpwalk(hostname, oid): if use_new: # New implementation: use binary search def to_bin_string(oid): - return tuple(map(int, oid.strip(".").split("."))) + try: + return tuple(map(int, oid.strip(".").split("."))) + except: + raise MKGeneralException("Invalid OID %s" % oid) def compare_oids(a, b): aa = to_bin_string(a)

13 years, 1 month

Check_MK Git: check_mk: Minor fix in check manpage of tcp_conn_stats

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 98cccd90f98510f6d6be39e27cfae97ab2fe5236 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98cccd90f98510… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 10 19:19:37 2011 +0200 Minor fix in check manpage of tcp_conn_stats --- checkman/tcp_conn_stats | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/tcp_conn_stats b/checkman/tcp_conn_stats index 46ccdf0..d75ec26 100644 --- a/checkman/tcp_conn_stats +++ b/checkman/tcp_conn_stats @@ -12,7 +12,7 @@ perfdata: inventory: If there is at least one TCP connection, then one check will be created. - On agents supporting {tcp_conn_state} this should always be the case since at + On agents supporting {tcp_conn_stats} this should always be the case since at least the connection to the agent should be shown. examples: @@ -24,4 +24,4 @@ levels(dict from string to (int, int)): A python dictionary from check state to [configuration] tcp_conn_stats_default_levels (dict from string to (int, int)): default levels used for all - inventorized checks. This might be renamed to tcp_conn_states_default_levels in the future. + inventorized checks.

13 years, 1 month

Check_MK Git: check_mk: New config option snmp_ports

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7344680e3ff9f8dd33bd35d6e433a0374bb65965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7344680e3ff9f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 9 18:50:57 2011 +0200 New config option snmp_ports --- .bugs/84 | 7 +++++++ ChangeLog | 2 ++ modules/check_mk.py | 29 +++++++++++++++++++++++++---- modules/snmp.py | 8 +++++--- 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/.bugs/84 b/.bugs/84 index 14187d8..7a794b7 100644 --- a/.bugs/84 +++ b/.bugs/84 @@ -16,3 +16,10 @@ So kann man z.B. auch eine alternative Portnummer verwenden oder evtl. Dinge für die Sicherheitseinstellung einfacher konfigurieren. Die Parameter sollen immer am Ende kommen. Dann kann man darüber sogar die Community einstellen und Parameter für V3. + +Achtung: Die Portnummer kann man nicht über Optionen angeben, +sondern hinter dem Hostnamen mit Doppelpunkt, z.B. +snmpwalk -c public -v1 localhost:555. + +Das ist daher separat über snmp_ports implementiert. + diff --git a/ChangeLog b/ChangeLog index badac5b..ee3123d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ Nagios user needs write access in precompiled directory! * new config variable agent_ports, allowing to specify the agent's TCP port (default is 6556) on a per-host basis. + * new config variable snmp_ports, allowing to specify the UDP port + to used with SNMP, on a per-host basis. Checks & Agents: * FIX: cisco_temp: skip non-present sensors at inventory diff --git a/modules/check_mk.py b/modules/check_mk.py index e8cc557..41bd031 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -211,6 +211,7 @@ NEGATE = '@negate' # negation in boolean lists # Basic Settings agent_port = 6556 agent_ports = [] +snmp_ports = [] # UDP ports used for SNMP tcp_connect_timeout = 5.0 do_rrd_update = False delay_precompile = False # delay Python compilation to Nagios execution @@ -655,8 +656,9 @@ def get_single_oid(hostname, ipaddress, oid): oid_prefix = oid commandtype = "get" + portspec = snmp_port_spec(hostname) command = snmp_base_command(commandtype, hostname) + \ - " -On -OQ -Oe -Ot %s %s 2>/dev/null" % (ipaddress, oid_prefix) + " -On -OQ -Oe -Ot %s%s %s 2>/dev/null" % (ipaddress, portspec, oid_prefix) try: if opt_debug: sys.stdout.write("Running '%s'\n" % command) @@ -946,6 +948,20 @@ def agent_port_of(hostname): else: return ports[0] +def snmp_port_of(hostname): + ports = host_extra_conf(hostname, snmp_ports) + if len(ports) == 0: + return None # do not specify a port, use default + else: + return ports[0] + +def snmp_port_spec(hostname): + port = snmp_port_of(hostname) + if port == None: + return "" + else: + return ":%d" % port + def service_description(checkname, item): if checkname not in check_info: @@ -2256,8 +2272,9 @@ no_inventory_possible = None # aggregation output.write("def host_is_aggregated(hostname):\n return %r\n\n" % host_is_aggregated(hostname)) - # TCP port of agent + # TCP and SNMP port of agent output.write("def agent_port_of(hostname):\n return %d\n\n" % agent_port_of(hostname)) + output.write("def snmp_port_spec(hostname):\n return %r\n\n" % snmp_port_spec(hostname)) # Parameters for checks: Default values are defined in checks/*. The # variables might be overridden by the user in main.mk. We need @@ -2900,7 +2917,8 @@ def do_snmpwalk_on(hostname, filename): if opt_verbose: sys.stdout.write("%s:\n" % hostname) ip = lookup_ipaddress(hostname) - cmd = snmp_walk_command(hostname) + " -On -Ob -OQ -Ot %s " % ip + portspec = snmp_port_spec(hostname) + cmd = snmp_walk_command(hostname) + " -On -Ob -OQ -Ot %s%s " % (ip, portspec) if opt_debug: print 'Executing: %s' % cmd out = file(filename, "w") @@ -3063,7 +3081,10 @@ def dump_host(hostname): bulk = "yes" else: bulk = "no" - agenttype = "SNMP (community: '%s', bulk walk: %s)" % (credentials, bulk) + portinfo = snmp_port_of(hostname) + if portinfo == None: + portinfo = 'default' + agenttype = "SNMP (community: '%s', bulk walk: %s, port: %s)" % (credentials, bulk, portinfo) print tty_yellow + "Type of agent: " + tty_normal + agenttype is_aggregated = host_is_aggregated(hostname) if is_aggregated: diff --git a/modules/snmp.py b/modules/snmp.py index 0ccff3e..de0ce2e 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -84,8 +84,9 @@ def get_snmp_explicit(hostname, ipaddress, mib, baseoid, suffixes): mibinfo = " -m %s" % mib else: mibinfo = "" - command = cmd + "%s -OQ -OU -Oe %s %s.%s 2>/dev/null" % \ - (mibinfo, ipaddress, baseoid, suffix) + portspec = snmp_port_spec(hostname) + command = cmd + "%s -OQ -OU -Oe %s%s %s.%s 2>/dev/null" % \ + (mibinfo, ipaddress, portspec, baseoid, suffix) if opt_debug: sys.stderr.write(' Running %s\n' % (command,)) num_found = 0 @@ -112,8 +113,9 @@ def get_snmp_explicit(hostname, ipaddress, mib, baseoid, suffixes): return info def snmpwalk_on_suboid(hostname, ip, oid): + portspec = snmp_port_spec(hostname) command = snmp_walk_command(hostname) + \ - " -OQ -OU -On -Ot %s %s 2>/dev/null" % (ip, oid) + " -OQ -OU -On -Ot %s%s %s 2>/dev/null" % (ip, portspec, oid) if opt_debug: sys.stderr.write(' Running %s\n' % (command,)) snmp_process = os.popen(command, "r").xreadlines()

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7d9913a960d5acfe851ad5b2c2d686232346324c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d9913a960d5ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 9 18:36:00 2011 +0200 Updated bug entries --- .bugs/322 | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/.bugs/322 b/.bugs/322 new file mode 100644 index 0000000..8207c76 --- /dev/null +++ b/.bugs/322 @@ -0,0 +1,33 @@ +Title: transid relativ zum Browserfenster machen +Component: multisite +Benefit: 1 +State: open +Cost: 2 +Date: 2011-08-09 18:12:55 +Class: nastiness + +Ein Problem bei Multisite ist, dass in jedem Formular eine transid steckt, +die vor Wiederholungen einer Aktion schützt. Diese macht Probleme, wenn +man min mehreren Tabs gleichzeitig arbeitet oder der Benutzer generell +mehrfach eingeloggt ist. + +Wir können es wie folgt umgehen: + +* Wenn irgendwo eine frische Transaktions-ID gebraucht wird, +dann würfeln wir eine ausreichend zufällige aus (mindestens +64 Bit). Davor hängen wir einen Zeitstempel. + +* Wenn eine Transaktions-ID *verbraucht* wird, dann hängen wir +diese in eine Liste, die wir transid.mk persistieren. + +* Wenn wir eine Transaktions-ID *prüfen*, dann kontrollieren +wir nur, ob sie in der Liste ist. Wenn nicht, ist sie gültig. +Wenn sie zu alt ist (> 24h), dann ist sie aber immer ungültig. + +* Immer wenn wir die Liste speichern (i.e. nur nach dem +verbrauchen), schmeißen wir alle Einträge raus, die älter +als 24 Stunden sind. Diese können ja dann eh nicht mehr gültig +sein. + +* Wenn die transid leer oder -1 ist, akzeptieren wir das immer +(für die automatisierten Zugriffe).

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7f372991dca4c5543d96de7cd8c588005fd73bf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f372991dca4c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 9 18:03:41 2011 +0200 Updated bug entries --- .bugs/114 | 10 +++++++--- .bugs/176 | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.bugs/114 b/.bugs/114 index d403d1c..71b581a 100644 --- a/.bugs/114 +++ b/.bugs/114 @@ -1,10 +1,14 @@ Title: Inventory of Windows services should support regex and host tags Component: core +State: wontfix +Class: feature +Date: 2011-01-30 13:03:57 Benefit: 1 -State: open Cost: 2 -Date: 2011-01-30 13:03:57 -Class: feature +Fun: 0 We could do this similar to ps. There should be a rule based variant that supports host specific configuration as well as regular expressions. + +2011-08-09 18:03:24: changed state open -> wontfix +We'll do it as described in bug #152. diff --git a/.bugs/176 b/.bugs/176 index 8b166a4..629449e 100644 --- a/.bugs/176 +++ b/.bugs/176 @@ -1,9 +1,13 @@ Title: services check should support pattern for service names Component: checks +State: wontfix +Class: feature +Date: 2011-03-03 13:39:02 Benefit: 6 -State: open Cost: 6 -Date: 2011-03-03 13:39:02 -Class: feature +Fun: 0 The services check only supports exact match of service names in inventory_services. This should allow pattern match like in other check_mk config parts to make the service selection more flexible. + +2011-08-09 18:01:22: changed state open -> wontfix +This is the same as bug #0114

13 years, 1 month

Check_MK Git: check_mk: gb: grep now *ands* all of the keywords

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1da77d2106b135c2c4b0d95794e2489bf585ed10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1da77d2106b135… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 9 17:58:58 2011 +0200 gb: grep now *ands* all of the keywords --- gb | 55 ++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 15 deletions(-) diff --git a/gb b/gb index 4c81202..97a30b1 100755 --- a/gb +++ b/gb @@ -40,7 +40,11 @@ else: def tty_colors(c): return "" -grep_color = tty_bold + tty_green +grep_colors = [ + tty_bold + tty_magenta, + tty_bold + tty_cyan, + tty_bold + tty_green, +] def bail_out(text): sys.stderr.write(text + "\n") @@ -156,7 +160,7 @@ where COMMAND is one of: show [# #..] - show several bugs (or all open) resolve ID - change a bugs state delete #.. - delete bug(s) - grep [-v] WHAT... - grep in titles and descriptions (-v: verbose) + grep [-v] KW1 KW2... - show bugs containing all of the given keywords (-v: verbose) edit [#] - open bug # in editor (or newest bug) commit - commit all changed and new bugs @@ -371,13 +375,14 @@ def main_delete(args): if 0 == os.system("git rm %s" % ids): sys.stdout.write("Delete bug %s (%s)\n" % (ids, g_bugs[int(ids)]["descriptions"])) -def grep(line, kw): +def grep(line, kw, n): lc = kw.lower() i = line.lower().find(lc) if i == -1: return None else: - return line[0:i] + grep_color + line[i:i+len(kw)] + tty_normal + line[i+len(kw):] + col = grep_colors[n % len(grep_colors)] + return line[0:i] + col + line[i:i+len(kw)] + tty_normal + line[i+len(kw):] def main_grep(args): @@ -391,23 +396,43 @@ def main_grep(args): usage() for bug in g_bugs.values(): - didmatch = False + one_kw_didnt_match = False + title = bug["title"] + lines = bug["description"].split("\n") + bodylines = set([]) + + # *all* of the keywords must match in order for the + # bug to be displayed + i = 0 for kw in args: - match = grep(bug["title"], kw) + i += 1 + this_kw_matched = False + + # look for keyword in title + match = grep(title, kw, i) if match: bug["title"] = match - didmatch = True - lines = bug["description"].split("\n") - bodylines = "" - for line in lines: - match = grep(line, kw) + title = match + this_kw_matched = True + + # look for keyword in description + for j, line in enumerate(lines): + match = grep(line, kw, i) if match: - bodylines += " " + match + "\n" - didmatch = True - if didmatch: + bodylines.add(j) + lines[j] = match + this_kw_matched = True + + if not this_kw_matched: + one_kw_didnt_match = True + + + if not one_kw_didnt_match: list_bug(bug) if verbose: - sys.stdout.write(bodylines) + for x in sorted(list(bodylines)): + sys.stdout.write(" %s\n" % lines[x]) + def main_edit(args): if len(args) == 0:

13 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2011