Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

Check_MK Git: check_mk: Fixed % label in WATO filesystem rule

by Mathias Kettner

Module: check_mk Branch: master Commit: b021b968327e43e4b9861c235ea35293149eff1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b021b968327e43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 10:40:48 2013 +0100 Fixed % label in WATO filesystem rule --- web/plugins/wato/check_parameters.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 0a75123..ad9caad 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1112,8 +1112,8 @@ register_check_parameters( Tuple( title = _("Levels for the used space"), elements = [ - Percentage(title = _("Warning at"), label = _("% usage"), allow_int = True, default_value=80), - Percentage(title = _("Critical at"), label = _("% usage"), allow_int = True, default_value=90)])), + Percentage(title = _("Warning at"), unit = _("% usage"), allow_int = True, default_value=80), + Percentage(title = _("Critical at"), unit = _("% usage"), allow_int = True, default_value=90)])), ( "magic", Float( title = _("Magic factor (automatic level adaptation for large filesystems)"),

11 years, 6 months

Check_MK Git: check_mk: Fix text color in messages

by Mathias Kettner

Module: check_mk Branch: master Commit: 2fcd60334f26ed009999993c21b1160a3627a9cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fcd60334f26ed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 10:37:28 2013 +0100 Fix text color in messages --- web/htdocs/pages.css | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 4ed2496..8486ecf 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -717,6 +717,10 @@ div.really, div.success, div.error, div.message, div.warning { border-style: solid;*/ } +div.message { + color: black; +} + div.really h1, div.success h1, div.error h1, div.message h1, div.warning h1 { font-size: 12pt; font-weight: bold;

11 years, 6 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: ea4e51f33dcb1270838f0b9ddb10d8e1aac5532e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea4e51f33dcb12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 10:37:30 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Check_MK Git: check_mk: LDAP connector: new option 'no_persistent'

by Andreas Boesl

Module: check_mk Branch: master Commit: 4f2e56a491778451855085f133566f8d185e64be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f2e56a4917784… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 27 10:25:17 2013 +0100 LDAP connector: new option 'no_persistent' --- ChangeLog | 2 ++ web/plugins/userdb/ldap.py | 2 +- web/plugins/wato/check_mk_configuration.py | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae8cf67..953d7f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ * Added PNP tempate for check_disk_smb * Dashboards can now be configured to be reloaded on resizing (automatically adds width/height url parameters) + * LDAP authentification: New config option "Do not use persistent + connections to ldap server" Event Console: * New rule feature: automatically delete event after actions diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 187c176..db0b7bf 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -102,7 +102,7 @@ def ldap_uri(): def ldap_connect(): global ldap_connection, ldap_connection_options - if ldap_connection and config.ldap_connection == ldap_connection_options: + if not "no_persistent" in config.ldap_connection and ldap_connection and config.ldap_connection == ldap_connection_options: return # Use existing connections (if connection settings have not changed) try: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f3e5e54..8ce9ab0 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -376,6 +376,12 @@ register_configvar(group, value = True, totext = _("Encrypt the network connection using SSL."), )), + ("no_persistent", FixedValue( + title = _("No persistent connection"), + help = _("The connection to the LDAP server is not persisted."), + value = True, + totext = _("Don't use persistent LDAP connections."), + )), ("connect_timeout", Float( title = _("LDAP Connect Timeout (sec)"), help = _("Timeout for the initial connection to the LDAP server in seconds."), @@ -423,7 +429,7 @@ register_configvar(group, ], )), ], - optional_keys = ['use_ssl', 'bind', ], + optional_keys = ['no_persistent', 'use_ssl', 'bind', ], ), domain = "multisite", )

11 years, 6 months

Check_MK Git: check_mk: FIX: avoid simultanous activation of changes by means of a lock

by Mathias Kettner

Module: check_mk Branch: master Commit: d3ac96af5a265902251eb5e6897cd7e2925ca651 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3ac96af5a2659… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 25 23:46:41 2013 +0100 FIX: avoid simultanous activation of changes by means of a lock Conflicts: ChangeLog --- ChangeLog | 1 + modules/automation.py | 4 ++++ modules/check_mk.py | 28 ++++++++++++++++++++++++++++ web/htdocs/livestatus.py | 9 ++++++--- web/plugins/wato/check_mk_configuration.py | 17 +++++++++++++++++ 5 files changed, 56 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4360157..ae8cf67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ will be added automatically if missing. * FIX: livecheck: fixed compilation bug * FIX: check_mk: convert service description unicode into utf-8 + * FIX: avoid simultanous activation of changes by means of a lock Checks & Agents: * FIX: jolokia_metrics.mem - now able to handle negative/missing max values diff --git a/modules/automation.py b/modules/automation.py index a0ed7e9..1994de8 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -479,6 +479,10 @@ def automation_restart(job="restart"): sys.stdout = null_file() try: + backup_path = None + if not lock_nagios_objects_file(): + raise MKAutomationError("Cannot activate changes. " + "Another activation process is currently in progresss") if os.path.exists(nagios_objects_file): backup_path = nagios_objects_file + ".save" os.rename(nagios_objects_file, backup_path) diff --git a/modules/check_mk.py b/modules/check_mk.py index a710bb3..0b1211e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -214,6 +214,7 @@ agent_ports = [] snmp_ports = [] # UDP ports used for SNMP tcp_connect_timeout = 5.0 delay_precompile = False # delay Python compilation to Nagios execution +restart_locking = "abort" # also possible: "wait", None check_submission = "file" # alternative: "pipe" aggr_summary_hostname = "%s-s" agent_min_version = 0 # warn, if plugin has not at least version @@ -4066,6 +4067,12 @@ def do_reload(): def do_restart(only_reload = False): try: + backup_path = None + + if not lock_nagios_objects_file(): + sys.stderr.write("Other restart currently in progress. Aborting.\n") + sys.exit(1) + # Save current configuration if os.path.exists(nagios_objects_file): backup_path = nagios_objects_file + ".save" @@ -4108,6 +4115,27 @@ def do_restart(only_reload = False): sys.stderr.write("An error occurred: %s\n" % e) sys.exit(1) +restart_lock_fd = None +def lock_nagios_objects_file(): + global restart_lock_fd + # In some bizarr cases (as cmk -RR) we need to avoid duplicate locking! + if restart_locking and restart_lock_fd == None: + lock_file = default_config_dir + "/main.mk" + import fcntl + restart_lock_fd = os.open(lock_file, os.O_RDONLY) + # Make sure that open file is not inherited to monitoring core! + fcntl.fcntl(restart_lock_fd, fcntl.F_SETFD, fcntl.FD_CLOEXEC) + try: + if opt_debug: + sys.stderr.write("Waiting for exclusive lock on %s.\n" % + lock_file) + fcntl.flock(restart_lock_fd, fcntl.LOCK_EX | + ( restart_locking == "abort" and fcntl.LOCK_NB or 0)) + except: + return False + return True + + def do_donation(): donate = [] cache_files = os.listdir(tcp_cache_dir) diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index 6823873..bff1cfd 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -296,7 +296,7 @@ class BaseConnection: # Reads a response from the livestatus socket. If the socket is closed # by the livestatus server, we automatically make a reconnect and send # the query again (once). This is due to timeouts during keepalive. - def recv_response(self, query = None, add_headers = ""): + def recv_response(self, query = None, add_headers = "", timeout_at = None): try: resp = self.receive_data(16) code = resp[0:3] @@ -318,11 +318,14 @@ class BaseConnection: # only once except (MKLivestatusSocketClosed, IOError), e: self.disconnect() - if query: + now = time.time() + if query and (not timeout_at or timeout_at > now): + if timeout_at == None: + timeout_at = now + self.timeout time.sleep(0.1) self.connect() self.send_query(query, add_headers) - return self.recv_response() # do not send query again -> danger of infinite loop + return self.recv_response(query, add_headers, timeout_at) # do not send query again -> danger of infinite loop else: raise MKLivestatusSocketError(str(e)) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index ef4fb86..f3e5e54 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -268,6 +268,7 @@ register_configvar(group, domain = "multisite" ) + register_configvar(group, "bi_precompile_on_demand", Checkbox(title = _("Precompile aggregations on demand"), @@ -632,6 +633,22 @@ register_configvar(group, need_restart = True) register_configvar(group, + "restart_locking", + DropdownChoice( + title = _("Simultanous activation of changes"), + help = _("When two users simultanously try to activate the changes then " + "you can decide to abort with an error (default) or have the requests " + "serialized. It is also possible - but not recommended - to turn " + "off locking altogether."), + choices = [ + ('abort', _("Abort with an error")), + ('ait' , _("Wait until the other has finished") ), + (None , _("Disable locking") ), + ]), + need_restart = False + ) + +register_configvar(group, "agent_simulator", Checkbox(title = _("SNMP Agent Simulator"), label = _("Process stored SNMP walks with agent simulator"),

11 years, 6 months

Check_MK Git: check_mk: FIX: fix rescheduling icon for services with non-ASCII characters

by Mathias Kettner

Module: check_mk Branch: master Commit: 1722def8205559d367489e942a01db065fa5e8eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1722def8205559… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 25 12:29:59 2013 +0100 FIX: fix rescheduling icon for services with non-ASCII characters --- ChangeLog | 1 + web/htdocs/actions.py | 26 +++++++++++++------------- web/htdocs/js/checkmk.js | 4 ++-- web/htdocs/livestatus.py | 4 ++++ web/plugins/icons/builtin.py | 2 +- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f073bc..4360157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ Multisite: * FIX: Avoid duplicate "Services" button in host detail views + * FIX: fix rescheduling icon for services with non-ASCII characters * New filter for IP address of a host * Quicksearch: allow searching for complete IP addresses and IP address prefixes diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index 634a1cc..20e9ebd 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -47,16 +47,16 @@ def action_reschedule(): if not host: raise MKGeneralException("Action reschedule: missing host name") - service = html.var("service", "") - wait_svc = html.var("wait_svc", "") + service = html.var_utf8("service", "") + wait_svc = html.var_utf8("wait_svc", "") if service: cmd = "SVC" what = "service" - spec = "%s;%s" % (host, service) + spec = "%s;%s" % (host, service.encode("utf-8")) if wait_svc: - wait_spec = '%s;%s' % (host, wait_svc) + wait_spec = u'%s;%s' % (host, wait_svc) add_filter = "Filter: service_description = %s\n" % wait_svc else: wait_spec = spec @@ -72,15 +72,15 @@ def action_reschedule(): now = int(time.time()) html.live.command("[%d] SCHEDULE_FORCED_%s_CHECK;%s;%d" % (now, cmd, spec, now), site) html.live.set_only_sites([site]) - row = html.live.query_row( - "GET %ss\n" - "WaitObject: %s\n" - "WaitCondition: last_check >= %d\n" - "WaitTimeout: %d\n" - "WaitTrigger: check\n" - "Columns: last_check state plugin_output\n" - "Filter: host_name = %s\n%s" - % (what, wait_spec, now, config.reschedule_timeout * 1000, host, add_filter)) + query = u"GET %ss\n" \ + "WaitObject: %s\n" \ + "WaitCondition: last_check >= %d\n" \ + "WaitTimeout: %d\n" \ + "WaitTrigger: check\n" \ + "Columns: last_check state plugin_output\n" \ + "Filter: host_name = %s\n%s" \ + % (what, wait_spec, now, config.reschedule_timeout * 1000, host, add_filter) + row = html.live.query_row(query) html.live.set_only_sites() last_check = row[0] if last_check < now: diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index c46bf09..46d5cae 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -599,8 +599,8 @@ function performAction(oLink, action, site, host, service, wait_svc) { get_url('nagios_action.py?action=' + action + '&site=' + escape(site) + '&host=' + escape(host) + - '&service=' + escape(service) + - '&wait_svc=' + escape(wait_svc), + '&service=' + service + // Already URL-encoded! + '&wait_svc=' + wait_svc, actionResponseHandler, oImg); oImg = null; } diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index e4a3c12..6823873 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -273,6 +273,10 @@ class BaseConnection: query += "\n" try: + # socket.send() will implicitely cast to str(), we need ot + # convert to UTF-8 in order to avoid exceptions + if type(query) == unicode: + query = query.encode("utf-8") self.socket.send(query) except IOError, e: if self.persist: diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index a7abd15..80188b8 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -109,7 +109,7 @@ def paint_reschedule(what, row, tags, custom_vars): return '<a href=\"javascript:void(0);\" ' \ 'onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ '<img class=icon title="%s" src="images/%s.gif" /></a>' % \ - (row["site"], row["host_name"], servicedesc, wait_svc, txt, icon) + (row["site"], row["host_name"], htmllib.urlencode(servicedesc), htmllib.urlencode(wait_svc), txt, icon) multisite_icons.append({ 'columns': [ 'active_checks_enabled' ],

11 years, 6 months

Check_MK Git: check_mk: Updated bug entries #0889

by Mathias Kettner

Module: check_mk Branch: master Commit: 71eef17cb75401155ca34f125775f5b18f450f1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71eef17cb75401… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 25 11:24:13 2013 +0100 Updated bug entries #0889 --- .bugs/889 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/889 b/.bugs/889 new file mode 100644 index 0000000..575990b --- /dev/null +++ b/.bugs/889 @@ -0,0 +1,10 @@ +Title: unify CPU load checks, avoid incompatible check parameters +Component: checks +State: open +Date: 2013-03-25 11:23:06 +Targetversion: 1.2.3 +Class: bug + +Several checks are in the group "cpu_load". All these checks need to +support predecitve levels by using get_levels(). Resolution: work with +an include file that does the actual checking.

11 years, 6 months

Check_MK Git: check_mk: Fix several ValueSpec display errors in WATO inventory

by Mathias Kettner

Module: check_mk Branch: master Commit: 87f31155dff73bfcefff5ea91c30b3b1561b907a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87f31155dff73b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 25 11:20:02 2013 +0100 Fix several ValueSpec display errors in WATO inventory --- checks/kernel | 2 +- web/htdocs/valuespec.py | 13 ++++++++----- web/htdocs/wato.py | 4 ++-- web/plugins/wato/check_parameters.py | 18 ++++++++++-------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/checks/kernel b/checks/kernel index 9687be8..297a659 100644 --- a/checks/kernel +++ b/checks/kernel @@ -26,7 +26,7 @@ # Inventory creates three checks per default: inventory_kernel_counters = [ "pgmajfault", "ctxt", "processes" ] -kernel_default_levels = (None, None) +kernel_default_levels = None kernel_counter_names = { "ctxt" : "Context Switches", diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8b805ca..ca91c4c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -194,7 +194,7 @@ class Integer(ValueSpec): self._display_format = kwargs.get("display_format", "%d") self._align = kwargs.get("align", "left") - if "size" not in kwargs and "maxvalue" in kwargs: + if "size" not in kwargs and "maxvalue" in kwargs and kwargs["maxvalue"] != None: self._size = 1 + int(math.log10(self._maxvalue)) + \ (type(self._maxvalue) == float and 3 or 0) @@ -779,6 +779,7 @@ class Float(Integer): Integer.__init__(self, **kwargs) self._decimal_separator = kwargs.get("decimal_separator", ".") self._display_format = kwargs.get("display_format", "%.2f") + self._accept_int = kwargs.get("accept_int", False) def canonical_value(self): return float(Integer.canonical_value(self)) @@ -794,16 +795,18 @@ class Float(Integer): _("The text <b><tt>%s</tt></b> is not a valid floating point number." % html.var(varprefix))) def validate_datatype(self, value, varprefix): - if type(value) != float: - raise MKUserError(varprefix, _("The value %r has type %s, but must be of type float") % (value, type(value))) + if type(value) != float and not \ + (type(value) == int and self._accept_int): + raise MKUserError(varprefix, _("The value %r has type %s, but must be of type float%s") % + (value, type(value), self._accept_int and _(" or int") or "")) class Percentage(Float): def __init__(self, **kwargs): Integer.__init__(self, **kwargs) - if "min_value" not in kwargs: + if "minvalue" not in kwargs: self._minvalue = 0.0 - if "max_value" not in kwargs: + if "maxvalue" not in kwargs: self._maxvalue = 101.0 if "unit" not in kwargs: self._unit = "%" diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 08d04d5..aa4f096 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11136,8 +11136,8 @@ def Levels(**kwargs): Tuple( title = _("Fixed Levels"), elements = [ - Float(unit = unit, title = _("Warning at"), default_value = default_levels[0]), - Float(unit = unit, title = _("Critical at"), default_value = default_levels[1]), + Float(unit = unit, title = _("Warning at"), default_value = default_levels[0], accept_int = True), + Float(unit = unit, title = _("Critical at"), default_value = default_levels[1], accept_int = True), ], ), PredictiveLevels( diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c5a3d4f..0a75123 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1368,8 +1368,8 @@ register_check_parameters( Tuple( title = _("Percentual levels (in relation to policy speed)"), elements = [ - Percentage(title = _("Warning at"), max_value=1000, label = _("% of port speed")), - Percentage(title = _("Critical at"), max_value=1000, label = _("% of port speed")), + Percentage(title = _("Warning at"), maxvalue=1000, label = _("% of port speed")), + Percentage(title = _("Critical at"), maxvalue=1000, label = _("% of port speed")), ] ), Tuple( @@ -1402,8 +1402,8 @@ register_check_parameters( Tuple( title = _("Percentual levels (in relation to policy speed)"), elements = [ - Percentage(title = _("Warning at"), max_value=1000, label = _("% of port speed")), - Percentage(title = _("Critical at"), max_value=1000, label = _("% of port speed")), + Percentage(title = _("Warning at"), maxvalue=1000, label = _("% of port speed")), + Percentage(title = _("Critical at"), maxvalue=1000, label = _("% of port speed")), ] ), Tuple( @@ -1430,8 +1430,8 @@ register_check_parameters( Tuple( title = _("Specify levels in percentage of total RAM"), elements = [ - Percentage(title = _("Warning at a usage of"), label = _("% of RAM"), max_value = None), - Percentage(title = _("Critical at a usage of"), label = _("% of RAM"), max_value = None) + Percentage(title = _("Warning at a usage of"), label = _("% of RAM"), maxvalue = None), + Percentage(title = _("Critical at a usage of"), label = _("% of RAM"), maxvalue = None) ] ), Tuple( @@ -1466,8 +1466,10 @@ register_check_parameters( Tuple( title = _("Specify levels in percentage of total RAM"), elements = [ - Percentage(title = _("Warning at a memory usage of"), default_value = 80.0), - Percentage(title = _("Critical at a memory usage of"), default_value = 90.0)]), + # Disable limit of value to 101%, because levels > 100% make sense here + # (swap+ram is > ram) + Percentage(title = _("Warning at a memory usage of"), default_value = 80.0, maxvalue = None), + Percentage(title = _("Critical at a memory usage of"), default_value = 90.0, maxvalue = None)]), Tuple( title = _("Specify levels in absolute usage values"), elements = [

11 years, 6 months

Check_MK Git: check_mk: FIX: UPS checks support Eaton Evolution

by Mathias Kettner

Module: check_mk Branch: master Commit: a597485b10f21a4d99b618108c6ab9cefcabe2b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a597485b10f21a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 25 10:09:30 2013 +0100 FIX: UPS checks support Eaton Evolution --- ChangeLog | 1 + checks/ups_capacity | 2 +- checks/ups_eaton_enviroment | 2 +- checks/ups_in_freq | 2 +- checks/ups_in_voltage | 2 +- checks/ups_out_load | 2 +- checks/ups_out_voltage | 2 +- checks/ups_power | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 293545f..7f073bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ * ADD: tcp_conn_stats: now additionally uses /proc/net/tcp6 * ADD: wmic_processs: cpucores now being considered when calculating user/kernel percentages. (thanks to William Baum) + * FIX: UPS checks support Eaton Evolution Notifications: * FIX: fixed crash on host notification when contact had explicit services set diff --git a/checks/ups_capacity b/checks/ups_capacity index 561a29a..c064d42 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -76,5 +76,5 @@ check_info["ups_capacity"] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.2", [ "2.0" , "3.0" ,"4.0" ] ), "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.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.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.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6" ] } diff --git a/checks/ups_eaton_enviroment b/checks/ups_eaton_enviroment index 1efcaed..e5907d6 100644 --- a/checks/ups_eaton_enviroment +++ b/checks/ups_eaton_enviroment @@ -62,6 +62,6 @@ check_info['ups_eaton_enviroment'] = { "has_perfdata" : True, "group" : "eaton_enviroment", "snmp_info" : ( ".1.3.6.1.4.1.534.1.6", [1,5,6 ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.534.1"] + "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"] } diff --git a/checks/ups_in_freq b/checks/ups_in_freq index 5209fa7..ab0062c 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -57,5 +57,5 @@ check_info['ups_in_freq'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.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.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.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.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6" ] \ } diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index 36833ad..c8ea68d 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -56,5 +56,5 @@ check_info['ups_in_voltage'] = { "has_perfdata" : True, "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.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.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.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6" ] } diff --git a/checks/ups_out_load b/checks/ups_out_load index a644534..402c659 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -56,5 +56,5 @@ check_info['ups_out_load'] = { "has_perfdata" : True, "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.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.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.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6" ] } diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index d33a2dd..6167f30 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -56,5 +56,5 @@ check_info['ups_out_voltage'] = { "has_perfdata" : True, "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.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.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.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6" ] } diff --git a/checks/ups_power b/checks/ups_power index 0b7aa11..ed1c9a4 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -60,5 +60,5 @@ check_info['ups_power'] = { "group" : "hw_temperature", "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.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.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.2.1.33", ".1.3.6.1.2.1.33.2" , ".1.3.6.1.4.1.5491.6" ] }

11 years, 6 months

Check_MK Git: check_mk: htmllib: clear key modifiers after loosing focus

by Mathias Kettner

Module: check_mk Branch: master Commit: 7df00fd8d7e4e3e002d8e6414f85a5a59ab3a59d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7df00fd8d7e4e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 23 17:14:39 2013 +0100 htmllib: clear key modifiers after loosing focus --- web/htdocs/htmllib.py | 1 + web/htdocs/js/checkmk.js | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c4afaad..5165489 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -929,6 +929,7 @@ class html: self.javascript("""var keybindings = %r;\n document.body.onkeydown = keybindings_keydown; document.body.onkeyup = keybindings_keyup; +document.body.onfocus = keybindings_focus; """ % self.keybindings) if self.final_javascript_code: self.javascript(self.final_javascript_code); diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index c196b0c..202501a 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1953,6 +1953,11 @@ function keybindings_keyup(e) { } } +function keybindings_focus(e) { + keybindings_pressedkeys = []; +} + + function keybindings_check(e) { for (var i in keybindings) { var keylist = keybindings[i][0];

11 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013