Checkmk git commits January 2013

checkmk-commits@lists.checkmk.com

3 participants
210 discussions

Check_MK Git: check_mk: Updated bug entries #0068

by Lars Michelsen

Module: check_mk Branch: master Commit: 9799d10b0065da8fcfe70e2984c03628db6955b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9799d10b0065da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 10:25:06 2013 +0100 Updated bug entries #0068 --- .bugs/68 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/.bugs/68 b/.bugs/68 index b0375a7..a49ec23 100644 --- a/.bugs/68 +++ b/.bugs/68 @@ -21,3 +21,7 @@ def lookup_ipaddress(hostname): return sockaddr[0] Ausserdem kommt check_icmp damit nicht klar. Hier muss dann auf check_ping ausgewichen werden. + +Note: There were many discussions about this feature on the mailinglists. I +also found some patches. When implementing this, please take a look at the +lists for details / hints.

11 years, 5 months

Check_MK Git: check_mk: Added comment painter to notification related views

by Lars Michelsen

Module: check_mk Branch: master Commit: eb9db241f9b5fbac78d464eec7645a960bdab33a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb9db241f9b5fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 11:22:20 2013 +0100 Added comment painter to notification related views --- ChangeLog | 3 +++ web/plugins/views/painters.py | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c923e2..c648cb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ * FIX: drbd: Parameters for expected roles and disk states can now be set to None to disable alerting on changed values + Multisite: + * Added comment painter to notification related views + WATO: * Added hr_mem check to the memory checkgroup to make it configurable in WATO * FIX: Fixed some typos in ldap error messages diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 2f96afb..ccc270a 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1679,6 +1679,20 @@ multisite_painters["log_options"] = { "paint" : lambda row: ("", row["log_options"]), } +def paint_log_comment(msg): + if ';' in msg: + parts = msg.split(';') + if len(parts) > 6: + return ("", parts[-1]) + return ("", "") + +multisite_painters["log_comment"] = { + "title" : _("Log: comment"), + "short" : _("Comment"), + "columns" : ["log_options"], + "paint" : lambda row: paint_log_comment(row['log_options']), +} + multisite_painters["log_time"] = { "title" : _("Log: entry time"), "short" : _("Time"),

11 years, 5 months

Check_MK Git: check_mk: updated drbd manpage

by Lars Michelsen

Module: check_mk Branch: master Commit: ebbe68b7c6bba125570acfce32941c2d33276a8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebbe68b7c6bba1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 10:00:25 2013 +0100 updated drbd manpage --- checkman/drbd | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/checkman/drbd b/checkman/drbd index cf6e60f..8b4f3c9 100644 --- a/checkman/drbd +++ b/checkman/drbd @@ -28,5 +28,7 @@ inventory: devices with the connection state "Unconfigured" are skipped. [parameters] -roles (list): The expected role of each node -disk_states (list): The expected disk-state of each node +roles (list): The expected role of each node. Can also be set to None to disable + alerting on this value. +disk_states (list): The expected disk-state of each node. Can also be set to None + to disable alerting on this value.

11 years, 5 months

Check_MK Git: check_mk: FIX: drbd: Parameters for expected roles and disk states can now be set to None to disable alerting on changed values

by Lars Michelsen

Module: check_mk Branch: master Commit: b43d54e5124b61ce42a88f4bd5950f207fe6975c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b43d54e5124b61… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 09:56:39 2013 +0100 FIX: drbd: Parameters for expected roles and disk states can now be set to None to disable alerting on changed values --- ChangeLog | 2 ++ checks/drbd | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce3decf..5c923e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ Checks & Agents: * FIX: mssql_counters.file_sizes - Fixed wrong value for "Log Files" in output + * FIX: drbd: Parameters for expected roles and disk states can now be set to + None to disable alerting on changed values WATO: * Added hr_mem check to the memory checkgroup to make it configurable in WATO diff --git a/checks/drbd b/checks/drbd index 4c58dc8..76b067c 100644 --- a/checks/drbd +++ b/checks/drbd @@ -254,12 +254,12 @@ def check_drbd_general(item, params, info): output = 'Connection State: %s' % parsed['cs'] output += ', Roles: %s/%s' % (parsed['ro'][0], parsed['ro'][1]) - if parsed['ro'] != params[0]: + if params[0] is not None and parsed['ro'] != params[0]: state = state < 2 and 2 or state output += ' (Expected: %s/%s)' % (params[0][0], params[0][1]) output += ', Disk States: %s/%s' % (parsed['ds'][0], parsed['ds'][1]) - if parsed['ds'] != params[1]: + if params[1] is not None and parsed['ds'] != params[1]: state = state < 2 and 2 or state output += ' (Expected: %s/%s)' % (params[1][0], params[1][1])

11 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0897

by Lars Michelsen

Module: check_mk Branch: master Commit: fa4c5551eda0209917fd2671576e5811f074cabb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa4c5551eda020… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 21 16:47:33 2013 +0100 Updated bug entries #0897 --- .bugs/897 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/897 b/.bugs/897 new file mode 100644 index 0000000..494729c --- /dev/null +++ b/.bugs/897 @@ -0,0 +1,9 @@ +Title: Add Windows-Agent as Zip-File to Download page +Component: core +State: open +Date: 2013-01-21 16:46:19 +Targetversion: future +Class: todo + +It is bad for windows users that there is no zip-download of the agent. There is the installer +but someone might not want to use it.

11 years, 5 months

Check_MK Git: check_mk: FIX: mssql_counters. file_sizes - Fixed wrong value for "Log Files" in output

by Lars Michelsen

Module: check_mk Branch: master Commit: 3dcb0d7dd1d7d6068d0f2c4a895bfd153d05b331 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dcb0d7dd1d7d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 09:28:08 2013 +0100 FIX: mssql_counters.file_sizes - Fixed wrong value for "Log Files" in output --- ChangeLog | 3 +++ checks/mssql_counters | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed34827..ce3decf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ * cmk --notify: added the macros NOTIFY_LASTHOSTSTATECHANGE, NOTIFY_HOSTSTATEID, NOTIFY_LASTSERVICESTATECHANGE and NOTIFY_SERVICESTATEID + Checks & Agents: + * FIX: mssql_counters.file_sizes - Fixed wrong value for "Log Files" in output + WATO: * Added hr_mem check to the memory checkgroup to make it configurable in WATO * FIX: Fixed some typos in ldap error messages diff --git a/checks/mssql_counters b/checks/mssql_counters index f243a2b..d49779c 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -219,7 +219,7 @@ def check_mssql_file_sizes(item, params, info): perfdata.append(('data_files', data_file_bytes)) output.append('Log Files: %s (Used: %s)' % - (get_bytes_human_readable(data_file_bytes), get_bytes_human_readable(log_file_used_bytes))) + (get_bytes_human_readable(log_file_bytes), get_bytes_human_readable(log_file_used_bytes))) perfdata.append(('log_files', log_file_bytes)) perfdata.append(('log_files_used', log_file_used_bytes))

11 years, 5 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 4142cc72021dd044c51717583824f3c7fae74f8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4142cc72021dd0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 11:42:41 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 5 months

Check_MK Git: check_mk: Added NOTIFY_NOTIFICATIONCOMMENT variable to cmk --notify

by Lars Michelsen

Module: check_mk Branch: master Commit: 81d14e4e261bd33eb69d5f5f868425f4d89c96db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81d14e4e261bd3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 11:41:52 2013 +0100 Added NOTIFY_NOTIFICATIONCOMMENT variable to cmk --notify --- ChangeLog | 2 +- check_mk_templates.cfg | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c648cb1..558aa45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,7 @@ * cmk --notify: added notification script to generate HTML mails including the performance graphs of hosts and services * cmk --notify: added the macros NOTIFY_LASTHOSTSTATECHANGE, NOTIFY_HOSTSTATEID, - NOTIFY_LASTSERVICESTATECHANGE and NOTIFY_SERVICESTATEID + NOTIFY_LASTSERVICESTATECHANGE, NOTIFY_SERVICESTATEID and NOTIFY_NOTIFICATIONCOMMENT Checks & Agents: * FIX: mssql_counters.file_sizes - Fixed wrong value for "Log Files" in output diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index c60c0e0..4e26a86 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -339,6 +339,7 @@ define command { NOTIFY_SHORTDATETIME='$SHORTDATETIME$' \ NOTIFY_LONGDATETIME='$LONGDATETIME$' \ NOTIFY_HOSTDOWNTIME='$HOSTDOWNTIME$' \ + NOTIFY_NOTIFICATIONCOMMENT='$NOTIFICATIONCOMMENT$' \ NOTIFY_HOSTTAGS='$_HOSTTAGS$' \ @BINDIR@/check_mk --notify }

11 years, 5 months

Check_MK Git: check_mk: Fixed problem on user profile page when no alias set for a user

by Lars Michelsen

Module: check_mk Branch: master Commit: b22e1fd423892da497a182a544efeade27b1409c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b22e1fd423892d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 21 15:41:16 2013 +0100 Fixed problem on user profile page when no alias set for a user --- ChangeLog | 2 ++ web/htdocs/wato.py | 2 +- web/plugins/userdb/ldap.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 378b33e..529fa72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ WATO: * Added hr_mem check to the memory checkgroup to make it configurable in WATO + * Fixed some typos in ldap error messages + * Fixed problem on user profile page when no alias set for a user 1.2.1i5: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fae9b2c..f5da593 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10947,7 +10947,7 @@ def page_user_profile(): forms.header(_("Personal Settings")) forms.section(_("Name"), simple=True) - html.write(user["alias"]) + html.write(user.get("alias", config.user_id)) if config.may('general.change_password') and not is_locked('password'): forms.section(_("Password")) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 86eb6b2..af09db0 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -159,7 +159,7 @@ def ldap_default_bind(): ldap_bind('', '', catch = False) # anonymous bind except (ldap.INVALID_CREDENTIALS, ldap.INAPPROPRIATE_AUTH): raise MKLDAPException(_('Unable to connect to LDAP server with the configured bind credentials. ' - 'Plase fix this in the ' + 'Please fix this in the ' '<a href="wato.py?mode=edit_configvar&varname=ldap_connection">LDAP ' 'connection settings</a>.')) @@ -423,7 +423,7 @@ ldap_attribute_plugins['alias'] = { def ldap_convert_auth_expire(params, user_id, ldap_user, user): changed_attr = params.get('attr', ldap_attr('pw_changed')) if not changed_attr in ldap_user: - raise MKLDAPException(_('The "Authentication Expiration" attribute (%s) could not be fetched' + raise MKLDAPException(_('The "Authentication Expiration" attribute (%s) could not be fetched ' 'from the LDAP server for user %s.') % (changed_attr, ldap_user)) # For keeping this thing simple, we don't parse the date here. We just store

11 years, 5 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: fdafdce2095cd93ff72e7de3aa9256dfc1c2374c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdafdce2095cd9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 21 16:45:54 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

11 years, 5 months

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2013