Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: #2341 LDAP Sync: Automatically syncing credential changes to slave sites in distributed setups

by Lars Michelsen

Module: check_mk Branch: master Commit: 74c6620c23b8765a9467cd0683b8276efa198f14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74c6620c23b876… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 22 12:17:35 2015 +0200 #2341 LDAP Sync: Automatically syncing credential changes to slave sites in distributed setups When using the LDAP sync while having a distributed setup users might not be able to access the GUI on the slave sites when their password was changed in LDAP. This could only be fixed by an admin which performed a manual WATO synchronisation of the current configuration. This has now been changed. When the password change has been detected, the master site tries to synchronize the profile of the user to the configured and reachable remote site(s). If this fails, the site is marked as "to be synchronized". Then the admin can perform the sync manually once the site is available again. --- .werks/2341 | 16 +++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 66 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/.werks/2341 b/.werks/2341 new file mode 100644 index 0000000..5d4a293 --- /dev/null +++ b/.werks/2341 @@ -0,0 +1,16 @@ +Title: LDAP Sync: Automatically syncing credential changes to slave sites in distributed setups +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i2 +Date: 1434967888 +Class: feature + +When using the LDAP sync while having a distributed setup users might not be able to access +the GUI on the slave sites when their password was changed in LDAP. This could only be +fixed by an admin which performed a manual WATO synchronisation of the current configuration. + +This has now been changed. When the password change has been detected, the master site tries +to synchronize the profile of the user to the configured and reachable remote site(s). If +this fails, the site is marked as "to be synchronized". Then the admin can perform the sync +manually once the site is available again. diff --git a/ChangeLog b/ChangeLog index c68a070..dc856e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ Multisite: * 2260 Improved load time of Check_MK GUI... * 2332 New icon for hosts/services that are out of their service period... + * 2341 LDAP Sync: Automatically syncing credential changes to slave sites in distributed setups... * 2324 FIX: Add icon for those checks that cannot be rescheduled... * 2261 FIX: Fixed wrong pnp template cache path in non OMD environments... * 2262 FIX: Fixed deletion of foreign views/dashboards... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 54ef6f6..d988855 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1025,6 +1025,61 @@ def ldap_login(username, password): ldap_default_bind(ldap_connection) return result +# In case the sync is done on the master of a distributed setup the auth serial +# is increased on the master, but not on the slaves. The user can not access the +# slave sites anymore with the master sites cookie since the serials differ. In +# case the slave sites sync with LDAP on their own this issue will be repaired after +# the next LDAP sync on the slave, but in case the slaves do not sync, this problem +# will be repaired automagically once an admin performs the next WATO sync for +# another reason. +# Now, to solve this issue, we issue a user profile sync in case the password has +# been changed. We do this only when only the password has changed. +# Hopefully we have no large bulks of users changing their passwords at the same +# time. In this case the implementation does not scale well. We would need to +# change this to some kind of profile bulk sync per site. +def synchronize_profile_to_sites(user_id, profile): + import wato # FIXME: Cleanup! + sites = [(site_id, config.site(site_id)) + for site_id in config.sitenames() + if not wato.site_is_local(site_id) ] + + ldap_log('Credentials changed: %s. Trying to sync to %d sites' % (user_id, len(sites))) + + num_disabled = 0 + num_succeeded = 0 + num_failed = 0 + for site_id, site in sites: + if not site.get("replication"): + num_disabled += 1 + continue + + if site.get("disabled"): + num_disabled += 1 + continue + + status = html.site_status.get(site_id, {}).get("state", "unknown") + if status == "dead": + result = "Site is dead" + else: + try: + result = wato.push_user_profile_to_site(site, user_id, profile) + except Exception, e: + result = str(e) + + if result == True: + num_succeeded += 1 + else: + num_failed += 1 + ldap_log(' FAILED [%s]: %s' % (site_id, result)) + # Add pending entry to make sync possible later for admins + wato.update_replication_status(site_id, {"need_sync": True}) + wato.log_pending(wato.AFFECTED, None, "edit-users", + _('Password changed (sync failed: %s)') % result, user_id = '') + + ldap_log(' Disabled: %d, Succeeded: %d, Failed: %d' % + (num_disabled, num_succeeded, num_failed)) + + def ldap_sync(add_to_changelog, only_username): # Store time of the last sync. Don't store after sync since parallel # requests to e.g. the page hook would cause duplicate calculations @@ -1100,11 +1155,20 @@ def ldap_sync(add_to_changelog, only_username): if removed: details.append(_('Removed: %s') % ', '.join(removed)) - # Ignore password changes from ldap - do not log them. For now. + # Password changes found in LDAP should not be logged as "pending change". + # These changes take effect imediately (pw already changed in AD, auth serial + # is increaed by sync plugin) on the local site, so no one needs to active this. + pw_changed = False if 'ldap_pw_last_changed' in changed: changed.remove('ldap_pw_last_changed') + pw_changed = True if 'serial' in changed: changed.remove('serial') + pw_changed = True + + # Synchronize new user profile to remote sites if needed + if pw_changed and not changed and wato.is_distributed(): + synchronize_profile_to_sites(user_id, user) if changed: details.append(('Changed: %s') % ', '.join(changed))

9 years

Check_MK Git: check_mk: Removed commented out obsolete rule

by Konstantin Büttner

Module: check_mk Branch: master Commit: e6f8609b07c96901abd85cb2d5547cc7fcb43bcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6f8609b07c969… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jun 22 10:13:15 2015 +0200 Removed commented out obsolete rule --- web/plugins/wato/check_parameters.py | 55 ---------------------------------- 1 file changed, 55 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9936ad1..3779a73 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -367,61 +367,6 @@ register_check_parameters( match_type = "first", ) -# register_check_parameters( -# subgroup_applications, -# "pfsense_counter", -# _("Various global packet rates for pfSense Firewalls"), -# Dictionary( -# elements = [ -# ("timerange", Integer( -# title = _("Timeframe for Average"), -# unit = _("min"), -# default_value = 5)), -# ("match", Tuple( -# title = _("Levels for rate of packets that matched a rule"), -# elements = [ -# Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 20), -# Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 30), -# ])), -# ("badoffset", Tuple( -# title = _("Levels for rate of packets with bad offset"), -# elements = [ -# Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 20), -# Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 30), -# ])), -# ("fragment", Tuple( -# title = _("Levels for rate of fragmented packets"), -# elements = [ -# Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 20), -# Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 30), -# ])), -# ("short", Tuple( -# title = _("Levels for rate of short packets"), -# elements = [ -# Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 20), -# Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 30), -# ])), -# ("normalize", Tuple( -# title = _("Levels for rate of normalized packets"), -# elements = [ -# Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 20), -# Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 30), -# ])), -# ("memdrop", Tuple( -# title = _("Levels for rate of packets dropped due to memory limitations"), -# elements = [ -# Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 20), -# Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 30), -# ])), -# ], -# ), -# TextAscii( -# title = _("Interface"), -# help = _("The description of the interface as provided by the device"), -# ), -# match_type = "dict", -# ) - register_check_parameters( subgroup_applications, "pfsense_counter",

9 years

Check_MK Git: check_mk: #2235 lnx_quota: Extended linux quota check with group quota check

by Sven Rueß

Module: check_mk Branch: master Commit: e7e59c3f264175c7eb8f825901cde079072a82ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7e59c3f264175… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Sat Jun 20 12:56:04 2015 +0200 #2235 lnx_quota: Extended linux quota check with group quota check Extended linux quota check with group quota check. Per default only user quota is checked. The user can configure if group quota should be checked additionally. Users and groups with no soft and hard limit are ignored for monitoring. --- .werks/2235 | 13 +++ ChangeLog | 1 + agents/plugins/lnx_quota | 14 ++- checkman/lnx_quota | 13 ++- checks/lnx_quota | 202 +++++++++++++++++++++++++--------- web/plugins/wato/check_parameters.py | 29 +++++ 6 files changed, 210 insertions(+), 62 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e7e59c3f26…

9 years

Check_MK Git: check_mk: Made several generic UPS checks inventorize on HP UPSs

by Konstantin Büttner

Module: check_mk Branch: master Commit: e29800b832b3187ad3e7efc22523ddd08abe974d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e29800b832b318… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jun 19 16:41:34 2015 +0200 Made several generic UPS checks inventorize on HP UPSs --- checks/ups_capacity | 3 ++- checks/ups_in_voltage | 2 +- checks/ups_out_load | 2 +- checks/ups_out_voltage | 4 ++-- checks/ups_power | 2 +- checks/ups_test | 3 ++- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/checks/ups_capacity b/checks/ups_capacity index de15dfe..c31e6ca 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -60,6 +60,7 @@ check_info["ups_capacity"] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", "1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] \ + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2", + ".1.3.6.1.4.1.232.165.3" ] \ or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') } diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index f56b169..e5935a1 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -41,7 +41,7 @@ check_info['ups_in_voltage'] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 3 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", - ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.232.165.3", ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] \ or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') } diff --git a/checks/ups_out_load b/checks/ups_out_load index 88a2658..15ae898 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -57,7 +57,7 @@ check_info['ups_out_load'] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 5 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", - ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.232.165.3", ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] \ or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') } diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index 3190a68..a3a87be 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -40,8 +40,8 @@ check_info['ups_out_voltage'] = { "includes" : [ 'ups_out_voltage.include' ], "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", - ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", + ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.232.165.3", ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] \ or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') } diff --git a/checks/ups_power b/checks/ups_power index 76ade5b..3db48f1 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -61,6 +61,6 @@ check_info['ups_power'] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 4 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", - ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" , ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" , ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.232.165.3", ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_test b/checks/ups_test index b192efd..43bae67 100644 --- a/checks/ups_test +++ b/checks/ups_test @@ -122,6 +122,7 @@ check_info['ups_test'] = { ('.1.3.6.1.2.1.1', ['3.0']), # sysUptime ( ".1.3.6.1.2.1.33.1.7", [ 3, 5, 4 ] ), ], - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.818.1.100.1.2" ], + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.818.1.100.1.2", + ".1.3.6.1.4.1.232.165.3",], "includes" : [ 'uptime.include' ], }

9 years

Check_MK Git: check_mk: #2310 FIX multisite view data export:

by Andreas Boesl

fixed exception when using joined columns Message-ID: <558417db.TimyMi77TozGftJr%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 3901bb128497ac4f27a27bb6033e76b1c8a2fa2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3901bb128497ac… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 19 15:22:21 2015 +0200 #2310 FIX multisite view data export: fixed exception when using joined columns The csv / json / python data export of a mulitsite view did not work correctly when there were joined columns involved. An exception occured whenever an additional column was set after the joined column. Note: A single joined column at the end of a table row did work. --- .werks/2310 | 14 ++++++++++++++ ChangeLog | 1 + web/plugins/views/webservice.py | 14 +++++++------- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.werks/2310 b/.werks/2310 new file mode 100644 index 0000000..9bd2a18 --- /dev/null +++ b/.werks/2310 @@ -0,0 +1,14 @@ +Title: multisite view data export: fixed exception when using joined columns +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1434719835 + +The csv / json / python data export of a mulitsite view did not work correctly +when there were joined columns involved. An exception occured whenever an additional +column was set after the joined column. + +Note: A single joined column at the end of a table row did work. diff --git a/ChangeLog b/ChangeLog index acca58e..3014c8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ * 2340 FIX: Email validation: Top level domains can now have a maximum length of 24 characters * 2353 FIX: Fix showing options for availability in BI mode, where above header * 2356 FIX: Fixed exception in Multisite JSON output + * 2310 FIX: multisite view data export: fixed exception when using joined columns... WATO: * 1254 The target address for crash reports can now be configured in wato global settings diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index ceae7d7..5eec631 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -41,8 +41,8 @@ def render_python(rows, view, group_painters, painters, num_columns, show_checkb for row in rows: html.write("[") for p in painters: - row = join_row(row, p) - tdclass, content = paint_painter(p[0], row) + joined_row = join_row(row, p) + tdclass, content = paint_painter(p[0], joined_row) html.write(repr(html.strip_tags(content))) html.write(",") html.write("],") @@ -95,10 +95,10 @@ def render_json(rows, view, group_painters, painters, num_columns, show_checkbox first = False else: html.write(",") - row = join_row(row, p) - tdclass, content = paint_painter(p[0], row) + joined_row = join_row(row, p) + tdclass, content = paint_painter(p[0], joined_row) if type(content) == unicode: - content = content.encode("utf-8") + content = content.encode("utf-8") else: content = str(content) content = content.replace(" ","\n") @@ -159,8 +159,8 @@ def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxe first = False else: html.write(csv_separator) - row = join_row(row, p) - tdclass, content = paint_painter(p[0], row) + joined_row = join_row(row, p) + tdclass, content = paint_painter(p[0], joined_row) content = type(content) in [ int, float ] and str(content) or content stripped = html.strip_tags(content).replace('\n', '').replace('"', '""') html.write('"%s"' % stripped.encode("utf-8"))

9 years

Check_MK Git: check_mk: Recurring downtimes now also in 14 and 28 days interval

by Mathias Kettner

Module: check_mk Branch: master Commit: 54f3a66892c3f80d1b6937999ec4d8cad8f773ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54f3a66892c3f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 19 11:49:15 2015 +0200 Recurring downtimes now also in 14 and 28 days interval --- web/plugins/views/commands.py | 6 ++++++ web/plugins/views/painters.py | 2 ++ 2 files changed, 8 insertions(+) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 208a93f..42b7cdd 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -387,6 +387,10 @@ def command_downtime(cmdtag, spec, row): title_start = _("schedule a daily recurring") elif recurring_type == "3": title_start = _("schedule a weekly recurring") + elif recurring_type == "4": + title_start = _("schedule a two-weekly recurring") + elif recurring_type == "5": + title_start = _("schedule a four-weekly recurring") else: title_start = _("schedule an immediate") @@ -590,6 +594,8 @@ def paint_downtime_buttons(what): ( "1", _("hour") ), ( "2", _("day") ), ( "3", _("week") ), + ( "4", _("second week") ), + ( "5", _("fourth week") ), ], "3") html.write(_("(This only works when using CMC)")) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index b29692f..8f0b8f8 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1867,6 +1867,8 @@ def paint_downtime_recurring(row): 1: _("hourly"), 2: _("daily"), 3: _("weekly"), + 4: _("two-weekly"), + 5: _("four-weekly"), 999: _("every 5 minutes"), }.get(r, _("(unknown)"))

9 years

Check_MK Git: check_mk: apc_inrow_airflow, _fanspeed, _temp:

by Konstantin Büttner

Made SNMP scan function more lenient Message-ID: <5583da65.W3D2L3Rzx7POOokZ%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: f7d04b356ab800a40740af0a94712ba0385c1d83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7d04b356ab800… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jun 19 11:01:19 2015 +0200 apc_inrow_airflow, _fanspeed, _temp: Made SNMP scan function more lenient --- checks/apc_inrow_airflow | 5 +++-- checks/apc_inrow_fanspeed | 5 +++-- checks/apc_inrow_temp | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/checks/apc_inrow_airflow b/checks/apc_inrow_airflow index 4ea52f4..85ee8fd 100644 --- a/checks/apc_inrow_airflow +++ b/checks/apc_inrow_airflow @@ -28,7 +28,8 @@ apc_inrow_airflow_default_levels = { "level_low" : ( 5.0 , 2.0 ), "level_high" : ( 10.0, 11.0 ) } def inventory_apc_inrow_airflow(info): - return [ (None, "apc_inrow_airflow_default_levels")] + if info: + return [ (None, "apc_inrow_airflow_default_levels")] def check_apc_inrow_airflow(_no_item, params, info): flow = saveint(info[0][0])/100.0 @@ -59,7 +60,7 @@ check_info["apc_inrow_airflow"] = { "inventory_function" : inventory_apc_inrow_airflow, "service_description" : "Airflow", "snmp_info" : (".1.3.6.1.4.1.318.1.1.13.3.2.2.2", [ "5" ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.318.1.3.14.5", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "group" : "airflow", "has_perfdata" : True, } diff --git a/checks/apc_inrow_fanspeed b/checks/apc_inrow_fanspeed index 89c007c..5112253 100644 --- a/checks/apc_inrow_fanspeed +++ b/checks/apc_inrow_fanspeed @@ -25,7 +25,8 @@ # Boston, MA 02110-1301 USA. def inventory_apc_inrow_fanspeed(info): - return [ (None, None) ] + if info: + return [ (None, None) ] def check_apc_inrow_fanspeed(_no_item, _no_params, info): value = savefloat(info[0][0]) / 10 @@ -36,6 +37,6 @@ check_info["apc_inrow_fanspeed"] = { "inventory_function" : inventory_apc_inrow_fanspeed, "service_description" : "Fanspeed", "snmp_info" : ( ".1.3.6.1.4.1.318.1.1.13.3.2.2.2", [ "16" ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.318.1.3.14.5", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "has_perfdata" : True, } diff --git a/checks/apc_inrow_temp b/checks/apc_inrow_temp index ebab953..b18df07 100644 --- a/checks/apc_inrow_temp +++ b/checks/apc_inrow_temp @@ -73,8 +73,9 @@ def apc_inrow_temp_convert(info): def inventory_apc_inrow_temp(info): - info = apc_inrow_temp_convert(info) - return [ (x, "apc_inrow_temp_default_levels") for x in info.keys() ] + if info: + info = apc_inrow_temp_convert(info) + return [ (x, "apc_inrow_temp_default_levels") for x in info.keys() ] def check_apc_inrow_temp(item, params, info): @@ -90,7 +91,7 @@ check_info["apc_inrow_temp"] = { "service_description" : "Temperature %s", "group" : "hw_temperature", "snmp_info" : (".1.3.6.1.4.1.318.1.1.13.3.2.2.2", [ 7, 9, 11, 24, 26 ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.318.1.3.14.5", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "has_perfdata" : True, "includes" : [ "temperature.include" ], }

9 years

Check_MK Git: check_mk: Allow tilde-prefixed regular expressions for explicit host names again

by Mathias Kettner

Module: check_mk Branch: master Commit: f9bb6eb0c3874e14d9c61170d2dba11efdf95a2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9bb6eb0c3874e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 19 09:48:36 2015 +0200 Allow tilde-prefixed regular expressions for explicit host names again --- web/htdocs/wato.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a6caa57..a7e6729 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14833,7 +14833,7 @@ def get_rule_conditions(ruleset): else: negate = html.get_checkbox("negate_hosts") nr = 0 - vs = ListOfStrings(valuespec=Hostname()) + vs = ListOfStrings() host_list = vs.from_html_vars("hostlist") vs.validate_value(host_list, "hostlist") if negate: @@ -15046,9 +15046,13 @@ def mode_edit_rule(phase, new = False): html.checkbox("negate_hosts", negate_hosts, label = _("Negate: make rule apply for all but the above hosts")) html.write("</div>") - html.help(_("You can enter a number of explicit host names that rule should or should " - "not apply to here. Leave this option disabled if you want the rule to " - "apply for all hosts specified by the given tags.")) + html.help(_("Here you can enter a list of explicit host names that the rule should or should " + "not apply to. Leave this option disabled if you want the rule to " + "apply for all hosts specified by the given tags. The names that you " + "enter here are compared with case sensitive exact matching. Alternatively " + "you can use regular expressions if you enter a tilde (<tt>~</tt>) as the first " + "character. That regular expression must match the beginning of " + "the host names in question.")) # Itemlist itemtype = rulespec["itemtype"]

9 years

Check_MK Git: check_mk: removed special colors in htdocs/

by Simon Betz

metrics.py to cmk_color_palette: toner cyan, toner magenta, toner yellow, toner black Message-ID: <5583c4b0.8fBgCHSpLDe4ha3K%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: cbea775936919e330d288e5ea47e610e4dff5c5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbea775936919e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 19 09:28:40 2015 +0200 removed special colors in htdocs/metrics.py to cmk_color_palette: toner cyan, toner magenta, toner yellow, toner black --- web/htdocs/metrics.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index d93def0..e6ba3e7 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -190,10 +190,6 @@ cmk_color_palette = { "51" : (0, 0, 0.5), # grey_50 "52" : (0.067, 0.7, 0.5), # brown 1 "53" : (0.083, 0.8, 0.55), # brown 2 - "54" : (0.5, 1, 1), # toner cyan - "55" : (0.83, 1, 1), # toner magenta - "56" : (0.17, 1, 1), # toner yellow - "57" : (0, 0, 0.1), # toner black }

9 years

Check_MK Git: check_mk: added special colors in htdocs/

by Simon Betz

metrics.py to cmk_color_palette: toner cyan, toner magenta, toner yellow, toner black Message-ID: <5583b2f8.3kd+MrlLHfaSezE0%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 7a2b65884e68bb29daff8769bfc988f8d4e9d0db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a2b65884e68bb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 19 08:12:52 2015 +0200 added special colors in htdocs/metrics.py to cmk_color_palette: toner cyan, toner magenta, toner yellow, toner black --- web/htdocs/metrics.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 819be8a..d93def0 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -187,9 +187,13 @@ cmk_color_palette = { "45" : (0.73, 1, 1), "46" : (0.75, 1, 1), # special colors - "51" : (0, 0, 0.5), # grey_50 - "52" : (0.067, 0.7, 0.5), # brown 1 - "53" : (0.083, 0.8, 0.55), # brown 2 + "51" : (0, 0, 0.5), # grey_50 + "52" : (0.067, 0.7, 0.5), # brown 1 + "53" : (0.083, 0.8, 0.55), # brown 2 + "54" : (0.5, 1, 1), # toner cyan + "55" : (0.83, 1, 1), # toner magenta + "56" : (0.17, 1, 1), # toner yellow + "57" : (0, 0, 0.1), # toner black }

9 years

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015