Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

7131 FIX win.mem: Fix incorrect representation of absolute memory levels in graphs

by Moritz Kiemer

Module: check_mk Branch: master Commit: 22997661d47cb51070c7fc76e1685c2de33a4f12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22997661d47cb5… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 23 14:06:47 2019 +0100 7131 FIX win.mem: Fix incorrect representation of absolute memory levels in graphs Previously, a warn or crit level of less than e.g. 20 GB free space would be displayed in the graph as a warn or crit level of more than 20 GB used space. The problem only affected the levels passed to the metrics system for representation, not the actual levels used for evaluation. CMK-1543 Change-Id: Iee645048af2d3f85bd19262224fd310c0ae32268 --- .werks/7131 | 14 +++++++ checks/mem | 49 +++++++++++----------- .../generictests/datasets/mem_win_regression.py | 4 +- 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/.werks/7131 b/.werks/7131 new file mode 100644 index 0000000..eec885d --- /dev/null +++ b/.werks/7131 @@ -0,0 +1,14 @@ +Title: win.mem: Fix incorrect representation of absolute memory levels in graphs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1548248661 +Class: fix + +Previously, a warn or crit level of less than e.g. 20 GB free space would be displayed +in the graph as a warn or crit level of more than 20 GB used space. +The problem only affected the levels passed to the metrics system for representation, +not the actual levels used for evaluation. + diff --git a/checks/mem b/checks/mem index be945bb..d5ebd98 100644 --- a/checks/mem +++ b/checks/mem @@ -532,6 +532,24 @@ def check_mem_windows(_no_item, params, info): meminfo = parse_proc_meminfo(info) now = time.time() + def _get_levels_on_used_mb(param_key, total_mb): + levels = params.get(param_key) + if not isinstance(levels, tuple): + # Predictive levels have no level information in the performance data + return None, None + + if isinstance(levels[0], float): + # float type means percent + warn = total_mb * levels[0] / 100 + else: + # int means levels on *free* space + warn = total_mb - levels[0] + if isinstance(levels[1], float): + crit = total_mb * levels[1] / 100 + else: + crit = total_mb - levels[1] + return warn, crit + for title, prefix, paramname in [("Memory usage", "Mem", "memory"), ("Commit Charge", "Page", "pagefile")]: @@ -546,27 +564,13 @@ def check_mem_windows(_no_item, params, info): used_mb = total_mb - free_mb perc = 100.0 * used_kb / total_kb + warn, crit = _get_levels_on_used_mb(paramname, total_mb) + infotext = "%s: %s (%s/%s)" % (title, get_percent_human_readable(perc), get_bytes_human_readable(used_kb * 1024), get_bytes_human_readable(total_kb * 1024)) - if isinstance(params[paramname], tuple): - warn, crit = params[paramname] - - # In perfdata show warn/crit as absolute values - # Absolute thresholds are in MB -> transform to MB - if isinstance(warn, float): - warn = total_mb * warn / 100 - - if isinstance(crit, float): - crit = total_mb * crit / 100 - - perfdata = [(paramname, used_mb, warn, crit, 0, total_mb)] - - # Predictive levels have no level information in the performance data - else: - perfdata = [(paramname, used_mb, None, None, 0, total_mb)] - + perfdata = [(paramname, used_mb, warn, crit, 0, total_mb)] if prefix == "Mem": perfdata.append(("mem_total", total_mb)) elif prefix == "Page": @@ -586,15 +590,12 @@ def check_mem_windows(_no_item, params, info): perfdata.append((paramname + "_avg", used_mb)) # Now check the levels - if isinstance(params[paramname], tuple): - if (isinstance(crit, int) and free_mb <= crit) or \ - (isinstance(crit, float) and perc >= crit): + if (warn, crit) != (None, None): + state = 0 + if used_mb >= crit: state = 2 - elif (isinstance(warn, int) and free_mb <= warn) or \ - (isinstance(warn, float) and perc >= warn): + elif used_mb >= warn: state = 1 - else: - state = 0 # Predictive levels else: diff --git a/tests/unit/checks/generictests/datasets/mem_win_regression.py b/tests/unit/checks/generictests/datasets/mem_win_regression.py index 601d5e2..86d1460 100644 --- a/tests/unit/checks/generictests/datasets/mem_win_regression.py +++ b/tests/unit/checks/generictests/datasets/mem_win_regression.py @@ -32,11 +32,11 @@ checks = { ]), (None, {'memory': (6553, 3277), 'pagefile': (19492, 77414)}, [ (0, 'Memory usage: 50.0% (15.99 GB/32.00 GB)', [ - ('memory', 16369.96875, 6553, 3277, 0, 32767.48828125), + ('memory', 16369.96875, 26214.48828125, 29490.48828125, 0, 32767.48828125), ('mem_total', 32767.48828125, None, None, None, None), ]), (2, 'Commit Charge: 20.1% (19.04 GB/94.50 GB)', [ - ('pagefile', 19491.90625, 19492.0, 77414.0, 0, 96767.48828125), + ('pagefile', 19491.90625, 77275.48828125, 19353.48828125, 0, 96767.48828125), ('pagefile_total', 96767.48828125, None, None, None, None), ]), ]),

5 years, 8 months

Use CRE header for CRE stuff. :-}

by Sven Panne

Module: check_mk Branch: master Commit: d1214f1ea27020fdacf06455c51731c4b8003c37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1214f1ea27020… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 23 15:32:08 2019 +0100 Use CRE header for CRE stuff. :-} Change-Id: I4ecfd5c8c9db6d883a2603442ab835eae165ef00 --- cmk/gui/plugins/webapi/inventory.py | 48 ++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/cmk/gui/plugins/webapi/inventory.py b/cmk/gui/plugins/webapi/inventory.py index 992a1f6..5fa4eb6 100644 --- a/cmk/gui/plugins/webapi/inventory.py +++ b/cmk/gui/plugins/webapi/inventory.py @@ -1,34 +1,28 @@ #!/usr/bin/env python # -*- encoding: utf-8; py-indent-offset: 4 -*- -# .------------------------------------------------------------------------. -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | |_____| | -# | _____ _ _ | -# | | ____|_ __ | |_ ___ _ __ _ __ _ __(_)___ ___ | -# | | _| | '_ \| __/ _ \ '__| '_ \| '__| / __|/ _ \ | -# | | |___| | | | || __/ | | |_) | | | \__ \ __/ | -# | |_____|_| |_|\__\___|_| | .__/|_| |_|___/\___| | -# | |_| | -# | _____ _ _ _ _ | -# | | ____|__| (_) |_(_) ___ _ __ | -# | | _| / _` | | __| |/ _ \| '_ \ | -# | | |__| (_| | | |_| | (_) | | | | | -# | |_____\__,_|_|\__|_|\___/|_| |_| | -# | | -# | mathias-kettner.com mathias-kettner.de | -# '------------------------------------------------------------------------' -# This file is part of the Check_MK Enterprise Edition (CEE). -# Copyright by Mathias Kettner and Mathias Kettner GmbH. All rights reserved. +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ # -# Distributed under the Check_MK Enterprise License. +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. # -# You should have received a copy of the Check_MK Enterprise License -# along with Check_MK. If not, email to mk(a)mathias-kettner.de -# or write to the postal address provided at www.mathias-kettner.de +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. from cmk.gui.inventory import inventory_of_host

5 years, 8 months

mem.win: various cleanups

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2285062a8c4b7c494d51bd1863e5a2969448463f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2285062a8c4b7c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 23 07:42:48 2019 +0100 mem.win: various cleanups CMK-1543 Change-Id: I2d3496aac756ae405765a9d20e81bf38d52dec2f --- checks/mem | 68 +++++++++++----------- .../generictests/datasets/mem_win_regression.py | 8 +-- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/checks/mem b/checks/mem index 28e6177..be945bb 100644 --- a/checks/mem +++ b/checks/mem @@ -464,7 +464,13 @@ check_info["mem.linux"] = { def parse_proc_meminfo(info): - return dict([(i[0][:-1], int(i[1])) for i in info]) + parsed = {} + for line in info: + try: + parsed[line[0][:-1]] = int(line[1]) + except (ValueError, IndexError) as _exc: + pass + return parsed # The following variable is obsolete. It is kept here so that Check_MK @@ -519,58 +525,52 @@ factory_settings["memory_win_default_levels"] = { def inventory_mem_win(info): meminfo = parse_proc_meminfo(info) if "MemTotal" in meminfo and "PageTotal" in meminfo: - return [(None, {})] + yield None, {} -def check_mem_windows(item, params, info): +def check_mem_windows(_no_item, params, info): meminfo = parse_proc_meminfo(info) - MB = 1024.0 * 1024 now = time.time() - for title, what, paramname in [("Memory usage", "Mem", "memory"), - ("Commit Charge", "Page", "pagefile")]: + for title, prefix, paramname in [("Memory usage", "Mem", "memory"), + ("Commit Charge", "Page", "pagefile")]: - key_total = what + "Total" - key_free = what + "Free" - if not (key_total in meminfo and key_free in meminfo): + total_kb = meminfo.get("%sTotal" % prefix) + free_kb = meminfo.get("%sFree" % prefix) + if None in (total_kb, free_kb): continue - total_kb = meminfo[key_total] - free_kb = meminfo[key_free] - used_kb = total_kb - free_kb - used_mb = used_kb / 1024.0 + total_mb = total_kb / 1024.0 free_mb = free_kb / 1024.0 + used_kb = total_kb - free_kb + used_mb = total_mb - free_mb perc = 100.0 * used_kb / total_kb - infotext = "%s: %.1f%% (%.1f/%.1f GB)" % \ - (title, perc, used_kb / MB, total_kb / MB) + infotext = "%s: %s (%s/%s)" % (title, get_percent_human_readable(perc), + get_bytes_human_readable(used_kb * 1024), + get_bytes_human_readable(total_kb * 1024)) if isinstance(params[paramname], tuple): warn, crit = params[paramname] # In perfdata show warn/crit as absolute values - # Absolute thresholds are in MB -> transform to KB + # Absolute thresholds are in MB -> transform to MB if isinstance(warn, float): - warn_kb = total_kb * warn / 100 - else: - warn_kb = warn * 1024 + warn = total_mb * warn / 100 if isinstance(crit, float): - crit_kb = total_kb * crit / 100 - else: - crit_kb = crit * 1024 + crit = total_mb * crit / 100 - perfdata = [(paramname, used_kb / 1024.0, warn_kb / 1024.0, crit_kb / 1024.0, 0, - total_kb / 1024.0)] + perfdata = [(paramname, used_mb, warn, crit, 0, total_mb)] # Predictive levels have no level information in the performance data else: - perfdata = [(paramname, used_kb / 1024.0, None, None, 0, total_kb / 1024.0)] + perfdata = [(paramname, used_mb, None, None, 0, total_mb)] - if what == "Mem": - perfdata.append(("mem_total", total_kb / 1024.0)) - elif what == "Page": - perfdata.append(("pagefile_total", total_kb / 1024.0)) + if prefix == "Mem": + perfdata.append(("mem_total", total_mb)) + elif prefix == "Page": + perfdata.append(("pagefile_total", total_mb)) # Do averaging, if configured, just for matching the levels if "average" in params: @@ -578,10 +578,12 @@ def check_mem_windows(item, params, info): used_kb = get_average( "mem.win.%s" % paramname, now, used_kb, average_min, initialize_zero=False) used_mb = used_kb / 1024.0 - free_mb = (total_kb / 1024.0) - used_mb + free_mb = total_mb - used_mb perc = 100.0 * used_kb / total_kb - infotext += ", %d min average: %.1f%% (%.1f GB)" % (average_min, perc, used_kb / MB) - perfdata.append((paramname + "_avg", used_kb / 1024.0)) + infotext += ", %d min average: %s (%s)" % (average_min, + get_percent_human_readable(perc), + get_bytes_human_readable(used_kb * 1024)) + perfdata.append((paramname + "_avg", used_mb)) # Now check the levels if isinstance(params[paramname], tuple): @@ -597,7 +599,7 @@ def check_mem_windows(item, params, info): # Predictive levels else: state, infoadd, perfadd = check_levels( - used_kb / 1024.0, # Current value stored in MB in RRDs + used_mb, # Current value stored in MB in RRDs "average" in params and paramname + "_avg" or paramname, # Name of RRD variable params[paramname], unit="GB", # Levels are specified in GB... diff --git a/tests/unit/checks/generictests/datasets/mem_win_regression.py b/tests/unit/checks/generictests/datasets/mem_win_regression.py index 03d996c..601d5e2 100644 --- a/tests/unit/checks/generictests/datasets/mem_win_regression.py +++ b/tests/unit/checks/generictests/datasets/mem_win_regression.py @@ -21,21 +21,21 @@ discovery = {'linux': [], 'used': [], 'vmalloc': [], 'win': [(None, {})]} checks = { 'win': [ (None, {'memory': (80.0, 90.0), 'pagefile': (80.0, 90.0)}, [ - (0, 'Memory usage: 50.0% (16.0/32.0 GB)', [ + (0, 'Memory usage: 50.0% (15.99 GB/32.00 GB)', [ ('memory', 16369.96875, 26213.990625, 29490.739453125, 0, 32767.48828125), ('mem_total', 32767.48828125, None, None, None, None), ]), - (0, 'Commit Charge: 20.1% (19.0/94.5 GB)', [ + (0, 'Commit Charge: 20.1% (19.04 GB/94.50 GB)', [ ('pagefile', 19491.90625, 77413.990625, 87090.739453125, 0, 96767.48828125), ('pagefile_total', 96767.48828125, None, None, None, None), ]), ]), (None, {'memory': (6553, 3277), 'pagefile': (19492, 77414)}, [ - (0, 'Memory usage: 50.0% (16.0/32.0 GB)', [ + (0, 'Memory usage: 50.0% (15.99 GB/32.00 GB)', [ ('memory', 16369.96875, 6553, 3277, 0, 32767.48828125), ('mem_total', 32767.48828125, None, None, None, None), ]), - (2, 'Commit Charge: 20.1% (19.0/94.5 GB)', [ + (2, 'Commit Charge: 20.1% (19.04 GB/94.50 GB)', [ ('pagefile', 19491.90625, 19492.0, 77414.0, 0, 96767.48828125), ('pagefile_total', 96767.48828125, None, None, None, None), ]),

5 years, 8 months

7008 mssql_connections: Service graph shows #connections

by Simon Betz

Module: check_mk Branch: master Commit: f57ca256bd21804d85a477c326ebae9bd674656e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f57ca256bd2180… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 16 17:59:04 2019 +0100 7008 mssql_connections: Service graph shows #connections Change-Id: Ic33d741b37544a8225e910896e3ee40e82c47fee --- .werks/7008 | 10 ++++++++++ checks/mssql_connections | 13 ++++++++++--- cmk/gui/plugins/metrics/check_mk.py | 11 ++++++++++- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/.werks/7008 b/.werks/7008 new file mode 100644 index 0000000..17c241a --- /dev/null +++ b/.werks/7008 @@ -0,0 +1,10 @@ +Title: mssql_connections: Service graph shows #connections +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547657879 +Class: feature + + diff --git a/checks/mssql_connections b/checks/mssql_connections index f1db0ed..f23fa52 100644 --- a/checks/mssql_connections +++ b/checks/mssql_connections @@ -58,10 +58,16 @@ def check_mssql_connections(item, params, parsed): warn, crit = params['levels'] if connection_count >= crit: - return 2, 'Connections: %d (warn/crit at %d/%d)' % (connection_count, warn, crit) + state = 2 elif connection_count >= warn: - return 1, 'Connections: %d (warn/crit at %d/%d)' % (connection_count, warn, crit) - return 0, 'Connections: %d' % connection_count + state = 1 + else: + state = 0 + + infotext = "Connections: %d" % connection_count + if state: + infotext += " (warn/crit at %d/%d)" % (warn, crit) + return state, infotext, [('connections', connection_count, warn, crit)] check_info['mssql_connections'] = { @@ -71,4 +77,5 @@ check_info['mssql_connections'] = { 'service_description': 'MSSQL Connections %s', 'group': 'mssql_connections', 'default_levels_variable': "mssql_connections_default_levels", + 'has_perfdata': True, } diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index b1e20dd..6487034 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -8164,10 +8164,19 @@ graph_info["total_and_open_slots"] = { graph_info["connections"] = { "title": _("Connections"), "metrics": [ + ("connections", "area"), ("connections_async_writing", "area"), ("connections_async_keepalive", "stack"), ("connections_async_closing", "stack"), - ("connections", "line"), + ], + "optional_metrics": [ + "connections_async_writing", + "connections_async_keepalive", + "connections_async_closing", + ], + "scalars": [ + "connections:warn", + "connections:crit", ], }

5 years, 8 months

mem.win: add regression test

by Moritz Kiemer

Module: check_mk Branch: master Commit: 48914b07761f07bac4b3d69ac5c8c633fc541077 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48914b07761f07… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 23 13:10:01 2019 +0100 mem.win: add regression test CMK-1543 Change-Id: I97381c2e63f94eccd2c81820434fcdd1290d9577 --- .../generictests/datasets/mem_win_regression.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/mem_win_regression.py b/tests/unit/checks/generictests/datasets/mem_win_regression.py new file mode 100644 index 0000000..03d996c --- /dev/null +++ b/tests/unit/checks/generictests/datasets/mem_win_regression.py @@ -0,0 +1,44 @@ + + +checkname = 'mem' + + +info = [ + ['MemTotal:', '33553908', 'kB'], + ['MemFree:', '16791060', 'kB'], + ['SwapTotal:', '65536000', 'kB'], + ['SwapFree:', '62339136', 'kB'], + ['PageTotal:', '99089908', 'kB'], + ['PageFree:', '79130196', 'kB'], + ['VirtualTotal:', '2097024', 'kB'], + ['VirtualFree:', '2055772', 'kB'], +] + + +discovery = {'linux': [], 'used': [], 'vmalloc': [], 'win': [(None, {})]} + + +checks = { + 'win': [ + (None, {'memory': (80.0, 90.0), 'pagefile': (80.0, 90.0)}, [ + (0, 'Memory usage: 50.0% (16.0/32.0 GB)', [ + ('memory', 16369.96875, 26213.990625, 29490.739453125, 0, 32767.48828125), + ('mem_total', 32767.48828125, None, None, None, None), + ]), + (0, 'Commit Charge: 20.1% (19.0/94.5 GB)', [ + ('pagefile', 19491.90625, 77413.990625, 87090.739453125, 0, 96767.48828125), + ('pagefile_total', 96767.48828125, None, None, None, None), + ]), + ]), + (None, {'memory': (6553, 3277), 'pagefile': (19492, 77414)}, [ + (0, 'Memory usage: 50.0% (16.0/32.0 GB)', [ + ('memory', 16369.96875, 6553, 3277, 0, 32767.48828125), + ('mem_total', 32767.48828125, None, None, None, None), + ]), + (2, 'Commit Charge: 20.1% (19.0/94.5 GB)', [ + ('pagefile', 19491.90625, 19492.0, 77414.0, 0, 96767.48828125), + ('pagefile_total', 96767.48828125, None, None, None, None), + ]), + ]), + ], +}

5 years, 8 months

Reserved 10 Werk IDS

by Moritz Kiemer

Module: check_mk Branch: master Commit: 067424f7d31204e45b95880df2b186ca1e5f957d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=067424f7d31204… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 23 14:01:04 2019 +0100 Reserved 10 Werk IDS Change-Id: I1fa99700efce709f34053aedb8fafac94b2cc44f --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 5997a44..eedd0c9 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7131 +7141

5 years, 8 months

agent_aws: Move session creation to main method

by Simon Betz

Module: check_mk Branch: master Commit: 3973243b407063bd8597b6376c6ceadf24ad3e65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3973243b407063… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 23 12:01:09 2019 +0100 agent_aws: Move session creation to main method Change-Id: Ib185d5f43c22a2508eb96bc3b81aac3ec8eb1cc4 --- agents/special/agent_aws | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 006d4fa..6f157d5 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -881,20 +881,16 @@ class CloudTrail(AWSSection): class AWSSectionsTmpl(object): - def __init__(self, hostname, access_key_id, secret_access_key, services, region): + __metaclass__ = abc.ABCMeta + + def __init__(self, hostname, session, services): self._hostname = hostname - self._session = self._init_session(access_key_id, secret_access_key, region) + self._session = session self._services = services self._sections = [] self._results = {} self._exceptions = [] - def _init_session(self, access_key_id, secret_access_key, region): - return boto3.session.Session( - aws_access_key_id=access_key_id, - aws_secret_access_key=secret_access_key, - region_name=region) - def _init_client(self, client_key): try: return self._session.client(client_key) @@ -1004,9 +1000,8 @@ class AWSSectionsUSEast(AWSSectionsTmpl): https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/ce-api.html """ - def __init__(self, hostname, access_key_id, secret_access_key, services): - super(AWSSectionsUSEast, self).__init__(hostname, access_key_id, secret_access_key, - services, "us-east-1") + def __init__(self, hostname, session, services): + super(AWSSectionsUSEast, self).__init__(hostname, session, services) #---clients--------------------------------------------------------- ce_client = self._init_client('ce') @@ -1020,9 +1015,8 @@ class AWSSectionsUSEast(AWSSectionsTmpl): class AWSSections(AWSSectionsTmpl): - def __init__(self, hostname, access_key_id, secret_access_key, services, region): - super(AWSSections, self).__init__(hostname, access_key_id, secret_access_key, services, - region) + def __init__(self, hostname, session, services): + super(AWSSections, self).__init__(hostname, session, services) #---clients--------------------------------------------------------- ec2_client = self._init_client('ec2') @@ -1177,6 +1171,13 @@ def setup_logging(opt_debug): logging.basicConfig(level=lvl, format=fmt) +def create_session(access_key_id, secret_access_key, region): + return boto3.session.Session( + aws_access_key_id=access_key_id, + aws_secret_access_key=secret_access_key, + region_name=region) + + def main(args=None): if args is None: cmk.utils.password_store.replace_passwords() @@ -1189,12 +1190,12 @@ def main(args=None): access_key_id = args.aws_access_key_id secret_access_key = args.aws_secret_access_key use_cache = not args.no_cache - services = args.services[:] + services = args.services exceptions = [] try: - aws_sections_us_east = AWSSectionsUSEast(hostname, access_key_id, secret_access_key, - services) + session = create_session(access_key_id, secret_access_key, "us-east-1") + aws_sections_us_east = AWSSectionsUSEast(hostname, session, services) aws_sections_us_east.run(use_cache=use_cache) except Exception as e: if args.debug: @@ -1203,7 +1204,8 @@ def main(args=None): for region in args.regions: try: - aws_sections = AWSSections(hostname, access_key_id, secret_access_key, services, region) + session = create_session(access_key_id, secret_access_key, region) + aws_sections = AWSSections(hostname, session, services) aws_sections.run(use_cache=use_cache) except Exception as e: if args.debug:

5 years, 8 months

agent_aws: Separate sections registry from __init__

by Simon Betz

Module: check_mk Branch: master Commit: 13456368b257de3b240656ba9d81a2502a36e82c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13456368b257de… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 23 12:23:08 2019 +0100 agent_aws: Separate sections registry from __init__ Change-Id: I6e61b5ab03f91141a22f9a8f5c38701c29732789 --- agents/special/agent_aws | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 6f157d5..f6bd95e 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -891,6 +891,10 @@ class AWSSectionsTmpl(object): self._results = {} self._exceptions = [] + @abc.abstractmethod + def init_sections(self, **kwargs): + pass + def _init_client(self, client_key): try: return self._session.client(client_key) @@ -1000,9 +1004,7 @@ class AWSSectionsUSEast(AWSSectionsTmpl): https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/ce-api.html """ - def __init__(self, hostname, session, services): - super(AWSSectionsUSEast, self).__init__(hostname, session, services) - + def init_sections(self, **kwargs): #---clients--------------------------------------------------------- ce_client = self._init_client('ce') @@ -1015,9 +1017,7 @@ class AWSSectionsUSEast(AWSSectionsTmpl): class AWSSections(AWSSectionsTmpl): - def __init__(self, hostname, session, services): - super(AWSSections, self).__init__(hostname, session, services) - + def init_sections(self, **kwargs): #---clients--------------------------------------------------------- ec2_client = self._init_client('ec2') s3_client = self._init_client('s3') @@ -1196,6 +1196,7 @@ def main(args=None): try: session = create_session(access_key_id, secret_access_key, "us-east-1") aws_sections_us_east = AWSSectionsUSEast(hostname, session, services) + aws_sections_us_east.init_sections() aws_sections_us_east.run(use_cache=use_cache) except Exception as e: if args.debug: @@ -1206,6 +1207,7 @@ def main(args=None): try: session = create_session(access_key_id, secret_access_key, region) aws_sections = AWSSections(hostname, session, services) + aws_sections.init_sections() aws_sections.run(use_cache=use_cache) except Exception as e: if args.debug:

5 years, 8 months

Suppress all remaining Bandit warnings for now.

by Sven Panne

Module: check_mk Branch: master Commit: 212d46f9b5008cea756dc45c9b0f81536db2c867 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=212d46f9b5008c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 23 11:06:31 2019 +0100 Suppress all remaining Bandit warnings for now. This way we get a CI baseline from which we can work, and we have to revisit all "# nosec" annotations, anyway. Change-Id: I23a35085194f7598b863d1bf336085ec7fa019a9 --- agents/special/agent_emcvnx | 6 +- agents/special/agent_ibmsvc | 2 +- agents/windows/msibuild/msi-update | 46 +++++++---- doc/treasures/cmk-delete-host | 6 +- .../memcached/agents/plugins/mk_memcached | 2 +- doc/treasures/notifications/opcmsg | 2 +- notifications/sms | 5 +- omd/packages/omd/omdlib/main.py | 89 +++++++++++++--------- 8 files changed, 94 insertions(+), 64 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=212d46f9b5…

5 years, 8 months

Refactored view sorters to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a150e84edfd42224dd0e2341eee21740428d0e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a150e84edfd42… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 21 09:10:25 2019 +0100 Refactored view sorters to plugin registry Change-Id: I0e9460d1ad49adf5b019e081fd75a992a55f5f73 --- cmk/gui/plugins/views/__init__.py | 4 +- cmk/gui/plugins/views/inventory.py | 26 +- cmk/gui/plugins/views/perfometer.py | 53 +- cmk/gui/plugins/views/sorters.py | 415 ++++----- cmk/gui/plugins/views/utils.py | 115 ++- cmk/gui/plugins/views/wato.py | 68 +- cmk/gui/views.py | 128 ++- tests/unit/cmk/gui/test_views.py | 1642 +++++++++++++++++++++++++++++++++++ 8 files changed, 2134 insertions(+), 317 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7a150e84ed…

5 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019