Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64570 discussions

Check_MK Git: check_mk: WATO: convert implementation of services table to table API

by Mathias Kettner

Module: check_mk Branch: master Commit: 9d49d7d5485e3b1b32027752d090645a2a723208 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d49d7d5485e3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 15:06:51 2014 +0100 WATO: convert implementation of services table to table API --- web/htdocs/table.py | 110 ++++++++++++++++++++++++++++++++------------------- web/htdocs/wato.py | 51 +++++++++++------------- 2 files changed, 92 insertions(+), 69 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9d49d7d548…

10 years, 8 months

Check_MK Git: check_mk: FIX fortigate_memory: Fix inventory, do not add check if no info available

by Mathias Kettner

Module: check_mk Branch: master Commit: 81c47459c128c9493cc8b5c701075cee1de56651 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81c47459c128c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 12:56:53 2014 +0100 FIX fortigate_memory: Fix inventory, do not add check if no info available Previously a check would be added if you do an explicity inventory. Now the inventory function only creates an item if there is really data available via SNMP. --- .werks/447 | 11 +++++++++++ ChangeLog | 1 + checks/fortigate_memory | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/447 b/.werks/447 new file mode 100644 index 0000000..cd5c10d --- /dev/null +++ b/.werks/447 @@ -0,0 +1,11 @@ +Title: fortigate_memory: Fix inventory, do not add check if no info available +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389700548 + +Previously a check would be added if you do an explicity inventory. Now the +inventory function only creates an item if there is really data available +via SNMP. diff --git a/ChangeLog b/ChangeLog index a549ea7..13ebe1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ * 0119 FIX: stulz_humidity: Fixed lower thresholds... * 0565 FIX: windows_updates: fix for some cases when forced_reboot is not set * 0255 FIX: windows_agent: now able to handle the removal of local/plugin scripts during runtime... + * 0447 FIX: fortigate_memory: Fix inventory, do not add check if no info available... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/fortigate_memory b/checks/fortigate_memory index fe2617a..fd2c382 100644 --- a/checks/fortigate_memory +++ b/checks/fortigate_memory @@ -26,6 +26,10 @@ fortigate_memory_default_levels = (70, 80) +def inventory_fortigate_memory(info): + if info: + return [(None, "fortigate_memory_default_levels")] + def check_fortigate_memory(item, params, info): # This check does not yet support averaging. We need to # convert it to mem.include @@ -48,7 +52,7 @@ def check_fortigate_memory(item, params, info): check_info["fortigate_memory"] = { "check_function" : check_fortigate_memory, - "inventory_function" : lambda info: [(None, "fortigate_memory_default_levels")], + "inventory_function" : inventory_fortigate_memory, "service_description" : "Memory usage", "has_perfdata" : True, "group" : "memory",

10 years, 8 months

Check_MK Git: check_mk: Make some memory checks tolerate new dict params

by Mathias Kettner

Module: check_mk Branch: master Commit: 75e269f6b4edb47bef5e7366fa63b0462044079c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75e269f6b4edb4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 12:55:25 2014 +0100 Make some memory checks tolerate new dict params --- checks/cisco_sys_mem | 5 +++++ checks/fortigate_memory | 5 +++++ checks/hr_mem | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/checks/cisco_sys_mem b/checks/cisco_sys_mem index a56af93..f3791b9 100644 --- a/checks/cisco_sys_mem +++ b/checks/cisco_sys_mem @@ -36,6 +36,11 @@ def inventory_cisco_sys_mem(info): return [] def check_cisco_sys_mem(_no_item, params, info): + # This check does not yet support averaging. We need to + # convert it to mem.include + if type(params) == dict: + params = params["levels"] + warn, crit = params if info[0][0]: mem_used = float(info[0][0]) diff --git a/checks/fortigate_memory b/checks/fortigate_memory index 4549924..fe2617a 100644 --- a/checks/fortigate_memory +++ b/checks/fortigate_memory @@ -27,6 +27,11 @@ fortigate_memory_default_levels = (70, 80) def check_fortigate_memory(item, params, info): + # This check does not yet support averaging. We need to + # convert it to mem.include + if type(params) == dict: + params = params["levels"] + warn, crit = params current = saveint(info[0][0]) state = 0 diff --git a/checks/hr_mem b/checks/hr_mem index 50440c0..4f8679b 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -38,6 +38,11 @@ def inventory_hr_mem(info): return [(None, "memused_default_levels")] def check_hr_mem(_no_item, params, info): + # This check does not yet support averaging. We need to + # convert it to mem.include + if type(params) == dict: + params = params["levels"] + usage = {} for hrtype, hrdescr, hrunits, hrsize, hrused in info: if hrtype in [ ".1.3.6.1.2.1.25.2.1.2",

10 years, 8 months

Check_MK Git: check_mk: mem.used: add useful default values to WATO rule

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e7bc3b1a190b21b220ab7de4af25790d0f42203 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e7bc3b1a190b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 11:56:45 2014 +0100 mem.used: add useful default values to WATO rule --- web/plugins/wato/check_parameters.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9af97d5..5e335e5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1989,14 +1989,15 @@ register_check_parameters( elements = [ # Disable limit of value to 101%, because levels > 100% make sense here # (swap+ram is > ram) - Percentage(title = _("Warning at a memory usage of"), default_value = 80.0, maxvalue = None), - Percentage(title = _("Critical at a memory usage of"), default_value = 90.0, maxvalue = None)]), + Percentage(title = _("Warning at a memory usage of"), maxvalue = None), + Percentage(title = _("Critical at a memory usage of"), maxvalue = None)]), Tuple( title = _("Specify levels in absolute usage values"), elements = [ Integer(title = _("Warning if above"), unit = _("MB")), Integer(title = _("Critical if above"), unit = _("MB"))]), - ]), + ], + default_value = (80.0, 90.0)), None, None )

10 years, 8 months

Check_MK Git: check_mk: mem.used: Fix memory defaults levels in WATO rule

by Mathias Kettner

Module: check_mk Branch: master Commit: b17a52d40d13a19f5e152ee6aa4ef34abfc5b8a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b17a52d40d13a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 12:11:53 2014 +0100 mem.used: Fix memory defaults levels in WATO rule --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 5e335e5..0f9464e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1997,7 +1997,7 @@ register_check_parameters( Integer(title = _("Warning if above"), unit = _("MB")), Integer(title = _("Critical if above"), unit = _("MB"))]), ], - default_value = (80.0, 90.0)), + default_value = (150.0, 200.0)), None, None )

10 years, 8 months

Check_MK Git: check_mk: mem.used, solaris_mem: Introduce optional averaging of used memory

by Mathias Kettner

Module: check_mk Branch: master Commit: c38800078a1926b748209590ff708e81efd6903a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c38800078a1926… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 12:39:10 2014 +0100 mem.used, solaris_mem: Introduce optional averaging of used memory You now can set an averaging time horizon in minutes. If you do that the levels for the used memory will be applied to its average over time. That makes the check less reactive to peaks in the memory usage. --- .werks/446 | 10 +++ ChangeLog | 1 + checkman/mem.used | 81 +++++++++++------------ checks/mem | 16 ++--- checks/mem.include | 119 ++++++++++++++++++++-------------- checks/solaris_mem | 17 +++-- web/plugins/wato/check_parameters.py | 65 ++++++++++++------- 7 files changed, 181 insertions(+), 128 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c38800078a…

10 years, 8 months

Check_MK Git: check_mk: Updated description of werk 445

by Mathias Kettner

Module: check_mk Branch: master Commit: e36dc3dcfee102c59881a71495b9201055a8a276 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e36dc3dcfee102… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 12:39:38 2014 +0100 Updated description of werk 445 --- .werks/445 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.werks/445 b/.werks/445 index 13ce0ab..4792367 100644 --- a/.werks/445 +++ b/.werks/445 @@ -5,7 +5,6 @@ Version: 1.2.5i1 Date: 1389692900 Class: feature -You now can set an averaging time horizon in minutes. If you do that -the levels for memory and page file usage will be applied to their -average over time. That make the check less reactive to small peaks -in the memory usage. +You now can set an averaging time horizon in minutes. If you do that the +levels for memory and page file usage will be applied to their average over +time. That makes the check less reactive to peaks in the memory usage.

10 years, 8 months

Check_MK Git: check_mk: windows_agent: now able to handle the removal of local/plugin scripts during runtime

by Andreas Boesl

Module: check_mk Branch: master Commit: 5741f6cd10519fa165796e63afbd295e7d44af86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5741f6cd10519f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 14 12:37:15 2014 +0100 windows_agent: now able to handle the removal of local/plugin scripts during runtime --- .werks/255 | 11 +++++++++++ ChangeLog | 1 + agents/windows/check_mk_agent.cc | 24 ++++++++++++++++++++---- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.werks/255 b/.werks/255 new file mode 100644 index 0000000..6183612 --- /dev/null +++ b/.werks/255 @@ -0,0 +1,11 @@ +Title: windows_agent: now able to handle the removal of local/plugin scripts during runtime +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389699043 + +Whenever a script got removed in the windows agents local or plugins directories, +the agent still tried to call this script, thus resulting in an error message in the +agent output. This has been fixed. Removed scripts no longer produce agent output. diff --git a/ChangeLog b/ChangeLog index 2f8e444..ed475e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -101,6 +101,7 @@ * 0118 FIX: stulz_humidity: Fixed coloring in pnp template... * 0119 FIX: stulz_humidity: Fixed lower thresholds... * 0565 FIX: windows_updates: fix for some cases when forced_reboot is not set + * 0255 FIX: windows_agent: now able to handle the removal of local/plugin scripts during runtime... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 325837a..db67017 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -171,7 +171,8 @@ enum script_type { }; struct script_container { - char *path; + char *path; // full path with interpreter, cscript, etc. + char *script_path; // path of script int max_age; int timeout; int max_retries; @@ -2414,6 +2415,11 @@ DWORD WINAPI ScriptWorkerThread(LPVOID lpParam) return 0; } +bool script_exists(script_container *cont) +{ + DWORD dwAttr = GetFileAttributes(cont->script_path); + return !(dwAttr == INVALID_FILE_ATTRIBUTES); +} void run_script_container(script_container *cont) { @@ -2421,6 +2427,11 @@ void run_script_container(script_container *cont) (cont->type == LOCAL && !(enabled_sections & SECTION_LOCAL)) ) return; + // Return if this script is no longer present + // However, the script container is preserved + if (!script_exists(cont)) + return; + time_t now = time(0); if (now - cont->buffer_time >= cont->max_age) { // Check if the thread within this cont is still collecting data @@ -2433,6 +2444,7 @@ void run_script_container(script_container *cont) if (cont->worker_thread != INVALID_HANDLE_VALUE) CloseHandle(cont->worker_thread); + cont->worker_thread = CreateThread( NULL, // default security attributes 0, // use default stack size @@ -2443,9 +2455,7 @@ void run_script_container(script_container *cont) if (cont->execution_mode == SYNC || cont->execution_mode == ASYNC && g_default_script_async_execution == SEQUENTIAL) - { WaitForSingleObject(cont->worker_thread, INFINITE); - } } } @@ -2456,6 +2466,11 @@ void output_external_programs(SOCKET &out, script_type type) script_container* cont = NULL; while (it_cont != script_containers.end()) { cont = it_cont->second; + if (!script_exists(cont)) { + it_cont++; + continue; + } + if (cont->type == type) { if (cont->status == SCRIPT_FINISHED) { // Free buffer @@ -3848,7 +3863,7 @@ void determine_available_scripts(script_type type) char newpath[512]; // If the path in question is a directory -> continue DWORD dwAttr = GetFileAttributes(path); - if(dwAttr != 0xffffffff && (dwAttr & FILE_ATTRIBUTE_DIRECTORY)) { + if(dwAttr != INVALID_FILE_ATTRIBUTES && (dwAttr & FILE_ATTRIBUTE_DIRECTORY)) { continue; } @@ -3860,6 +3875,7 @@ void determine_available_scripts(script_type type) // create new entry for this program cont = new script_container(); cont->path = strdup(command); + cont->script_path = strdup(path); cont->buffer_time = 0; cont->buffer = NULL; cont->buffer_work = NULL;

10 years, 8 months

Check_MK Git: check_mk: FIX windows_updates: fix for some cases when forced_reboot is not set

by Götz Golla

Module: check_mk Branch: master Commit: f378f7d5a69884f5a8d7f73f4abbf2e5cee115b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f378f7d5a69884… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Jan 14 12:01:59 2014 +0100 FIX windows_updates: fix for some cases when forced_reboot is not set --- .werks/565 | 8 ++++++++ ChangeLog | 1 + checks/windows_updates | 3 +-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.werks/565 b/.werks/565 new file mode 100644 index 0000000..7f3affa --- /dev/null +++ b/.werks/565 @@ -0,0 +1,8 @@ +Title: windows_updates: fix for some cases when forced_reboot is not set +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1389697265 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 537241b..2f8e444 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ * 0116 FIX: cisco_vpn_tunnel: Fixed typo that lead to an exception * 0118 FIX: stulz_humidity: Fixed coloring in pnp template... * 0119 FIX: stulz_humidity: Fixed lower thresholds... + * 0565 FIX: windows_updates: fix for some cases when forced_reboot is not set Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/windows_updates b/checks/windows_updates index 7249095..031d0da 100644 --- a/checks/windows_updates +++ b/checks/windows_updates @@ -71,8 +71,7 @@ def check_windows_updates(_unused, params, info): # the last element may be the forced_reboot time forced_reboot = "" - print len(info), last - if len(info) - 1 == last: + if len(info) - 1 == last and len(info[last]) == 2: forced_reboot = info[last] txt = []

10 years, 8 months

Check_MK Git: check_mk: Reserved 100 Werk IDS

by Götz Golla

Module: check_mk Branch: master Commit: ee5bfbe0b5a6996aa27ce0f723cce3f5a09192aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee5bfbe0b5a699… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Jan 14 11:59:58 2014 +0100 Reserved 100 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 066ce60..7ae8d44 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -565 +665

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits