Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

by Konstantin Büttner

Module: check_mk Branch: master Commit: a220e0ef75aa76dcaad40c26431077e32a8fd4b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a220e0ef75aa76… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jun 17 10:02:29 2016 +0200 Added comment --- checks/esx_vsphere_counters | 3 +++ 1 file changed, 3 insertions(+) diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index 2d72202..f911c1a 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -251,6 +251,7 @@ def convert_esx_counters_if(parsed): nics = by_item.keys() nics.sort() + # This is for the if Check converted = [ [], # 0 ifIndex 0 [], # 1 ifDescr 1 @@ -274,6 +275,8 @@ def convert_esx_counters_if(parsed): [], # 19 ifPhysAddress 19 ] + # This is for mapping the incoming ESX counter data to table indeces above + # These can be passed directly to if tableindex = { 'bytesRx': 5, # is in Kilobytes! 'packetsRx': 6,

8 years

render.py: new function time_of_day()

by Mathias Kettner

Module: check_mk Branch: master Commit: 14b3788a3b2ccd314e53b84eaafda36b255a6f36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14b3788a3b2ccd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 16 17:40:42 2016 +0200 render.py: new function time_of_day() --- lib/render.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/render.py b/lib/render.py index bd14166..125aa2e 100644 --- a/lib/render.py +++ b/lib/render.py @@ -48,3 +48,7 @@ def date(timestamp): def date_and_time(timestamp): return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp)) + + +def time_of_day(timestamp): + return time.strftime("%H:%M:%S", time.localtime(timestamp))

8 years

fixed bug in werk 3544

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f4455276f1f8342e2e7d45d49802c2b923ecb93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f4455276f1f83… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 16 15:51:48 2016 +0200 fixed bug in werk 3544 --- modules/automation.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index f06da25..1cf3683 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -738,9 +738,7 @@ def automation_diag_host(args): # ('authPriv', 'md5', '11111111', '22222222', 'DES', '33333333') # Insert preconfigured communitiy - if test != "snmpv3" and snmp_community: - explicit_snmp_communities[hostname] = snmp_community - else: + if test == "snmpv3": if snmpv3_use: snmpv3_credentials = [snmpv3_use] if snmpv3_use in ["authNoPriv", "authPriv"]: @@ -748,6 +746,8 @@ def automation_diag_host(args): if snmpv3_use == "authPriv": snmpv3_credentials.extend([snmpv3_privacy_proto, snmpv3_privacy_password]) explicit_snmp_communities[hostname] = tuple(snmpv3_credentials) + elif snmp_community: + explicit_snmp_communities[hostname] = snmp_community # Determine SNMPv2/v3 community if hostname not in explicit_snmp_communities:

8 years

fixed invalid variable access

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7953db84e2ce807ee6ef8456b09301ddaadfe0a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7953db84e2ce80… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 16 15:33:21 2016 +0200 fixed invalid variable access --- web/htdocs/notifications.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/notifications.py b/web/htdocs/notifications.py index 7062cca..a121ffb 100644 --- a/web/htdocs/notifications.py +++ b/web/htdocs/notifications.py @@ -98,7 +98,7 @@ def load_failed_notifications(before=None, after=None, stat_only=False, extra_he query = "\n".join(query) if extra_headers is not None: - query += extra_filter_headers + query += extra_headers if stat_only: return sites.live().query_summed_stats(query)

8 years

more work on failed notification display and acknowledgement

by Sebastian Herbord

Module: check_mk Branch: master Commit: bda9c64e2f0c1fc5295fe2ced152c2f2db3c114f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bda9c64e2f0c1f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 16 15:21:51 2016 +0200 more work on failed notification display and acknowledgement --- web/htdocs/config.py | 12 +++++ web/htdocs/default_permissions.py | 15 ++++-- web/htdocs/notifications.py | 92 +++++++++++++++++++++++++++++++++---- web/plugins/dashboard/dashlets.py | 33 +++++-------- web/plugins/sidebar/shipped.py | 20 +++----- 5 files changed, 126 insertions(+), 46 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bda9c64e2f…

8 years

new function date_and_time in render.py

by Mathias Kettner

Module: check_mk Branch: master Commit: e99c8a8abcc73303acb05406c6ee61c47d289584 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e99c8a8abcc733… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 16 11:29:15 2016 +0200 new function date_and_time in render.py --- lib/render.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/render.py b/lib/render.py index 2f31f7b..bd14166 100644 --- a/lib/render.py +++ b/lib/render.py @@ -44,3 +44,7 @@ except NameError: def date(timestamp): return time.strftime("%Y-%m-%d", time.localtime(timestamp)) + + +def date_and_time(timestamp): + return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp))

8 years

3144 FIX bugfix: replacing pipe symbol in plugin output was broken

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8edbad64016d5f81b2844bf2127a13bdce8d3953 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8edbad64016d5f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 16 09:10:14 2016 +0200 3144 FIX bugfix: replacing pipe symbol in plugin output was broken --- .werks/3144 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3144 b/.werks/3144 new file mode 100644 index 0000000..cae5214 --- /dev/null +++ b/.werks/3144 @@ -0,0 +1,10 @@ +Title: bugfix: replacing pipe symbol in plugin output was broken +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1466060960 + + diff --git a/ChangeLog b/ChangeLog index b2b92fc..2a6f4a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -272,6 +272,7 @@ * 3637 FIX: ipmi_sensors: fixed sensor discovery if sensor is unknown and perfdata handling * 3545 FIX: netapp_api_vs_traffic: fixed crash when NFSv4.1 information was available * 3143 FIX: windows agent: fixed some minor memory and handle leaks + * 3144 FIX: bugfix: replacing pipe symbol in plugin output was broken Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index fc63a14..b0cbad7 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1919,7 +1919,7 @@ def submit_check_result(host, servicedesc, result, sa, cached_at=None, cache_int # make sure that plugin output does not contain a vertical bar. If that is the # case then replace it with a Uniocode "Light vertical bar" - infotext = infotext.replace("|", "\u2758") + infotext = infotext.replace("|", u"\u2758".encode("utf8")) # Aggregated service -> store for later if sa != "":

8 years

windows agent: updated binaries

by Sebastian Herbord

Module: check_mk Branch: master Commit: 24c17c566f20abc796afd5a197e9f442a0876e9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24c17c566f20ab… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 16 08:55:59 2016 +0200 windows agent: updated binaries --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1270784 -> 1272320 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1270784 -> 1272320 bytes agents/windows/check_mk_agent.exe | Bin 1239552 -> 1240576 bytes agents/windows/check_mk_agent.msi | Bin 248320 -> 2779136 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1239552 -> 1240576 bytes agents/windows/install_agent-64.exe | Bin 566335 -> 567138 bytes agents/windows/install_agent.exe | Bin 560642 -> 560942 bytes 8 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 4f5ed40..fdd3a56 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1763 +1765 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 6cfd91a..c5086f0 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 5c6c901..e973884 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 60e0615..5d3a06b 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index b59d1c6..15a3f15 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 77a1c2a..4b78b1e 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 2ee5ca7..6a9eb78 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index e07f73c..6f40bfa 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years

failed notification acknowledgements are now stored per user

by Sebastian Herbord

Module: check_mk Branch: master Commit: 632a78be8d3e7964c4ca9c40040af6154157ebb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=632a78be8d3e79… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 15 16:57:02 2016 +0200 failed notification acknowledgements are now stored per user --- web/htdocs/default_permissions.py | 10 +++++----- web/htdocs/notifications.py | 33 ++++++++++++--------------------- web/htdocs/sidebar.py | 9 +++++++-- web/plugins/sidebar/shipped.py | 35 +++++++++++++++++++++++------------ 4 files changed, 47 insertions(+), 40 deletions(-) diff --git a/web/htdocs/default_permissions.py b/web/htdocs/default_permissions.py index 481a5c8..1049241 100644 --- a/web/htdocs/default_permissions.py +++ b/web/htdocs/default_permissions.py @@ -148,12 +148,12 @@ def load_plugins(force): "if the user has this permission."), [ "admin" ]) - config.declare_permission("general.acknowledge_failed_notifications", - _("Acknowledge Failed Notifications"), + config.declare_permission("general.see_failed_notifications", + _("See Failed Notifications"), _("If check_mk is unable to notify users about problems, the site will warn about this situation " - "very visibly inside the UI (both in the Tactical Overview and the Dashboard). Only a user " - "with this permission can acknowledge this situation and thereby disable the warnings."), - [ "admin" ]) + "very visibly inside the UI (both in the Tactical Overview and the Dashboard). This affects only " + "users with this permission ."), + [ "admin", "user" ]) loaded_with_language = current_language diff --git a/web/htdocs/notifications.py b/web/htdocs/notifications.py index 26d1da9..e61d534 100644 --- a/web/htdocs/notifications.py +++ b/web/htdocs/notifications.py @@ -29,46 +29,37 @@ import config import defaults import lib import errno +import os + +g_acknowledgement_time = {} -g_acknowledgement_path = defaults.var_dir + "/acknowledged_notifications.mk" -g_acknowledgement_time = None def acknowledge_failed_notifications(timestamp): - config.need_permission("general.acknowledge_failed_notifications") + config.need_permission("general.see_failed_notifications") global g_acknowledgement_time - g_acknowledgement_time = timestamp + g_acknowledgement_time[config.user_id] = timestamp save_acknowledgements() def save_acknowledgements(): - config.need_permission("general.acknowledge_failed_notifications") - with open(g_acknowledgement_path, "w") as f: - f.write("%r\n" % g_acknowledgement_time) + config.need_permission("general.see_failed_notifications") + config.save_user_file("acknowledged_notifications", int(g_acknowledgement_time[config.user_id])) def acknowledged_time(): - if g_acknowledgement_time is None: + if g_acknowledgement_time.get(config.user_id) is None: load_acknowledgements() - return g_acknowledgement_time + return g_acknowledgement_time[config.user_id] def load_acknowledgements(): global g_acknowledgement_time - try: - with open(g_acknowledgement_path, "r") as f: - content = f.read().strip() - if content: - g_acknowledgement_time = literal_eval(content) - except IOError, e: - if e.errno == errno.ENOENT: - g_acknowledgement_time = 0 - else: - raise + g_acknowledgement_time[config.user_id] = config.load_user_file("acknowledged_notifications", 0) def render_page_confirm(acktime, prev_url): html.set_render_headfoot(False) html.header(_("Confirm"), javascripts=[], stylesheets=[ "pages", "check_mk" ]) html.debug_vars() html.write('<div class="really">\n') - html.write(_("Do you really want to acknowledge all failed notifications up to %s?</br>" - "This removes the warning for all users.") % lib.datetime_human_readable(acktime)) + html.write(_("Do you really want to acknowledge all failed notifications up to %s?") %\ + lib.datetime_human_readable(acktime)) html.begin_form("confirm", method="GET", action=prev_url) html.hidden_field('acktime', acktime), html.image_button('_confirm', _("Yes")) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index e35e325..9655070 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -24,8 +24,13 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import config, defaults, views, pprint, os, copy, userdb, pagetypes -import notify, werks, urlparse +import pprint +import os +import copy +import urlparse + +import config, defaults, views, userdb, pagetypes +import notify, werks import sites from lib import * diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index f23e4cf..7175596 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -546,7 +546,7 @@ table.sitestate td.state { # | | # '----------------------------------------------------------------------' -def render_tactical_overview(extra_filter_headers="", extra_url_variables=[]): +def get_tactical_overview_data(extra_filter_headers): host_query = \ "GET hosts\n" \ "Stats: state >= 0\n" \ @@ -588,15 +588,28 @@ def render_tactical_overview(extra_filter_headers="", extra_url_variables=[]): try: hstdata = sites.live().query_summed_stats(host_query) svcdata = sites.live().query_summed_stats(service_query) - notdata = sites.live().query_summed_stats(notification_query) + if config.may("general.see_failed_notifications"): + notdata = sites.live().query_summed_stats(notification_query) + else: + notdata = [0] except livestatus.MKLivestatusNotFoundError: + return None, None, None + + return hstdata, svcdata, notdata + +def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): + if extra_url_variables is None: + extra_url_variables = [] + + hstdata, svcdata, notdata = get_tactical_overview_data(extra_filter_headers) + if hstdata is None or svcdata is None or notdata is None: html.write("<center>No data from any site</center>") return + html.write("<table class=\"content_center tacticaloverview\" cellspacing=2 cellpadding=0 border=0>\n") for title, data, view, what in [ (_("Hosts"), hstdata, 'hostproblems', 'host'), - (_("Services"), svcdata, 'svcproblems', 'service'), - ]: + (_("Services"), svcdata, 'svcproblems', 'service')]: html.write("<tr><th>%s</th><th>%s</th><th>%s</th></tr>\n" % (title, _('Problems'), _('Unhandled'))) html.write("<tr>") @@ -620,14 +633,12 @@ def render_tactical_overview(extra_filter_headers="", extra_url_variables=[]): content = '<a target="main" href="%s">%d failed notifications</a>' %\ (view_url, failed_notifications) - if config.may("general.acknowledge_failed_notifications"): - - confirm_url = html.makeuri_contextless( - [("acktime", str(time.time()))] + extra_url_variables, - filename="clear_failed_notifications.py") - content = ('<a target="main" href="%s">' - '<img src="images/button_closetimewarp.png" style="width:16px;height:16px;">' - '</a> ' % confirm_url) + content + confirm_url = html.makeuri_contextless( + [("acktime", str(time.time()))] + extra_url_variables, + filename="clear_failed_notifications.py") + content = ('<a target="main" href="%s">' + '<img src="images/button_closetimewarp.png" style="width:16px;height:16px;">' + '</a> ' % confirm_url) + content html.write('<div class=spacertop><div class=tacticalalert>%s</div></div>' % content)

8 years

3546 Drastically sped up response time on querying single aggregations

by Andreas Boesl

Module: check_mk Branch: master Commit: 78b732305460c31fb21c972f8d41da20199da4cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78b732305460c3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 15 14:39:19 2016 +0200 3546 Drastically sped up response time on querying single aggregations Querying a single aggregation (e.g. through <i>Filter: Aggregation name (exact match)</i>) took considerably longer than it should. The query time was proportional to the number of available aggregations. This has been fixed. The main beneficiary of this fix is the active check "Check State of BI Aggregation". --- .werks/3546 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 9 ++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.werks/3546 b/.werks/3546 new file mode 100644 index 0000000..a4e202b --- /dev/null +++ b/.werks/3546 @@ -0,0 +1,13 @@ +Title: Drastically sped up response time on querying single aggregations +Level: 1 +Component: bi +Compatible: compat +Version: 1.4.0i1 +Date: 1465993843 +Class: feature + +Querying a single aggregation (e.g. through <i>Filter: Aggregation name (exact match)</i>) took +considerably longer than it should. The query time was proportional to the number of +available aggregations. This has been fixed. + +The main beneficiary of this fix is the active check "Check State of BI Aggregation". diff --git a/ChangeLog b/ChangeLog index dde3338..b2b92fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -455,6 +455,7 @@ * 3271 New option in aggregation for tuning aggregation of downtimes... * 3396 Change default setting of Precompile aggregations on demand to ON now... * 3449 The host alias can now be used in BI aggregates... + * 3546 Drastically sped up response time on querying single aggregations... * 3247 FIX: Do not allow multiple BI aggregates with the same title... * 3232 FIX: BI: Only querying site of host for specific host status info... * 3291 FIX: Improved error handling when searching for BI aggregations with invalid regex diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 9bcb290..0f85da5 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1872,6 +1872,7 @@ def table(columns, add_headers, only_sites, limit, filters): # later out again. only_group = None only_service = None + only_aggr_name = None for filter in filters: if filter.name == "aggr_group": @@ -1880,6 +1881,10 @@ def table(columns, add_headers, only_sites, limit, filters): only_group = val elif filter.name == "aggr_service": only_service = filter.service_spec() + elif filter.name == "aggr_name": + only_aggr_name = filter.value().get("aggr_name") + # TODO: can be further improved by filtering aggr_name_regex + # See BITextFilter(Filter): filter_table(self, rows) if config.bi_precompile_on_demand and only_group: # optimized mode: if aggregation group known only precompile this one @@ -1901,7 +1906,6 @@ def table(columns, add_headers, only_sites, limit, filters): entries.append(aggr) by_groups[group] = entries items = by_groups.items() - else: items = g_user_cache["forest"].items() @@ -1910,6 +1914,9 @@ def table(columns, add_headers, only_sites, limit, filters): continue for tree in trees: + if only_aggr_name and only_aggr_name != tree.get("title"): + continue + row = create_aggregation_row(tree) row["aggr_group"] = group rows.append(row)

8 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016