Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

Rename argument in order to avoid confusion

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e0f24c2f8d0de90715e9b1aa7d41e86d0d96d25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e0f24c2f8d0de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 11 14:46:39 2016 +0200 Rename argument in order to avoid confusion --- web/htdocs/js/checkmk.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 55036ba..a7baec2 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -425,7 +425,7 @@ if (!("nextElementSibling" in document.documentElement)) { //# | AJAX call related functions | //# '--------------------------------------------------------------------' -function call_ajax(url, args) +function call_ajax(url, optional_args) { args = merge_args({ add_ajax_id : true, @@ -436,7 +436,7 @@ function call_ajax(url, args) method : "GET", post_data : null, sync : false - }, args); + }, optional_args); var AJAX = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP");

8 years, 4 months

inventory webapi: Fixed permission checking when using distributed monitoring

by Lars Michelsen

Module: check_mk Branch: master Commit: de4eac86f3de9fc12f3329ad2e27a76c37374e20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de4eac86f3de9f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 11 12:58:29 2016 +0200 inventory webapi: Fixed permission checking when using distributed monitoring --- web/htdocs/inventory.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/htdocs/inventory.py b/web/htdocs/inventory.py index 7496ce8..9b89d4b 100644 --- a/web/htdocs/inventory.py +++ b/web/htdocs/inventory.py @@ -334,7 +334,12 @@ def may_see(host_name): if config.may("general.see_all"): return True - return sites.live().query_value("GET hosts\nStats: state >= 0\nFilter: name = %s\n" % lqencode(host_name)) > 0 + query = "GET hosts\nStats: state >= 0\nFilter: name = %s\n" % lqencode(host_name) + result = sites.live().query_summed_stats(query, "ColumnHeaders: off\n") + if not result: + return False + else: + return result[0] > 0 def write_xml(response):

8 years, 4 months

3669 FIX LDAP: Fixed very long running LDAP sync when using group based sync plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: bb87bbc6a98c48f17be49fcda5feaee80004ac01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb87bbc6a98c48… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 11 09:26:50 2016 +0200 3669 FIX LDAP: Fixed very long running LDAP sync when using group based sync plugins --- .werks/3669 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/index.py | 14 +++++++++----- web/htdocs/userdb.py | 28 ++++++++++++++++++++++++++-- 4 files changed, 46 insertions(+), 7 deletions(-) diff --git a/.werks/3669 b/.werks/3669 new file mode 100644 index 0000000..45dca6b --- /dev/null +++ b/.werks/3669 @@ -0,0 +1,10 @@ +Title: LDAP: Fixed very long running LDAP sync when using group based sync plugins +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1468221930 + + diff --git a/ChangeLog b/ChangeLog index a1d2e69..ad0a5c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -388,6 +388,7 @@ * 3659 FIX: Fixed GUI exceptions for users having special characters in ther user names * 3662 FIX: Fixed creation/editing of dashboards (regression since 1.2.8p5) * 3668 FIX: Fixed slow loading of GUI pages when using a localized GUI + * 3669 FIX: LDAP: Fixed very long running LDAP sync when using group based sync plugins WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/index.py b/web/htdocs/index.py index ab7342b..a99db40 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -30,6 +30,7 @@ import i18n import sites import livestatus import modules +import userdb import defaults, config, login from lib import * from html_mod_python import html_mod_python, FinalizeRequest @@ -173,9 +174,7 @@ def handler(req, fields = None, is_profiling = False): except (apache.SERVER_RETURN, (apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED), (apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY)): - release_all_locks() - sites.disconnect() - html.finalize(is_error=True) + finalize_request(is_error=True) raise except Exception, e: @@ -191,10 +190,15 @@ def handler(req, fields = None, is_profiling = False): modules.get_handler("gui_crash")() response_code = apache.OK + finalize_request() + return response_code + + +def finalize_request(is_error=False): release_all_locks() + userdb.finalize() sites.disconnect() - html.finalize() - return response_code + html.finalize(is_error=is_error) # Ajax-Functions want no HTML output in case of an error but diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 2644f34..f81b872 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -35,7 +35,11 @@ loaded_with_language = False # Custom user attributes user_attributes = {} builtin_user_attribute_names = [] + +# Connection configuration connection_dict = {} +# Connection object dictionary +g_connections = {} # Load all userdb plugins def load_plugins(force): @@ -56,6 +60,10 @@ def load_plugins(force): for connection in config.user_connections: connection_dict[connection['id']] = connection + # Cleanup eventual still open connections + if g_connections: + g_connections.clear() + global loaded_with_language if loaded_with_language == current_language and not force: return @@ -79,6 +87,12 @@ def load_plugins(force): loaded_with_language = current_language +# Cleans up at the end of a request: Cleanup eventual open connections +def finalize(): + if g_connections: + g_connections.clear() + + # Returns a list of two part tuples where the first element is the unique # connection id and the second element the connector specification dict def get_connections(only_enabled=False): @@ -133,9 +147,19 @@ def cleanup_connection_id(connection_id): return connection_id -# Returns the connector dictionary of the given id +# Returns the connection object of the requested connection id. This function +# maintains a cache that for a single connection_id only one object per request +# is created. def get_connection(connection_id): - return dict(get_connections()).get(connection_id) + if connection_id in g_connections: + return g_connections[connection_id] + + connection = dict(get_connections()).get(connection_id) + + if connection: + g_connections[connection_id] = connection + + return connection # Returns a list of connection specific locked attributes

8 years, 4 months

3668 FIX Fixed slow loading of GUI pages when using a localized GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: eae3370390aa643011c773d22ac9179e42187324 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eae3370390aa64… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 8 15:39:54 2016 +0200 3668 FIX Fixed slow loading of GUI pages when using a localized GUI --- .werks/3668 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/i18n.py | 1 + web/htdocs/index.py | 4 ++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/3668 b/.werks/3668 new file mode 100644 index 0000000..871c988 --- /dev/null +++ b/.werks/3668 @@ -0,0 +1,10 @@ +Title: Fixed slow loading of GUI pages when using a localized GUI +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467985155 + + diff --git a/ChangeLog b/ChangeLog index 9922844..a1d2e69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -387,6 +387,7 @@ * 3148 FIX: fixed Edit View/Dashlet Dialogs offering non-sensical filter choices... * 3659 FIX: Fixed GUI exceptions for users having special characters in ther user names * 3662 FIX: Fixed creation/editing of dashboards (regression since 1.2.8p5) + * 3668 FIX: Fixed slow loading of GUI pages when using a localized GUI WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/i18n.py b/web/htdocs/i18n.py index d9f8ede..e1a3c6e 100644 --- a/web/htdocs/i18n.py +++ b/web/htdocs/i18n.py @@ -109,6 +109,7 @@ def init_language(lang, domain="multisite", locale_path=None): # Prepares the builtin-scope for localization, registers the _() function and # current_language variable. Is also used to disable localization def unlocalize(): + # TODO: Make behaviour like gettext _(): Always return unicode strings __builtin__._ = lambda x: x __builtin__.current_language = None diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 7f38224..ab7342b 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -43,7 +43,6 @@ def handler(req, fields = None, is_profiling = False): response_code = apache.OK try: - i18n.initialize() config.load_config() # load multisite.mk etc. init_profiling(is_profiling) html.init_modes() @@ -108,12 +107,13 @@ def handler(req, fields = None, is_profiling = False): # Initialize the multiste i18n. This will be replaced by # language settings stored in the user profile after the user # has been initialized + previous_language = current_language i18n.localize(html.var("lang", config.get_language())) # All plugins might have to be reloaded due to a language change. Only trigger # a second plugin loading when the user is really using a custom localized GUI. # Otherwise the load_all_plugins() at the beginning of the request is sufficient. - if current_language != None: + if current_language != previous_language: modules.load_all_plugins() # User allowed to login at all?

8 years, 5 months

3667 Search expressions in host search can now be given as regexes

by Lars Michelsen

Module: check_mk Branch: master Commit: 485765d8c338d60af0662ce85a9683006236bb83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=485765d8c338d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 8 14:15:21 2016 +0200 3667 Search expressions in host search can now be given as regexes The host search in WATO is normally performing a case insensitive infix search on the set text attributes (e.g. name, alias, IP addresses). Now you can specify regular expressions by prefixing the search term with a <tt>~</tt>. The regex searches are also performed as case insensitive infix searches. --- .werks/3667 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 8 +++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/3667 b/.werks/3667 new file mode 100644 index 0000000..585687e --- /dev/null +++ b/.werks/3667 @@ -0,0 +1,12 @@ +Title: Search expressions in host search can now be given as regexes +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1467979934 +Class: feature + +The host search in WATO is normally performing a case insensitive infix search on the +set text attributes (e.g. name, alias, IP addresses). Now you can specify regular expressions +by prefixing the search term with a <tt>~</tt>. The regex searches are also performed as +case insensitive infix searches. diff --git a/ChangeLog b/ChangeLog index b78be88..9922844 100644 --- a/ChangeLog +++ b/ChangeLog @@ -405,6 +405,7 @@ * 3657 Custom host attributes can now be configured... * 3658 LDAP: Connections can now be enabled/disabled per site... * 3553 SNMPv3 noAuthNoPriv: Fixed diagnostic page + * 3667 Search expressions in host search can now be given as regexes... * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 9e72fd5..730d1ce 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -2466,7 +2466,13 @@ class TextAttribute(Attribute): def filter_matches(self, crit, value, hostname): if value == None: # Host does not have this attribute value = "" - return crit.lower() in value.lower() + + if crit[0] == "~": + # insensitive infix regex match + return re.search(crit[1:], value, re.IGNORECASE) != None + else: + # insensitive infix search + return crit.lower() in value.lower() # A simple text attribute that is not editable by the user. # It can be used to store context information from other

8 years, 5 months

Crashreporting: fix crash if crash does not contain local_vars

by Mathias Kettner

Module: check_mk Branch: master Commit: f2cb753654caafa4888d353493f3649c086b723c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2cb753654caaf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 8 13:28:24 2016 +0200 Crashreporting: fix crash if crash does not contain local_vars --- web/htdocs/crash_reporting.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 5b7aa24..6509267 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -279,8 +279,9 @@ def show_crash_report(info): html.attrencode(info["exc_value"]))) html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Traceback")) html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_traceback(info["exc_traceback"]))) - html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Local Variables")) - html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_local_vars(info["local_vars"]))) + if "local_vars" in info: + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Local Variables")) + html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_local_vars(info["local_vars"]))) html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Python Module Paths")) joined_paths = "<br>".join([ html.attrencode(p) for p in info.get("python_paths", [_("Unknown")]) ]) html.write("<td>%s</td></tr>" % joined_paths)

8 years, 5 months

Fixed problem with site specific ldap connections

by Lars Michelsen

Module: check_mk Branch: master Commit: 0421ee9151ae1d163ddf06e48b77b9d69da3e403 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0421ee9151ae1d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 8 09:27:06 2016 +0200 Fixed problem with site specific ldap connections --- web/htdocs/userdb.py | 23 +++++++++++------------ web/plugins/userdb/ldap.py | 8 ++++++++ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index bd20b6a..2644f34 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -89,8 +89,15 @@ def get_connections(only_enabled=False): connections.insert(0, ('htpasswd', connector_class({}))) else: for connection_config in config.user_connections: - if not only_enabled or not connection_config.get('disabled'): - connections.append((connection_config['id'], connector_class(connection_config))) + if only_enabled and connection_config.get('disabled'): + continue + + connection = connector_class(connection_config) + + if only_enabled and not connection.is_enabled(): + continue + + connections.append((connection_config['id'], connection)) return connections @@ -99,8 +106,8 @@ def active_connections(): def connection_choices(): - return sorted([ (cid, "%s (%s)" % (cid, c.type())) for cid, c in get_connections() - if c.type() == "ldap"], + return sorted([ (cid, "%s (%s)" % (cid, c.type())) for cid, c in get_connections(only_enabled=False) + if c.type() == "ldap" ], key=lambda (x, y): y) @@ -1251,14 +1258,6 @@ def execute_userdb_job(): return for connection_id, connection in active_connections(): - if connection.type() != "ldap": - continue # currently only ldap can sync - - sync_config = user_sync_config() - if type(sync_config) == tuple and connection_id not in sync_config[1]: - #logger(LOG_DEBUG, 'Skipping disabled connection %s' % (connection_id)) - continue - try: connection.on_cron_job() except: diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 987438e..c04eca8 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1075,6 +1075,14 @@ class LDAPUserConnector(UserConnector): self.persist_sync_failure() + def is_enabled(self): + sync_config = user_sync_config() + if type(sync_config) == tuple and self.id() not in sync_config[1]: + #logger(LOG_DEBUG, 'Skipping disabled connection %s' % (self.id())) + return False + return True + + def sync_is_needed(self): return self.get_last_sync_time() + self.get_cache_livetime() <= time.time()

8 years, 5 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 3df9326f4142e1ebe5bcf33d68b2fd87f7d10b5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df9326f4142e1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 7 15:40:52 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/TableEventConsoleEvents.cc | 15 +++++++++++++++ livestatus/src/TableEventConsoleEvents.h | 5 +++++ livestatus/src/TableEventConsoleHistory.cc | 15 +++++++++++++++ livestatus/src/TableEventConsoleHistory.h | 5 +++++ 4 files changed, 40 insertions(+) diff --git a/livestatus/src/TableEventConsoleEvents.cc b/livestatus/src/TableEventConsoleEvents.cc index 627088e..afc8037 100644 --- a/livestatus/src/TableEventConsoleEvents.cc +++ b/livestatus/src/TableEventConsoleEvents.cc @@ -27,6 +27,12 @@ #include "Table.h" #include "TableHosts.h" +#ifdef CMC +#include "Host.h" +#else +#include "auth.h" +#endif + using std::string; #ifdef CMC @@ -122,3 +128,12 @@ const char *TableEventConsoleEvents::name() const { const char *TableEventConsoleEvents::namePrefix() const { return "eventconsoleevents_"; } + +bool TableEventConsoleEvents::isAuthorized(contact *ctc, void *data) { + host *host = static_cast<Row *>(data)->_host; +#ifdef CMC + return host == nullptr || host->hasContact(ctc); +#else + return host == nullptr || is_authorized_for(ctc, host, nullptr); +#endif +} diff --git a/livestatus/src/TableEventConsoleEvents.h b/livestatus/src/TableEventConsoleEvents.h index 99c32e2..b16ca62 100644 --- a/livestatus/src/TableEventConsoleEvents.h +++ b/livestatus/src/TableEventConsoleEvents.h @@ -28,11 +28,14 @@ #include "config.h" // IWYU pragma: keep #include "TableEventConsole.h" class Table; + #ifdef CMC #include <mutex> +#include "cmc.h" class Core; class Notes; #else +#include "nagios.h" class DowntimesOrComments; #endif @@ -56,6 +59,8 @@ public: const DowntimesOrComments &downtimes_holder, const DowntimesOrComments &comments_holder); #endif + + bool isAuthorized(contact *ctc, void *data) override; }; #endif // TableEventConsoleEvents_h diff --git a/livestatus/src/TableEventConsoleHistory.cc b/livestatus/src/TableEventConsoleHistory.cc index e8d318e..055a4be 100644 --- a/livestatus/src/TableEventConsoleHistory.cc +++ b/livestatus/src/TableEventConsoleHistory.cc @@ -26,6 +26,12 @@ #include "TableEventConsoleEvents.h" #ifdef CMC +#include "Host.h" +#else +#include "auth.h" +#endif + +#ifdef CMC TableEventConsoleHistory::TableEventConsoleHistory( const Notes &downtimes_holder, const Notes &comments_holder, std::recursive_mutex &holder_lock, Core *core) @@ -66,3 +72,12 @@ const char *TableEventConsoleHistory::name() const { const char *TableEventConsoleHistory::namePrefix() const { return "eventconsolehistory_"; } + +bool TableEventConsoleHistory::isAuthorized(contact *ctc, void *data) { + host *host = static_cast<Row *>(data)->_host; +#ifdef CMC + return host == nullptr || host->hasContact(ctc); +#else + return host == nullptr || is_authorized_for(ctc, host, nullptr); +#endif +} diff --git a/livestatus/src/TableEventConsoleHistory.h b/livestatus/src/TableEventConsoleHistory.h index 7cc6f12..8459319 100644 --- a/livestatus/src/TableEventConsoleHistory.h +++ b/livestatus/src/TableEventConsoleHistory.h @@ -27,11 +27,14 @@ #include "config.h" // IWYU pragma: keep #include "TableEventConsole.h" + #ifdef CMC #include <mutex> +#include "cmc.h" class Core; class Notes; #else +#include "nagios.h" class DowntimesOrComments; #endif @@ -47,6 +50,8 @@ public: #endif const char *name() const override; const char *namePrefix() const override; + + bool isAuthorized(contact *ctc, void *data) override; }; #endif // TableEventConsoleHistory_h

8 years, 5 months

3666 FIX ups_*: Fixed discovery for Vision UPS devices

by Lars Michelsen

Module: check_mk Branch: master Commit: 54a5e884f0019573b6c7d153b08e4d115ad0b567 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54a5e884f00195… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 7 15:23:57 2016 +0200 3666 FIX ups_*: Fixed discovery for Vision UPS devices --- .werks/3666 | 10 ++++++++++ ChangeLog | 1 + checks/ups_bat_temp | 1 + checks/ups_capacity | 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 +- checks/ups_test | 2 +- 10 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.werks/3666 b/.werks/3666 new file mode 100644 index 0000000..47ff58b --- /dev/null +++ b/.werks/3666 @@ -0,0 +1,10 @@ +Title: ups_*: Fixed discovery for Vision UPS devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467897794 + + diff --git a/ChangeLog b/ChangeLog index 8116774..b78be88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -301,6 +301,7 @@ * 3153 FIX: windows agent: fixed two problems that could cause missing wmi results... * 3555 FIX: esx_vsphere_sensors: fixed incorrect default parameter during service discovery... * 3665 FIX: hitachi_hnas_*: Fixed service discovery on some devices (e.g. HM800) + * 3666 FIX: ups_*: Fixed discovery for Vision UPS devices Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 49cf8be..1f16c26 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -58,6 +58,7 @@ def snmp_scan_ups_bat_temp(oid): [".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.935", ".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') \ or oid('.1.3.6.1.2.1.33.1.1.1.0', "").startswith('RPS') diff --git a/checks/ups_capacity b/checks/ups_capacity index 3f68249..94f6c7a 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -61,6 +61,6 @@ check_info["ups_capacity"] = { [ ".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.232.165.3" ] \ + ".1.3.6.1.4.1.232.165.3", ".1.3.6.1.4.1.935" ] \ 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_freq b/checks/ups_in_freq index 3b5c4a8..0003caa 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -60,6 +60,6 @@ check_info['ups_in_freq'] = { "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.2.1.33", ".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.935" ] \ 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 c0db31e..0e4816e 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -42,6 +42,6 @@ check_info['ups_in_voltage'] = { "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.232.165.3", - ".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.935", ] \ 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 c7c8444..7ba16fa 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -58,6 +58,6 @@ check_info['ups_out_load'] = { "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.232.165.3", - ".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.935", ] \ 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 5e47dc5..e98d956 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -42,6 +42,6 @@ check_info['ups_out_voltage'] = { "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.232.165.3", - ".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.935", ] \ 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 110fd97..b89366d 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -62,5 +62,5 @@ check_info['ups_power'] = { "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.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" ] + ".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.935", ] } diff --git a/checks/ups_test b/checks/ups_test index c2cd8c5..4f2a775 100644 --- a/checks/ups_test +++ b/checks/ups_test @@ -123,6 +123,6 @@ check_info['ups_test'] = { ( ".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", - ".1.3.6.1.4.1.232.165.3",], + ".1.3.6.1.4.1.232.165.3", ".1.3.6.1.4.1.935", ], "includes" : [ 'uptime.include' ], }

8 years, 5 months

Fixed vertical alignment of context button icons

by Mathias Kettner

Module: check_mk Branch: master Commit: 619672876c1fa12dbc61ca10879d293a45ca123b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=619672876c1fa1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 7 14:36:26 2016 +0200 Fixed vertical alignment of context button icons --- web/htdocs/pages.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 0bfd74f..82ea8d1 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -307,7 +307,7 @@ div.contextlink img { height: 18px; vertical-align: middle; position: relative; - top: -2px; + top: -1.5px; margin-right: 5px; }

8 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016