Checkmk git commits November 2013

checkmk-commits@lists.checkmk.com

6 participants
274 discussions

Check_MK Git: check_mk: FIX checkman: alcatel power - now with correct classification

by Andreas Boesl

Module: check_mk Branch: master Commit: e010c62fa4b4be6ebec04f6e024cd5f640c1a141 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e010c62fa4b4be… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 18 16:37:27 2013 +0100 FIX checkman: alcatel power - now with correct classification This incorrect classification broke the checkman browser (cmk -m) in the network devices subtree --- .werks/37 | 9 +++++++++ ChangeLog | 1 + checkman/alcatel_power | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/37 b/.werks/37 new file mode 100644 index 0000000..9e8e3e9 --- /dev/null +++ b/.werks/37 @@ -0,0 +1,9 @@ +Title: checkman: alcatel power - now with correct classification +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1384788936 +Class: fix + +This incorrect classification broke the checkman browser (cmk -m) +in the network devices subtree diff --git a/ChangeLog b/ChangeLog index e8d4e8d..f4fc516 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress * 0209 FIX: Cleaned up bad code in fileinfo.groups check * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process inventory... + * 0037 FIX: checkman: alcatel power - now with correct classification... Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/checkman/alcatel_power b/checkman/alcatel_power index 36428d9..3da772b 100644 --- a/checkman/alcatel_power +++ b/checkman/alcatel_power @@ -1,6 +1,6 @@ title: Alcatel switches: Power Supplies agents: snmp -catalog: hw/network +catalog: hw/network/alcatel license: GPL distribution: check_mk description:

10 years, 10 months

Check_MK Git: check_mk: Logwatch: context lines can now be disabled using nocontext=1

by Lars Michelsen

Module: check_mk Branch: master Commit: 7869f2d3dd7bb9af288c6537335ddd3020699fe9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7869f2d3dd7bb9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 18 15:03:05 2013 +0100 Logwatch: context lines can now be disabled using nocontext=1 Each line which comes together with a line matching a logwatch pattern is proceeded to the monitoring host as context line. This can now be disabled using the linux agent plugin by adding the option "nocontext=1" to the header line of a logfile configuration in logwatch.cfg --- .werks/214 | 11 +++++++++++ ChangeLog | 1 + agents/plugins/mk_logwatch | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/.werks/214 b/.werks/214 new file mode 100644 index 0000000..30d8ab0 --- /dev/null +++ b/.werks/214 @@ -0,0 +1,11 @@ +Title: Logwatch: context lines can now be disabled using nocontext=1 +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1384783276 +Class: feature + +Each line which comes together with a line matching a logwatch pattern +is proceeded to the monitoring host as context line. This can now be +disabled using the linux agent plugin by adding the option "nocontext=1" +to the header line of a logfile configuration in logwatch.cfg diff --git a/ChangeLog b/ChangeLog index 0573e06..e8d4e8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 0093 check_http: Default service description prefix can be avoided... * 0004 df: dynamic filesystem levels now reorder levels automatically... * 0069 veeam_client: limits for time since last backup introduced + * 0214 Logwatch: context lines can now be disabled using nocontext=1... * 0024 FIX: cisco_wlc: removed configuration parameter ap_model * 0065 FIX: veeam_client: check behaviour improved when backup is in progress * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 6cd4e3f..3dbca32 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -293,6 +293,8 @@ def process_logfile(logfile, patterns): line = line.replace("\1", "\nCONT:") if level == "I": level = "." + if opt_nocontext and level == '.': + continue 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 @@ -328,6 +330,7 @@ for filenames, patterns in config: opt_regex = None opt_overflow = 'C' opt_overflow_level = 2 + opt_nocontext = False try: options = [ o.split('=', 1) for o in filenames if '=' in o ] for key, value in options: @@ -344,6 +347,8 @@ for filenames, patterns in config: opt_regex = re.compile(value) elif key == 'iregex': opt_regex = re.compile(value, re.I) + elif key == 'nocontext': + opt_nocontext = True else: raise Exception("Invalid option %s" % key) except Exception, e:

10 years, 10 months

Check_MK Git: check_mk: FIX LDAP: Various small improvements for handling the LDAP user connector

by Lars Michelsen

Module: check_mk Branch: master Commit: 895d84a591434ff0d30348f1c05ca7916c7d4da2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=895d84a591434f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 18 13:30:37 2013 +0100 FIX LDAP: Various small improvements for handling the LDAP user connector --- .werks/213 | 8 ++++++++ ChangeLog | 1 + web/htdocs/userdb.py | 8 ++++---- web/htdocs/wato.py | 16 ++++++++++++---- web/plugins/userdb/ldap.py | 16 ++++++++++++++-- web/plugins/wato/check_mk_configuration.py | 8 +++++++- 6 files changed, 46 insertions(+), 11 deletions(-) diff --git a/.werks/213 b/.werks/213 new file mode 100644 index 0000000..212b10b --- /dev/null +++ b/.werks/213 @@ -0,0 +1,8 @@ +Title: LDAP: Various small improvements for handling the LDAP user connector +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1384777799 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fc6279f..0573e06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 0212 FIX: Fixed loading of sites with configured tcp socket in WATO * 0095 FIX: Fixed problem with portnumber in Wato Distributed Monitoring dialog * 0096 FIX: Fixed exception in wato + * 0213 FIX: LDAP: Various small improvements for handling the LDAP user connector Notifications: * 0005 Added notification script for sending SMS via mobilant.com... diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 794e64a..d69d733 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -664,12 +664,12 @@ def hook_sync(connector_id = None, add_to_changelog = False, only_username = Non if config.debug: import traceback html.show_error( - "<h3>" + _("Error executing sync hook") + "</h3>" + "<h3>" + _("Error during sync") + "</h3>" "<pre>%s</pre>" % (traceback.format_exc()) ) else: html.show_error( - "<h3>" + _("Error executing sync hook") + "</h3>" + "<h3>" + _("Error during sync") + "</h3>" "<pre>%s</pre>" % (e) ) no_errors = False @@ -678,7 +678,7 @@ def hook_sync(connector_id = None, add_to_changelog = False, only_username = Non raise import traceback html.show_error( - "<h3>" + _("Error executing sync hook") + "</h3>" + "<h3>" + _("Error during sync") + "</h3>" "<pre>%s</pre>" % (traceback.format_exc()) ) no_errors = False @@ -697,7 +697,7 @@ def hook_save(users): if config.debug: import traceback html.show_error( - "<h3>" + _("Error executing save hook") + "</h3>" + "<h3>" + _("Error during saving") + "</h3>" "<pre>%s</pre>" % (traceback.format_exc()) ) else: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f8ae000..a25d868 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5847,10 +5847,15 @@ def mode_ldap_config(phase): html.write('<h2>' + _('Diagnostics') + '</h2>') if not html.var('_test'): - html.message(_('You can verify the single parts of your ldap configuration using this ' + html.message('<p>%s</p><p>%s</p>' % + (_('You can verify the single parts of your ldap configuration using this ' 'dialog. Simply make your configuration in the form on the left side and ' 'hit the "Save & Test" button to execute the tests. After ' - 'the page reload, you should see the results of the test here.')) + 'the page reload, you should see the results of the test here.'), + _('If you need help during configuration or experience problems, please refer ' + 'to the Multisite <a target="_blank" ' + 'href="http://mathias-kettner.de/checkmk_multisite_ldap_integration.html">' + 'LDAP Documentation</a>.'))) else: def test_connect(address): conn, msg = userdb.ldap_connect_server(address) @@ -8742,8 +8747,11 @@ def mode_users(phase): elif c == False: return "" elif html.var('_sync'): - if userdb.hook_sync(add_to_changelog = True): - return None, _('The user synchronization completed successfully.') + try: + if userdb.hook_sync(add_to_changelog = True, raise_exc = True): + return None, _('The user synchronization completed successfully.') + except Exception, e: + raise MKUserError(None, str(e)) return None diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index d419730..23f899d 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -949,9 +949,21 @@ def ldap_sync(add_to_changelog, only_username): wato.log_pending(wato.SYNCRESTART, None, "edit-users", _("LDAP Connector: Created user %s" % user_id)) else: + details = [] + if added: + details.append(_('Added: %s') % ', '.join(added)) + if removed: + details.append(_('Removed: %s') % ', '.join(removed)) + if changed: + if 'ldap_pw_last_changed' in changed and 'serial' in changed: + details.append(_('Password Changed')) + changed.remove('ldap_pw_last_changed') + changed.remove('serial') + if changed: + details.append(('Changed: %s') % ', '.join(changed)) + wato.log_pending(wato.SYNCRESTART, None, "edit-users", - _("LDAP Connector: Modified user %s (Added: %s, Removed: %s, Changed: %s)" % - (user_id, ', '.join(added), ', '.join(removed), ', '.join(changed)))) + _("LDAP Connector: Modified user %s (%s)") % (user_id, ', '.join(details))) duration = time.time() - start_time ldap_log('SYNC FINISHED - Duration: %0.3f sec' % duration) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 92a6170..a4e2ec0 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -530,7 +530,13 @@ register_configvar(group, )), ("use_ssl", FixedValue( title = _("Use SSL"), - help = _("Connect to the LDAP server with a SSL encrypted connection."), + help = _("Connect to the LDAP server with a SSL encrypted connection. You might need " + "to configure the OpenLDAP installation on your monitoring server to accept " + "the certificates of the LDAP server. This is normally done via system wide " + "configuration of the CA certificate which signed the certificate of the LDAP " + "server. Please refer to the <a target=\"_blank\" " + "href=\"http://mathias-kettner.de/checkmk_multisite_ldap_integration.html\">" + "documentation</a> for details."), value = True, totext = _("Encrypt the network connection using SSL."), )),

10 years, 10 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 836283f0d7b919f67c8b70de332465cd5d28c036 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=836283f0d7b919… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 18 13:29:42 2013 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 964480f..0c56bea 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -213 +233

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #1025

by Lars Michelsen

Module: check_mk Branch: master Commit: 515577287cb7106a6ad6cf4db397c38e554fae4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=515577287cb710… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 15 00:03:21 2013 +0100 Updated bug entries #1025 --- .bugs/1025 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/1025 b/.bugs/1025 new file mode 100644 index 0000000..6e927e5 --- /dev/null +++ b/.bugs/1025 @@ -0,0 +1,11 @@ +Title: HTML tags are interpreted on Global Settings page +Component: wato +State: open +Date: 2013-11-14 23:58:41 +Targetversion: 1.2.3i6 +Class: bug + +Mail template, parameters in mail command or +page title might contain < or > chars which are interpreted +as html tags on the global settings page. These tags should +really be escaped somehow.

10 years, 10 months

Check_MK Git: check_mk: FIX Fixed exception in wato

by Bastian Kuhn

Module: check_mk Branch: master Commit: bda3a43cf0226041519cc0495bf656d6e9dd6114 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bda3a43cf02260… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Sun Nov 17 17:16:44 2013 +0100 FIX Fixed exception in wato --- .werks/96 | 8 ++++++++ ChangeLog | 3 ++- web/htdocs/htmllib.py | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/96 b/.werks/96 new file mode 100644 index 0000000..2c748eb --- /dev/null +++ b/.werks/96 @@ -0,0 +1,8 @@ +Title: Fixed exception in wato +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1384704895 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7b4021e..fc6279f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,9 +42,10 @@ * 0033 FIX: WATO forms: incorrect handling of checkbox state * 0205 FIX: Allowing star chars in variable names to fix role/permission editing... * 0207 FIX: Explicit communities were not written to config files in all cases - * 0095 FIX: Fixed problem with portnumber in Wato Distributed Monitoring dialog * 0094 FIX: Hide SNMPv3 credentials in WATO... * 0212 FIX: Fixed loading of sites with configured tcp socket in WATO + * 0095 FIX: Fixed problem with portnumber in Wato Distributed Monitoring dialog + * 0096 FIX: Fixed exception in wato Notifications: * 0005 Added notification script for sending SMS via mobilant.com... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4e98d99..3964300 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1129,6 +1129,8 @@ class html: def varencode(self, varname): if varname == None: return "None" + if type(varname) == int: + return varname ret = "" for c in varname:

10 years, 10 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0be183415f77bbf1c125973d5a79d957062a96ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0be183415f77bb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 15 16:15:03 2013 +0100 merge conflict ---

10 years, 10 months

Check_MK Git: check_mk: FIX Fixed problem with portnumber in Wato Distributed Monitoring dialog

by Bastian Kuhn

Module: check_mk Branch: master Commit: 559f8025f25831865bc1bb77bfd8975983b53493 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=559f8025f25831… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 15 16:14:15 2013 +0100 FIX Fixed problem with portnumber in Wato Distributed Monitoring dialog --- .werks/95 | 8 ++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/95 b/.werks/95 new file mode 100644 index 0000000..43a94e0 --- /dev/null +++ b/.werks/95 @@ -0,0 +1,8 @@ +Title: Fixed problem with portnumber in Wato Distributed Monitoring dialog +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1384528369 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index cb576f5..2003325 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 0205 FIX: Allowing star chars in variable names to fix role/permission editing... * 0207 FIX: Explicit communities were not written to config files in all cases * 0094 FIX: Hidding snmpv3 credentials in wato... + * 0095 FIX: Fixed problem with portnumber in Wato Distributed Monitoring dialog Notifications: * 0032 FIX: mail notification plugin: replace windows forbidden characters in mail images diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 0ba8c5c..251df0b 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -239,7 +239,7 @@ class Integer(ValueSpec): style = "text-align: right;" else: style = "" - html.number_input(varprefix, self._display_format % value, size = self._size, style = style) + html.number_input(varprefix, self._display_format % saveint(value), size = self._size, style = style) if self._unit: html.write(" ") html.write(self._unit)

10 years, 10 months

Check_MK Git: check_mk: FIX display http[s] links in plugin output

by Andreas Boesl

Module: check_mk Branch: master Commit: 6b764906003c989f2243ca99d7c87dceb147ddb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b764906003c98… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 15 11:58:25 2013 +0100 FIX display http[s] links in plugin output --- web/htdocs/lib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 1606408..12929cb 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -256,7 +256,8 @@ def format_plugin_output(output, row = None): output = output[:a] + "running on " + h + output[e+1:] output = re.sub("http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*,]|(?:%[0-9a-fA-F][0-9a-fA-F]))+", - lambda p: '<a href="%(group)s">%(group)s</a>' % { "group": p.group(0) }, output) + lambda p: '<a href="%s">%s</a>' % + (p.group(0), len(p.group(0)) > 40 and p.group(0)[:40] + "..." or p.group(0)), output) return output

10 years, 10 months

Check_MK Git: check_mk: veeam_client: limits for time since last backup introduced

by Götz Golla

Module: check_mk Branch: master Commit: f68a98683ec025cc9faafff9df139d97f2bd862f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f68a98683ec025… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Nov 15 10:56:52 2013 +0100 veeam_client: limits for time since last backup introduced --- .werks/69 | 8 +++++++ ChangeLog | 2 +- checkman/veeam_client | 24 +++++++++++++++++--- checks/veeam_client | 40 +++++++++++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 20 +++++++++++++++++ 5 files changed, 85 insertions(+), 9 deletions(-) diff --git a/.werks/69 b/.werks/69 new file mode 100644 index 0000000..acfad14 --- /dev/null +++ b/.werks/69 @@ -0,0 +1,8 @@ +Title: veeam_client: limits for time since last backup introduced +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1384509363 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3639ddb..f2aede8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 0208 fileinfo.groups: Added minimum/maximum file size parameters... * 0093 check_http: Default service description prefix can be avoided... * 0004 df: dynamic filesystem levels now reorder levels automatically... + * 0069 veeam_client: limits for time since last backup introduced * 0024 FIX: cisco_wlc: removed configuration parameter ap_model * 0065 FIX: veeam_client: check behaviour improved when backup is in progress * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress @@ -37,7 +38,6 @@ WATO: * 0053 New rule for configuring the display_name of a service... - * 0008 Test - Please ignore... * 0048 FIX: Fixed locking issue on host diagnose page * 0033 FIX: WATO forms: incorrect handling of checkbox state * 0205 FIX: Allowing star chars in variable names to fix role/permission editing... diff --git a/checkman/veeam_client b/checkman/veeam_client index 83ce3fb..c74a1f6 100644 --- a/checkman/veeam_client +++ b/checkman/veeam_client @@ -17,11 +17,29 @@ description: or {InProgress}. It is {WARN} if the status is {Warning}. It is {CRIT} if the status of the backup is {Failed}. -inventory: - A check will be created for all hosts known to check_mk and reported - by the Veeam agent plugin. + In addition {WARN} and {CRIT} levels can be set for the time since the end + of the last backup. + +examples: + # sets the warning and critical levels to 5 and 10 days, respectively + veeam_client_default_levels = { "age": ( 432000, 864000 ) } perfdata: Total Size, duration and the average speed of the backup will be recorded as performance data. Duration will not be recorded if the status of the backup is {Pending} or {InProgress}. + +inventory: + A check will be created for all hosts known to check_mk and reported + by the Veeam agent plugin. + +[parameters] +parameters(tuple): parameters is a dictionary with one value + + {"age"}: a tuple of warning and critical limits for the time since last + backup in seconds + + +[configuration] +veeam_client_default_levels (dict): This variable is preset to +{{ "age": ( 108000, 172800 ) } } diff --git a/checks/veeam_client b/checks/veeam_client index 2b11b8f..53c1c1e 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -24,13 +24,22 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import datetime, time + +veeam_client_default_levels = { "age": ( 108000, 172800 ) } # 30h/2d + state = { "Success": 0, "Failed": 2, "Warning":1, "InProgress":0, "Pending":0 } def inventory_veeam_client(info): if info[0][0] == "Status": - return [ (None, None) ] + return [ (None, veeam_client_default_levels) ] def check_veeam_client(item, params, info): + if params.get("age"): + warn, crit = params['age'] + else: + warn, crit = veeam_default_levels.get("age") + if not info[0][0] == "Status": return 3, "No status data found in first line of agent data" result = "" @@ -57,18 +66,39 @@ def check_veeam_client(item, params, info): elif line[0] == "TotalSizeByte": totalsize = saveint(line[1]) perfdata.append(("totalsize", totalsize, 0, 0, 0)) - else: - if (result == "InProgress" or result == "Pending") and line[0] == "StopTime": + elif line[0] == "StopTime": + if (result == "InProgress" or result == "Pending"): infotxt += line[0] + ": - " else: - infotxt += line[0] + ":" + line[1] + " " + now = datetime.datetime.now() + date, time = line[1].split(" ") + day, month, year = map(int, date.split(".")) + hour, minute, second = map(int, time.split(":")) + stoptime = datetime.datetime( year, month, day, hour, minute, second) + warndiff = datetime.timedelta(seconds=warn) + critdiff = datetime.timedelta(seconds=crit) + + if critdiff < now - stoptime: + stopstate = 2 + stopsym = "( >%s ago)(!!)" % get_age_human_readable(crit) + elif warndiff < now - stoptime: + stopstate = 1 + stopsym = "( >%s ago)(!)" % get_age_human_readable(warn) + else: + stopstate = 0 + stopsym = "" + infotxt += line[0] + ":" + line[1] + stopsym + " " + else: + infotxt += line[0] + ":" + line[1] + " " - return (state[result], infotxt, perfdata) + status = max(state[result], stopstate) + return (status, infotxt, perfdata) check_info["veeam_client"] = { 'check_function': check_veeam_client, 'inventory_function': inventory_veeam_client, 'service_description': 'VEEAM Client', + 'group': 'veeam_backup', 'has_perfdata': True, } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e970bc3..bb4f649 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2410,6 +2410,26 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "veeam_backup", + _("Veeam Time since last Backup"), + Dictionary( + elements = [ + ("age", + Tuple( + title = _("Time since end of last backup"), + elements = [ + Age(title = _("Warning if older than"), default_value = 108000), + Age(title = _("Critical if older than"), default_value = 172800) + ] + ) + )] + ), + None, + None +) + +register_check_parameters( + subgroup_applications, "mssql_counters_locks", _("MSSQL Locks"), Dictionary(

10 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2013