Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 24e78e9998feb89591c3d0f337ad4cdff75b00f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24e78e9998feb8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 27 10:31:47 2013 +0200 Better wording --- web/plugins/wato/check_mk_configuration.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index ba15b70..8623261 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -433,7 +433,7 @@ register_configvar(group, totext = _("Don't use persistent LDAP connections."), )), ("connect_timeout", Float( - title = _("LDAP Connect Timeout (sec)"), + title = _("Connect Timeout (sec)"), help = _("Timeout for the initial connection to the LDAP server in seconds."), minvalue = 1.0, default_value = 2.0, @@ -456,7 +456,7 @@ register_configvar(group, ], )), ("bind", Tuple( - title = _("LDAP Bind Credentials"), + title = _("Bind Credentials"), help = _("Set the credentials to be used to connect to the LDAP server. The " "used account must not be allowed to do any changes in the directory " "the whole connection is read only. " @@ -479,14 +479,14 @@ register_configvar(group, ], )), ("page_size", Integer( - title = _("LDAP Page Size"), + title = _("Page Size"), help = _("LDAP searches can be performed in paginated mode, for example to improve " "the performance. This enables pagination and configures the size of the pages."), minvalue = 1, default_value = 100, )), ("response_timeout", Integer( - title = _("LDAP Response Timeout (sec)"), + title = _("Response Timeout (sec)"), help = _("Timeout for LDAP query responses."), minvalue = 0, default_value = 5,

11 years

Check_MK Git: check_mk: ldap: supporting paginated searches now

by Lars Michelsen

Module: check_mk Branch: master Commit: a557f4f7061bfad6b04086e254a578158c43a263 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a557f4f7061bfa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 27 10:25:11 2013 +0200 ldap: supporting paginated searches now Using asynchronous searches / added optional support for paginated searches (Can be enabled in connection settings) --- ChangeLog | 3 ++ web/plugins/userdb/ldap.py | 78 +++++++++++++++++++++++++++- web/plugins/wato/check_mk_configuration.py | 15 +++++- 3 files changed, 93 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed9938f..c97fe8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,9 @@ Can be activated in global settings * New global multisite options: Default downtime duration and comment Display current date in dashboard + * LDAP: Using asynchronous searches / added optional support for paginated + searches (Can be enabled in connection settings) + WATO: * Allow to configure check-/retry_interval in second precision * FIX: do validation of check items in rule editor diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index ae51e41..6129538 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -31,6 +31,15 @@ try: # docs: http://www.python-ldap.org/doc/html/index.html import ldap import ldap.filter + from ldap.controls import SimplePagedResultsControl + + # be compatible to both python-ldap below 2.4 and above + try: + LDAP_CONTROL_PAGED_RESULTS = ldap.LDAP_CONTROL_PAGE_OID + ldap_compat = False + except: + LDAP_CONTROL_PAGED_RESULTS = ldap.CONTROL_PAGEDRESULTS + ldap_compat = True except: pass from lib import * @@ -180,6 +189,68 @@ def ldap_bind(username, password, catch = True): else: raise +def ldap_async_search(base, scope, filt, columns): + ldap_log(' ASYNC SEARCH') + # issue the ldap search command (async) + msgid = ldap_connection.search_ext(base, scope, filt, columns) + + results = [] + while True: + restype, resdata = ldap_connection.result(msgid = msgid, + timeout = config.ldap_connection.get('response_timeout', 5)) + + results.extend(resdata) + if restype == ldap.RES_SEARCH_RESULT or not resdata: + break + + # no limit at the moment + #if sizelimit and len(users) >= sizelimit: + # ldap_connection.abandon_ext(msgid) + # break + time.sleep(0.1) + + return results + +def ldap_paged_async_search(base, scope, filt, columns): + ldap_log(' PAGED ASYNC SEARCH') + page_size = config.ldap_connection.get('page_size', 100) + + if ldap_compat: + lc = SimplePagedResultsControl(size = page_size, cookie = '') + else: + lc = SimplePagedResultsControl( + LDAP_CONTROL_PAGED_RESULTS, True, (page_size, '') + ) + + results = [] + while True: + # issue the ldap search command (async) + msgid = ldap_connection.search_ext(base, scope, filt, columns, serverctrls = [lc]) + + unused_code, response, unused_msgid, serverctrls = ldap_connection.result3( + msgid = msgid, timeout = config.ldap_connection.get('response_timeout', 5) + ) + + for result in response: + results.append(result) + + # Mark current position in pagination control for next loop + cookie = None + for serverctrl in serverctrls: + if serverctrl.controlType == LDAP_CONTROL_PAGED_RESULTS: + if ldap_compat: + cookie = serverctrl.cookie + if cookie: + lc.cookie = cookie + else: + cookie = serverctrl.controlValue[1] + if cookie: + lc.controlValue = (page_size, cookie) + break + if not cookie: + break + return results + def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): if scope: config_scope = scope @@ -196,14 +267,17 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): ldap_log('LDAP_SEARCH "%s" "%s" "%s" "%r"' % (base, scope, filt, columns)) start_time = time.time() - # Convert all keys to lower case! result = [] try: - for dn, obj in ldap_connection.search_s(base, scope, filt, columns): + + search_func = config.ldap_connection.get('page_size') \ + and ldap_paged_async_search or ldap_async_search + for dn, obj in search_func(base, scope, filt, columns): if dn is None: continue # skip unwanted answers new_obj = {} for key, val in obj.iteritems(): + # Convert all keys to lower case! new_obj[key.lower().decode('utf-8')] = [ i.decode('utf-8') for i in val ] result.append((dn, new_obj)) except ldap.NO_SUCH_OBJECT, e: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 991e110..ba15b70 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -478,8 +478,21 @@ register_configvar(group, ), ], )), + ("page_size", Integer( + title = _("LDAP Page Size"), + help = _("LDAP searches can be performed in paginated mode, for example to improve " + "the performance. This enables pagination and configures the size of the pages."), + minvalue = 1, + default_value = 100, + )), + ("response_timeout", Integer( + title = _("LDAP Response Timeout (sec)"), + help = _("Timeout for LDAP query responses."), + minvalue = 0, + default_value = 5, + )), ], - optional_keys = ['no_persistent', 'use_ssl', 'bind', ], + optional_keys = ['no_persistent', 'use_ssl', 'bind', 'page_size', 'response_timeout'], ), domain = "multisite", )

11 years

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

by Lars Michelsen

Module: check_mk Branch: master Commit: f8c39766ca839f29bcb10ed54f1a4a75e153593d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8c39766ca839f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 27 10:29:11 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years

Check_MK Git: check_mk: jar_signature: avoid entry for "*.jar"

by Mathias Kettner

Module: check_mk Branch: master Commit: 89dd6d9ebbcc5d68dc7c13204f61d31b5e7bddd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89dd6d9ebbcc5d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 27 08:56:23 2013 +0200 jar_signature: avoid entry for "*.jar" --- agents/plugins/jar_signature | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/agents/plugins/jar_signature b/agents/plugins/jar_signature index 76bb431..7309923 100755 --- a/agents/plugins/jar_signature +++ b/agents/plugins/jar_signature @@ -36,10 +36,12 @@ PATH=$JAVA_HOME/bin:$PATH echo "<<<jar_signature>>>" for JAR in $JAR_PATH; do - echo "[[[${JAR##*/}]]]" - OUTPUT=$(jarsigner -verify -verbose -certs "$JAR") - LINE=$(echo "$OUTPUT" | grep -n ^s | tail -n1 | cut -d: -f1) - echo "$(echo "$OUTPUT" | tail -n +$LINE)" - echo + if [ -e "$JAR" ] ; then # avoid entry for '*.jar' + echo "[[[${JAR##*/}]]]" + OUTPUT=$(jarsigner -verify -verbose -certs "$JAR") + LINE=$(echo "$OUTPUT" | grep -n ^s | tail -n1 | cut -d: -f1) + echo "$(echo "$OUTPUT" | tail -n +$LINE)" + echo + fi done

11 years

Check_MK Git: check_mk: Fixed invalid error message in WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 4914a66ed468ef1f740c27125955fb146564e463 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4914a66ed468ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 27 08:48:57 2013 +0200 Fixed invalid error message in WATO --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5e3c477..bf73fe4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11613,7 +11613,7 @@ def page_user_profile(): users = userdb.load_users() user = users.get(config.user_id) if user == None: - html.warning(_("Sorry, your user account does not exist.")) + html.show_warning(_("Sorry, your user account does not exist.")) html.footer() return

11 years

Check_MK Git: check_mk: Rework global downtime settings

by Mathias Kettner

Module: check_mk Branch: master Commit: 5135e7f68b29d11ed0098c39bdc630ac4b9de3db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5135e7f68b29d1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 26 17:23:12 2013 +0200 Rework global downtime settings --- web/plugins/views/commands.py | 6 +++--- web/plugins/wato/check_mk_configuration.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index e9fc174..23e9393 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -420,14 +420,14 @@ def get_child_hosts(site, hosts, recurse): def paint_downtime_buttons(what): downtime_duration = config.default_downtime.get("duration", 60) downtime_comment = config.default_downtime.get("comment", "") + html.write(_('Downtime Comment')+": ") + html.text_input("_down_comment", downtime_comment, size=60, submit="") + html.write("<hr>") html.button("_down_from_now", _("From now for")) html.write(" ") html.number_input("_down_minutes", downtime_duration, size=4, submit="_down_from_now") html.write("  " + _("minutes")) html.write("<hr>") - html.write(_('Downtime Comment')+": ") - html.text_input("_down_comment", downtime_comment, size=60, submit="") - html.write("<hr>") html.button("_down_2h", _("2 hours")) html.button("_down_today", _("Today")) html.button("_down_week", _("This week")) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index ec2fd34..991e110 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -283,22 +283,22 @@ register_configvar(group, "default_downtime", Dictionary( title = _("Default downtime settings"), - help = _("This setting allows to set a default downtime comment and duration. "\ + help = _("This setting allows to set a default downtime comment and the duration for the button <i>From now for...</i>. "\ "The schedule downtime formular uses these values as default. "), + optional_keys = False, elements = [ ("duration", Integer( title = _("Duration"), help = _("The duration in minutes of the default downtime"), minvalue = 1, unit = _("minutes"), - default_value = 120, + default_value = 60, )), - ("comment", TextAscii( + ("comment", TextUnicode( title = _("Downtime comment"), help = _("The default comment for a downtime. "\ "You can use the placeholders %(user)s and %(duration)s "\ "which will replaced when the downtime command is sent"), - default_value = _("Downtime of %(duration)s minutes triggered by %(user)s"), size = 80 )), ],

11 years

Check_MK Git: check_mk: Rename config variable for date format

by Mathias Kettner

Module: check_mk Branch: master Commit: 245e6aa5f972eb7d50e72aa90be2954768c79e00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=245e6aa5f972eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 26 17:14:13 2013 +0200 Rename config variable for date format --- web/htdocs/htmllib.py | 4 ++-- web/htdocs/wato.py | 4 ++-- web/plugins/config/builtin.py | 2 +- web/plugins/wato/check_mk_configuration.py | 28 ++++++++++++---------------- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a7292f4..4f7cd04 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -887,8 +887,8 @@ class html: 'onclick="this.innerHTML=\'%s\'; document.location.reload();">%s</a></td>' % (_("Reloading..."), title)) self.write('<td style="min-width:240px" class=right><span id=headinfo></span>%s   ' % login_text) - if config.display_date_in_dashboard.get("format"): - self.write('   <b id=headerdate format="%s"></b>' % config.display_date_in_dashboard["format"]) + if config.pagetitle_date_format: + self.write('   <b id=headerdate format="%s"></b>' % config.pagetitle_date_format) self.write(' <b id=headertime></b>') self.write("<script language=\"javascript\" type=\"text/javascript\">updateHeaderTime()</script>") try: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b2efec8..5e3c477 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5510,7 +5510,7 @@ def mode_edit_configvar(phase): is_on_default = varname not in current_settings if phase == "action": - if html.var("reset"): + if html.var("_reset"): if not isinstance(valuespec, Checkbox): c = wato_confirm( _("Resetting configuration variable"), @@ -5574,7 +5574,7 @@ def mode_edit_configvar(phase): html.button("save", _("Save")) if allow_reset and not is_on_default: curvalue = current_settings[varname] - html.button("reset", curvalue == defvalue and _("Remove explicit setting") or _("Reset to default")) + html.button("_reset", curvalue == defvalue and _("Remove explicit setting") or _("Reset to default")) html.hidden_fields() html.end_form() diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 51b8bb7..c1abc51 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -184,7 +184,7 @@ multisite_draw_ruleicon = False default_downtime = {} # Display dashboard date -display_date_in_dashboard = {} +pagetitle_date_format = None # _ _ ____ ____ # | | | |___ ___ _ __| _ \| __ ) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index e68d97d..ec2fd34 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -219,22 +219,18 @@ register_configvar(group, domain = "multisite") register_configvar(group, - "display_date_in_dashboard", - Dictionary( - title = _("Display date in dashboard"), - help = _("When enabled, the dashboard headline also displays "\ - "the date in addition the time "), - label = _("Draw date"), - elements = [ - ("format", DropdownChoice( - title = _("Display date in dashboard"), - label = _("Date format"), - choices = [ - ('yyyy-mm-dd', _("YYYY-MM-DD")), - ('dd.mm.yyyy', _("DD.MM.YYYY")), - ], - default_value = 'yyyy-mm-dd')) - ]), + "pagetitle_date_format", + DropdownChoice( + title = _("Date format for page titles"), + help = _("When enabled, the headline of each page also displays "\ + "the date in addition the time."), + choices = [ + (None, _("Do not display a date")), + ('yyyy-mm-dd', _("YYYY-MM-DD")), + ('dd.mm.yyyy', _("DD.MM.YYYY")), + ], + default_value = None + ), domain = "multisite") register_configvar(group,

11 years

Check_MK Git: check_mk: New global option: Display date in dashboard

by Andreas Boesl

Module: check_mk Branch: master Commit: 98812b92c4ceb35eb59a6828a90b0855657f372c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98812b92c4ceb3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 26 16:56:32 2013 +0200 New global option: Display date in dashboard --- ChangeLog | 4 ++-- web/htdocs/htmllib.py | 6 ++++-- web/htdocs/js/checkmk.js | 21 +++++++++++++++++---- web/plugins/config/builtin.py | 3 +++ web/plugins/wato/check_mk_configuration.py | 19 +++++++++++++++++++ 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbc7a7b..ed9938f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,8 +61,8 @@ * Sorter Host IP address: fixed sorting, no longer uses str compare on ip * Views: New: Draw rule editor icon in multisite views (default off) Can be activated in global settings - * New global multisite option: Default downtime duration and comment - + * New global multisite options: Default downtime duration and comment + Display current date in dashboard WATO: * Allow to configure check-/retry_interval in second precision * FIX: do validation of check items in rule editor diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index bfae476..a7292f4 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -886,8 +886,10 @@ class html: self.write('<a href="#" onfocus="if (this.blur) this.blur();" ' 'onclick="this.innerHTML=\'%s\'; document.location.reload();">%s</a></td>' % (_("Reloading..."), title)) - self.write('<td style="min-width:240px" class=right><span id=headinfo></span>%s   <b id=headertime></b>' % - login_text) + self.write('<td style="min-width:240px" class=right><span id=headinfo></span>%s   ' % login_text) + if config.display_date_in_dashboard.get("format"): + self.write('   <b id=headerdate format="%s"></b>' % config.display_date_in_dashboard["format"]) + self.write(' <b id=headertime></b>') self.write("<script language=\"javascript\" type=\"text/javascript\">updateHeaderTime()</script>") try: self.help_visible = config.load_user_file("help", False) # cache for later usage diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 61a2b19..98e010c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -859,10 +859,23 @@ function updateHeaderTime() { oTime.innerHTML = hours + ':' + min - min = null; - hours = null; - t = null; - oTime = null; + var oDate = document.getElementById('headerdate'); + if (oDate) { + var day = ("0" + t.getDate()).slice(-2); + var month = ("0" + (t.getMonth() + 1)).slice(-2); + var year = t.getFullYear(); + var date_format = oDate.getAttribute("format"); + oDate.innerHTML = date_format.replace(/yyyy/, year).replace(/mm/, month).replace(/dd/, day); + } + day = null; + month = null; + year = null; + format = null; + oDate = null; + min = null; + hours = null; + t = null; + oTime = null; } var g_reload_error = false; diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 3f9b6db..51b8bb7 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -183,6 +183,9 @@ multisite_draw_ruleicon = False # Default downtime configuration default_downtime = {} +# Display dashboard date +display_date_in_dashboard = {} + # _ _ ____ ____ # | | | |___ ___ _ __| _ \| __ ) # | | | / __|/ _ \ '__| | | | _ \ diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index c95790d..e68d97d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -219,6 +219,25 @@ register_configvar(group, domain = "multisite") register_configvar(group, + "display_date_in_dashboard", + Dictionary( + title = _("Display date in dashboard"), + help = _("When enabled, the dashboard headline also displays "\ + "the date in addition the time "), + label = _("Draw date"), + elements = [ + ("format", DropdownChoice( + title = _("Display date in dashboard"), + label = _("Date format"), + choices = [ + ('yyyy-mm-dd', _("YYYY-MM-DD")), + ('dd.mm.yyyy', _("DD.MM.YYYY")), + ], + default_value = 'yyyy-mm-dd')) + ]), + domain = "multisite") + +register_configvar(group, "multisite_draw_ruleicon", Checkbox(title = _("Draw WATO rule editor icon for services"), label = _("Draw rule editor icon"),

11 years

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e813fa96b39e30cd57cf2c8a1ebf091997b2c98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e813fa96b39e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 26 14:55:40 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years

Check_MK Git: check_mk: mk_logwatch: support continuation lines with 'A'. Please refer to docu.

by Mathias Kettner

Module: check_mk Branch: master Commit: 75146d8ec9ff5bf28c36490ca26c7425a6601ba1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75146d8ec9ff5b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 26 14:55:38 2013 +0200 mk_logwatch: support continuation lines with 'A'. Please refer to docu. --- ChangeLog | 1 + agents/plugins/mk_logwatch | 137 +++++++++++++++++++++++++++++++------------- web/htdocs/logwatch.py | 2 +- 3 files changed, 98 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa73107..c0ca936 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ is obsolete now. * Special Agent vSphere: support ESX 4.1 (thanks to Mirko Witt) * esx_vsphere_object: make check state configurable + * mk_logwatch: support continuation lines with 'A'. Please refer to docu. Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 6823df4..1d64c76 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -29,7 +29,7 @@ import sys, os, re, time import glob -if '-d' in sys.argv[1:]: +if '-d' in sys.argv[1:] or '--debug' in sys.argv[1:]: tty_red = '\033[1;31m' tty_green = '\033[1;32m' tty_yellow = '\033[1;33m' @@ -42,7 +42,7 @@ else: tty_yellow = '' tty_blue = '' tty_normal = '' - debug = False + debug = False # The configuration file and status file are searched # in the directory named by the environment variable @@ -54,7 +54,7 @@ if not logwatch_dir: logwatch_dir = os.getenv("MK_CONFDIR") if not logwatch_dir: logwatch_dir = "." - + print "<<<logwatch>>>" config_filename = logwatch_dir + "/logwatch.cfg" @@ -70,61 +70,68 @@ def is_not_comment(line): def parse_filenames(line): return line.split() -def parse_pattern(line): - level, pattern = line.split(None, 1) - if level == 'R': - return False +def parse_pattern(level, pattern): + if level not in [ 'C', 'W', 'I', 'O' ]: + raise(Exception("Invalid pattern line '%s'" % line)) try: compiled = re.compile(pattern) except: raise(Exception("Invalid regular expression in line '%s'" % line)) - if level not in [ 'R','C', 'W', 'I', 'O' ]: - raise(Exception("Invalid pattern line '%s'" % line)) return (level, compiled) def read_config(): config_lines = [ line.rstrip() for line in filter(is_not_comment, file(config_filename).readlines()) ] - #Add config from a logwatch.d folder + # Add config from a logwatch.d folder for config_file in glob.glob(config_dir): config_lines += [ line.rstrip() for line in filter(is_not_comment, file(config_file).readlines()) ] have_filenames = False config = [] - # Line starts with whitespace -> pattern line - # otherwise -> file name line - count_lines = 1 - max_lines = len(config_lines) + for line in config_lines: rewrite = False - if line[0].isspace(): + if line[0].isspace(): # pattern line if not have_filenames: raise Exception("Missing logfile names") - if count_lines < max_lines: - try: - level, tmp_rewrite = config_lines[count_lines].split(None,1) - except: - level = "Nein" - if level == 'R': - rewrite = tmp_rewrite - pattern = parse_pattern(line) - if pattern: - patterns.append((pattern[0], pattern[1], rewrite)) - else: + level, pattern = line.split(None, 1) + if level == 'A': + cont_list.append(parse_cont_pattern(pattern)) + elif level == 'R': + rewrite_list.append(pattern) + else: + level, compiled = parse_pattern(level, pattern) + cont_list = [] # List of continuation patterns + rewrite_list = [] # List of rewrite patterns + patterns.append((level, compiled, cont_list, rewrite_list)) + else: # filename line patterns = [] config.append((parse_filenames(line), patterns)) have_filenames = True - count_lines += 1 return config +def parse_cont_pattern(pattern): + try: + return int(pattern) + except: + try: + return re.compile(pattern) + except: + if debug: + raise + raise Exception("Invalid regular expression in line '%s'" % pattern) + # structure of statusfile # # LOGFILE OFFSET INODE # /var/log/messages|7767698|32455445 # /var/test/x12134.log|12345|32444355 def read_status(): + if debug: + return {} + status = {} for line in file(status_filename): # TODO: Remove variants with spaces. rsplit is - # not portale. split fails if logfilename contains + # not portable. split fails if logfilename contains # spaces inode = -1 try: @@ -147,7 +154,24 @@ def save_status(status): for filename, (offset, inode) in status.items(): f.write("%s|%d|%d\n" % (filename, offset, inode)) +pushed_back_line = None +def next_line(f): + global pushed_back_line + if pushed_back_line != None: + line = pushed_back_line + pushed_back_line = None + return line + else: + try: + line = f.next() + return line + except: + return None + + def process_logfile(logfile, patterns): + global pushed_back_line + # Look at which file offset we have finished scanning # the logfile last time. If we have never seen this file # before, we set the offset to -1 @@ -156,6 +180,8 @@ def process_logfile(logfile, patterns): fl = os.open(logfile, os.O_RDONLY) inode = os.fstat(fl)[1] # 1 = st_ino except: + if debug: + raise print "[[[%s:cannotopen]]]" % logfile return @@ -202,7 +228,11 @@ def process_logfile(logfile, patterns): lines_parsed = 0 start_time = time.time() - for line in f: + while True: + line = next_line(f) + if line == None: + break # End of file + lines_parsed += 1 # Check if maximum number of new log messages is exceeded if opt_maxlines != None and lines_parsed > opt_maxlines: @@ -223,24 +253,45 @@ def process_logfile(logfile, patterns): break level = "." - log_line = line[:-1] - for lev, pattern, replace in patterns: - matches = pattern.search(log_line) + for lev, pattern, cont_patterns, replacements in patterns: + matches = pattern.search(line[:-1]) if matches: level = lev levelint = {'C': 2, 'W': 1, 'O': 0, 'I': -1, '.': -1}[lev] worst = max(levelint, worst) - if replace: - replace_count = 1 - new_message = replace.replace('\\0', log_line) - for replacement in matches.groups(): - new_message = new_message.replace('\\%d' % replace_count, replacement) - replace_count += 1 - log_line = new_message - break + + # Check for continuation lines + for cont_pattern in cont_patterns: + if type(cont_pattern) == int: # add that many lines + for x in range(cont_pattern): + cont_line = next_line(f) + if cont_line == None: # end of file + break + line = line[:-1] + "\1" + cont_line + + else: # pattern is regex + while True: + cont_line = next_line(f) + if cont_line == None: # end of file + break + elif cont_pattern.search(cont_line[:-1]): + line = line[:-1] + "\1" + cont_line + else: + pushed_back_line = cont_line # sorry for stealing this line + break + + # Replacement + for replace in replacements: + line = replace.replace('\\0', line) + "\n" + for nr, group in enumerate(matches.groups()): + line = line.replace('\\%d' % (nr+1), group) + + break # matching rule found and executed color = {'C': tty_red, 'W': tty_yellow, 'O': tty_green, 'I': tty_blue, '.': ''}[level] - outputtxt += "%s%s %s%s\n" % (color, level, log_line, tty_normal) + if debug: + line = line.replace("\1", "\nCONT:") + outputtxt += "%s%s %s%s\n" % (color, level, line[:-1], tty_normal) new_offset = os.lseek(fl, 0, 1) # os.SEEK_CUR not available in Python 2.4 status[logfile] = new_offset, inode @@ -253,6 +304,8 @@ def process_logfile(logfile, patterns): try: config = read_config() except Exception, e: + if debug: + raise print "CANNOT READ CONFIG FILE: %s" % e sys.exit(1) @@ -292,6 +345,8 @@ for filenames, patterns in config: else: raise Exception("Invalid option %s" % key) except Exception, e: + if debug: + raise print "INVALID CONFIGURATION: %s" % e sys.exit(1) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 3b8afed..2f521ce 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -220,7 +220,7 @@ def show_file(host, filename): ('match', line['line']), ]) html.icon_button(edit_url, _("Analyze this line"), "analyze") - html.write('%s</p>\n' % (htmllib.attrencode(line['line']) )) + html.write('%s</p>\n' % (htmllib.attrencode(line['line']).replace(" ", " ").replace("\1", "<br>") )) html.write('</div>\n')

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013