Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65234 discussions

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, 11 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, 11 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, 11 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, 11 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, 11 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, 11 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, 11 months

Check_MK Git: check_mk: base: rename if.functions into if. include and check_libs into check_includes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7adb721130938d2108fae1145f1228a08d314d21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7adb721130938d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 8 13:22:37 2010 +0100 base: rename if.functions into if.include and check_libs into check_includes --- checks/if | 2 +- checks/{if.functions => if.include} | 0 checks/if64 | 2 +- modules/check_mk.py | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/if b/checks/if index 1c451d1..3a35a55 100644 --- a/checks/if +++ b/checks/if @@ -37,7 +37,7 @@ def if_convert_to_if64(info): return newinfo check_info['if'] = (check_if, "Interface %s", 1, inventory_if) -check_libs['if'] = [ "if.functions" ] +check_includes['if'] = [ "if.include" ] snmp_info['if'] = \ ( ".1.3.6.1.2.1.2.2.1", [ diff --git a/checks/if.functions b/checks/if.include similarity index 100% rename from checks/if.functions rename to checks/if.include diff --git a/checks/if64 b/checks/if64 index 79d21c4..6797c24 100644 --- a/checks/if64 +++ b/checks/if64 @@ -31,7 +31,7 @@ def check_if64(item, params, info): return check_if_common(item, params, info) check_info['if64'] = (check_if64, "Interface %s", 1, inventory_if64) -check_libs['if64'] = [ "if.functions" ] +check_includes['if64'] = [ "if.include" ] snmp_info['if64'] = \ ( ".1.3.6.1.2.1", [ diff --git a/modules/check_mk.py b/modules/check_mk.py index b5eec95..3062899 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -304,7 +304,7 @@ ip_to_hostname_cache = None # The following data structures will be filled by the various checks # found in the checks/ directory. check_info = {} # all known checks -check_libs = {} # library files needed by checks +check_includes = {} # library files needed by checks precompile_params = {} # optional functions for parameter precompilation, look at df for an example check_config_variables = [] # variables (names) in checks/* needed for check itself snmp_info = {} # whichs OIDs to fetch for which check (for tabular information) @@ -2025,11 +2025,11 @@ filesystem_default_levels = None filenames.add(path) # Add library files needed by check - for lib in check_libs.get(checktype, []): + for lib in check_includes.get(checktype, []): filenames.add(checks_dir + "/" + lib) output.write("check_info = {}\n" + - "check_libs = {}\n" + + "check_includes = {}\n" + "precompile_params = {}\n" + "check_config_variables = []\n" + "snmp_info = {}\n" +

13 years, 11 months

Check_MK Git: check_mk: if/if64: averaging, monitoring of unused ports

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b96d6183b965a9b7627c00fef64a18854efb2720 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b96d6183b965a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 8 17:52:38 2010 +0100 if/if64: averaging, monitoring of unused ports --- ChangeLog | 4 + LIESMICH.zutun | 6 -- checks/if.include | 125 +++++++++++++++++++++++++++------------- modules/check_mk.py | 8 +- modules/check_mk_base.py | 11 +++- modules/snmp.py | 4 +- pnp-templates/check_mk-if.php | 28 ++++++++-- 7 files changed, 125 insertions(+), 61 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b96d6183b9…

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

13 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits