Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: mcdata_fcport: fix computation of traffic

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f96071ee5af8fb3e09af98f7b7d1a7dd5d8ebf41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f96071ee5af8fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 10:02:36 2011 +0200 mcdata_fcport: fix computation of traffic --- checks/mcdata_fcport | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/mcdata_fcport b/checks/mcdata_fcport index ed71956..2dff73b 100644 --- a/checks/mcdata_fcport +++ b/checks/mcdata_fcport @@ -27,7 +27,7 @@ mcdata_fcport_speedbits = { "2": '1000000000', "3": '2000000000' } mcdata_fcport_opstatus = { "1" : "1", "2": "2", "3": "testing", "4": "faulty" } -def mcdata_bin_to_64(bin): +def mcdata_bin_to_64(bin, mult = 1): # McData encodes 64 bit counters as big endian HEX strings, # e.g. Hex-STRING: 00 00 00 01 AC C2 8C EE. Check_MK converts # such strings into binary Python strings @@ -36,7 +36,7 @@ def mcdata_bin_to_64(bin): for byte in bin[::-1]: value += mult * ord(byte) mult *= 256 - return str(value) + return str(value * mult) def mcdata_fcport_convert_to_if64(info): return map(mcdata_fcport_convert_line_to_if64, info) @@ -55,13 +55,13 @@ def mcdata_fcport_convert_line_to_if64(line): '6', # ifType 2 speed, # ifSpeed 3 opStatus, # ifOperStatus 4 - mcdata_bin_to_64(rxWords64), # ifHCInOctets 5 + mcdata_bin_to_64(rxWords64, 4), # ifHCInOctets 5 mcdata_bin_to_64(rxFrames64), # ifHCInUcastPkts 6 '0', # ifHCInMulticastPkts 7 '0', # ifHCInBroadcastPkts 8 '0', # ifInDiscards 9 crcs, # ifInErrors 10 - mcdata_bin_to_64(txWords64), # ifHCOutOctets 11 + mcdata_bin_to_64(txWords64, 4), # ifHCOutOctets 11 mcdata_bin_to_64(txFrames64), # ifHCOutUcastPkts 12 '0', # ifHCOutMulticastPkts 13 '0', # ifHCOutBroadcastPkts 14

13 years, 4 months

Check_MK Git: check_mk: New option --profile, for profiling check_mk itself

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1460f4343d1f0bf5afe6490403124336457fc7be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1460f4343d1f0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 09:48:13 2011 +0200 New option --profile, for profiling check_mk itself --- ChangeLog | 1 + modules/check_mk.py | 34 ++++++++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b5b2c5..b3a28e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ cases where OIDs are missing) * Allow merging of dictionary based check parameters * --debug now implies -v + * new option --debug: creates execution profile of check_mk itself Multisite: * FIX: webservice: suppress livestatus errors in multi-site setups diff --git a/modules/check_mk.py b/modules/check_mk.py index 4cb4457..da09961 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -34,9 +34,18 @@ check_mk_version = '(inofficial)' # Some things have to be done before option parsing and might # want to output some verbose messages. +g_profile = None + if __name__ == "__main__": opt_debug = '--debug' in sys.argv[1:] opt_verbose = opt_debug or '-v' in sys.argv[1:] or '--verbose' in sys.argv[1:] + if '--profile' in sys.argv[1:]: + import cProfile + g_profile = cProfile.Profile() + g_profile.enable() + if opt_verbose: + sys.stderr.write("Enabled profiling.\n") + else: opt_verbose = False opt_debug = False @@ -4010,6 +4019,18 @@ backup_paths = [ ] +def output_profile(): + if g_profile: + g_profile.dump_stats("profile.out") + file("show_profile.py", "w")\ + .write("#!/usr/bin/python\n" + "import pstats\n" + "stats = pstats.Stats('profile.out')\n" + "stats.sort_stats('time').print_stats()\n") + os.chmod("show_profile.py", 0755) + + sys.stderr.write("Profile 'profile.out' written. Please run ./show_profile.py.\n") + # +----------------------------------------------------------------------+ # | __ __ _ | # | | \/ | __ _(_)_ __ | @@ -4027,7 +4048,7 @@ if __name__ == "__main__": "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", "flush", "package", "donate", "snmpwalk", "usewalk", "scan-parents", "procs=", "automation=", - "snmpget=", + "snmpget=", "profile", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "paths", "cleanup-autochecks", "checks=" ] @@ -4081,12 +4102,12 @@ if __name__ == "__main__": for o,a in opts: if o in [ '-h', '--help' ]: usage() - sys.exit(0) + done = True elif o in [ '-V', '--version' ]: print_version() - sys.exit(0) + done = True elif o in [ '-X', '--config-check' ]: - sys.exit(0) # already done + done = True elif o in [ '-S', '-H' ]: sys.stderr.write(tty_bold + tty_red + "ERROR" + tty_normal + "\n") sys.stderr.write("The options -S and -H have been replaced with the option -N. If you \n") @@ -4205,8 +4226,7 @@ if __name__ == "__main__": (host, clust, ",".join(missing), clust)) # if the host is part of a cluster and # the other nodes of that cluster are - # also present in the list, then we also - # drop the checks of the clusters + # also present in the list, then we also # drop the checks of the clusters else: for host in all_active_hosts() + all_active_clusters(): @@ -4231,6 +4251,7 @@ if __name__ == "__main__": if done: + output_profile() sys.exit(0) elif len(args) == 0 or len(args) > 2: usage() @@ -4251,3 +4272,4 @@ if __name__ == "__main__": sys.exit(2) do_check(hostname, ipaddress) +

13 years, 4 months

Check_MK Git: check_mk: sped up use of stored snmp walks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 498b206a903b97daad7bba663f89a18ece1348c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=498b206a903b97… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 09:53:20 2011 +0200 sped up use of stored snmp walks --- ChangeLog | 1 + modules/snmp.py | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3a28e9..eafc253 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * Allow merging of dictionary based check parameters * --debug now implies -v * new option --debug: creates execution profile of check_mk itself + * sped up use of stored snmp walks Multisite: * FIX: webservice: suppress livestatus errors in multi-site setups diff --git a/modules/snmp.py b/modules/snmp.py index e9e0e60..bec9d6b 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -365,13 +365,16 @@ def get_stored_snmpwalk(hostname, oid): sys.stderr.write("Getting %s from %s\n" % (oid, path)) if not os.path.exists(path): raise MKGeneralException("No snmpwalk file %s\n" % path) + rowinfo = [] + hot = False for line in file(path): parts = line.split(None, 1) o = parts[0] if o.startswith('.'): o = o[1:] if o == oid or o.startswith(oid_prefix + "."): + hot = True if len(parts) > 1: value = parts[1] if agent_simulator: @@ -381,4 +384,6 @@ def get_stored_snmpwalk(hostname, oid): rowinfo.append((o, strip_snmp_value(value))) # return pair of OID and value if dot_star: return rowinfo # only return first (used by get_single_oid) + elif hot: # end of interesting part, no point in further search + return rowinfo return rowinfo

13 years, 4 months

Check_MK Git: check_mk: FIX: fix bug in snmp when using OID_END

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 077d2ad962ec45804ccc5e4bac1f54837aed7820 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=077d2ad962ec45… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 28 17:06:12 2011 +0200 FIX: fix bug in snmp when using OID_END --- modules/snmp.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index 6c592be..e9e0e60 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -191,6 +191,11 @@ def get_snmp_table(hostname, ip, oid_info): max_len_col = -1 for column in targetcolumns: + fetchoid = oid + if suboid: + fetchoid += "." + str(suboid) + fetchoid += "." + str(column) + # column may be integer or string like "1.5.4.2.3" colno += 1 # if column is 0, we do not fetch any data from snmp, but use @@ -201,14 +206,10 @@ def get_snmp_table(hostname, ip, oid_info): # string or as binary UTF-8 encoded number string if column in [ OID_END, OID_STRING, OID_BIN ]: index_column = colno - columns.append([]) + columns.append((fetchoid, [])) index_format = column continue - fetchoid = oid - if suboid: - fetchoid += "." + str(suboid) - fetchoid += "." + str(column) if opt_use_snmp_walk or is_usewalk_host(hostname): rowinfo = get_stored_snmpwalk(hostname, fetchoid)

13 years, 4 months

Check_MK Git: check_mk: FIX: syntax error in man page of cisco_power

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0acc566efbe0e06391d084034004f8ac999a9bc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0acc566efbe0e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 09:26:26 2011 +0200 FIX: syntax error in man page of cisco_power --- ChangeLog | 1 + checkman/cisco_power | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index da92d65..9b5b2c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * Allow moving hosts from one to another config file Checks & Agents: + * FIX: cisco_power: fix syntax error in man page (broke also Multisite) * FIX: local: fixed search for custom templates PNP template * FIX: if/if64: always generate unique items (in case ifAlias is used) * FIX: ipmi: fix ugly ouput in case of warning and error diff --git a/checkman/cisco_power b/checkman/cisco_power index 70f5390..a98cc94 100644 --- a/checkman/cisco_power +++ b/checkman/cisco_power @@ -3,6 +3,7 @@ agents: snmp author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk +description: This check monitors the health of redundant power supplies in CISCO switches. If one of the two power supplies fails, the check goes critical.

13 years, 4 months

Check_MK Git: check_mk: FIX: cmk -II also refreshes cluster checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 64cb66de650cfa6283a86eb613d803877be51400 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64cb66de650cfa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 28 08:38:02 2011 +0200 FIX: cmk -II also refreshes cluster checks But only if all nodes of the cluster are specified as hosts to -II. If you only specify some, then a warning is printed an the cluster is untouched. Otherwise service (originated at the other nodes) might get lost. --- .bugs/16 | 32 +++++++++++++++++++++++++++++--- ChangeLog | 1 + modules/check_mk.py | 20 +++++++++++++++++++- 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/.bugs/16 b/.bugs/16 index 7dd601e..80f13e2 100644 --- a/.bugs/16 +++ b/.bugs/16 @@ -1,10 +1,11 @@ Title: check_mk -II bei Clustern löscht die Checks nicht Component: core +State: done +Class: bug +Date: 2010-12-21 12:15:32 Benefit: 2 -State: open Cost: 3 -Date: 2010-12-21 12:15:32 -Class: bug +Fun: 0 Wenn man ein check_mk -II macht, dann werden clustered services nicht entfernt. Um das sauber hinzubekommen, muss man sicherstellen, @@ -20,3 +21,28 @@ zulässt und dann einfach automatisch anstelle dessen die Nodes inventarisiert und zusätzlich die Checks vom Cluster entfernt. Das könnte eine einfache Lösung sein. So sorgt der User selbst dafür, dass der Cluster richtig behandelt wird. + +Dabei stellt sich mir die Frage, ob es eigentlich einen Inventur-Check +auf den Cluster gibt, oder wie das geregelt ist. + +Noch weiter in die Zukunft gedacht, gibt es die Idee, dass clustered_services +(und auch ignored_services), garnicht mehr bei der Inventur angewandt wird, +sondern generell nach dem Einlesen der Autochecks. Die manuellen Checks +sollten ja nicht betroffen sein. Wenn man schon was in ignored services +auflistet, warum sollte es dann trotzdem gecheckt werden, blos weil man +es man früher aufgenommen hat? + +Der Vorteil - im Bezug auf die Clustered Services - könnte sein, dass man +noch weiß, woher der Service ursprünglich kam. Andererseits kann dann +folgendes passieren: + +1. Inventur findet service X auf Node A +2. service schenkt auf B +3. Man macht cmk -II auf A +4. nun ist der Service weg! + +===> Ist also auch keine wirklich gute Lösung. + +2011-04-28 08:37:57: changed state open -> done +-II entfernt jetzt auch die Cluster Checks, falls alle nodes +angegeben wurden. diff --git a/ChangeLog b/ChangeLog index 3e7aed8..da92d65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: cmk -II also refreshes cluster checks, if all nodes are specified * FIX: avoid floating points with 'e' in performance data * FIX: cmk -D: drop obsolete (and always empty) Notification: * FIX: better handling of broken checks returning empty services diff --git a/modules/check_mk.py b/modules/check_mk.py index ec53c54..4cb4457 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -723,7 +723,7 @@ def is_cluster(hostname): return False # If host is node of a cluster, return name of that cluster -# (untagged). If not, return None. If a host belongt to +# (untagged). If not, return None. If a host belongs to # more than one cluster, then a random cluster is choosen. def cluster_of(hostname): for clustername, nodes in clusters.items(): @@ -4190,6 +4190,24 @@ if __name__ == "__main__": if len(hostnames) > 0: for host in hostnames: remove_autochecks_of(host, checknames) + clust = cluster_of(host) + if clust: + missing = [] + for node in clusters[clust]: + if node not in hostnames: + missing.append(node) + if len(missing) == 0: + if opt_verbose: + sys.stdout.write("All nodes of %s specified, dropping checks of %s, too.\n" % (clust, clust)) + remove_autochecks_of(clust, checknames) + else: + sys.stdout.write("Warning: %s is part of cluster %s, but you didn't specify %s as well.\nChecks on %s will be kept.\n" % + (host, clust, ",".join(missing), clust)) + # if the host is part of a cluster and + # the other nodes of that cluster are + # also present in the list, then we also + # drop the checks of the clusters + else: for host in all_active_hosts() + all_active_clusters(): remove_autochecks_of(host, checknames)

13 years, 4 months

Check_MK Git: check_mk: Multisite: fix font size in tables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ae5fa5e3692e7f208f497b61f23abe298546a9d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae5fa5e3692e7f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 27 17:52:53 2011 +0200 Multisite: fix font size in tables --- web/htdocs/check_mk.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a04d71d..bcc2895 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -20,7 +20,7 @@ td, th { vertical-align: top; } -input, select { +input, td, select { font-size: 9pt; }

13 years, 4 months

Check_MK Git: check_mk: Fix check_mk.css after merge

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fee697b269c2c802793366e595575abf3b94ff2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fee697b269c2c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 16:59:13 2011 +0200 Fix check_mk.css after merge --- web/htdocs/check_mk.css | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 6e5d6c3..a04d71d 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -743,16 +743,6 @@ td.perfometer img.glass { height: 22px; margin-bottom: 1px; z-index: 30; -======= -td.perfometer div.title { - height: 0px; - position: relative; - top: 3px; - left: 0px; - width: 120px; - text-align: center; - white-space: nowrap; ->>>>>>> A lot of additional styling cleanups }

13 years, 4 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: c7024505aa55676bb16d5decf6ab51cde48fa686 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7024505aa5567… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 16:59:23 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 4 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 04c05a77b9bd3232c06cd705138cd57c794a79a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04c05a77b9bd32… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 26 15:49:02 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits