Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 70ce8feafb97023102787c71eda57d84469a6778 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70ce8feafb9702… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 1 10:23:54 2011 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9af8c04..9eb7cc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * FIX: Fixed OID_END handling in SNMP based checks (e.g. canon_pages) Checks & Agents: + * FIX: Problems with { and } in manpage parsing has been fixed * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) * FIX: Added PNP-template for winperf_phydisk * FIX: if64: fix UNKNOWN in case of non-unique ifAlias

13 years, 2 months

Check_MK Git: check_mk: The progress dialog now supports a optional URL to redirect to when nothing has been found

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6119f4104d9fc5618fe7dbf26d85c3960a11b9a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6119f4104d9fc5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 1 10:24:22 2011 +0200 The progress dialog now supports a optional URL to redirect to when nothing has been found --- web/htdocs/js/wato.js | 37 +++++++++++++++++++++++++++---------- web/htdocs/wato.py | 11 +++++++---- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 1779d93..7e3d447 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -83,8 +83,17 @@ var progress_items = null; var failed_items = null; // Number of total items to handle var progress_total_num = 0; +// Contains the total number of items which have been successfully processed +// This is e.g. used to decide if the dialog needs to redirect to end_url +// or to the term_url +var progress_found = 0; +// The fields which signal that something has been successfully processed. +// this is used together with progress_found to find out the correct redirect url +var progress_success_stats = []; // The URL to redirect to after finish/abort button pressed var progress_end_url = ''; +// The URL to redirect to after finish/abort button pressed when nothing found +var progress_term_url = ''; // The text to show in the progress bar after finished processing var progress_fin_txt = ''; // Is set to true while one request is waiting for a response @@ -180,10 +189,14 @@ function progress_finished() { function progress_end() { // Mark as ended to catch currently running requests progress_ended = true; - location.href = progress_end_url; + if(progress_found > 0) + location.href = progress_end_url; + else + location.href = progress_term_url; } function clear_progress_stats() { + progress_found = 0 for(var i = 1; i < 100; i++) { var o = document.getElementById('progress_stat' + (i - 1)); if (o) { @@ -199,6 +212,8 @@ function update_progress_stats(header) { for(var i = 1; i < header.length; i++) { var o = document.getElementById('progress_stat' + (i - 1)); if (o) { + if(progress_success_stats.indexOf(i) !== -1) + progress_found += parseInt(header[i]); o.innerHTML = parseInt(o.innerHTML) + parseInt(header[i]); o = null; } @@ -237,17 +252,19 @@ function progress_clean_log() { log = null; } -function progress_scheduler(mode, url_prefix, timeout, items, end_url, finished_txt) { +function progress_scheduler(mode, url_prefix, timeout, items, end_url, success_stats, term_url, finished_txt) { // Initialize if (progress_items === null) { - progress_items = items; - failed_items = Array(); - progress_total_num = items.length; - progress_end_url = end_url; - progress_fin_txt = finished_txt; - progress_mode = mode; - progress_url = url_prefix; - progress_timeout = timeout; + progress_items = items; + failed_items = Array(); + progress_total_num = items.length; + progress_end_url = end_url; + progress_term_url = term_url; + progress_success_stats = success_stats; + progress_fin_txt = finished_txt; + progress_mode = mode; + progress_url = url_prefix; + progress_timeout = timeout; } // Escape the loop when ended diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a308f82..ad30896 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2200,7 +2200,9 @@ def render_folder_path(the_folder = 0, the_file = 0, link_to_last = False): # | buttons for aborting and pausing. | # +----------------------------------------------------------------------+ -def interactive_progress(items, title, stats, finishvars, timewait): +def interactive_progress(items, title, stats, finishvars, timewait, success_stats = [], termvars = []): + if not termvars: + termvars = finishvars; html.write("<center>") html.write("<table class=progress>") html.write("<tr><th colspan=2>%s</th></tr>" % title) @@ -2227,13 +2229,14 @@ def interactive_progress(items, title, stats, finishvars, timewait): html.write("</td></tr>") html.write("</table>") html.write("</center>") - json_items = '[ %s ]' % ','.join([ "'" + h + "'" for h in items ]) + json_items = '[ %s ]' % ','.join([ "'" + h + "'" for h in items ]) + success_stats = '[ %s ]' % ','.join(success_stats) # Remove all sel_* variables. We do not need them for our ajax-calls. # They are just needed for the Abort/Finish links. Those must be converted # to POST. base_url = html.makeuri([], remove_prefix = "sel_") - html.javascript(('progress_scheduler("%s", "%s", 50, %s, "%s", "' + _("FINISHED.") + '");') % - (html.var('mode'), base_url, json_items, html.makeuri(finishvars))) + html.javascript(('progress_scheduler("%s", "%s", 50, %s, "%s", %s, "%s", "' + _("FINISHED.") + '");') % + (html.var('mode'), base_url, json_items, html.makeuri(finishvars), success_stats, html.makeuri(termvars),)) # +----------------------------------------------------------------------+ # | _ _ _ _ _ _ |

13 years, 2 months

Check_MK Git: check_mk: gb: added alias solve for resolve - I stuble upon it all the time

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3cd1f172a0d34a896b881922f91c74cdc2bcfbb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cd1f172a0d34a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 30 16:33:38 2011 +0200 gb: added alias solve for resolve - I stuble upon it all the time --- gb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/gb b/gb index d6a653c..4c81202 100755 --- a/gb +++ b/gb @@ -511,6 +511,7 @@ commands = { "show" : main_show, "new" : main_new, "resolve" : main_resolve, + "solve" : main_resolve, "delete" : main_delete, "grep" : main_grep, "edit" : main_edit,

13 years, 2 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0fc62d5b241acf7ec566e91d1abfa6ebdf0e190c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fc62d5b241acf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 30 16:34:28 2011 +0200 Updated bug entries --- .bugs/122 | 10 +++++++--- .bugs/201 | 12 +++++++++--- .bugs/209 | 11 ++++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.bugs/122 b/.bugs/122 index a901e6c..cbd19b2 100644 --- a/.bugs/122 +++ b/.bugs/122 @@ -1,10 +1,11 @@ Title: --snmpwalk creates OIDs without leading . Component: core +State: done +Class: bug +Date: 2011-02-08 12:13:30 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-08 12:13:30 -Class: bug +Fun: 0 The --snmpwalk stores the OIDs without a leading dot, whereas the real snmpwalk outputs a dot. This leads @@ -13,3 +14,6 @@ Resolution: make --snmpwalk also prepend a dot. Note: This was detected in a case where OID_STRING was used. + +2011-06-30 15:54:42: changed state open -> done +This has already been fixed some time ago. diff --git a/.bugs/201 b/.bugs/201 index b52109c..801a85f 100644 --- a/.bugs/201 +++ b/.bugs/201 @@ -1,11 +1,17 @@ Title: cmk -N HOSTNAME outputs legacy checks of all hosts Component: core +State: closed +Class: bug +Date: 2011-03-05 23:02:05 Benefit: 1 -State: open Cost: 2 -Date: 2011-03-05 23:02:05 -Class: bug +Fun: 0 Somebody said that cmk -N HOSTNAME outputs always all legacy checks, not only that of a specific host. Check and maybe fix this. + +2011-06-30 16:04:28: changed state open -> closed +The legacy checks are only shown for the configured hosts. But what is shown is the extra_nagios_conf. +This is clear since cmk can not decide for which hosts this is needed. So this needs to be included +for all hosts. diff --git a/.bugs/209 b/.bugs/209 index c97b61b..d818a79 100644 --- a/.bugs/209 +++ b/.bugs/209 @@ -1,9 +1,14 @@ Title: Man-Pages in HTML format have formatting errors Component: doku +State: done +Class: bug +Date: 2011-03-14 09:38:59 Benefit: 2 -State: open Cost: 2 -Date: 2011-03-14 09:38:59 -Class: bug +Fun: 0 See the documentation of the df-Check. + +2011-06-30 16:34:25: changed state open -> done +Fixed handling of double braces {{ and }}. There were problems in +HTML and also regular rendering.

13 years, 2 months

Check_MK Git: check_mk: windows_updates: Added missing manpage

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ac9536f392b932cc0d6ba602ffb00237ff178a04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac9536f392b932… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 30 12:00:42 2011 +0200 windows_updates: Added missing manpage --- ChangeLog | 1 + checkman/windows_updates | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index afc861e..010e3eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * lnx_if: treat interfaces without information from ethtool as softwareLoopback interface. The will not be found by inventory now. * vbox_guest: new check for checking guest additions of Linux virtual box hosts + * windows_updates: Added missing manpage Multisite: * FIX: make non-Ascii characters in services names work again diff --git a/checkman/windows_updates b/checkman/windows_updates new file mode 100644 index 0000000..d67a5c5 --- /dev/null +++ b/checkman/windows_updates @@ -0,0 +1,33 @@ +title: Checks number of pending windows updates and needed reboot state +agents: windows +author: Lars Michelsen <lm(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + The check uses WMI to fetch the number of pending important and optional updates + on a windows system. It also checks if a reboot is needed after installing updates. + + By default the check only fetches the information and never raises WARNING/CRITICAL + states. But this can be configured. + + The windows agent needs to be extended with the {windows_updates.vbs} provided + in {agents/windows/plugins}. + +inventory: + One service named {System Updates} is being created for each host. + +perfdata: + Two values important and optional which contain the number of pending updates. + +[parameters] +imp_warn (int): Number of pending important updates to raise a WARNING state. + Can be set to None for disabling the level. +imp_crit (int): Number of pending important updates to raise a CRITICAL state + Can be set to None for disabling the level. +opt_warn (int): Number of pending optional updates to raise a WARNING state + Can be set to None for disabling the level. +opt_crit (int): Number of pending optional updates to raise a CRITICAL state + Can be set to None for disabling the level. + +[configuration] +windows_updates_default_params (tuple of four ints): Default value is set to {(None, None, None, None)}

13 years, 2 months

Check_MK Git: check_mk: Fixed typo

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 082c6091cb65631aab59c3aecaa111a2b3861abc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=082c6091cb6563… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 30 12:00:58 2011 +0200 Fixed typo --- checkman/ad_replication | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checkman/ad_replication b/checkman/ad_replication index 82d8511..6d7db89 100644 --- a/checkman/ad_replication +++ b/checkman/ad_replication @@ -1,5 +1,5 @@ title: Check state of the Microsoft Active Directory Replication between DCs -agents: window +agents: windows author: Lars Michelsen <lm(a)mathias-kettner.de> license: GPL distribution: check_mk

13 years, 2 months

Check_MK Git: check_mk: FIX: Fixed OID_END handling in SNMP based checks (e .g. canon_pages)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 99cbf67c5dfbc8635ccde705da8de87f84630073 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99cbf67c5dfbc8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 30 12:27:21 2011 +0200 FIX: Fixed OID_END handling in SNMP based checks (e.g. canon_pages) --- ChangeLog | 1 + modules/snmp.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 010e3eb..9af8c04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core, Setup, etc.: * FIX: sort output of cmk --list-hosts alphabetically * FIX: Fixed .* in SNMP scan function when using stored SNMP walks + * FIX: Fixed OID_END handling in SNMP based checks (e.g. canon_pages) Checks & Agents: * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) diff --git a/modules/snmp.py b/modules/snmp.py index 3fa670f..0ccff3e 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -157,7 +157,10 @@ def snmpwalk_on_suboid(hostname, ip, oid): return rowinfo def extract_end_oid(prefix, complete): - return complete[len(prefix):].lstrip('.') + if prefix == complete: + return complete.split('.')[-1] + else: + return complete[len(prefix):].lstrip('.') # sort OID strings numerically def cmp_oids(o1, o2): @@ -428,7 +431,8 @@ def get_stored_snmpwalk(hostname, oid): value = agent_simulator_process(value) else: value = "" - rows.append((o, strip_snmp_value(value))) + # Fix for missing starting oids + rows.append(('.'+o, strip_snmp_value(value))) index += direction if index < 0 or index >= len(lines): break

13 years, 2 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 53b9e85f5846726f41d38ea4bb005735fb548944 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53b9e85f584672… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 30 11:48:22 2011 +0200 Updated bug entries --- .bugs/186 | 9 +++++++++ .bugs/187 | 11 +++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/.bugs/186 b/.bugs/186 new file mode 100644 index 0000000..8b309b5 --- /dev/null +++ b/.bugs/186 @@ -0,0 +1,9 @@ +Title: Windows Agent führt keine Plugins auf Windows 2000 aus +Component: core +Benefit: 1 +State: open +Cost: 4 +Date: 2011-06-30 11:44:52 +Class: bug + +Beim aktuellen Windows Agenten werden auf einem Windows 2000 SP4 System die Plugins nicht ausgeführt. diff --git a/.bugs/187 b/.bugs/187 new file mode 100644 index 0000000..627f71a --- /dev/null +++ b/.bugs/187 @@ -0,0 +1,11 @@ +Title: Windows Agent Debug Modus funktiert nicht +Component: core +Benefit: 1 +State: open +Cost: 3 +Date: 2011-06-30 11:46:51 +Class: bug + +Auf einem Windows 2000 SP4 System getestet: + +Der Debug-Modus liefert keine Ausgabe.

13 years, 2 months

Check_MK Git: check_mk: FIX: Fixed . * in SNMP scan function when using stored SNMP walks

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 752484ef82ee7dfa5952ede93690d1a8f2a4f4be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=752484ef82ee7d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 30 09:24:58 2011 +0200 FIX: Fixed .* in SNMP scan function when using stored SNMP walks --- modules/snmp.py | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index e0fe30d..3fa670f 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -229,9 +229,9 @@ def get_snmp_table(hostname, ip, oid_info): index_rows = [] # Take end-oids of non-index columns as indices fetchoid, max_column = columns[max_len_col] - for o, value in max_column: + for o, value in max_column: if index_format == OID_END: - eo = extract_end_oid(columns[max_len_col][0], o) + eo = extract_end_oid(fetchoid, o) index_rows.append((o, eo)) elif index_format == OID_STRING: index_rows.append((o, o)) @@ -436,12 +436,16 @@ def get_stored_snmpwalk(hostname, oid): break return rows - + rowinfo = collect_until(current, -1) rowinfo.reverse() rowinfo += collect_until(current + 1, 1) # import pprint ; pprint.pprint(rowinfo) - return rowinfo + + if dot_star: + return [ rowinfo[0] ] + else: + return rowinfo

13 years, 2 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: edc1426da1df482266bf12c70e51eedd01381394 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edc1426da1df48… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 30 11:48:15 2011 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e2d238..afc861e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.1.11i2: Core, Setup, etc.: * FIX: sort output of cmk --list-hosts alphabetically + * FIX: Fixed .* in SNMP scan function when using stored SNMP walks Checks & Agents: * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100)

13 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits