Checkmk git commits July 2013

checkmk-commits@lists.checkmk.com

4 participants
235 discussions

Check_MK Git: check_mk: LDAP: Supporting posixGroup with memberUid as member attribute

by Lars Michelsen

Module: check_mk Branch: master Commit: d1ac9e05efb98fa1eb4f71b1116c260790fed13e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1ac9e05efb98f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 22 09:20:05 2013 +0200 LDAP: Supporting posixGroup with memberUid as member attribute --- ChangeLog | 2 +- web/plugins/userdb/ldap.py | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55475ea..e149c02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,7 +62,6 @@ new script parameters cache_age, retry_count, timeout new script caching options "off", "async", "sync" - Notifications: * notify.py: Matching service level: Use the hosts service level if a service has no service level set @@ -91,6 +90,7 @@ * Implemented search forms for most data tables * New icons in view footers: export as CSV, export as JSON * Availability: new columns for shortest, longest, average and count + * LDAP: Supporting posixGroup with memberUid as member attribute * FIX: better error message in case of exception in SNMP handling * FIX: Inventory screen: Now shows custom checks * FIX: Fixed locking problem of multisite pages related to user loading/saving diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 0535d56..b3c0174 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -394,10 +394,18 @@ def ldap_user_groups(username, attr = 'cn'): else: return g_ldap_group_cache[username][1] + # posixGroup objects use the memberUid attribute to specify the group memberships. + # This is the username instead of the users DN. So the username needs to be used + # for filtering here. + if ldap_member_attr().lower() == 'memberuid': + user_filter = username + else: + user_filter = user_dn + # Apply configured group ldap filter and only reply with groups # having the current user as member filt = '(&%s(%s=%s))' % (ldap_filter('groups'), ldap_member_attr(), - ldap.filter.escape_filter_chars(user_dn)) + ldap.filter.escape_filter_chars(user_filter)) # First get all groups groups_cn = [] groups_dn = []

10 years, 11 months

Check_MK Git: check_mk: initial version of check manpage for blade_bx_powermod and blade_bx_temp

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 25edb9f3c8a0faaf17eaa8f63d5390e4ec407b07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25edb9f3c8a0fa… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 19 16:37:40 2013 +0200 initial version of check manpage for blade_bx_powermod and blade_bx_temp --- checkman/blade_bx_powermod | 16 ++++++++++++++-- checkman/blade_bx_temp | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/checkman/blade_bx_powermod b/checkman/blade_bx_powermod index abe9394..326e873 100644 --- a/checkman/blade_bx_powermod +++ b/checkman/blade_bx_powermod @@ -1,7 +1,19 @@ title: Primergy BX600 Blade Server: Power module +agents: snmp catalog: hw/server/fujitsu license: GPL distribution: check_mk description: - TODO: BERND - title correct + TODO: BERND, FIXME: Blade Server or Blade Enclosure? + + Checks the state of power modules in Primergy BX600 Blade Servers + + Returns {OK} if the power module reports ok status and {CRIT} on any + other status. + +item: + The index of the power module as returned by SNMP. + +inventory: + Creates one check per power module. + diff --git a/checkman/blade_bx_temp b/checkman/blade_bx_temp index 229ca62..97df583 100644 --- a/checkman/blade_bx_temp +++ b/checkman/blade_bx_temp @@ -1,7 +1,35 @@ title: Primergy BX600 Blade Server: Temperature +agents: snmp catalog: hw/server/fujitsu license: GPL distribution: check_mk description: - TODO: BERND - title correct? + TODO: BERND, FIXME: in Blade Servers or Blade Enclosures? + + Checks temperature sensors in Primergy BX600 Blade Servers. + + Returns {CRIT} if the sensor is not present or powered off or if the sensor + reports a non ok state or if the reported temperature is higher or equal {level_crit} + + Returns {WARN} if the reported temperature is higher or equal {level_warn} + + {OK} is returned otherwise. + +item: + The index of the temperature sensor as returned by SNMP + +perfdata: + One value: The temperature in °C + +inventory: + Creates one check per power module. + +[parameters] +level_warn(int): If you want to set a warning level manually give a number here. + Unit is °C. Or leave empty to use the default warning level from the device + (reported by SNMP). + +level_crit(int): If you want to set a critical level manually give a number here. + Unit is °C. Or leave empty to use the default critical level from the device + (reported by SNMP). +

10 years, 11 months

Check_MK Git: check_mk: initial version of check manpage for blade_bx_powerfan

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b19d961ab51e17afd84c470e33e65b93da6bfe9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b19d961ab51e17… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 19 16:03:35 2013 +0200 initial version of check manpage for blade_bx_powerfan --- checkman/blade_bx_powerfan | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/checkman/blade_bx_powerfan b/checkman/blade_bx_powerfan index adb4fc4..0339b1b 100644 --- a/checkman/blade_bx_powerfan +++ b/checkman/blade_bx_powerfan @@ -1,7 +1,38 @@ title: Primergy BX600 Blade Server: Power fan +agents: snmp catalog: hw/server/fujitsu license: GPL distribution: check_mk description: - TODO: BERND - title correct? + TODO: BERND, FIXME: in Blade or in Enclosure? + + Checks fans in Primergy BX600 Blade Servers. + + Returns {CRIT} if the fan is not present or powered off or reports a + non-OK state or if the speed is less or equal {crit_perc}% of max speed. + + Returns {WARN} if the speed is less or equal {warn_perc}% of max speed. + + And {OK} is returned otherwise. + +item: + The name of the fan as returned by SNMP. + +perfdata: + Two values: The pecentage of max speed the fan is running at and the + absolute speed of the fan (rpm). + +inventory: + Returns one Check for each fan. + +[parameters] +warn_perc(int): If the speed is less or equal this percentage of max speed + the check results in {WARN} state. + +crit_perc(int): If the speed is less or equal this percentage of max speed + the check results in {CRIT} state. + +[configuration] +blade_bx_fan_default_error_levels(int, int): A pair of integers: The default + levels for {WARN} and {CRIT}. These levels are used for inventorized checks. + This variable is preset to {( 50, 40 )}

10 years, 11 months

Check_MK Git: check_mk: cleaned up fixme markers in check manpage for blade_bx_blades

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 2e8df6f4fed72ecca75d5c4af649529cbadc38b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e8df6f4fed72e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 19 11:21:29 2013 +0200 cleaned up fixme markers in check manpage for blade_bx_blades --- checkman/blade_bx_blades | 3 --- checkman/blade_bx_load | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/checkman/blade_bx_blades b/checkman/blade_bx_blades index 8e3701b..ef965bb 100644 --- a/checkman/blade_bx_blades +++ b/checkman/blade_bx_blades @@ -4,9 +4,6 @@ catalog: hw/server/fujitsu license: GPL distribution: check_mk description: - TODO: BERND - title correct? - Checks the blade status of Primergy BX600 Blade Servers. Returns {CRIT} on blade status {Error} or {Critical} diff --git a/checkman/blade_bx_load b/checkman/blade_bx_load index 00f4d05..0617816 100644 --- a/checkman/blade_bx_load +++ b/checkman/blade_bx_load @@ -1,4 +1,5 @@ title: Primergy BX600 Blade Server: CPU load +agents: snmp catalog: hw/server/fujitsu license: GPL distribution: check_mk

10 years, 11 months

Check_MK Git: check_mk: initial version of check manpage for blade_bx_load

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 51be45dcdc1bef7ee8e27aca1806ae074dd04562 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51be45dcdc1bef… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 19 15:41:03 2013 +0200 initial version of check manpage for blade_bx_load --- checkman/blade_bx_load | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/checkman/blade_bx_load b/checkman/blade_bx_load index 0617816..84f90fc 100644 --- a/checkman/blade_bx_load +++ b/checkman/blade_bx_load @@ -1,7 +1,38 @@ -title: Primergy BX600 Blade Server: CPU load +title: Primergy BX600 Blade Enclosure: CPU load agents: snmp catalog: hw/server/fujitsu license: GPL distribution: check_mk description: - TODO: BERND + TODO: BERND, FIXME: is this really CPU of enclosure? Bastian tries out on monday... + + This check measures and checks the averaged CPU load of a Primergy + BX600 Blade Enclosure. The values for 1, 5 and 15 minute average are + reported. + +examples: + # Set default levels to a load of 4 and 8 + blade_bx_cpuload_default_levels = (4.0, 8.0). + + checks += [ + # Use levels 4 (warning) and 8 (critical) + # on all hosts with the tag "bx600" + (["bx600"], ALL_HOSTS, "blade_bx_load", None, (4, 8)), + ] + +perfdata: + Three values: The load average for 1, 5 and 15 minutes. + +inventory: + Returns one check on each blade enclosure. + +[parameters] +warn (int): 15 minute average load at which a {WARN} is triggered. + +crit (int): 15 minute average load at which {CRIT} state is triggered. + +[configuration] +blade_bx_cpuload_default_levels(int,int): A pair of integers: The default + levels for {WARN} and {CRIT}. These levels are used for inventorized checks. + This variable is preset to {( 5, 20 )} +

10 years, 11 months

Check_MK Git: check_mk: new check manpage apc_powerswitch

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: acc1b4135382994f44155fd00e967431cbe9e8d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acc1b413538299… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 19 10:36:27 2013 +0200 new check manpage apc_powerswitch --- checkman/apc_powerswitch | 23 ++++++++++++++++++++--- checkman/win_netstat | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/checkman/apc_powerswitch b/checkman/apc_powerswitch index 811e1b0..007ca4a 100644 --- a/checkman/apc_powerswitch +++ b/checkman/apc_powerswitch @@ -1,7 +1,24 @@ -title: APC Powerswitch: Power status +title: APC Powerswitch/APC PDU: Power Outlet Status +agents: snmp catalog: hw/power license: GPL distribution: check_mk description: - TODO: BERND - Title correct? Ask Bastian + Checks the status of a power outlet of an APC Powerswitch/APC PDU. + Returns {OK} if the power outlet status is {on} + and {WARN} if the power outlet status if {off} + +item: + The single power outlet port with it's number as delivered by SNMP. + +inventory: + One item per power outlet will be found. + +[configuration] +apc_powerswitch_warning_states: A tuple of states leading to {WARN} level, default is + apc_powerswitch_warning_states = (2,) + meaning {WARN} is returned on power state {off} + +apc_powerswitch_critical_states: A tuple of states leading to {CRIT} level, default is + apc_powerswitch_critical_states = () + meaning {CRIT} is returned in no case by default diff --git a/checkman/win_netstat b/checkman/win_netstat index 71c2a1a..3c1f0ab 100644 --- a/checkman/win_netstat +++ b/checkman/win_netstat @@ -1,6 +1,6 @@ title: Established TCP Connections or TCP/UDP Listeners agents: windows -catalog: os/network +catalog: os/networking license: GPL distribution: check_mk description:

10 years, 11 months

Check_MK Git: check_mk: initial version of check manpage for blade_bx_blades

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 65c3524f5f5c2815b7ec79dea349e0965512edaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65c3524f5f5c28… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 19 11:19:26 2013 +0200 initial version of check manpage for blade_bx_blades --- checkman/blade_bx_blades | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/checkman/blade_bx_blades b/checkman/blade_bx_blades index 4091117..8e3701b 100644 --- a/checkman/blade_bx_blades +++ b/checkman/blade_bx_blades @@ -1,7 +1,22 @@ title: Primergy BX600 Blade Server: Blade status +agents: snmp catalog: hw/server/fujitsu license: GPL distribution: check_mk description: TODO: BERND title correct? + + Checks the blade status of Primergy BX600 Blade Servers. + + Returns {CRIT} on blade status {Error} or {Critical} + + Returns {OK} for any other blade status + +item: + The blade ID + +inventory: + All blades are found which do not report status {not-present} + + For all other blades one item per blade is found.

10 years, 11 months

Check_MK Git: check_mk: add missing group key to wmic_process

by Andreas Boesl

Module: check_mk Branch: master Commit: 762b91c1aef888217533bafd5dd2aa45a05af601 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=762b91c1aef888… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 19 10:28:36 2013 +0200 add missing group key to wmic_process --- checks/wmic_process | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/wmic_process b/checks/wmic_process index 6e56849..0b99e40 100644 --- a/checks/wmic_process +++ b/checks/wmic_process @@ -100,4 +100,5 @@ check_info["wmic_process"] = { 'check_function': check_wmic_process, 'service_description': 'proc_%s', 'has_perfdata': True, + 'group': 'wmic_process' }

10 years, 11 months

Check_MK Git: check_mk: FIX: line wrapping of logwatch entries

by Andreas Boesl

Module: check_mk Branch: master Commit: a1b1d9e19f7d3042cd408899ffdfce1e9013119e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1b1d9e19f7d30… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 18 17:33:55 2013 +0200 FIX: line wrapping of logwatch entries --- ChangeLog | 1 + web/htdocs/logwatch.css | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index f1dc7cf..55475ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * FIX: Inventory screen: Now shows custom checks * FIX: Fixed locking problem of multisite pages related to user loading/saving * FIX: Fixed wrong default settings of view filters in localized multisite + * FIX: line wrapping of logwatch entries WATO: * Allow to configure check-/retry_interval in second precision diff --git a/web/htdocs/logwatch.css b/web/htdocs/logwatch.css index 41f9ded..eeaaa61 100644 --- a/web/htdocs/logwatch.css +++ b/web/htdocs/logwatch.css @@ -176,4 +176,11 @@ Boston, MA 02110-1301 USA. border-bottom-style: none; } +#logwatch p { + white-space: pre-wrap; /* CSS3 */ + white-space: -moz-pre-wrap; /* Firefox */ + white-space: -pre-wrap; /* Opera <7 */ + white-space: -o-pre-wrap; /* Opera 7 */ + word-wrap: break-word; /* IE */ +}

10 years, 11 months

Check_MK Git: check_mk: valuespec AbsoluteDate now optionally supports time of day

by Mathias Kettner

Module: check_mk Branch: master Commit: d3d5b668052f186d7e465ad60bd13d8c48c605ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3d5b668052f18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 18 16:00:46 2013 +0200 valuespec AbsoluteDate now optionally supports time of day --- web/htdocs/valuespec.py | 71 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 59 insertions(+), 12 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 56aa751..8129be0 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1415,21 +1415,33 @@ class RelativeDate(OptionalDropdownChoice): # A ValueSpec for editing a date. The date is # represented as a UNIX timestamp x where x % seconds_per_day -# is zero (or will be ignored if non-zero). +# is zero (or will be ignored if non-zero), as long es +# include_time is not set to True class AbsoluteDate(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) - self._default_value = today() self._show_titles = kwargs.get("show_titles", True) self._label = kwargs.get("label") - self._format = kwargs.get("format", "%F") + self._include_time = kwargs.get("include_time", False) + self._format = kwargs.get("format", self._include_time and "%F %T" or "%F") + self._default_value = kwargs.get("default_value", None) + + def default_value(self): + if self._default_value != None: + return self._default_value + else: + if self._include_time: + return time.time() + else: + return today() def canonical_value(self): - return self._default_value + return self.default_value() def split_date(self, value): lt = time.localtime(value) - return lt.tm_year, lt.tm_mon, lt.tm_mday + return lt.tm_year, lt.tm_mon, lt.tm_mday, \ + lt.tm_hour, lt.tm_min, lt.tm_sec def render_input(self, varprefix, value): if self._label: @@ -1437,10 +1449,13 @@ class AbsoluteDate(ValueSpec): if self._show_titles: html.write('<table class=vs_date>') - html.write('<tr><th>%s</th><th>%s</th><th>%s</th></tr>' % ( + html.write('<tr><th>%s</th><th>%s</th><th>%s</th>' % ( _("Year"), _("Month"), _("Day"))) - html.write('<tr><td>') - year, month, day = self.split_date(value) + if self._include_time: + html.write('<th></th><th>%s</th><th>%s</th><th>%s</th>' % ( + _("Hour"), _("Minute"), _("Sec."))) + html.write('</tr><tr><td>') + year, month, day, hour, mmin, sec = self.split_date(value) html.number_input(varprefix + "_year", year, size=4) if self._show_titles: html.write('</td><td>') @@ -1453,7 +1468,31 @@ class AbsoluteDate(ValueSpec): html.write(" ") html.number_input(varprefix + "_day", day, size=2) if self._show_titles: - html.write('</td></tr></table>') + html.write('</td>') + + if self._include_time: + if self._show_titles: + html.write('<td>&nbsp</td><td>') + else: + html.write(" ") + html.number_input(varprefix + "_hour", hour, size=2) + + if self._show_titles: + html.write('</td><td>') + else: + html.write(" ") + html.number_input(varprefix + "_min", mmin, size=2) + + if self._show_titles: + html.write('</td><td>') + else: + html.write(" ") + html.number_input(varprefix + "_sec", sec, size=2) + if self._show_titles: + html.write('</td>') + + if self._show_titles: + html.write('</tr></table>') def set_focus(self, varprefix): html.set_focus(varprefix + "_year") @@ -1463,10 +1502,18 @@ class AbsoluteDate(ValueSpec): def from_html_vars(self, varprefix): parts = [] - for what, mmin, mmax in [ + entries = [ ("year", 1970, 2038), ("month", 1, 12), - ("day", 1, 31)]: + ("day", 1, 31)] + if self._include_time: + entries += [ + ("hour", 0, 23), + ("min", 0, 59), + ("sec", 0, 59), + ] + + for what, mmin, mmax in entries: try: varname = varprefix + "_" + what part = int(html.var(varname)) @@ -1475,7 +1522,7 @@ class AbsoluteDate(ValueSpec): if part < mmin or part > mmax: raise MKUserError(varname, _("The value for %s must be between %d and %d" % (_(what), mmin, mmax))) parts.append(part) - parts += [0] * 6 + parts += [0] * (self._include_time and 3 or 6) return time.mktime(tuple(parts)) def validate_datatype(self, value, varprefix):

10 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2013