Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64377 discussions

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

Check_MK Git: check_mk: test

by Lars Michelsen

Module: check_mk Branch: master Commit: 6f3a2e9c235d12368321ab804ca3f3f392a64421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f3a2e9c235d12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 11:12:19 2012 +0100 test --- ChangeLog | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46464a7..7465922 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,7 +19,6 @@ * FIX: Fixed generated manual check definitions for checks without items like ntp_time and tcp_conn_stats - 1.2.1i3: Core: * added HOST/SERVICEPROBLEMID to notification macros

11 years, 10 months

Check_MK Git: check_mk: FIX: Fixed generated manual check definitions for checks without items

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9359ce900d9c78cf8843cc7286267009c780c21c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9359ce900d9c78… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 10:46:05 2012 +0100 FIX: Fixed generated manual check definitions for checks without items like ntp_time and tcp_conn_stats --- ChangeLog | 4 ++++ web/htdocs/wato.py | 7 +++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d51143..7465922 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,10 @@ * Restructured cookie auth cookies (all auth cookies will be invalid after update -> all users have to login again) * Modularized login and cookie validation + + WATO: + * FIX: Fixed generated manual check definitions for checks without items + like ntp_time and tcp_conn_stats 1.2.1i3: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3d06cec..ae9291f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11109,6 +11109,13 @@ def register_check_parameters(subgroup, checkgroup, title, valuespec, itemspec, help = _("Please choose the check plugin")) ] if itemspec: elements.append(itemspec) + else: + # In case of static checks without check-item, add the fixed + # valuespec to add "None" as second element in the tuple + elements.append(FixedValue( + None, + totext = '', + )) if not valuespec: valuespec =\ FixedValue(None,

11 years, 10 months

Check_MK Git: check_mk: Checking for existing auth.phgp and auth. serials independent of the used login method

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8da8c92ad2d1b56a3384f781e6577fd45e74f43b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8da8c92ad2d1b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 09:18:08 2012 +0100 Checking for existing auth.phgp and auth.serials independent of the used login method --- web/htdocs/login.py | 10 ---------- web/htdocs/userdb.py | 23 ++++++++++++++++++++++- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 3c7557d..7e5e2ee 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -205,16 +205,6 @@ def page_login(no_html_output = False): return normal_login_page() def normal_login_page(called_directly = True): - # Working around the problem that the auth.php file needed for multisite based - # authorization of external addons might not exist when setting up a new installation - # We assume: Each user must visit this login page before using the multisite based - # authorization. So we can easily create the file here if it is missing. - # This is a good place to replace old api based files in the future. - auth_php = defaults.var_dir + '/wato/auth/auth.php' - if not os.path.exists(auth_php) or os.path.getsize(auth_php) == 0: - import wato - wato.create_auth_file(wato.load_users()) - html.set_render_headfoot(False) html.header(_("Check_MK Multisite Login"), javascripts=[], stylesheets=["pages", "login"]) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index c49d112..e0da8ce 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import config +import config, defaults from lib import * import time from valuespec import * @@ -217,6 +217,25 @@ def hook_save(users): else: raise +# This function registers general stuff, which is independet of the single +# connectors to each page load. It is exectued AFTER all other page hooks. +def general_page_hook(): + # Working around the problem that the auth.php file needed for multisite based + # authorization of external addons might not exist when setting up a new installation + # We assume: Each user must visit this login page before using the multisite based + # authorization. So we can easily create the file here if it is missing. + # This is a good place to replace old api based files in the future. + auth_php = defaults.var_dir + '/wato/auth/auth.php' + if not os.path.exists(auth_php) or os.path.getsize(auth_php) == 0: + import wato + wato.create_auth_file(wato.load_users()) + + # Create initial auth.serials file, same issue as auth.php above + serials_file = '%s/auth.serials' % os.path.dirname(defaults.htpasswd_file) + if not os.path.exists(serials_file): + import wato + wato.save_users(wato.load_users()) + # Hook function can be registered here to execute actions on a "regular" base without # user triggered action. This hook is called on each page load. # Catch all exceptions and log them to apache error log. Let exceptions raise trough @@ -235,3 +254,5 @@ def hook_page(): import traceback html.log('Exception (%s, page handler): %s' % (connector['id'], traceback.format_exc())) + + general_page_hook()

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