Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65404 discussions

Check_MK Git: check_mk: Made latest changes to megaraid_pdisks a bit stronger

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b444844f1c656e276db0e6fa594c0968b7a4f909 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b444844f1c656e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 19 15:39:14 2010 +0200 Made latest changes to megaraid_pdisks a bit stronger --- checks/megaraid_pdisks | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index fed9ca1..6714f28 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -69,7 +69,10 @@ def check_megaraid_pdisks(item, target_state, info): if line[0] == "dev2enc": dev2enc[line[5]] = 'e'+line[2] elif line[0] == "Enclosure": - enclosure = item.startswith('e') and dev2enc[line[-1]] or line[-1] + if item.startswith('e') and line[-1] in dev2enc: + enclosure = dev2enc[line[-1]] + else: + enclosure = line[-1] elif line[0] == "Slot": slot = int(line[-1]) found = "%s/%d" % (enclosure, slot) == item

14 years

Check_MK Git: check_mk: Using the real enclosure number as check item now.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9d219166765abb6507e982c1317eca2742e6e35a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d219166765abb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 19 15:10:51 2010 +0200 Using the real enclosure number as check item now. The problem with the 'enclosure device id' which was used before is being generated somehow. So on identical hardware with identical raid setup the 'enclosure device ids' can be different. This is a bad behaviour when hardcoding checks for a group of hosts in check_mk. Instead of the 'enclosure device id' the 'enclosure number' is used now. Which is also better to identify the enclosure hardware without having a look at the configuration. --- ChangeLog | 2 ++ agents/check_mk_agent.linux | 5 +++++ checks/megaraid_pdisks | 29 +++++++++++++++++++++++------ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2e9ed5..dd78e6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 1.1.9i1 + Checks & Agents: + * megaraid_pdisks: Using the real enclosure number as check item now. Multisite: * The custom open/close states of custom links are now stored for each user diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 40b92cc..4c8f63c 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -213,6 +213,11 @@ fi # http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/megar… if which MegaCli >/dev/null ; then echo '<<<megaraid_pdisks>>>' + for part in $(MegaCli -EncInfo -aALL -NoLog < /dev/null | egrep 'Enclosure|Device ID'); do + [ $part == 'Enclosure' ] && echo -ne "\ndev2enc" + echo -n " ${part//:/}" + done + echo MegaCli -PDList -aALL -NoLog < /dev/null | egrep 'Enclosure|Raw Size|Slot Number|Device Id|Firmware state|Inquiry' echo '<<<megaraid_ldisks>>>' MegaCli -LDInfo -Lall -aALL -NoLog < /dev/null | egrep 'Size|State|Number|Adapter|Virtual' diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index d327fca..fed9ca1 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -36,26 +36,43 @@ # Firmware state: Unconfigured(good) # Inquiry Data: FUJITSU MBB2147RC 5204BS04P9104BSC +# The agent provides some new information since 1.1.9. +# The dev2enc infos are sent from the agent to have the +# real enclosure numbers instead of the device ids which +# seem to be generated somehow. +# +# dev2enc Enclosure 0 Device ID 6 +# dev2enc Enclosure 1 Device ID 252 +# +# On new inventory runs the enclosure number is used as +# index and item part. + def inventory_megaraid_pdisks(checkname, info): inventory = [] + dev2enc = {} for line in info: - if line[0] == "Enclosure": - enclosure = int(line[-1]) + if line[0] == "dev2enc": + dev2enc[line[5]] = 'e'+line[2] + elif line[0] == "Enclosure": + enclosure = dev2enc.get(line[-1], line[-1]) elif line[0] == "Slot": slot = int(line[-1]) elif line[0] == "Firmware" and line[1] == "state:": - inventory.append(( "%d/%d" % (enclosure, slot), "", repr(line[2]) )) + inventory.append(( "%s/%d" % (enclosure, slot), "", repr(line[2]) )) return inventory def check_megaraid_pdisks(item, target_state, info): # item is "$ENCLOSURE/$SLOT" # param is the target state + dev2enc = {} for line in info: - if line[0] == "Enclosure": - enclosure = int(line[-1]) + if line[0] == "dev2enc": + dev2enc[line[5]] = 'e'+line[2] + elif line[0] == "Enclosure": + enclosure = item.startswith('e') and dev2enc[line[-1]] or line[-1] elif line[0] == "Slot": slot = int(line[-1]) - found = "%d/%d" % (enclosure, slot) == item + found = "%s/%d" % (enclosure, slot) == item elif found and line[0] == "Firmware" and line[1] == "state:": state = line[2] elif found and line[0] == "Inquiry" and line[1] == "Data:":

14 years

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7837026995ac805ec0b52302eb5fb2ae62884ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7837026995ac8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 30 19:20:13 2010 +0200 Updated internal doku --- LIESMICH.zutun | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index fdd2c41..06e0e9c 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -117,7 +117,7 @@ werden soll. Perfdatenformat per Default auf 'pnp' -Aggregation per Default auf mehrzeilige Ausgabe +aggregation_output_format: Aggregation per Default auf mehrzeilige Ausgabe Direct rrd updates ganz entfernen. @@ -125,7 +125,7 @@ Inventurchecks: severity per Default auf 1 stellen. snmp_communities: dictionary nicht mehr verwenden, aus Doku raus, Defaultwert leere Liste, aus Code raus, Hinweis im ChangeLog. Evtl einen Test mit -Abbruch, wenn immer noch type ist dict. +Abbruch, wenn immer noch type ist dict. Gleiches für bulkwalk_hosts [""] deprecaten, aus der Doku raus und durch ALL_SERVICES ersetzen

14 years

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a661e2e24c7b10c17aa9a26e52452f50b54b574f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a661e2e24c7b10… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 29 14:17:00 2010 +0200 Updated internal doku --- LIESMICH.zutun | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 587ebf2..fdd2c41 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -525,3 +525,11 @@ nicht ähnlich wie Gruppieren? Allerdings wäre es dann gut, wenn man die Aggregationen irgendwo separat editieren kann und in der View nur noch drauf verweisen. Sonst muss man soviel Copy&Paste zwischen den Views machen... + +Idee: Checks, die eigentlich keine Perfdaten liefern, könnten +über eine Konfiguration künstlich perfdaten bekommen, ala +status=0, status=1 etc. Das könnte man über eine Regel +konfigurierbar machen: +fake_perfdata = [ ... ] + +Idee: Inventurcheck könnte gleich die Checkergebnisse berechnen

14 years

Check_MK Git: check_mk: nfsmounts: fix output of used space

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d8516abc6edfb3f16da8cb765691dc20aa797dd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8516abc6edfb3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 29 19:23:24 2010 +0200 nfsmounts: fix output of used space --- ChangeLog | 1 + checkman/nfsmounts | 40 +++++++++++++++++++--------------------- checks/nfsmounts | 6 ++++-- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64eb7ac..567f5b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * hp_proliant_psu: Fixed multiple PSU detection on one system (Thanks to Andreas Döhler) * megaraid_pdisks: Fixed coding error * cisco_fan: fixed check bug in case of critical state + * nfsmounts: fix output (free and used was swapped), make output identical to df Livestatus: * Prohibit { and } in regular expressions. This avoids a segmentation diff --git a/checkman/nfsmounts b/checkman/nfsmounts index 0f87c98..561d307 100644 --- a/checkman/nfsmounts +++ b/checkman/nfsmounts @@ -4,37 +4,35 @@ author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This check probes the availability of NFS mounts. The - Linux agent sends the status of all NFS mounts, if the - command line utility {maxwait} is available (it is - is used to avoid hanging if the NFS server is not - responding). The probe is done by trying a {stat -f} - (system call {statfs(2)}) on the mount point. If that - lasts longer then 2 seconds, then the server is considered + This check probes the availability of NFS mounts. The Linux agent sends the + status of all NFS mounts, if the command line utility {maxwait} is available + (it is is used to avoid hanging if the NFS server is not responding). The + probe is done by trying a {stat -f} (system call {statfs(2)}) on the mount + point. If that lasts longer then 2 seconds, then the server is considered to be not responding. - When you install the Linux agent manually, please - do not forget to also install {waitmax} into {/usr/bin}. - That file is shipped together with the agent. When - {waitmax} is missing, the agent will silently omit - the section {nfsmounts}. + When you install the Linux agent manually, please do not forget to also + install {waitmax} into {/usr/bin}. That file is shipped together with + the agent. When {waitmax} is missing, the agent will silently omit the + section {nfsmounts}. - If the NFS mount is "stale", then {stat -f} returns immediately - but with a size of {-1}. The check detects that and results - in a warning state. + If the NFS mount is "stale", then {stat -f} returns immediately but with + a size of {-1}. The check detects that and results in a warning state. + + Please note, that though this check outputs the current usage of the remote + filesystem, no levels can be defined for the used space and no performance + data is output. Please do a check for used space directly on the NFS server. item: The mount point. perfdata: - This check does not provide performance data. The disk - usage is assumedly measured on the file server itself. - Duplicating that data on all clients would unneccessarily - create redundant RRDs. + This check does not provide performance data. The disk usage is assumedly + measured on the file server itself. Duplicating that data on all clients + would unneccessarily create redundant RRDs. inventory: - All NFS mounts are found automatically. This is not + All NFS mounts are found automatically. This is done by scanning {/proc/mounts}. The file {/etc/fstab} is irrelevant. - diff --git a/checks/nfsmounts b/checks/nfsmounts index 97fd749..ed73e04 100644 --- a/checks/nfsmounts +++ b/checks/nfsmounts @@ -41,9 +41,11 @@ def check_nfsmounts(item, params, info): gb = 1024 * 1024 * 1024.0 size_gb = (size_blocks * blocksize) / gb - used_gb = (free_blocks * blocksize) / gb + free_gb = (free_blocks * blocksize) / gb + used_gb = size_gb - free_gb + used_perc = 100.0 * used_gb / size_gb if line[1] == 'ok': - return (0, "OK - server responding (%.2f GB / %.2f GB used)" % (used_gb, size_gb)) + return (0, "OK - %.1f%% used (%.1f of %.1f GB)" % (used_perc, used_gb, size_gb)) else: return (2, "CRITICAL - server not responding") return (3, "UNKNOWN - not mounted")

14 years

Check_MK Git: check_mk: Multisite: fix computation of buffer slots

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ba84dde72a5df15aed9ab7e6f517c41e94d5268 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ba84dde72a5df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 28 21:02:29 2010 +0200 Multisite: fix computation of buffer slots --- LIESMICH.zutun | 6 ------ web/plugins/sidebar/shipped.py | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index cf4dadb..587ebf2 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -3,12 +3,6 @@ BUGS beheben bis => 1.1.8 -------------------------------------------------------------------------------- CHECK_MK: -bei den Server Perf Werten "Com. buf. max.total" wird nicht der eigene -sonderen einer der anderen sites angezeigt, -Eigentlich: es sollte (meiner Meinung nach) addiert werden oder evtl. -auch das MAX genommen werden. Oder ganz rausfliegen. Es muss unbedingt -konsisten mit den übrigen werden sein. - -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 52393dc..586eff6 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -547,12 +547,12 @@ def render_performance(): ("Process creations", 4, "%.2f/s"), ("New log messages", 5, "%.2f/s"), ("Cached log messages", 6, "%d")]: - html.write(("<tr><td class=left>%s:</td><td class=right>" + format + "</td></tr>\n") % (what, sum([row[col] for row in data]))) - size, usage, max = html.live.query("GET status\nColumns: external_command_buffer_slots external_command_buffer_usage external_command_buffer_max\n")[0] - # html.write("<tr><td class=left>Com. buf. c/max/t</td>" - # "<td class=right>%05d/%05d/%05d</td></tr>" % (usage, max, size)) + html.write(("<tr><td class=left>%s:</td><td class=right>" + format + "</td></tr>\n") % (what, sum([row[col] for row in data]))) + data = html.live.query("GET status\nColumns: external_command_buffer_slots external_command_buffer_max\n") + size = sum([row[0] for row in data]) + maxx = sum([row[1] for row in data]) html.write("<tr><td class=left>Com. buf. max/total</td>" - "<td class=right>%d / %d</td></tr>" % (max, size)) + "<td class=right>%d / %d</td></tr>" % (maxx, size)) html.write("</table>\n") sidebar_snapins["performance"] = {

14 years

Check_MK Git: check_mk: cisco_fan: fixed check bug in critical state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 32b6fa72b0660a43d05d679f4a9adaba7dc181a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32b6fa72b0660a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 28 20:33:49 2010 +0200 cisco_fan: fixed check bug in critical state --- ChangeLog | 1 + checks/cisco_fan | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 703bab6..64eb7ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * win_dhcp_pools: better handle invalid agent output * hp_proliant_psu: Fixed multiple PSU detection on one system (Thanks to Andreas Döhler) * megaraid_pdisks: Fixed coding error + * cisco_fan: fixed check bug in case of critical state Livestatus: * Prohibit { and } in regular expressions. This avoids a segmentation diff --git a/checks/cisco_fan b/checks/cisco_fan index 48adbec..b2f522b 100644 --- a/checks/cisco_fan +++ b/checks/cisco_fan @@ -34,7 +34,7 @@ def check_cisco_fan(item, params, info): if line[1] == "1": return (0, "OK") else: - return (2, "CRITICAL (state is %ds" % line[1]) + return (2, "CRITICAL (state is %s)" % line[1]) return (3, "UNKNOWN - item not found in snmp data") check_info['cisco_fan'] = (check_cisco_fan, "FAN %s", 0, inventory_cisco_fan)

14 years

Check_MK Git: check_mk: ps inventory: make %u optional on GRAB_USER

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a992e1dd5b7fa84e35cd14e571271602043a78c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a992e1dd5b7fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 28 20:29:42 2010 +0200 ps inventory: make %u optional on GRAB_USER --- ChangeLog | 2 +- LIESMICH.zutun | 3 +++ checkman/ps | 6 ++++-- checks/ps | 2 -- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2d9a24..703bab6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,7 +12,7 @@ * logwatch: Fixed typo in 'too many unacknowledged logs' error message * ps: fix bug: inventory with fixed user name now correctly puts that user name into the resulting check - not None. - * ps: inventory with GRAB_USER: require service description to contain + * ps: inventory with GRAB_USER: service description may contain %u. That will be replaced with the user name and thus makes the service description unique. * win_dhcp_pools: better handle invalid agent output diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 3c11e35..cf4dadb 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -12,6 +12,9 @@ konsisten mit den übrigen werden sein. -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- +Wenn zwei Checks mit dem gleichen Namen existieren bei einem Host +soll mit einem Fehler abgebrochen werden. + win_dhcp_pools sendet: [['MIBCounts:'], ['Discovers', '=', '193.'], diff --git a/checkman/ps b/checkman/ps index 01fd674..8a28fee 100644 --- a/checkman/ps +++ b/checkman/ps @@ -55,8 +55,10 @@ inventory: Specifying {GRAB_USER} makes the created check expect the process to run as the same user as during inventory: the user name will be hardcoded into - the check. In that case you need to put {%u} into the service description, - which will be replace by the actual user name during inventory. + the check. In that case if you put {%u} into the service description, + that will be replaced by the actual user name during inventory. You need + that if your rule might match for more than one user - your would create + duplicate services with the same description otherwise. The {warning and critical levels} are simply copied to the created checks. diff --git a/checks/ps b/checks/ps index bb7a163..946e2bf 100644 --- a/checks/ps +++ b/checks/ps @@ -80,8 +80,6 @@ def inventory_ps(check_name, info): if userspec == GRAB_USER: i_userspec = l_user[0] - if '%u' not in servicedesc: - raise MKGeneralException("Invalid entry in inventory_processes: if you use GRAB_USER, you need to put %%u into the service description. Your description is '%s'" % servicedesc) i_servicedesc = servicedesc.replace("%u", l_user[0]) else: i_userspec = userspec

14 years

Check_MK Git: check_mk: Recompiled Windows agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c5b491a4afc275b088cb1bfcc8294cbc2234525f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5b491a4afc275… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 27 13:38:24 2010 +0200 Recompiled Windows agent --- agents/windows/check_mk_agent.exe | Bin 93184 -> 93184 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index a37e27c..e906449 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 5e8bac3..00385a7 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ

14 years

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: d0705e66435d14305d5fba540c1fcc366f32ee22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0705e66435d14… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 28 20:20:52 2010 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

14 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits