Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

Access HTML variables via the request, not via html.

by Sven Panne

Module: check_mk Branch: master Commit: 37eda7d465931c0cdde1a4512145e9719959a243 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37eda7d465931c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 9 16:20:04 2019 +0100 Access HTML variables via the request, not via html. This fixes various TODOs. Change-Id: I75a2f1dc2a00a4e31e9840f249ccd83d36babc1a --- cmk/gui/backup.py | 20 ++--- cmk/gui/bi.py | 14 ++-- cmk/gui/crash_reporting.py | 20 ++--- cmk/gui/dashboard.py | 59 +++++++------- cmk/gui/display_options.py | 10 +-- cmk/gui/forms.py | 8 +- cmk/gui/gui_background_job.py | 14 ++-- cmk/gui/help.py | 2 +- cmk/gui/htmllib.py | 84 ++++++++------------ cmk/gui/key_mgmt.py | 10 +-- cmk/gui/login.py | 16 ++-- cmk/gui/logwatch.py | 14 ++-- cmk/gui/metrics.py | 18 ++--- cmk/gui/mobile.py | 8 +- cmk/gui/notifications.py | 4 +- cmk/gui/pagetypes.py | 30 +++---- cmk/gui/plugins/dashboard/graph.py | 6 +- cmk/gui/plugins/dashboard/stats.py | 4 +- cmk/gui/plugins/dashboard/utils.py | 4 +- cmk/gui/plugins/dashboard/view.py | 8 +- cmk/gui/plugins/sidebar/bookmarks.py | 4 +- cmk/gui/plugins/sidebar/master_control.py | 6 +- cmk/gui/plugins/sidebar/quicksearch.py | 4 +- cmk/gui/plugins/sidebar/site_status.py | 2 +- cmk/gui/plugins/sidebar/speedometer.py | 6 +- cmk/gui/plugins/sidebar/virtual_host_tree.py | 4 +- cmk/gui/plugins/views/availability.py | 58 +++++++------- cmk/gui/plugins/views/commands.py | 68 ++++++++-------- cmk/gui/plugins/views/icons/builtin.py | 8 +- cmk/gui/plugins/views/inventory.py | 10 +-- cmk/gui/plugins/views/mkeventd.py | 18 ++--- cmk/gui/plugins/views/painters.py | 4 +- cmk/gui/plugins/views/utils.py | 12 +-- cmk/gui/plugins/views/wato.py | 2 +- cmk/gui/plugins/views/webservice.py | 4 +- cmk/gui/plugins/visuals/filters.py | 88 +++++++++++---------- cmk/gui/plugins/visuals/inventory.py | 38 ++++----- cmk/gui/plugins/visuals/utils.py | 14 ++-- cmk/gui/plugins/visuals/wato.py | 4 +- cmk/gui/plugins/wato/background_job.py | 2 +- cmk/gui/plugins/wato/bi.py | 46 +++++------ cmk/gui/plugins/wato/utils/__init__.py | 12 +-- cmk/gui/plugins/wato/utils/html_elements.py | 2 +- cmk/gui/plugins/wato/utils/simple_modes.py | 6 +- cmk/gui/prediction.py | 8 +- cmk/gui/sidebar.py | 24 +++--- cmk/gui/sites.py | 2 +- cmk/gui/table.py | 26 +++--- cmk/gui/valuespec.py | 91 ++++++++++----------- cmk/gui/view_utils.py | 4 +- cmk/gui/views.py | 94 +++++++++++----------- cmk/gui/visuals.py | 58 +++++++------- cmk/gui/wato/__init__.py | 10 +-- cmk/gui/wato/mkeventd.py | 68 ++++++++-------- cmk/gui/wato/pages/activate_changes.py | 9 ++- cmk/gui/wato/pages/analyze_configuration.py | 20 ++--- cmk/gui/wato/pages/audit_log.py | 4 +- cmk/gui/wato/pages/automation.py | 22 +++--- cmk/gui/wato/pages/backup.py | 2 +- cmk/gui/wato/pages/bulk_discovery.py | 4 +- cmk/gui/wato/pages/bulk_edit.py | 2 +- cmk/gui/wato/pages/bulk_import.py | 30 +++---- cmk/gui/wato/pages/check_catalog.py | 2 +- cmk/gui/wato/pages/custom_attributes.py | 12 +-- cmk/gui/wato/pages/folders.py | 63 +++++++-------- cmk/gui/wato/pages/global_settings.py | 12 +-- cmk/gui/wato/pages/groups.py | 10 +-- cmk/gui/wato/pages/host_diagnose.py | 12 +-- cmk/gui/wato/pages/host_rename.py | 2 +- cmk/gui/wato/pages/host_tags.py | 18 ++--- cmk/gui/wato/pages/hosts.py | 24 +++--- cmk/gui/wato/pages/icons.py | 6 +- cmk/gui/wato/pages/ldap.py | 16 ++-- cmk/gui/wato/pages/notifications.py | 34 ++++---- cmk/gui/wato/pages/parentscan.py | 18 ++--- cmk/gui/wato/pages/pattern_editor.py | 6 +- cmk/gui/wato/pages/random_hosts.py | 6 +- cmk/gui/wato/pages/roles.py | 14 ++-- cmk/gui/wato/pages/rulesets.py | 113 ++++++++++++++------------- cmk/gui/wato/pages/services.py | 6 +- cmk/gui/wato/pages/sites.py | 36 ++++----- cmk/gui/wato/pages/timeperiods.py | 22 +++--- cmk/gui/wato/pages/users.py | 20 ++--- cmk/gui/wato/user_profile.py | 14 ++-- cmk/gui/watolib.py | 48 ++++++------ cmk/gui/webapi.py | 6 +- cmk/gui/weblib.py | 18 ++--- cmk/gui/werks.py | 10 +-- doc/treasures/open_ticket.py | 4 +- tests/unit/cmk/gui/old/html_tests.py | 2 +- tests/unit/cmk/gui/test_http.py | 4 +- tests/unit/cmk/gui/test_sidebar.py | 65 +++++---------- tests/unit/cmk/gui/test_table.py | 4 +- web/app/index.wsgi | 8 +- 94 files changed, 926 insertions(+), 962 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=37eda7d465…

5 years, 5 months

Fixed some typos

by Simon Betz

Module: check_mk Branch: master Commit: 905d4311212941b4c90186f953af21582654b3e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=905d4311212941… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 9 16:39:05 2019 +0100 Fixed some typos Change-Id: I85def5d06e77b284e8efcc7da7e9d30e1536db02 --- bin/mkbench | 2 +- cmk_base/piggyback.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/mkbench b/bin/mkbench index 0c68385..63b86f5 100755 --- a/bin/mkbench +++ b/bin/mkbench @@ -176,7 +176,7 @@ def usage(error=None): sys.stdout.write("system. The test is saving different static information of\n") sys.stdout.write("the system (Installed CPUs, memory, disks, ...) and captures\n") sys.stdout.write("the most important peformance relevant values during testing\n") - sys.stdout.write("for later analysis and comparision.\n") + sys.stdout.write("for later analysis and comparison.\n") sys.stdout.write("\n") sys.stdout.write("The results of mkbench are stored in 'var/mkbench'.\n") sys.stdout.write("\n") diff --git a/cmk_base/piggyback.py b/cmk_base/piggyback.py index 7992f70..337d6f4 100644 --- a/cmk_base/piggyback.py +++ b/cmk_base/piggyback.py @@ -169,7 +169,7 @@ def store_piggyback_raw_data(source_host, piggybacked_raw_data): piggyback_file_paths.append(piggyback_file_path) # Store the last contact with this piggyback source to be able to filter outdated data later - # We use the mtime of this file later for comparision. + # We use the mtime of this file later for comparison. # Only do this for hosts that sent piggyback data this turn, cleanup the status file when no # piggyback data was sent this turn. if piggybacked_raw_data:

5 years, 5 months

Extracted single builtin icon handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 48932e15800e0d076d8b85062060e151182ed822 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48932e15800e0d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 8 16:25:27 2019 +0100 Extracted single builtin icon handling CMK-1514 Change-Id: I968abdd3d186d19bebc5f1f95b0a3463e7ac604a --- cmk/gui/plugins/views/icons/__init__.py | 121 ++++++++++++++++---------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/cmk/gui/plugins/views/icons/__init__.py b/cmk/gui/plugins/views/icons/__init__.py index 802bbad..35ec46e 100644 --- a/cmk/gui/plugins/views/icons/__init__.py +++ b/cmk/gui/plugins/views/icons/__init__.py @@ -121,69 +121,70 @@ def get_icons(what, row, toplevel): def _process_multisite_icons(what, row, tags, custom_vars, toplevel): icons = [] for icon_id, icon in get_multisite_icons().items(): - if icon.get('type', 'icon') == 'icon': - try: - title = None - url = None - if icon['toplevel'] != toplevel: - continue - - sort_index = icon['sort_index'] - - # In old versions, the icons produced html code directly. The new API - # is that the icon functions need to return: - # a) None - nothing to be rendered - # b) single string - the icon name (without .png) - # c) tuple - icon, title - # d) triple - icon, title, url - try: - result = icon['paint'](what, row, tags, custom_vars) - except Exception: - if config.debug: - raise - result = ("alert", - "Exception in icon '%s': %s" % (icon_id, traceback.format_exc())) - - if result is None: - continue - - elif isinstance(result, six.string_types + (HTML,)): - - # TODO: This is handling the deprecated API with 1.2.7. Remove this one day. - if result[0] == '<': - # seems like an old format icon (html code). In regular rendering - # case (html), it can simply be appended to the output. Otherwise - # extract the icon name from icon images - if html.output_format == "html": - icons.append((sort_index, result)) - else: - # Strip icon names out of HTML code that is generated by htmllib.render_icon() - for n in cmk.utils.regex.regex('<img src="([^"]*)"[^>]*>').findall( - "%s" % result): - if n.startswith("images/"): - n = n[7:] - if n.startswith("icon_"): - n = n[5:] - if n.endswith(".png"): - n = n[:-4] - icons.append((sort_index, n.encode('utf-8'), None, None)) - continue - - else: - icon_name = result - else: - if len(result) == 2: - icon_name, title = result - elif len(result) == 3: - icon_name, title, url = result - icons.append((sort_index, icon_name, title, url)) - - except Exception: - icons.append((sort_index, - 'Exception in icon plugin!<br />' + traceback.format_exc())) + if icon.get('type', 'icon') != 'icon': + continue + + if icon['toplevel'] != toplevel: + continue + + try: + for icon in _process_multisite_icon(what, row, tags, custom_vars, icon_id, icon): + icons.append(icon) + except Exception: + icons.append((icon["sort_index"], + 'Exception in icon plugin!<br />' + traceback.format_exc())) return icons +def _process_multisite_icon(what, row, tags, custom_vars, icon_id, icon): + # In old versions, the icons produced html code directly. The new API + # is that the icon functions need to return: + # a) None - nothing to be rendered + # b) single string - the icon name (without .png) + # c) tuple - icon, title + # d) triple - icon, title, url + try: + result = icon['paint'](what, row, tags, custom_vars) + except Exception: + if config.debug: + raise + result = ("alert", "Exception in icon '%s': %s" % (icon_id, traceback.format_exc())) + + if result is None: + return + + title, url = None, None + if isinstance(result, six.string_types + (HTML,)): + # TODO: This is handling the deprecated API with 1.2.7. Remove this one day. But there + # are icons that still use this API. These need to be cleaned up before. + if result[0] == '<': + # seems like an old format icon (html code). In regular rendering + # case (html), it can simply be appended to the output. Otherwise + # extract the icon name from icon images + if html.output_format == "html": + yield icon["sort_index"], result + else: + # Strip icon names out of HTML code that is generated by htmllib.render_icon() + for n in cmk.utils.regex.regex('<img src="([^"]*)"[^>]*>').findall("%s" % result): + if n.startswith("images/"): + n = n[7:] + if n.startswith("icon_"): + n = n[5:] + if n.endswith(".png"): + n = n[:-4] + yield icon["sort_index"], n.encode('utf-8'), None, None + return + + icon_name = result + else: + if len(result) == 2: + icon_name, title = result + elif len(result) == 3: + icon_name, title, url = result + + yield icon["sort_index"], icon_name, title, url + + def _process_custom_user_icons_and_actions(user_action_ids, toplevel): icons = [] for uid in user_action_ids:

5 years, 5 months

Refactored internal icons and actions registry to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: f0beee3f5ad2c436a7ae5a078104ddbd8741c4e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0beee3f5ad2c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 9 08:55:41 2019 +0100 Refactored internal icons and actions registry to plugin registry * Transforming the previous multisite_icons_and_actions dict based icon plugins to the new format for compatibility. This will be kept for at least one stable version. CMK-1514 Change-Id: Idca55a739380a394d1816153bc31edc856401d35 --- cmk/gui/plugins/views/icons/__init__.py | 53 +++++------ cmk/gui/plugins/views/icons/builtin.py | 5 +- cmk/gui/plugins/views/icons/utils.py | 116 +++++++++++++++++++++++++ cmk/gui/plugins/wato/check_mk_configuration.py | 4 +- cmk/gui/views.py | 25 ++++++ tests/unit/cmk/gui/plugins/views/test_icons.py | 40 +++++++++ 6 files changed, 214 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f0beee3f5a…

5 years, 5 months

Cleaned up deprecated multisite_icons registration

by Lars Michelsen

Module: check_mk Branch: master Commit: a6fa9194589d7ca45de6b6f31db7963f6bf78023 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6fa9194589d7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 8 17:14:40 2019 +0100 Cleaned up deprecated multisite_icons registration Since 1.2.7i1 the registration based on the multisite_icons dictionary is deprecated and has been replaced with registration to the dictionary multisite_icons_and_actions. In case your plugins relied on that old structure you will now have to migrate your plugin to the newer mechanism. CMK-1514 Change-Id: Ie7c8191ce40d4b421056055d5661ca6be5146a41 --- cmk/gui/plugins/views/icons/__init__.py | 15 +--------- cmk/gui/plugins/views/icons/mkeventd.py | 18 +++++++----- cmk/gui/views.py | 3 +- tests/unit/cmk/gui/plugins/views/test_icons.py | 40 ++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 23 deletions(-) diff --git a/cmk/gui/plugins/views/icons/__init__.py b/cmk/gui/plugins/views/icons/__init__.py index 35ec46e..5eeb94e 100644 --- a/cmk/gui/plugins/views/icons/__init__.py +++ b/cmk/gui/plugins/views/icons/__init__.py @@ -46,8 +46,6 @@ from cmk.utils.plugin_loader import load_plugins # | |___/ | # '----------------------------------------------------------------------' -# Deprecated in 1.2.7i1 -multisite_icons = [] # Use this structure for new icons multisite_icons_and_actions = {} @@ -63,18 +61,6 @@ def get_multisite_icons(): icon.update(icon_config) icons[icon_id] = icon - # multisite_icons has been deprecated, but to be compatible to old icon - # plugins transform them to the new structure. We use part of the paint - # function name as icon id. - for icon_config in multisite_icons: - icon = { - "toplevel": False, - "sort_index": 30, - } - icon.update(icon_config) - icon_id = icon['paint'].__name__.replace('paint_', '') - icons[icon_id] = icon - # Now apply the user customized options for icon_id, cfg in config.builtin_icon_visibility.items(): if icon_id in icons: @@ -157,6 +143,7 @@ def _process_multisite_icon(what, row, tags, custom_vars, icon_id, icon): if isinstance(result, six.string_types + (HTML,)): # TODO: This is handling the deprecated API with 1.2.7. Remove this one day. But there # are icons that still use this API. These need to be cleaned up before. + # LM: There are icons that still use this API if result[0] == '<': # seems like an old format icon (html code). In regular rendering # case (html), it can simply be appended to the output. Otherwise diff --git a/cmk/gui/plugins/views/icons/mkeventd.py b/cmk/gui/plugins/views/icons/mkeventd.py index 5cd6d4a..54f734c 100644 --- a/cmk/gui/plugins/views/icons/mkeventd.py +++ b/cmk/gui/plugins/views/icons/mkeventd.py @@ -28,10 +28,13 @@ import cmk.gui.config as config from cmk.gui.i18n import _ from cmk.gui.globals import html -from . import multisite_icons +from cmk.gui.plugins.views.icons import multisite_icons_and_actions def paint_mkeventd(what, row, tags, custom_vars): + if not config.mkeventd_enabled: + return + # show for services based on the mkevents active check command = row[what + '_check_command'] @@ -96,9 +99,10 @@ def paint_mkeventd(what, row, tags, custom_vars): return 'mkeventd', title, url_prefix + url -if config.mkeventd_enabled: - multisite_icons.append({ - 'columns': ['check_command'], - 'host_columns': ['address', 'name'], - 'paint': paint_mkeventd, - }) +multisite_icons_and_actions["mkeventd"] = { + "columns": ["check_command"], + "host_columns": ["address", "name"], + "paint": paint_mkeventd, + "toplevel": False, + "sort_index": 30, +} diff --git a/cmk/gui/views.py b/cmk/gui/views.py index d91b5e1..e4d28a2 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -92,8 +92,7 @@ from cmk.gui.plugins.views.utils import ( # pylint: disable=unused-import # Needed for legacy (pre 1.6) plugins from cmk.gui.plugins.views.icons import ( # pylint: disable=unused-import - multisite_icons, multisite_icons_and_actions, get_multisite_icons, get_icons, - iconpainter_columns, + multisite_icons_and_actions, get_multisite_icons, get_icons, iconpainter_columns, ) import cmk.gui.plugins.views.inventory diff --git a/tests/unit/cmk/gui/plugins/views/test_icons.py b/tests/unit/cmk/gui/plugins/views/test_icons.py new file mode 100644 index 0000000..1ab8785 --- /dev/null +++ b/tests/unit/cmk/gui/plugins/views/test_icons.py @@ -0,0 +1,40 @@ +import cmk.gui.plugins.views.icons as icons + + +def test_builtin_icons_and_actions(): + builtin_icons = sorted(icons.get_multisite_icons().keys()) + assert builtin_icons == sorted([ + 'action_menu', + 'agent_deployment', + 'aggregation_checks', + 'aggregations', + 'check_manpage', + 'check_period', + 'crashed_check', + 'custom_action', + 'deployment_status', + 'download_agent_output', + 'download_snmp_walk', + 'icon_image', + 'inventory', + 'logwatch', + 'mkeventd', + 'notes', + 'perfgraph', + 'prediction', + 'reschedule', + 'rule_editor', + 'stars', + 'status_acknowledged', + 'status_active_checks', + 'status_comments', + 'status_downtimes', + 'status_flapping', + 'status_notification_period', + 'status_notifications_enabled', + 'status_passive_checks', + 'status_service_period', + 'status_shadow', + 'status_stale', + 'wato', + ])

5 years, 5 months

Refactored icon plugin action_menu to new plugin registry structure

by Lars Michelsen

Module: check_mk Branch: master Commit: 45eff2cd8b11008c2d0b7cf55708042d023c747e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45eff2cd8b1100… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 9 09:21:58 2019 +0100 Refactored icon plugin action_menu to new plugin registry structure CMK-1514 Change-Id: Icef7d85ee6738ec52ffe48599aaceb66864ca95b --- cmk/gui/plugins/views/icons/builtin.py | 55 +++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/cmk/gui/plugins/views/icons/builtin.py b/cmk/gui/plugins/views/icons/builtin.py index 4fc84a3..603b586 100644 --- a/cmk/gui/plugins/views/icons/builtin.py +++ b/cmk/gui/plugins/views/icons/builtin.py @@ -78,6 +78,8 @@ from cmk.gui.plugins.views import ( ) from cmk.gui.plugins.views.icons import ( + Icon, + icon_and_action_registry, multisite_icons_and_actions, ) @@ -93,36 +95,41 @@ from cmk.gui.plugins.views.icons import ( # '----------------------------------------------------------------------' -def paint_action_menu(what, row, tags, host_custom_vars): - url_vars = [ - ('host', row['host_name']), - ] +(a)icon_and_action_registry.register +class ActionMenuIcon(Icon): + @classmethod + def ident(cls): + return "action_menu" - if row.get('site'): - url_vars.append(('site', row['site'])) + def default_toplevel(self): + return True - if what == 'service': - url_vars.append(('service', row['service_description'])) + def default_sort_index(self): + return 10 - if html.has_var('display_options'): - url_vars.append(('display_options', html.var('display_options'))) - if html.has_var('_display_options'): - url_vars.append(('_display_options', html.var('_display_options'))) - url_vars.append(('_back_url', html.makeuri([]))) + def render(self, what, row, tags, custom_vars): + url_vars = [ + ('host', row['host_name']), + ] - return html.render_popup_trigger( - html.render_icon('menu', _('Open the action menu'), cssclass="iconbutton"), - 'action_menu', - 'action_menu', - url_vars=url_vars) + if row.get('site'): + url_vars.append(('site', row['site'])) + if what == 'service': + url_vars.append(('service', row['service_description'])) + + if html.has_var('display_options'): + url_vars.append(('display_options', html.var('display_options'))) + if html.has_var('_display_options'): + url_vars.append(('_display_options', html.var('_display_options'))) + url_vars.append(('_back_url', html.makeuri([]))) + + return html.render_popup_trigger( + html.render_icon('menu', _('Open the action menu'), cssclass="iconbutton"), + 'action_menu', + 'action_menu', + url_vars=url_vars) -multisite_icons_and_actions['action_menu'] = { - 'columns': [], - 'paint': paint_action_menu, - 'toplevel': True, - 'sort_index': 10, -} #. # .--Icon-Image----------------------------------------------------------.

5 years, 5 months

agent_aws: Use pagination for S3 objects

by Simon Betz

Module: check_mk Branch: master Commit: d082a91d9c871d3bab9b24aedd86d4584eeec3cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d082a91d9c871d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 9 16:21:47 2019 +0100 agent_aws: Use pagination for S3 objects Change-Id: I210f568f57f15b77e1c4e9659576e2937aaff756 --- agents/special/agent_aws | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index b058f9e..23e04df 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -413,6 +413,7 @@ class S3(AWSSection): logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) return [] + paginator = self._client.get_paginator('list_objects') for bucket in buckets: bucket_name = bucket['Name'] response = self._client.get_bucket_location(Bucket=bucket_name) @@ -424,14 +425,17 @@ class S3(AWSSection): else: bucket['LocationConstraint'] = location - response = self._client.list_objects(Bucket=bucket_name) - try: - objects = response['Contents'] - except KeyError as e: - logging.info("%s/%s: KeyError %s; Available are %s", self.name, bucket_name, e, - response.keys()) - else: - bucket['Contents'] = objects + contents = [] + pages = paginator.paginate(Bucket=bucket_name) + for page in pages: + try: + objects = page['Contents'] + except KeyError as e: + logging.info("%s/%s: KeyError %s; Available are %s", self.name, bucket_name, e, + page.keys()) + else: + contents += objects + bucket['Contents'] = contents return buckets def _extract_content_from(self, raw_result):

5 years, 5 months

Fixed embarrassing typo.

by Sven Panne

Module: check_mk Branch: master Commit: d0565ec45d6e13c5f04d35474b5acca865f63db1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0565ec45d6e13… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 9 16:27:20 2019 +0100 Fixed embarrassing typo. Change-Id: I78fc16f748f285d05441d70161df28e7484e2f15 --- cmk/gui/http.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/http.py b/cmk/gui/http.py index 2e5d0eb..96dab22 100644 --- a/cmk/gui/http.py +++ b/cmk/gui/http.py @@ -174,7 +174,7 @@ class Request(object): self._vars.pop(varname, None) # TODO: self._vars should be strictly read only in the Request() object - def del_vars(self, prefix=None): + def del_vars(self, prefix=""): for varname, _value in list(self.itervars(prefix)): self.del_var(varname)

5 years, 5 months

aws_ec2: Minor improvements

by Simon Betz

Module: check_mk Branch: master Commit: 9fd35d532544aded0b644e8255ebb9d2b255e1d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fd35d532544ad… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 9 16:15:47 2019 +0100 aws_ec2: Minor improvements Change-Id: I574c9d275860a46a872c86ef40455e8baf1bbb68 --- checks/aws_ec2 | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/checks/aws_ec2 b/checks/aws_ec2 index 14105c5..85a54ab 100644 --- a/checks/aws_ec2 +++ b/checks/aws_ec2 @@ -46,6 +46,14 @@ def parse_aws_ec2(info): return +def inventory_aws_ec2_cpu_credits(parsed, required_metrics): + metrics = parsed.get(EC2DefaultItemName, {}) + for required_metric in required_metrics: + if required_metric not in metrics: + return [] + return [(None, {})] + + # .--status check--------------------------------------------------------. # | _ _ _ _ | # | ___| |_ __ _| |_ _ _ ___ ___| |__ ___ ___| | __ | @@ -80,7 +88,8 @@ def check_aws_ec2_status_check(item, params, parsed): check_info['aws_ec2'] = { 'parse_function': parse_aws_ec2, - 'inventory_function': discover_single, + 'inventory_function': + lambda p: inventory_aws_ec2_cpu_credits(p, ['StatusCheckFailed_System', 'StatusCheckFailed_Instance']), 'check_function': check_aws_ec2_status_check, 'service_description': 'AWS/EC2 Status Check', 'includes': ['aws.include'], @@ -112,7 +121,8 @@ def check_aws_ec2_cpu_credits(item, params, parsed): check_info['aws_ec2.cpu_credits'] = { - 'inventory_function': discover_single, + 'inventory_function': + lambda p: inventory_aws_ec2_cpu_credits(p, ['CPUCreditUsage', 'CPUCreditBalance']), 'check_function': check_aws_ec2_cpu_credits, 'service_description': 'AWS/EC2 CPU Credits', 'group': 'aws_ec2_cpu_credits', @@ -142,7 +152,7 @@ def check_aws_ec2_cpu_util(item, params, parsed): check_info['aws_ec2.cpu_util'] = { - 'inventory_function': discover_single, + 'inventory_function': lambda p: inventory_aws_ec2_cpu_credits(p, ['CPUUtilization']), 'check_function': check_aws_ec2_cpu_util, 'service_description': 'AWS/EC2 CPU utilization', 'group': 'cpu_utilization',

5 years, 5 months

aws_s3: Minor improvements

by Simon Betz

Module: check_mk Branch: master Commit: e5dae7cac1c7a86bb50a252e74a55089295328b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5dae7cac1c7a8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 9 16:03:48 2019 +0100 aws_s3: Minor improvements Change-Id: I0408cb9fb93c5f60782abcdc325e7f31d5e9435d --- checks/.f12 | 1 + checks/aws_s3 | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/checks/.f12 b/checks/.f12 index be888b0..302a564 100755 --- a/checks/.f12 +++ b/checks/.f12 @@ -3,6 +3,7 @@ set -e SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} +SITE=heute2 ROOT=/omd/sites/$SITE echo "TARGET: $ROOT/share/check_mk/checks" diff --git a/checks/aws_s3 b/checks/aws_s3 index 3b81742..9381d6c 100644 --- a/checks/aws_s3 +++ b/checks/aws_s3 @@ -47,12 +47,15 @@ def check_aws_s3_summary(item, params, parsed): buckets_by_region = {} long_output = [] for bucket_name, row in parsed.iteritems(): - buckets_by_region.setdefault(row['LocationConstraint'], []).append(row) + region = row['LocationConstraint'] + if not region: + region = "unknown" + buckets_by_region.setdefault(region, []).append(row) long_output.append("Bucket: %s, Region: %s, Creation date: %s"\ - % (bucket_name, row['LocationConstraint'], row['CreationDate'])) + % (bucket_name, region, row['CreationDate'])) for region, buckets in buckets_by_region.iteritems(): - yield 0, "%s buckets in region %s" % (len(buckets), region) + yield 0, "%s: %s" % (region, len(buckets)) if long_output: yield 0, '\n%s' % '\n'.join(long_output) @@ -98,5 +101,5 @@ def check_aws_s3_objects(item, params, metrics): check_info['aws_s3.objects'] = { 'inventory_function': discover(), 'check_function': check_aws_s3_objects, - 'service_description': 'AWS/S3 %s Objects', + 'service_description': 'AWS/S3 Objects %s', }

5 years, 5 months

← Newer
1
...
35
36
37
38
39
40
41
...
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