Checkmk git commits November 2012

checkmk-commits@lists.checkmk.com

3 participants
219 discussions

Check_MK Git: check_mk: Updated bug entries #0872, #0819, #0811

by Lars Michelsen

Module: check_mk Branch: master Commit: b0b9b5074dd9eb577b030e44a953b955441ba9f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0b9b5074dd9eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 23 15:01:27 2012 +0100 Updated bug entries #0872, #0819, #0811 --- .bugs/811 | 5 +++++ .bugs/819 | 7 +++++-- .bugs/872 | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.bugs/811 b/.bugs/811 index 64c419c..c52ad1d 100644 --- a/.bugs/811 +++ b/.bugs/811 @@ -9,3 +9,8 @@ If you install an MKP and it brings a check man page this man page is not displayed from Multisite, instead it gives an error about not finding the check man page in the default path. It would be good if multisite could also check the local/ structure for existing man pages + +LM: This is already implemented, but with the nastyness, that the regular +check manpages are placed in share/doc/check_mk/checks but the local +check manpages are searched in local/share/check_mk/checkman. This should +be cleaned up! diff --git a/.bugs/819 b/.bugs/819 index 217a098..046d6c4 100644 --- a/.bugs/819 +++ b/.bugs/819 @@ -1,9 +1,9 @@ Title: Apache Status bug Component: checks -State: open +Class: bug +State: done Date: 2012-10-24 11:08:13 Targetversion: 1.2.0 -Class: bug osTicket id 258581 sorry to report a bug regarding the new apache_status in 1.2.0p3. @@ -18,3 +18,6 @@ We tested the server-status url with lynx and it is working fine. CentOS release 5.6 (Final) 32-Bit httpd-2.2.3-65.el5.centos + +2012-11-23 14:38:23: changed state open -> done +URL handling changed and fixed for python versions <2.6. Should work now. diff --git a/.bugs/872 b/.bugs/872 index 2e5e4e3..dfc0f4e 100644 --- a/.bugs/872 +++ b/.bugs/872 @@ -8,3 +8,5 @@ Class: bug When having e.g. the speedometer in the sidebar and removing it, the javascript worker code remains fetching the speedometer webservice. The worker should detect that the snapin has been removed and stop updating the data. + +Not a general problem: The speedometer uses its own scheduler. Must be fixed individually.

11 years, 10 months

Check_MK Git: check_mk: Modernize fsc_temp check

by Mathias Kettner

Module: check_mk Branch: master Commit: 573fc11300eb8fe58643206d49f1c34bdfacf8d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=573fc11300eb8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 23 09:53:59 2012 +0100 Modernize fsc_temp check --- checks/fsc_temp | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/checks/fsc_temp b/checks/fsc_temp index fc22977..c4ab1a0 100644 --- a/checks/fsc_temp +++ b/checks/fsc_temp @@ -25,18 +25,26 @@ # Boston, MA 02110-1301 USA. -def inventory_fsc_temp(info): +# We fetch the following columns from SNMP: +# 13: name of the temperature sensor (used as item) +# 11: current temperature in C +# 6: warning level +# 8: critical level + +def inventory_fsc_temp(info): + # Ignore non-connected sensors return [ (line[0], None) for line in info if int(line[1]) < 500 ] def check_fsc_temp(item, _no_params, info): - for line in info: # , value1, value2 in info: - name = line[0] + for name, current, warn, crit in info: if name != item: continue - current = int(line[1]) - warn = int(line[2]) - crit = int(line[3]) + current = int(current) + warn = int(warn) + crit = int(crit) + infotext = "%d C (levels at %d C / %d C)" % (current, warn, crit) perfdata = [ ("temp", current, warn, crit, 0 ) ] + if current == -1 or current == 4294967295: return(3, "UNKNOWN - Problem with sensor") elif current >= crit and crit > 0: @@ -48,9 +56,12 @@ def check_fsc_temp(item, _no_params, info): return (3, "UNKNOWN - Sensor %s not found in SNMP data" % item) -check_info['fsc_temp'] = (check_fsc_temp, "Temperature %s", 1, inventory_fsc_temp) -snmp_info['fsc_temp'] = ( ".1.3.6.1.4.1.231.2.10.2.2.5.2.1.1", [ 13, 11, 6, 8 ] ) -snmp_scan_functions['fsc_temp'] = lambda oid: \ - oid(".1.3.6.1.4.1.231.2.10.2.1.1.0") - -checkgroup_of["fsc_temp"] = "temperature_auto" +check_info['fsc_temp'] = { + "inventory_function" : inventory_fsc_temp, + "check_function" : check_fsc_temp, + "service_description" : "Temperature %s", + "has_perfdata" : True, + "snmp_info" : ( ".1.3.6.1.4.1.231.2.10.2.2.5.2.1.1", [ 13, 11, 6, 8 ] ), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.231.2.10.2.1.1.0"), + "group" : "temperature_auto", +}

11 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: edd1a81b65aa63f0e9db7cb8ddae4b05a843e7a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edd1a81b65aa63… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 22 20:35:32 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Fix flexible notifications on non-OMD systems

by Mathias Kettner

Module: check_mk Branch: master Commit: f27d68adabf1887b21832aa47512ac5a7aeeb652 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f27d68adabf188… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 22 16:25:39 2012 +0100 Fix flexible notifications on non-OMD systems --- ChangeLog | 3 +++ modules/notify.py | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7465922..9c8f62a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.1i4: + Notifications: + * Fix flexible notifications on non-OMD systems + Checks & Agents: * Linux Agent, mk_postgres: Supporting pgsql and postgres as user * Linux Agent, mk_postgres: Fixed database stats query to be compatible diff --git a/modules/notify.py b/modules/notify.py index a258034..600d594 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -255,9 +255,13 @@ def call_notification_script(plugin, parameters): os.putenv(name, "") # Call actual script without any arguments - path = local_notifications_dir + "/" + plugin - if not os.path.exists(path): + if local_notifications_dir: + path = local_notifications_dir + "/" + plugin + if not os.path.exists(path): + path = notifications_dir + "/" + plugin + else: path = notifications_dir + "/" + plugin + if not os.path.exists(path): notify_log("Notification plugin '%s' not found" % plugin) notify_log(" not in %s" % notifications_dir)

11 years, 10 months

Check_MK Git: check_mk: Fixed example in df manpages

by Mathias Kettner

Module: check_mk Branch: master Commit: 4d952ae032118f1ec1ff721954e58b6f216ad107 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d952ae032118f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 22 17:09:13 2012 +0100 Fixed example in df manpages --- checkman/df | 2 +- checkman/df_netapp | 2 +- checkman/df_netapp32 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checkman/df b/checkman/df index 7d24b1a..f152572 100644 --- a/checkman/df +++ b/checkman/df @@ -83,7 +83,7 @@ examples: # /usr and /opt on hosts zlnx01 and zlnx02 ( (98, 99), [ "zlnx01", "zlnx02" ], [ "fs_/usr$", "fs_/opt$" ] ), # All filesystems on clusters get 80/95 - ( (80, 95), ALL_CLUSTERS, [ "fs_" ] ), + ( (80, 95), CLUSTERS_HOSTS, [ "fs_" ] ), # Complex parameters in dictionary form ( {"levels":(80,90), "trend_range":48, "trend_mb":(20,40)}, [ "windows" ], ALL_HOSTS, [ "fs_" ]), diff --git a/checkman/df_netapp b/checkman/df_netapp index 54fa559..7381298 100644 --- a/checkman/df_netapp +++ b/checkman/df_netapp @@ -67,7 +67,7 @@ examples: # /usr and /opt on hosts zlnx01 and zlnx02 ( (98, 99), [ "zlnx01", "zlnx02" ], [ "fs_/usr$", "fs_/opt$" ] ), # All filesystems on clusters get 80/95 - ( (80, 95), ALL_CLUSTERS, [ "fs_" ] ), + ( (80, 95), CLUSTER_HOSTS, [ "fs_" ] ), # Complex parameters in dictionary form ( {"levels":(80,90), "trend_range":48, "trend_mb":(20,40)}, [ "windows" ], ALL_HOSTS, [ "fs_" ]), diff --git a/checkman/df_netapp32 b/checkman/df_netapp32 index 64ee578..d33f640 100644 --- a/checkman/df_netapp32 +++ b/checkman/df_netapp32 @@ -72,7 +72,7 @@ examples: # /usr and /opt on hosts zlnx01 and zlnx02 ( (98, 99), [ "zlnx01", "zlnx02" ], [ "fs_/usr$", "fs_/opt$" ] ), # All filesystems on clusters get 80/95 - ( (80, 95), ALL_CLUSTERS, [ "fs_" ] ), + ( (80, 95), CLUSTER_HOSTS, [ "fs_" ] ), # Complex parameters in dictionary form ( {"levels":(80,90), "trend_range":48, "trend_mb":(20,40)}, [ "windows" ], ALL_HOSTS, [ "fs_" ]),

11 years, 10 months

Check_MK Git: check_mk: Logwatch: Added buttons to acknowledge all logs of a host or really all problematic logs in a site

by Lars Michelsen

Module: check_mk Branch: master Commit: fab7a6bd48037af64fa036d9b43bcad239ae35df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fab7a6bd48037a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 14:40:39 2012 +0100 Logwatch: Added buttons to acknowledge all logs of a host or really all problematic logs in a site --- ChangeLog | 2 + web/htdocs/logwatch.py | 116 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 79 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7465922..8bec320 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ * Restructured cookie auth cookies (all auth cookies will be invalid after update -> all users have to login again) * Modularized login and cookie validation + * Logwatch: Added buttons to acknowledge all logs of all hosts or really + all logs which currently have a problem WATO: * FIX: Fixed generated manual check definitions for checks without items diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 9c6a518..4b5c998 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -56,6 +56,16 @@ def level_state(level): def page_show(): host = html.var('host') filename = html.var('file') + + # Acknowledging logs is supported on + # a) all logs on all hosts + # b) all logs on one host + # c) one log on one host + if html.has_var('_ack') and not html.var("_do_actions") == _("No"): + html.live.set_auth_domain('action') + do_log_ack(host, filename) + return + if not host: show_log_list() return @@ -65,11 +75,7 @@ def page_show(): raise MKAuthException(_("You are not allowed to access the logs of the host %s") % htmllib.attrencode(host)) if filename: - if html.has_var('_ack') and not html.var("_do_actions") == _("No"): - html.live.set_auth_domain('action') - do_log_ack(host, filename) - else: - show_file(host, filename) + show_file(host, filename) else: show_host_log_list(host) @@ -79,11 +85,13 @@ def show_log_list(): html.begin_context_buttons() html.context_button(_("Analyze Patterns"), "%swato.py?mode=pattern_editor" % html.var('master_url', ''), 'analyze') + ack_button() html.end_context_buttons() html.write("<table class=data>\n") for host, logs in all_logs(): - html.write('<tr><td colspan=2><h2>%s</h2></td></tr>' % host) + html.write('<tr><td colspan=2><h2><a href="%s">%s</a></h2></td></tr>' % \ + (html.makeuri([('host', host)]), host)) list_logs(host, logs) html.write("</table>\n") @@ -99,6 +107,7 @@ def show_host_log_list(host): html.context_button(_("All Logfiles"), html.makeuri([('host', ''), ('file', '')])) html.context_button(_("Analyze Host Patterns"), "%swato.py?mode=pattern_editor&host=%s" % (master_url, htmllib.urlencode(host)), 'analyze') + ack_button(host) html.end_context_buttons() html.write("<table class=data>\n") @@ -142,6 +151,18 @@ def list_logs(host, logfiles): html.write('<tr><td colspan=4>'+_('No logs found for this host.')+'</td></tr>\n') +def ack_button(host = None, int_filename = None): + if not config.may("general.act") or (host and not may_see(host)): + return + + if int_filename: + label = _("Clear Log") + else: + label = _("Clear Logs") + + html.context_button(label, html.makeuri([('_ack', '1')]), 'delete') + + def show_file(host, filename): master_url = html.var('master_url', '') @@ -176,13 +197,7 @@ def show_file(host, filename): html.footer() return - if config.may("general.act") and may_see(host): - html.context_button( - _("Clear Log"), - html.makeuri([('_ack', '1')]), - 'delete' - ) - + ack_button(host, int_filename) html.context_button(hide_context_label, html.makeuri([('_hidecontext', hide_context_param)])) html.end_context_buttons() @@ -214,22 +229,44 @@ def show_file(host, filename): def do_log_ack(host, filename): - file = form_file_to_int(filename) - file_display = form_file_to_ext(file) - html.header(_("Acknowledge Logfile %s - %s") % (htmllib.attrencode(host), file_display), stylesheets = stylesheets) + todo = [] + if not host and not filename: # all logs on all hosts + for this_host, logs in all_logs(): + for int_filename in logs: + file_display = form_file_to_ext(int_filename) + todo.append((this_host, int_filename, file_display)) + ack_msg = _('all logfiles on all hosts') + + elif host and not filename: # all logs on one host + for int_filename in host_logs(host): + file_display = form_file_to_ext(int_filename) + todo.append((host, int_filename, file_display)) + ack_msg = _('all logfiles of host <tt>%s</tt>') % htmllib.attrencode(host) + + elif host and filename: # one log on one host + int_filename = form_file_to_int(filename) + todo = [ (host, int_filename, form_file_to_ext(int_filename)) ] + ack_msg = _('the log file <tt>%s</tt> on host <tt>%s</tt>') % \ + (htmllib.attrencode(filename), htmllib.attrencode(host)) + + html.header(_("Acknowledge %s") % ack_msg, stylesheets = stylesheets) html.begin_context_buttons() - html.context_button(_("All Logfiles of Host"), html.makeuri([('file', '')])) + html.context_button(_("All Logfiles"), html.makeuri([('host', ''), ('file', '')])) + if host: + html.context_button(_("All Logfiles of Host"), html.makeuri([('file', '')])) + if host and filename: + html.context_button(_("Back to Logfile"), html.makeuri([])) html.end_context_buttons() - ack = html.var('_ack') - if not html.confirm(_("Do you really want to acknowledge the log file <tt>%s</tt> by <b>deleting</b> all stored messages?") % filename): + ack = html.var('_ack') + if not html.confirm(_("Do you really want to acknowledge %s by <b>deleting</b> all stored messages?") % ack_msg): html.footer() return - if not (config.may("general.act") and may_see(host)): + if not config.may("general.act"): html.write("<h1 class=error>"+_('Permission denied')+"</h1>\n") - html.write("<div class=error>" + _('You are not allowed to acknowledge the logs of the host %s</div>') % htmllib.attrencode(host)) + html.write("<div class=error>" + _('You are not allowed to acknowledge %s</div>') % ack_msg) html.footer() return @@ -237,18 +274,19 @@ def do_log_ack(host, filename): if ack != '1': raise MKUserError('_ack', _('Invalid value for ack parameter.')) - try: - os.remove(defaults.logwatch_dir + '/' + host + '/' + file) - - message = '<b>'+_('%s: %s Acknowledged') % (htmllib.attrencode(host), htmllib.attrencode(file_display)) +'</b><br>' - message += '<p>' - message += _('The log messages from host "%s" in file "%s" have been acknowledged.') % \ - (htmllib.attrencode(host), htmllib.attrencode(file_display)) - message += '</p>' - html.message(message) - except Exception, e: - html.show_error(_('The log file "%s" from host "%s" could not be deleted: %s.') % \ - (htmllib.attrencode(file_display), htmllib.attrencode(host), e)) + for this_host, int_filename, display_name in todo: + try: + if not may_see(this_host): + raise MKAuthException(_('Permission denied.')) + os.remove(defaults.logwatch_dir + '/' + this_host + '/' + int_filename) + except Exception, e: + html.show_error(_('The log file <tt>%s</tt> of host <tt>%s</tt> could not be deleted: %s.') % \ + (htmllib.attrencode(file_display), htmllib.attrencode(this_host), e)) + + html.message('<b>%s</b><p>%s</p>' % ( + _('Acknowledged %s') % ack_msg, + _('Acknowledged all messages in %s.') % ack_msg + )) html.footer() @@ -380,12 +418,12 @@ def form_level(level): levels = [ 'OK', 'WARN', 'CRIT', 'UNKNOWN' ] return levels[level] -def form_file_to_int(file): - return file.replace('/', '\\') +def form_file_to_int(f): + return f.replace('/', '\\') -def form_file_to_ext(file): - return file.replace('\\', '/') +def form_file_to_ext(f): + return f.replace('\\', '/') -def form_datetime(dt, format = '%Y-%m-%d %H:%M:%S'): +def form_datetime(dt, fmt = '%Y-%m-%d %H:%M:%S'): # FIXME: Dateformat could be configurable - return dt.strftime(format) + return dt.strftime(fmt)

11 years, 10 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: c219e19493bcead01affb148e3c854adfd654e71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c219e19493bcea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 15:11:21 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0881

by Mathias Kettner

Module: check_mk Branch: master Commit: 1fd87f94f7136104b966b1861b3c9a32a8905a7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fd87f94f71361… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 22 12:23:30 2012 +0100 Updated bug entries #0881 --- .bugs/881 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/881 b/.bugs/881 new file mode 100644 index 0000000..826e521 --- /dev/null +++ b/.bugs/881 @@ -0,0 +1,13 @@ +Title: Manpage of fileinfo outdated +Component: docu +State: open +Date: 2012-11-22 12:21:55 +Targetversion: future +Class: bug + +The man page of fileinfo is not uptodate: The linux agent now +supports fileinfo. Also the configuration of that should be +described here. + +The man page of fileinfo.groups: do we really have regular expressions? +It does not seem to work...

11 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0880

by Mathias Kettner

Module: check_mk Branch: master Commit: d0a5549e98ed1ded708c6d7f18aebdf16c729542 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0a5549e98ed1d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 22 12:10:22 2012 +0100 Updated bug entries #0880 --- .bugs/880 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/880 b/.bugs/880 new file mode 100644 index 0000000..c334cf0 --- /dev/null +++ b/.bugs/880 @@ -0,0 +1,10 @@ +Title: Convert check writing docu to new check API +Component: docu +State: open +Date: 2012-11-22 12:09:37 +Targetversion: future +Class: todo + +Now since 1.2.0 is out long enough it is time to convert +the check writing docu to the new dictionary based format +of check_info[...].

11 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b5690ccaae2bf815bd472965ae863e7f3756e46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b5690ccaae2bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 22 12:10:24 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2012