Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

Started cleaning up intermediate pwstore

by Lars Michelsen

Module: check_mk Branch: master Commit: be583b7fd36f5c61ec4802bdabaae6605b009db8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be583b7fd36f5c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 09:25:05 2016 +0200 Started cleaning up intermediate pwstore --- lib/passwordstore.py | 700 --------------------------------- web/htdocs/userdb.py | 19 +- web/htdocs/wato.py | 3 - web/plugins/userdb/hook_auth.py | 58 --- web/plugins/userdb/user_attributes.py | 37 -- 5 files changed, 1 insertion(+), 816 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=be583b7fd3…

8 years, 1 month

Addition password store cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: a65aba33c347b32855644377a2b4fec4bd5f72c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a65aba33c347b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 09:33:53 2016 +0200 Addition password store cleanups --- bin/pwquery | 15 --------------- checks/check_http | 2 +- checks/check_mail | 2 +- checks/check_mail_loop | 4 ++-- checks/check_mailboxes | 2 +- checks/check_sql | 2 +- modules/check_mk_base.py | 5 ++++- web/htdocs/valuespec.py | 8 +------- 8 files changed, 11 insertions(+), 29 deletions(-) diff --git a/bin/pwquery b/bin/pwquery deleted file mode 100755 index 10b6124..0000000 --- a/bin/pwquery +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# this is run from active checks with empty environment, so we somehow need to figure out -# where python, the passwordstore.py and the passwordstore itself reside - -OMD_ROOT=$1 -shift - -export PYTHONPATH=$OMD_ROOT/lib/python:$OMD_ROOT/local/lib/python - -$OMD_ROOT/bin/python $OMD_ROOT/lib/python/cmk/passwordstore.py\ - --get $1\ - --keydir $OMD_ROOT/var/check_mk/private_keys\ - --file $OMD_ROOT/var/check_mk/passwords.json - diff --git a/checks/check_http b/checks/check_http index 96dadb8..7641730 100644 --- a/checks/check_http +++ b/checks/check_http @@ -95,7 +95,7 @@ def check_http_arguments(params): if "auth" in settings: username, password = settings["auth"] - args += passwordstore.get_cmdline(" -a %s:%%s" % quote_shell_string(username), password) + args += passwordstore_get_cmdline(" -a %s:%%s" % quote_shell_string(username), password) if "proxy_auth" in settings: auth = settings["proxy_auth"] diff --git a/checks/check_mail b/checks/check_mail index 347e0d8..a76aa11 100644 --- a/checks/check_mail +++ b/checks/check_mail @@ -42,7 +42,7 @@ def check_mail_arguments(params): args += ' --port=%d' % fetch_port args += ' --username=%s' % quote_shell_string(fetch_params['auth'][0]) - args += passwordstore.get_cmdline(" --password=%s", fetch_params['auth'][1]) + args += passwordstore_get_cmdline(" --password=%s", fetch_params['auth'][1]) if 'connect_timeout' in params: args += ' --connect-timeout=%d' % params['connect_timeout'] diff --git a/checks/check_mail_loop b/checks/check_mail_loop index dbb104f..bd7ba6a 100644 --- a/checks/check_mail_loop +++ b/checks/check_mail_loop @@ -43,7 +43,7 @@ def check_mail_loop_arguments(params): if 'smtp_auth' in params: args += ' --smtp-username=%s' % quote_shell_string(params['smtp_auth'][0]) - args += passwordstore.get_cmdline(" --smtp-password=%s", params['smtp_auth'][1]) + args += passwordstore_get_cmdline(" --smtp-password=%s", params['smtp_auth'][1]) fetch_proto, fetch_params = params['fetch'] args += ' --fetch-protocol=%s' % quote_shell_string(fetch_proto) @@ -60,7 +60,7 @@ def check_mail_loop_arguments(params): args += ' --fetch-port=%d' % fetch_port args += ' --fetch-username=%s' % quote_shell_string(fetch_params['auth'][0]) - args += passwordstore.get_cmdline(" --fetch-password=%s", fetch_params['auth'][1]) + args += passwordstore_get_cmdline(" --fetch-password=%s", fetch_params['auth'][1]) args += ' --mail-from=%s' % quote_shell_string(params['mail_from']) args += ' --mail-to=%s' % quote_shell_string(params['mail_to']) diff --git a/checks/check_mailboxes b/checks/check_mailboxes index 5e3a857..38212cc 100644 --- a/checks/check_mailboxes +++ b/checks/check_mailboxes @@ -44,7 +44,7 @@ def check_mailboxes_arguments(params): username, password = fetch_params['auth'] args.append('--username=%s' % quote_shell_string(username)) - args.append(passwordstore.get_cmdline("--password=%s", password)) + args.append(passwordstore_get_cmdline("--password=%s", password)) if 'connect_timeout' in params: args.append('--connect-timeout=%d' % params['connect_timeout']) diff --git a/checks/check_sql b/checks/check_sql index f306cc0..d3c6ceb 100644 --- a/checks/check_sql +++ b/checks/check_sql @@ -38,7 +38,7 @@ def check_sql_arguments(params): args += " --dbms %s" % quote_shell_string(params["dbms"]) args += " --name %s" % quote_shell_string(params["name"]) args += " --user %s" % quote_shell_string(params["user"]) - args += passwordstore.get_cmdline(" --password=%s", params["password"]) + args += passwordstore_get_cmdline(" --password=%s", params["password"]) if "port" in params: args += " --port %s" % params["port"] diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 3ff017d..ed6393e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -57,7 +57,6 @@ from cmk.exceptions import MKGeneralException, MKTerminate from cmk.regex import regex import cmk.tty as tty import cmk.render as render -import cmk.passwordstore as passwordstore # PLANNED CLEANUP: # - central functions for outputting verbose information and bailing @@ -2111,6 +2110,10 @@ def utc_mktime(time_struct): import calendar return calendar.timegm(time_struct) + +def passwordstore_get_cmdline(fmt, pw): + return fmt % quote_shell_string(pw) + #. # .--Check helpers-------------------------------------------------------. # | ____ _ _ _ _ | diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index f85e422..68b090e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3403,13 +3403,7 @@ class PasswordFromStore(Alternative): def __stored_passwords(self): - from cmk.passwordstore import CryptoBackend, PasswordStore, NonePasswordProvider - backend = CryptoBackend(defaults.var_dir + "/private_keys", NonePasswordProvider()) - - # TODO: we can't limit the view to only the passwords accessible by the user because at - # this point the user_id has not been set yet - with PasswordStore(defaults.var_dir + "/passwords.json", backend) as store: - return store.list(with_details=True) + return [] # TODO def matching_alternative(self, value):

8 years, 1 month

mkbackup: Fixed small output issue

by Lars Michelsen

Module: check_mk Branch: master Commit: 161750bc3a8a65d76e734bd5e9e0faf5bd57afc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=161750bc3a8a65… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 09:11:22 2016 +0200 mkbackup: Fixed small output issue --- bin/mkbackup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkbackup b/bin/mkbackup index d9ce442..18926be 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -1742,7 +1742,7 @@ def read_from_tarfile_threaded(s, pipeout_fd): def complete_restore(): state = load_state() duration = time.time() - state["started"] - log("--- Restore completed (Duration: %s, IO: %s) ---" % + log("--- Restore completed (Duration: %s, IO: %s/s) ---" % (render.timespan(duration), render.bytes(state["bytes_per_second"])))

8 years, 1 month

Moved schedule calculation code to own submodule

by Lars Michelsen

Module: check_mk Branch: master Commit: e9282874b64416223d1e5b27a2865a214fd1e82b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9282874b64416… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 08:59:02 2016 +0200 Moved schedule calculation code to own submodule --- bin/mkbackup | 11 ++--- lib/render.py | 91 ------------------------------------- lib/schedule.py | 114 +++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/backup.py | 3 +- web/htdocs/valuespec.py | 1 - 5 files changed, 122 insertions(+), 98 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e9282874b6…

8 years, 1 month

3723 FIX Mobile GUI: Don' t mix classic and mobile GUI when choosing classic on mobile device

by Lars Michelsen

Module: check_mk Branch: master Commit: 92defe0494318ebe019af4c5b9aac46532dea845 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92defe0494318e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 08:32:58 2016 +0200 3723 FIX Mobile GUI: Don't mix classic and mobile GUI when choosing classic on mobile device --- .werks/3723 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/html_mod_python.py | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/.werks/3723 b/.werks/3723 new file mode 100644 index 0000000..6c52be3 --- /dev/null +++ b/.werks/3723 @@ -0,0 +1,10 @@ +Title: Mobile GUI: Don't mix classic and mobile GUI when choosing classic on mobile device +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1469514754 + + diff --git a/ChangeLog b/ChangeLog index 789f3ea..ac16e0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -407,6 +407,7 @@ * 3670 FIX: Fixed empty AV PDF report when exporting it from a quicksearch result view * 3622 FIX: Fix labelling of V-Achsis on graphs with very large numbers... * 3722 FIX: Mobile GUI: Prevent it from being opened with regular sidebar + * 3723 FIX: Mobile GUI: Don't mix classic and mobile GUI when choosing classic on mobile device WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 3e5239f..bc8a346 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -131,6 +131,12 @@ class html_mod_python(htmllib.html): def init_mobile(self): if self.has_var("mobile"): self.mobile = bool(self.var("mobile")) + # Persist the explicitly set state in a cookie to have it maintained through further requests + self.set_cookie("mobile", str(int(self.mobile))) + + elif self.has_cookie("mobile"): + self.mobile = self.cookie("mobile", "0") == "1" + else: self.mobile = mobile.is_mobile(self.get_user_agent())

8 years, 1 month

3722 FIX Mobile GUI: Prevent it from being opened with regular sidebar

by Lars Michelsen

Module: check_mk Branch: master Commit: 8461df43820f66ef0805f732a220a21fa3c6e9e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8461df43820f66… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 08:26:54 2016 +0200 3722 FIX Mobile GUI: Prevent it from being opened with regular sidebar --- .werks/3722 | 10 ++++++++++ ChangeLog | 2 ++ web/htdocs/mobile.py | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/3722 b/.werks/3722 new file mode 100644 index 0000000..344504c --- /dev/null +++ b/.werks/3722 @@ -0,0 +1,10 @@ +Title: Mobile GUI: Prevent it from being opened with regular sidebar +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1469514403 + + diff --git a/ChangeLog b/ChangeLog index 394914a..789f3ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -406,6 +406,7 @@ * 3669 FIX: LDAP: Fixed very long running LDAP sync when using group based sync plugins * 3670 FIX: Fixed empty AV PDF report when exporting it from a quicksearch result view * 3622 FIX: Fix labelling of V-Achsis on graphs with very large numbers... + * 3722 FIX: Mobile GUI: Prevent it from being opened with regular sidebar WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... @@ -497,6 +498,7 @@ * 3583 FIX: Fixed loosing some services after saving services in WATO... * 3588 FIX: BI aggregation: Fixed folding of tag groups in aggregation rules using host/service searches * 3620 FIX: Do not longer put SNMP MIB files into WATO snapshots... + * 3542 FIX: WATO Web API: fixed exception when WATO Git is activated... * 3547 FIX: Deleting a subfolder now generates a correct audit message... * 3661 FIX: Service discovery is now possible with only "modify services" permission... * 3152 FIX: lvm_vgs: fixed exception in host-specific settings if rule for LVM groups is set diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 083aeaa..6f435e7 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -63,6 +63,12 @@ def mobile_html_head(title, ready_code=""): if metrics.cmk_graphs_possible(): html.write(" <script type='text/javascript' src='js/graphs.js'></script>\n") + # Never allow the mobile page to be opened in a frameset. Redirect top page to the current content page. + # This will result in a full screen mobile interface page. + html.javascript('''if(top != self) { + window.top.location.href = location; +}''') + html.write("""<script type='text/javascript'> $(document).ready(function() { %s }); $(document).ready(function() {

8 years, 1 month

Fixed wrong version in werk

by Lars Michelsen

Module: check_mk Branch: master Commit: c01f5e4f1dcb2629cdb2324407b9a83513ff76d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c01f5e4f1dcb26… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 25 16:54:21 2016 +0200 Fixed wrong version in werk --- .werks/3542 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/3542 b/.werks/3542 index 9cf2e28..22882bf 100644 --- a/.werks/3542 +++ b/.werks/3542 @@ -2,7 +2,7 @@ Title: WATO Web API: fixed exception when WATO Git is activated Level: 1 Component: wato Compatible: compat -Version: 1.2.9i1 +Version: 1.4.0i1 Date: 1465807142 Class: fix

8 years, 1 month

Check_MK graphs can now be rendered on mobile interface

by Lars Michelsen

Module: check_mk Branch: master Commit: 3b719a8ae9dfb42827eb8d515d30ade03306a6f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b719a8ae9dfb4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 25 16:50:30 2016 +0200 Check_MK graphs can now be rendered on mobile interface --- web/htdocs/metrics.py | 3 +-- web/htdocs/mobile.css | 24 ++---------------------- web/htdocs/mobile.py | 20 ++++++++++++++------ web/plugins/icons/builtin.py | 6 ++++++ web/plugins/views/mobile.py | 4 ++-- web/plugins/views/painters.py | 8 ++++++++ 6 files changed, 33 insertions(+), 32 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 1dffad4..3528a09 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1279,8 +1279,7 @@ def cmk_graphs_possible(site_id = None): render_graph_html # Will throw exception if missing return not config.force_pnp_graphing \ and browser_supports_canvas() \ - and site_is_running_cmc(site_id) \ - and not html.is_mobile() + and site_is_running_cmc(site_id) except: return False diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css index a0ef3e5..04bcef2 100644 --- a/web/htdocs/mobile.css +++ b/web/htdocs/mobile.css @@ -26,17 +26,6 @@ Boston, MA 02110-1301 USA. */ /* Styles for Check_MK mobile interface */ -/* -body.mobile { - padding: 0px; - margin: 0px; -} - -div.ui-content { - padding: 0px; - background-color: #green; -} -*/ body.mobile div.really, body.mobile div.success, @@ -61,14 +50,10 @@ body.mobile div.command_group a { } body.mobile table.data { - /* width: 10px;*/ /* 100%; */ border-collapse: collapse; empty-cells: show; } -body.mobile table.data tr { -} - body.mobile table.data td { padding: 1px; border: 1px solid #ddd; @@ -85,12 +70,7 @@ body.mobile table.dataset tr.header { color: black; } -body.mobile table.dataset tr.header th { -} - -body.mobile table.dataset tr.data td { - /* border-radius: 10px; */ - /* -webkit-border-radius: 10px; */ +body.mobile table.dataset > tbody > tr.data > td { border-radius: 5px; border: 1px solid #aaa; padding: 4px 6px; @@ -126,8 +106,8 @@ body.mobile table.alertstatefilter td { body.mobile table.alertstatefilter .ui-checkbox { margin: 0; } -/* Perfometers */ +/* Perfometers */ body.mobile td.perfometer { height: 14px; diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 8160fa4..083aeaa 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -26,7 +26,7 @@ import re from lib import * -import views, config, visuals +import views, config, visuals, metrics # These regexes are taken from the public domain code of Matt Sullivan # http://sullerton.com/2011/03/django-mobile-browser-detection-middleware/ @@ -49,13 +49,21 @@ def mobile_html_head(title, ready_code=""): <link rel="stylesheet" type="text/css" href="jquery/jquery.mobile-1.0.css"> <link rel="stylesheet" type="text/css" href="check_mk.css"> <link rel="stylesheet" type="text/css" href="status.css"> - <link rel="stylesheet" type="text/css" href="mobile.css"> - <link rel="apple-touch-icon" href="images/ios_logo.png"/> + <link rel="stylesheet" type="text/css" href="mobile.css">""" % title) + + if metrics.cmk_graphs_possible(): + html.write(' <link rel="stylesheet" type="text/css" href="graphs.css">\n') + + html.write("""<link rel="apple-touch-icon" href="images/ios_logo.png"/> <script type='text/javascript' src='jquery/jquery-1.6.4.min.js'></script> <script type='text/javascript' src='js/mobile.js'></script> <script type='text/javascript' src='jquery/jquery.mobile-1.0.min.js'></script> - <script type='text/javascript' src='js/checkmk.js'></script> - <script type='text/javascript'> + <script type='text/javascript' src='js/checkmk.js'></script>\n""") + + if metrics.cmk_graphs_possible(): + html.write(" <script type='text/javascript' src='js/graphs.js'></script>\n") + + html.write("""<script type='text/javascript'> $(document).ready(function() { %s }); $(document).ready(function() { $("a").click(function (event) { @@ -66,7 +74,7 @@ def mobile_html_head(title, ready_code=""): </script> </head> <body class=mobile> -""" % (title, ready_code)) +""" % (ready_code)) def mobile_html_foot(): html.write("</body></html>\n") diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 5a3445b..add81c5 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -359,6 +359,12 @@ def pnp_icon(row, what): # to keep the number of single requests low hover_content_func = 'fetch_pnp_hover_contents(\'%s\')' % pnp_popup_url(row, what) else: + # Don't show the icon with Check_MK graphing. The hover makes no sense and there is no + # mobile view for graphs, so the graphs on the bottom of the host/service view are enough + # for the moment. + if html.is_mobile(): + return + hover_content_func = 'hover_graph(\'%s\', \'%s\', \'%s\')' % \ (row['site'], row['host_name'], row.get('service_description', '_HOST_').replace("\\", "\\\\")) diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index 35e5e82..bdceb28 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -822,8 +822,8 @@ def render_mobile_dataset(rows, view, group_painters, painters, num_columns, sho html.write('</tr>\n') html.write('</table>') # html.write('</p></div>') - html.javascript('$("table.dataset tr.data td").addClass("ui-shadow").not(".state").addClass("nonstatus");\n' - '$("table.dataset tr.data a").attr("data-ajax", "false");\n') + html.javascript('$("table.dataset > tbody > tr.data > td").addClass("ui-shadow").not(".state").addClass("nonstatus");\n' + '$("table.dataset > tbody > tr.data a").attr("data-ajax", "false");\n') multisite_layouts["mobiledataset"] = { diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 92b5e9e..07d0837 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -962,6 +962,14 @@ def paint_time_graph_cmk(row, show_timeranges=False): graph_data_range = { "time_range" : get_graph_timerange_from_painter_options() } graph_render_options = {} + if html.is_mobile(): + graph_render_options.update({ + "interaction" : False, + "show_controls" : False, + # Would be much better to autodetect the possible size (like on dashboard) + "size" : (50, 20), # ex + }) + if "host_metrics" in row: available_metrics = row["host_metrics"] perf_data = row["host_perf_data"]

8 years, 1 month

3697 sym_brightmail_queues: added support for newer symantec brightmail version

by Marcel Schulte

Module: check_mk Branch: master Commit: 7bd18cfdf3d600f1e99bb228508195bb87551116 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bd18cfdf3d600… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Jul 25 16:34:53 2016 +0200 3697 sym_brightmail_queues: added support for newer symantec brightmail version --- .werks/3697 | 9 +++++++++ ChangeLog | 1 + checks/sym_brightmail_queues | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3697 b/.werks/3697 new file mode 100644 index 0000000..5077394 --- /dev/null +++ b/.werks/3697 @@ -0,0 +1,9 @@ +Title: sym_brightmail_queues: added support for newer symantec brightmail version +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1469457007 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b2882a5..394914a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,7 @@ * 3695 f5_bigip_cluster_v11: Now WATO configurable... NOTE: Please refer to the migration notes! * 2241 check_mk_agent.openwrt: Added section for local scripts and plugins... + * 3697 sym_brightmail_queues: added support for newer symantec brightmail version * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/sym_brightmail_queues b/checks/sym_brightmail_queues index 1d60f49..9bd05f7 100644 --- a/checks/sym_brightmail_queues +++ b/checks/sym_brightmail_queues @@ -106,7 +106,8 @@ check_info["sym_brightmail_queues"] = { "inventory_function" : inventory_sym_brightmail_queues, "service_description" : "Queue %s", "has_perfdata" : False, - "snmp_scan_function" : lambda oid: "el5_sms" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "snmp_scan_function" : lambda oid: "el5_sms" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + "el6" in oid(".1.3.6.1.2.1.1.1.0").lower(), "snmp_info" : ( ".1.3.6.1.4.1.393.200.130.2", [ "2.1.1.2", # InstanceDescr

8 years, 1 month

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: f7feba6af89c3a5f7bffc11241d500dab3173148 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7feba6af89c3a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 25 15:00:51 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/AttributelistColumn.cc | 2 +- livestatus/src/BlobColumn.cc | 4 +-- livestatus/src/Column.h | 4 +-- livestatus/src/ContactgroupsColumn.cc | 2 +- livestatus/src/ContactsColumn.cc | 4 ++- livestatus/src/CustomVarsNamesColumn.cc | 2 +- livestatus/src/CustomVarsValuesColumn.cc | 2 +- livestatus/src/DoubleAggregator.cc | 10 +++--- livestatus/src/DoubleColumn.cc | 2 +- livestatus/src/DownCommColumn.cc | 4 +-- livestatus/src/EmptyColumn.cc | 2 +- livestatus/src/GlobalCountersColumn.cc | 2 +- livestatus/src/HostgroupsColumn.cc | 2 +- livestatus/src/HostlistColumn.cc | 4 +-- livestatus/src/IntAggregator.cc | 6 ++-- livestatus/src/LogEntry.h | 16 +++++----- livestatus/src/LogwatchListColumn.cc | 2 +- livestatus/src/NullColumn.cc | 2 +- livestatus/src/OffsetStringMacroColumn.cc | 2 +- livestatus/src/PerfdataAggregator.cc | 2 +- livestatus/src/Query.cc | 14 ++++----- livestatus/src/Renderer.cc | 4 +-- livestatus/src/Renderer.h | 40 ++++++------------------ livestatus/src/ServicegroupsColumn.cc | 2 +- livestatus/src/ServicelistColumn.cc | 12 +++---- livestatus/src/StatsColumn.cc | 3 +- livestatus/src/StringColumn.cc | 2 +- livestatus/src/Table.cc | 17 +++++----- livestatus/src/Table.h | 6 ++-- livestatus/src/TableColumns.cc | 10 +++--- livestatus/src/TableColumns.h | 9 +++--- livestatus/src/TableCommands.cc | 4 +-- livestatus/src/TableCommands.h | 4 +-- livestatus/src/TableContactgroups.cc | 6 ++-- livestatus/src/TableContactgroups.h | 5 +-- livestatus/src/TableContacts.cc | 4 +-- livestatus/src/TableContacts.h | 4 +-- livestatus/src/TableDownComm.cc | 6 ++-- livestatus/src/TableDownComm.h | 5 +-- livestatus/src/TableEventConsole.cc | 2 +- livestatus/src/TableEventConsole.h | 2 +- livestatus/src/TableEventConsoleEvents.cc | 6 ++-- livestatus/src/TableEventConsoleEvents.h | 5 +-- livestatus/src/TableEventConsoleHistory.cc | 6 ++-- livestatus/src/TableEventConsoleHistory.h | 5 +-- livestatus/src/TableEventConsoleReplication.cc | 6 ++-- livestatus/src/TableEventConsoleReplication.h | 5 +-- livestatus/src/TableEventConsoleStatus.cc | 8 ++--- livestatus/src/TableEventConsoleStatus.h | 5 +-- livestatus/src/TableHostgroups.cc | 4 +-- livestatus/src/TableHostgroups.h | 4 +-- livestatus/src/TableHosts.cc | 4 +-- livestatus/src/TableHosts.h | 4 +-- livestatus/src/TableHostsByGroup.cc | 6 ++-- livestatus/src/TableHostsByGroup.h | 5 +-- livestatus/src/TableLog.cc | 12 +++---- livestatus/src/TableLog.h | 7 +++-- livestatus/src/TableServicegroups.cc | 4 +-- livestatus/src/TableServicegroups.h | 4 +-- livestatus/src/TableServices.cc | 4 +-- livestatus/src/TableServices.h | 4 +-- livestatus/src/TableServicesByGroup.cc | 6 ++-- livestatus/src/TableServicesByGroup.h | 5 +-- livestatus/src/TableServicesByHostGroup.cc | 8 ++--- livestatus/src/TableServicesByHostGroup.h | 5 +-- livestatus/src/TableStateHistory.cc | 22 ++++++------- livestatus/src/TableStateHistory.h | 6 ++-- livestatus/src/TableStatus.cc | 6 ++-- livestatus/src/TableStatus.h | 5 +-- livestatus/src/TableTimeperiods.cc | 6 ++-- livestatus/src/TableTimeperiods.h | 5 +-- 71 files changed, 211 insertions(+), 208 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f7feba6af8…

8 years, 1 month

← Newer
1
...
4
5
6
7
8
9
10
...
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