Checkmk git commits December 2010

checkmk-commits@lists.checkmk.com

3 participants
155 discussions

Check_MK Git: check_mk: statgrab_disk: Fixed byte calculation in plugin output, Added inventory function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c10a0410392a69aa7b609c6e49c8989e4bf27cd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c10a0410392a69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 9 09:15:02 2010 +0100 statgrab_disk: Fixed byte calculation in plugin output, Added inventory function --- ChangeLog | 2 ++ checks/statgrab_disk | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0a6421..d029396 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,8 @@ * Windows agent: .vbs scripts in agents plugins/ directory are executed automatically with "cscript.exe /Nologo" to prevent wrong file handlers * aironet_clients: Only counting clients which don't have empty values for strength + * statgrab_disk: Fixed byte calculation in plugin output + * statgrab_disk: Added inventory function Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checks/statgrab_disk b/checks/statgrab_disk index d7e9355..0679f19 100644 --- a/checks/statgrab_disk +++ b/checks/statgrab_disk @@ -24,6 +24,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +def inventory_statgrab_disk(checkname, info): + for line in info: + if line[0].endswith('read_bytes') or line[0].endswith('write_bytes'): + return [ ('read', None, None), ('write', None, None) ] + return [] def check_statgrab_disk(item, params, info): # item is 'read' or 'write' @@ -37,9 +42,8 @@ def check_statgrab_disk(item, params, info): this_time = int(time.time()) timedif, per_sec = get_counter("diskstat." + item, this_time, this_val) - mb_per_s = per_sec / 1024.0 # Diskstat output is in KB perfdata = [ (item, "%dc" % this_val ) ] - return (0, "OK - %.1fMB/s (in last %d secs)" % (mb_per_s, timedif), perfdata) + return (0, "OK - %s/s (in last %d secs)" % (get_bytes_human_readable(per_sec), timedif), perfdata) -check_info['statgrab_disk'] = (check_statgrab_disk, "Disk IO %s", 1, no_inventory_possible) +check_info['statgrab_disk'] = (check_statgrab_disk, "Disk IO %s", 1, inventory_statgrab_disk)

13 years, 9 months

Check_MK Git: check_mk: aironet_clients: Only counting clients which don' t have empty values for strength

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 48d54a18bf719a5661573ca670277ef411b2fba2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48d54a18bf719a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 9 08:34:29 2010 +0100 aironet_clients: Only counting clients which don't have empty values for strength Thanks to Jasmin Beharic --- ChangeLog | 1 + checks/aironet_clients | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f591d5..f0a6421 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,7 @@ configure the reported state on small remaining capacity. * Windows agent: .vbs scripts in agents plugins/ directory are executed automatically with "cscript.exe /Nologo" to prevent wrong file handlers + * aironet_clients: Only counting clients which don't have empty values for strength Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checks/aironet_clients b/checks/aironet_clients index 662ce5f..2929fa2 100644 --- a/checks/aironet_clients +++ b/checks/aironet_clients @@ -34,6 +34,8 @@ def inventory_aironet_clients(checkname, info): ("clients", "", None)] def check_aironet_clients(item, params, info): + info = [ line for line in info if line[0] != '' ] + if len(info) == 0: return (0, "OK - No clients currently logged in")

13 years, 9 months

Check_MK Git: check_mk: Applied patches from Josef Hack to make the uptime check show up days:

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8a96ba625f27c3b925622b3c6a8c5ae70d75a505 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a96ba625f27c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 9 08:38:22 2010 +0100 Applied patches from Josef Hack to make the uptime check show up days: 0002-Uptime-modify-pluginoutput-to-see-days.patch 0003-Uptime-pnp4nagios-template-Convert-Graph-to-days-and.patch Thanks Josef Hack! --- checks/uptime | 5 +++-- pnp-templates/check_mk-uptime.php | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/checks/uptime b/checks/uptime index 0a43080..051a40b 100644 --- a/checks/uptime +++ b/checks/uptime @@ -33,10 +33,11 @@ def check_uptime(_no_item, _no_params, info): seconds = uptime % 60 rem = uptime / 60 minutes = rem % 60 - hours = rem / 60 + hours = (rem % 1440) / 60 + days = rem / 1440 now = int(time.time()) since = time.strftime("%c", time.localtime(now - uptime)) - return (0, "OK - up since %s (%d:%02d:%02d)" % (since, hours, minutes, seconds), [ ("uptime", uptime) ]) + return (0, "OK - up since %s (%dd %02d:%02d:%02d)" % (since, days, hours, minutes, seconds), [ ("uptime", uptime) ]) check_info["uptime"] = (check_uptime, "Uptime", 1, inventory_uptime) diff --git a/pnp-templates/check_mk-uptime.php b/pnp-templates/check_mk-uptime.php index 7eaa652..52de72e 100644 --- a/pnp-templates/check_mk-uptime.php +++ b/pnp-templates/check_mk-uptime.php @@ -23,10 +23,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -$opt[1] = "--vertical-label 'Uptime (s)' -l0 --title \"Uptime (time since last reboot)\" "; +$opt[1] = "--vertical-label 'Uptime (d)' -l0 --title \"Uptime (time since last reboot)\" "; -$def[1] = "DEF:uptime=$RRDFILE[1]:$DS[1]:MAX "; -$def[1] .= "AREA:uptime#80f000:\"Uptime (sec)\" "; +$def[1] = "DEF:sec=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "CDEF:uptime=sec,86400,/ "; +$def[1] .= "AREA:uptime#80f000:\"Uptime (days)\" "; $def[1] .= "LINE:uptime#408000 "; - +$def[1] .= "GPRINT:uptime:LAST:\"%7.2lf %s LAST\" "; +$def[1] .= "GPRINT:uptime:MAX:\"%7.2lf %s MAX\" "; ?>

13 years, 9 months

Check_MK Git: check_mk: Windows Agent provides uptime of the system now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f61a59a68e8e436b8bf1df4d69798b5c7074ef4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f61a59a68e8e43… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 9 08:50:10 2010 +0100 Windows Agent provides uptime of the system now Applied patch 0001-Windows-Agent-add-uptime-funktion.patch from Josef Hack. Thanks! --- agents/windows/check_mk_agent.cc | 13 +++++++++++++ agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index f7c8f43..4e26b73 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -220,6 +220,18 @@ void output(SOCKET &out, const char *format, ...) } +void section_uptime(SOCKET &out) +{ + output(out, "<<<uptime>>>\n"); + static LARGE_INTEGER Frequency,Ticks; + QueryPerformanceFrequency (&Frequency); + QueryPerformanceCounter (&Ticks); + Ticks.QuadPart = Ticks.QuadPart - Frequency.QuadPart; + unsigned int uptime = (double)Ticks.QuadPart / Frequency.QuadPart; + output(out, "%s\n", llu_to_string(uptime)); +} + + void section_df(SOCKET &out) { output(out, "<<<df>>>\n"); @@ -1094,6 +1106,7 @@ void output_data(SOCKET &out) setlocale(LC_ALL, "C"); section_check_mk(out); + section_uptime(out); section_df(out); section_ps(out); section_mem(out); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 263adc5..42b81e5 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

13 years, 9 months

Check_MK Git: check_mk: The windows Agent uses cscript for .vbs plugins now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ec67661d6dfb8fbe56103b2167ba3a1ccdcaefce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec67661d6dfb8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 9 08:19:29 2010 +0100 The windows Agent uses cscript for .vbs plugins now It is not safe to rely on the default system handler for this file type since it might be an editor on some systems. --- ChangeLog | 2 ++ agents/windows/check_mk_agent.cc | 20 ++++++++++++++++++++ agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20494 bytes 4 files changed, 22 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e46e75d..4f591d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,8 @@ The check also handles unknown states better now * printer_supply: Added new parameter "printer_supply_some_remaining_status" to configure the reported state on small remaining capacity. + * Windows agent: .vbs scripts in agents plugins/ directory are executed + automatically with "cscript.exe /Nologo" to prevent wrong file handlers Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 143f962..f7c8f43 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -44,6 +44,7 @@ #define WINVER 0x0500 #include <stdio.h> +#include <stdint.h> #include <windows.h> #include <winbase.h> #include <winreg.h> // performance counters from registry @@ -970,8 +971,27 @@ void section_eventlog(SOCKET &out) first_run = false; } +void add_interpreter(char *path) +{ + if((strcmp(&path[strlen(path) - 5], ".vbs\"")) == 0) { + // If this is a vbscript don't rely on the default handler for this + // file extensions. This might be notepad or some other editor by + // default on a lot of systems. So better add cscript as interpreter. + // + snprintf(path, 256, "cscript.exe //Nologo %s", path); + // + //char path_tmp[256]; + //strcpy(path_tmp, path); + //strcpy(path, "cscript.exe //Nologo "); + //strcat(path, path_tmp); + //free(path_tmp); + } +} + void run_plugin(SOCKET &out, char *path) { + add_interpreter(path); + FILE *f = popen(path, "r"); if (f) { char line[4096]; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index be9b18a..263adc5 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 00385a7..40aaa68 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ

13 years, 9 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: 8f1f1da6c5e3bdb06645c93f6d6cd99bdb4c40ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f1f1da6c5e3bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 8 17:55:34 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 9 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0b9cb623fa8b4ce426b7906fd22fd9568b29f55b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b9cb623fa8b4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 8 17:55:33 2010 +0100 Updated internal doku --- LIESMICH.zutun | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index c409ef6..334e1cc 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -1,3 +1,5 @@ +if/if64: Dokumentation muss aktualisiert werden. + Man-Pages zu df_netapp und df_netapp32 fehlen (df_netapp geht nur mit bulkwalk_hosts!!) Livestatus: is_contact_member_of_contactgroup selbst programmieren,

13 years, 9 months

Check_MK Git: check_mk: Better handling for removed checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c1d9ff1e22096e1c52d90beeb7f8275f78d1acde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1d9ff1e22096e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 8 17:14:07 2010 +0100 Better handling for removed checks Removed exceptions in check_mk calls when some configured checks have been removed/renamed --- ChangeLog | 2 ++ modules/check_mk.py | 20 +++++++++++++++++--- modules/check_mk_base.py | 4 +++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 448a345..cc26f37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,8 @@ per-host configuration * allow check implementations to use common include files. See if/if64 for an example + * Better handling for removed checks: Removed exceptions in check_mk calls + when some configured checks have been removed/renamed Checks & Agents: * fc_brocade_port_detailed: allow to specify port state combinations not diff --git a/modules/check_mk.py b/modules/check_mk.py index b5eec95..294e5ed 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -396,7 +396,10 @@ if __name__ == "__main__": # +----------------------------------------------------------------------+ def have_perfdata(checkname): - return check_info[checkname][2] + try: + return check_info[checkname][2] + except: + return False def output_check_info(): print "Available check types:" @@ -866,8 +869,13 @@ def get_datasource_program(hostname, ipaddress): def service_description(checkname, item): if checkname not in check_info: - raise MKGeneralException("Unknown check type '%s'.\n" - "Please use check_mk -L for a list of all check types.\n" % checkname) + if item: + return "Unimplmented check %s / %s" % (checkname, item) + else: + return "Unimplemented check %s" % checkname + + # raise MKGeneralException("Unknown check type '%s'.\n" + # "Please use check_mk -L for a list of all check types.\n" % checkname) # use user-supplied service description, of available descr_format = service_descriptions.get(checkname) @@ -1880,6 +1888,9 @@ def remove_autochecks_of(hostname, checktypes): count += 1 splitted = line.split('"') if splitted[1] != hostname or splitted[3] not in checktypes: + if splitted[3] not in check_info: + sys.stderr.write('Removing unimplemented check %s\n' % splitted[3]) + continue lines.append(line) if len(lines) == 0: if opt_verbose: @@ -2006,6 +2017,9 @@ filesystem_default_levels = None need_snmp_module = False needed_types = set([]) for checktype, item, param, descr, aggr in check_table: + if checktype not in check_info: + sys.stderr.write('Warning: Ignoring missing check %s.\n' % checktype) + continue needed_types.add(checktype.split(".")[0]) if check_uses_snmp(checktype): need_snmp_module = True diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index d0f16bc..7b7c5ed 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -725,6 +725,8 @@ def do_check(hostname, ipaddress): sys.stdout.write(output) sys.exit(status) +def check_unimplemented(checkname, params, info): + return (3, 'UNKNOWN - Check not implemented') # Loops over all checks for a host, gets the data, calls the check # function that examines that data and sends the result to Nagios @@ -767,7 +769,7 @@ def do_all_checks_on_host(hostname, ipaddress): try: check_funktion = check_info[checkname][0] except: - raise MKGeneralException("Unknown check type %s" % checkname) + check_funktion = check_unimplemented try: dont_submit = False

13 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 658367cff9194980064171f5b406b2d0d3c68386 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=658367cff91949… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 8 17:54:27 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 9 months

Check_MK Git: check_mk: Updated ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b380089db6748b1274ef33b431eabb68605dc71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b380089db6748… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 8 17:54:13 2010 +0100 Updated ChangeLog --- ChangeLog | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ebc985..f576ffa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,9 +14,6 @@ * Configuration check (-X) is now always done. It is now impossible to call any Check_MK action with an invalid configuration. This saves you agains mistyped variables. - * Renamed check functions of imm_health check from test_imm to imm_health - to have valid function and check names. Please remove remove from - inventory and re-inventory those checks. * Check kernel: converted performance data from counters to rates. This fixes RRD problems (spikes) on reboots and also allows better access to the peformance data for the Perf-O-Meters. Also changed service @@ -55,6 +52,9 @@ for an example Checks & Agents: + * Renamed check functions of imm_health check from test_imm to imm_health + to have valid function and check names. Please remove remove from + inventory and re-inventory those checks. * fc_brocade_port_detailed: allow to specify port state combinations not to be critical * megaraid_pdisks: Using the real enclosure number as check item now

13 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2010