Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: a1c124050e30355a63a303336e4ae714e180fb16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1c124050e3035… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Sep 5 09:39:35 2018 +0200 Reserved 10 Werk IDS Change-Id: I3136c8655c39c3f5c8a3a0d1e03fe7f13705a659 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 549a0b2..f1f8de3 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6569 +6579

6 years

ups_in_freq: cleanup

by Simon Betz

Module: check_mk Branch: master Commit: da13e033ac36e44a2344b61c50aa25d8c3b0a363 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da13e033ac36e4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 4 16:02:16 2018 +0200 ups_in_freq: cleanup Change-Id: I021a3628d2b44db90865ec492711641f82f11abf --- checks/ups_in_freq | 56 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/checks/ups_in_freq b/checks/ups_in_freq index f1f999c..bddbaa6 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -27,36 +27,52 @@ ups_in_freq_default_levels = (45, 40) # warning / critical -def inventory_ups_in_freq(info): - if len(info) > 0: - return [ ( x[0], "ups_in_freq_default_levels") for x in info if int(x[1]) > 0 ] -def check_ups_in_freq(item, params, info): - warn, crit = params - for line in info: - if line[0] == item: - power = int(line[1]) / 10 - perfdata = [ ( "in_freq", power, warn, crit, 30, 70 ) ] - infotext = "in frequency: %dHz (warn/crit at %d/%d Hz)" % \ - (power, warn, crit) +def parse_ups_in_freq(info): + parsed = {} + for name, freq_str in info: + try: + freq = int(freq_str) / 10.0 + except ValueError: + freq = None + parsed.setdefault(name, freq) + return parsed + + +def inventory_ups_in_freq(parsed): + for name, freq in parsed.iteritems(): + if freq is not None and freq > 0: + yield name, "ups_in_freq_default_levels" - if power <= crit: - return (2, infotext, perfdata) - elif power <= warn: - return (1, infotext, perfdata) - else: - return (0, infotext, perfdata) - return (3, "Phase %s not found in SNMP output" % item) +def check_ups_in_freq(item, params, parsed): + freq = parsed.get(item) + if freq is None: + return + + infotext = "%.1f Hz" % freq + state = 0 + warn, crit = params + if freq < crit: + state = 2 + elif freq < warn: + state = 1 + if state: + infotext += " (warn/crit below %s Hz/%s Hz)" % (warn, crit) + return state, infotext, [("in_freq", freq, warn, crit, 30, 70)] check_info['ups_in_freq'] = { + "parse_function" : parse_ups_in_freq, "inventory_function" : inventory_ups_in_freq, "check_function" : check_ups_in_freq, "service_description" : "IN frequency phase %s", "has_perfdata" : True, "group" : "efreq", - "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 2 ] ), + "snmp_info" : (".1.3.6.1.2.1.33.1.3.3.1", [ + 0, + 2, # UPS-MIB.txt::upsInputFrequency + ]), "snmp_scan_function" : ups_generic_scan_function, - "includes" : [ "ups_generic.include" ] + "includes" : ["ups_generic.include"] }

6 years

Fix integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 5635f2094a9f0630a10687f864bb1accee60ec3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5635f2094a9f06… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 5 08:35:09 2018 +0200 Fix integration tests Change-Id: I4b018eefd52f2af89966d8b68cec4af6efde2e85 --- tests/integration/omd/test_hooks.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/omd/test_hooks.py b/tests/integration/omd/test_hooks.py index 172998b..71986af 100644 --- a/tests/integration/omd/test_hooks.py +++ b/tests/integration/omd/test_hooks.py @@ -26,6 +26,7 @@ def test_hooks(site): "NSCA", "NSCA_TCP_PORT", "PNP4NAGIOS", + "TMPFS", ] if site.version.edition() == "enterprise":

6 years

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 62e5149fd5910e28380e55b00576d4b57c2f76ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62e5149fd5910e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 5 08:48:06 2018 +0200 Reserved 20 Werk IDS Change-Id: Ia1785d529b1325581ae70ea38aa42ada5b5f5da5 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 5af27a5..549a0b2 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6549 +6569

6 years

Removed dead parameter. Simplifications.

by Sven Panne

Module: check_mk Branch: master Commit: 03cf5134a47e03820b635b3f43fdc21f5c577cfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03cf5134a47e03… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Sep 4 12:00:38 2018 +0200 Removed dead parameter. Simplifications. Change-Id: Id1ba3395854e0218aea4240ca83c66bcd849b18e --- cmk/gui/views.py | 2 +- cmk/gui/visuals.py | 24 ++++++++---------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index ff6b89d..b87e592 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -857,7 +857,7 @@ def show_view(view, show_heading = False, show_buttons = True, # # a) single context vars of the view are enforced # b) multi context vars can be overwritten by existing HTML vars - visuals.add_context_to_uri_vars(view, datasource["infos"], only_count) + visuals.add_context_to_uri_vars(view, only_count) # Check that all needed information for configured single contexts are available visuals.verify_single_contexts('views', view, datasource.get('link_filters', {})) diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index 0cc0215..5b4c03d 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -1055,10 +1055,7 @@ def visible_filters_of_visual(visual, use_filters): return show_filters -def add_context_to_uri_vars(visual, only_infos=None, only_count=False): - if only_infos == None: - only_infos = infos.keys() # all datasources! - +def add_context_to_uri_vars(visual, only_count=False): # Populate the HTML vars with missing context vars. The context vars set # in single context are enforced (can not be overwritten by URL). The normal # filter vars in "multiple" context are not enforced. @@ -1067,19 +1064,14 @@ def add_context_to_uri_vars(visual, only_infos=None, only_count=False): html.set_var(key, "%s" % visual['context'][key]) # Now apply the multiple context filters - for info_key in only_infos: - for filter_vars in visual['context'].itervalues(): - if type(filter_vars) == dict: # this is a multi-context filter - # We add the filter only if *none* of its HTML variables are present on the URL - # This important because checkbox variables are not present if the box is not checked. - skip = False + for filter_vars in visual['context'].itervalues(): + if type(filter_vars) == dict: # this is a multi-context filter + # We add the filter only if *none* of its HTML variables are present on the URL + # This important because checkbox variables are not present if the box is not checked. + skip = any(html.has_var(uri_varname) for uri_varname in filter_vars.iterkeys()) + if not skip or only_count: for uri_varname, value in filter_vars.items(): - if html.has_var(uri_varname): - skip = True - break - if not skip or only_count: - for uri_varname, value in filter_vars.items(): - html.set_var(uri_varname, "%s" % value) + html.set_var(uri_varname, "%s" % value) # Vice versa: find all filters that belong to the current URI variables # and create a context dictionary from that.

6 years

Fixed a few unused-variable warnings. Tiny cleanups on the way.

by Sven Panne

Module: check_mk Branch: master Commit: 3f63397f8d052c186261e6739d850b70e59be62c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f63397f8d052c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Sep 4 09:52:46 2018 +0200 Fixed a few unused-variable warnings. Tiny cleanups on the way. Change-Id: I6a049d6bc0b1b138a6e220011e6a6909c0d23989 --- cmk/gui/config.py | 22 ++++++++++---------- cmk/gui/visuals.py | 60 ++++++++++++++++++------------------------------------ 2 files changed, 31 insertions(+), 51 deletions(-) diff --git a/cmk/gui/config.py b/cmk/gui/config.py index 5e81451..9542047 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -187,7 +187,7 @@ def load_config(): conf_dir = cmk.paths.default_config_dir + "/multisite.d" filelist = [] if os.path.isdir(conf_dir): - for root, dirs, files in os.walk(conf_dir): + for root, _directories, files in os.walk(conf_dir): for filename in files: if filename.endswith(".mk"): filelist.append(root + "/" + filename) @@ -215,9 +215,7 @@ def _load_default_config_from_module_plugins(): # TODO: Find a better solution for this. Probably refactor declaration of default # config option. config_plugin_vars = {} - for name, module in _config_plugin_modules(): - if module is None: - continue + for module in _config_plugin_modules(): config_plugin_vars.update(module.__dict__) for k, v in config_plugin_vars.items(): @@ -236,10 +234,12 @@ def _load_default_config_from_legacy_plugins(vars_before_plugins, vars_after_plu def _config_plugin_modules(): - return [ (name, module) for name, module in sys.modules.items() - if name.startswith("cmk.gui.plugins.config.") - or name.startswith("cmk.gui.cee.plugins.config.") - or name.startswith("cmk.gui.cme.plugins.config.") ] + return [module + for name, module in sys.modules.items() + if (name.startswith("cmk.gui.plugins.config.") or + name.startswith("cmk.gui.cee.plugins.config.") or + name.startswith("cmk.gui.cme.plugins.config.")) and + module is not None] def reporting_available(): @@ -278,7 +278,7 @@ def get_language(default=None): def tag_alias(tag): for entry in host_tag_groups(): - tag_id, title, tags = entry[:3] + tag_id, _title, tags = entry[:3] for t in tags: if t[0] == tag: return t[1] @@ -290,7 +290,7 @@ def tag_alias(tag): def tag_group_title(tag): for entry in host_tag_groups(): - tag_id, title, tags = entry[:3] + _tag_id, title, tags = entry[:3] for t in tags: if t[0] == tag: return title @@ -1056,7 +1056,7 @@ def site_is_local(site_name): def default_site(): - for site_name, site in sites.items(): + for site_name, _site in sites.items(): if site_is_local(site_name): return site_name return None diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index eeeb8d6..0cc0215 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -134,19 +134,11 @@ class UserVisualsCache(object): def get(self, path): try: - cached_modification_timestamp, cached_user_visuals = self._cache[path] - - try: - current_modification_timestamp = os.stat(path).st_mtime - except IOError: - return None # Invalidate cache (file to readable) - - if os.stat(path).st_mtime <= cached_modification_timestamp: - return cached_user_visuals # Use cache - else: - return None # Cache is outdated - except KeyError: - return None # Not cached yet + cached_mtime, cached_user_visuals = self._cache[path] + current_mtime = os.stat(path).st_mtime + return cached_user_visuals if current_mtime <= cached_mtime else None + except (KeyError, IOError): + return None def add(self, path, modification_timestamp, user_visuals): @@ -603,8 +595,6 @@ def page_create_visual(what, info_keys, next_url = None): # '----------------------------------------------------------------------' def get_context_specs(visual, info_handler): - context_specs = [] - info_keys = [] if info_handler: info_keys = info_handler(visual) @@ -632,23 +622,15 @@ def get_context_specs(visual, info_handler): info = infos[info_key] filter_list = VisualFilterList([info_key], title=info['title'], ignore=set(single_info_keys)) filter_names = filter_list.filter_names() - - if not filter_names: - return # Skip infos which have no filters available - - params = [ - ('filters', filter_list), - ] - optional = None - # Make it open by default when at least one filter is used - isopen = bool([ fn for fn in visual.get('context', {}).keys() - if fn in filter_names ]) - return filter_list + # Skip infos which have no filters available + return filter_list if filter_names else None # single infos first, the rest afterwards - return [(info_key, visual_spec_single(info_key)) for info_key in single_info_keys] +\ - [(info_key, visual_spec_multi(info_key)) for info_key in multi_info_keys - if visual_spec_multi(info_key) ] + return [(info_key, visual_spec_single(info_key)) + for info_key in single_info_keys] + \ + [(info_key, visual_spec_multi(info_key)) + for info_key in multi_info_keys + if visual_spec_multi(info_key)] def process_context_specs(context_specs): @@ -684,8 +666,6 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, visual_type = visual_types[what] if not config.user.may("general.edit_" + what): raise MKAuthException(_("You are not allowed to edit %s.") % visual_type["plural_title"]) - what_s = what[:-1] - visual = {} # Load existing visual from disk - and create a copy if 'load_user' is set @@ -905,7 +885,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, # FIXME: Hier werden die Flags aus visibility nicht korrekt geladen. Wäre es nicht besser, # diese in einem Unter-Dict zu lassen, anstatt diese extra umzukopieren? visib = {} - for key, vs in visibility_elements: + for key, _vs in visibility_elements: if visual.get(key): visib[key] = visual[key] visual["visibility"] = visib @@ -1017,7 +997,7 @@ def filters_of_visual(visual, info_keys, show_all=False, link_filters=None): # Collect all available filters for these infos all_possible_filters = [] - for filter_name, filter in multisite_filters.items(): + for _filter_name, filter in multisite_filters.items(): if filter.info in info_keys: all_possible_filters.append(filter) @@ -1088,7 +1068,7 @@ def add_context_to_uri_vars(visual, only_infos=None, only_count=False): # Now apply the multiple context filters for info_key in only_infos: - for filter_name, filter_vars in visual['context'].items(): + for filter_vars in visual['context'].itervalues(): if type(filter_vars) == dict: # this is a multi-context filter # We add the filter only if *none* of its HTML variables are present on the URL # This important because checkbox variables are not present if the box is not checked. @@ -1264,7 +1244,7 @@ def pack_context_for_editing(visual, info_handler): def unpack_context_after_editing(packed_context): context = {} - for info_type, its_context in packed_context.items(): + for _info_type, its_context in packed_context.items(): context.update(its_context) return context @@ -1300,12 +1280,12 @@ def verify_single_contexts(what, visual, link_filters): (visual_types[what]['title'], k)) def visual_title(what, visual): - extra_titles = [] - # Beware: if a single context visual is being visited *without* a context, then # the value of the context variable(s) is None. In order to avoid exceptions, # we simply drop these here. - extra_titles = [ v for k, v in get_singlecontext_html_vars(visual).items() if v != None ] + extra_titles = [v + for v in get_singlecontext_html_vars(visual).itervalues() + if v is not None] # FIXME: Is this really only needed for visuals without single infos? if not visual['single_infos']: @@ -1385,7 +1365,7 @@ def collect_context_links(this_visual, mobile = False, only_types = None): # compute list of html variables needed for this visual active_filter_vars = set([]) - for var, val in get_singlecontext_html_vars(this_visual).items(): + for var in get_singlecontext_html_vars(this_visual).iterkeys(): if html.has_var(var): active_filter_vars.add(var)

6 years

Fixed a few more unused-variable warnings.

by Sven Panne

Module: check_mk Branch: master Commit: c2f07af741f9e63256f346c9e443e012180893b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2f07af741f9e6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Sep 4 12:32:45 2018 +0200 Fixed a few more unused-variable warnings. Change-Id: Ib9a8822f186451868b58fe1951dc8573f7de4c73 --- cmk/gui/availability.py | 11 +++++----- cmk/gui/metrics.py | 34 +++++++++++------------------ cmk/gui/multitar.py | 17 ++++++--------- cmk/gui/plugins/dashboard/dashlets.py | 3 +-- cmk/gui/plugins/wato/background_job.py | 2 +- cmk/gui/plugins/wato/datasource_programs.py | 2 +- cmk/gui/plugins/wato/omd_configuration.py | 4 ++-- cmk/gui/prediction.py | 7 +++--- cmk/gui/table.py | 13 +++++------ cmk/gui/views.py | 18 +++++++-------- 10 files changed, 46 insertions(+), 65 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c2f07af741…

6 years

Fixed more unused-variable warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 1f97f1bade8846b599b9f1487c8c6ead953e7d8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f97f1bade8846… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Sep 4 16:52:45 2018 +0200 Fixed more unused-variable warnings. Change-Id: Ib2a13922f291938bd5eb6596e68abb215d2896e2 --- cmk/gui/bi.py | 43 ++++++++---------- cmk/gui/htmllib.py | 2 +- cmk/gui/plugins/sidebar/bookmarks.py | 8 +--- cmk/gui/plugins/sidebar/virtual_host_tree.py | 5 +-- cmk/gui/plugins/views/availability.py | 18 +++----- cmk/gui/plugins/views/commands.py | 5 ++- cmk/gui/plugins/views/icons/__init__.py | 2 +- cmk/gui/plugins/views/icons/builtin.py | 7 ++- cmk/gui/plugins/views/inventory.py | 18 ++++---- cmk/gui/plugins/views/layouts.py | 41 +++++------------ cmk/gui/plugins/views/mobile.py | 3 +- cmk/gui/plugins/views/painters.py | 2 +- cmk/gui/plugins/views/perfometers/check_mk.py | 20 ++------- cmk/gui/plugins/views/utils.py | 13 ++---- cmk/gui/plugins/views/webservice.py | 4 +- cmk/gui/plugins/visuals/filters.py | 14 +++--- cmk/gui/plugins/wato/ac_tests.py | 8 ++-- cmk/gui/plugins/wato/bi.py | 18 ++++---- cmk/gui/plugins/wato/check_mk_configuration.py | 2 +- cmk/gui/plugins/wato/utils/main_menu.py | 2 +- cmk/gui/valuespec.py | 61 ++++++++++---------------- 21 files changed, 113 insertions(+), 183 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1f97f1bade…

6 years

synology_disks: Added MIB information

by Simon Betz

Module: check_mk Branch: master Commit: 0c7bc54becbe4239b6ad1513627c4001aea8d30b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c7bc54becbe42… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 4 16:33:18 2018 +0200 synology_disks: Added MIB information Change-Id: I534290b92d6f78cf6b37cbe257ffdbc66e8bf63e --- checks/synology_disks | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/synology_disks b/checks/synology_disks index 97ab40f..d215443 100644 --- a/checks/synology_disks +++ b/checks/synology_disks @@ -69,11 +69,11 @@ check_info["synology_disks"] = { "has_perfdata" : True, "snmp_scan_function" : synology_scan_function, "snmp_info" : (".1.3.6.1.4.1.6574.2.1.1", [ - 2, #Disk ID - 3, #Disk Model - 5, #Disk Status - 6, #Disk Temperature - ]), + 2, #SYNOLOGY-DISK-MIB::diskID + 3, #SYNOLOGY-DISK-MIB::diskModel + 5, #SYNOLOGY-DISK-MIB::diskStatus + 6, #SYNOLOGY-DISK-MIB::diskTemperature + ]), "includes" : [ "synology.include" ] }

6 years

6475 FIX New Theme: Fixed snapins in dashboards

by Marcel Arentz

Module: check_mk Branch: master Commit: b59bf0830c2af01b9c483f5a8089b6c88a60a4a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b59bf0830c2af0… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Sep 4 11:03:22 2018 +0200 6475 FIX New Theme: Fixed snapins in dashboards The layout of snapins is slightly different if embedded into dashboards for a more proper look. Change-Id: I50155089cbb0dca5b01e1e0406708a7994acc2d9 --- .werks/6475 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6475 b/.werks/6475 new file mode 100644 index 0000000..5597755 --- /dev/null +++ b/.werks/6475 @@ -0,0 +1,11 @@ +Title: New Theme: Fixed snapins in dashboards +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536051584 +Class: fix + +The layout of snapins is slightly different if embedded into dashboards for +a more proper look.

6 years

← Newer
1
...
31
32
33
34
35
36
37
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018