Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Fixed and enabled ungrouped-imports warning.

by Sven Panne

Module: check_mk Branch: master Commit: 8a7c98e42368a855408cf987ab7089f3f2869446 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a7c98e42368a8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 26 15:26:47 2018 +0200 Fixed and enabled ungrouped-imports warning. Change-Id: I856a49659fa8f7caadcf81c6c97e13f1c534a426 --- cmk/ec/main.py | 3 ++- cmk/gui/bi.py | 1 - cmk/gui/valuespec.py | 3 ++- cmk/store.py | 1 - cmk_base/check_api.py | 7 +++---- cmk_base/core.py | 3 ++- cmk_base/crash_reporting.py | 2 +- cmk_base/data_sources/__init__.py | 2 +- cmk_base/modes/check_mk.py | 2 +- cmk_base/snmp.py | 2 +- tests/pylint/pylintrc | 1 - tests/pylint/test_pylint.py | 2 ++ 12 files changed, 15 insertions(+), 14 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index aa09b6d..a79f877 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -59,9 +59,10 @@ import cmk.log import cmk.paths import cmk.profile import cmk.render -import livestatus import cmk.regex +import livestatus + class SyslogPriority(object): NAMES = { diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index a749d52..f143022 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -33,7 +33,6 @@ import fcntl import md5 import copy import multiprocessing -import pprint from contextlib import contextmanager import traceback diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 8ea125e..5e0ba3d 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -52,7 +52,6 @@ import json import cmk.paths import cmk.defines as defines -import livestatus import cmk.gui.pages import cmk.gui.forms as forms @@ -62,6 +61,8 @@ from cmk.gui.globals import html from cmk.gui.htmllib import HTML from cmk.gui.exceptions import MKUserError, MKGeneralException +import livestatus + def type_name(v): try: return type(v).__name__ diff --git a/cmk/store.py b/cmk/store.py index 7620c83..88f1e3a 100644 --- a/cmk/store.py +++ b/cmk/store.py @@ -34,7 +34,6 @@ import os import pprint import tempfile import time -import pprint from .exceptions import MKGeneralException diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 3164fcb..88fe3db 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -89,15 +89,17 @@ Global variables: # concatenates lots of files, including this one. import cmk.debug as _debug +import cmk.defines as _defines import cmk.paths as _paths from cmk.exceptions import MKGeneralException +from cmk.regex import regex +import cmk.render as render # These imports are not meant for use in the API. So we prefix the names # with an underscore. These names will be skipped when loading into the # check context. import cmk_base.utils as _utils import cmk_base.config as _config -import cmk.defines as _defines import cmk_base.snmp_utils as _snmp_utils import cmk_base.item_state as _item_state import cmk_base.prediction as _prediction @@ -132,9 +134,6 @@ import time # NOTE: We do not use pprint in this module, but it is part of the check API. import pprint # pylint: disable=unused-import -from cmk.regex import regex -import cmk.render as render - # Names of texts usually output by checks core_state_names = _defines.short_service_state_names() diff --git a/cmk_base/core.py b/cmk_base/core.py index aa63a36..ca99d21 100644 --- a/cmk_base/core.py +++ b/cmk_base/core.py @@ -35,7 +35,6 @@ import sys import cmk.paths import cmk.debug import cmk.tty as tty -import livestatus from cmk.exceptions import MKGeneralException import cmk_base.console as console @@ -46,6 +45,8 @@ from cmk_base.exceptions import MKTimeout from cmk_base import config_cache import cmk_base.cleanup +import livestatus + _restart_lock_fd = None #. diff --git a/cmk_base/crash_reporting.py b/cmk_base/crash_reporting.py index e1964b4..d2848ab 100644 --- a/cmk_base/crash_reporting.py +++ b/cmk_base/crash_reporting.py @@ -33,9 +33,9 @@ import cStringIO as StringIO import cmk.debug import cmk.paths -import cmk_base.config as config import cmk.crash_reporting as crash_reporting +import cmk_base.config as config import cmk_base.utils import cmk_base.check_utils diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index d6b67c5..37f39e5 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -45,9 +45,9 @@ import time import cmk.paths import cmk.debug from cmk.exceptions import MKGeneralException +import cmk.store as store import cmk_base -import cmk.store as store import cmk_base.config as config import cmk_base.console as console import cmk_base.item_state as item_state diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 4bfd35d..7ee1ecd 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -290,9 +290,9 @@ modes.register(Mode( # | | # '----------------------------------------------------------------------' -import cmk.man_pages as man_pages def mode_list_checks(): + import cmk.man_pages as man_pages all_check_manuals = man_pages.all_man_pages() checks_sorted = config.check_info.items() + \ diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index bcf09c4..ec29518 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -30,12 +30,12 @@ import subprocess import cmk.debug import cmk.tty as tty from cmk.exceptions import MKGeneralException, MKBailOut +import cmk.store as store import cmk_base.utils import cmk_base.config as config import cmk_base.console as console import cmk_base.classic_snmp as classic_snmp -import cmk.store as store import cmk_base.ip_lookup as ip_lookup import cmk_base.agent_simulator from cmk_base.exceptions import MKSNMPError diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 577a98c..0429ab7 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -22,7 +22,6 @@ disable= protected-access, reimported, relative-import, - ungrouped-imports, #--------------------------------------------------------------------------- # We should really enable this, there could be some real exceptions waiting # to be thrown. But some work is needed first to sprinkle abc annotations diff --git a/tests/pylint/test_pylint.py b/tests/pylint/test_pylint.py index d96e893..cd76122 100755 --- a/tests/pylint/test_pylint.py +++ b/tests/pylint/test_pylint.py @@ -122,6 +122,8 @@ def inv_tree(path, default_value=None): # add the modules pylint_cmk.add_file(f, repo_path() + "/cmk_base/check_api.py") + # This pylint warning is incompatible with our "concatenation technology". + f.write("# pylint: disable=ungrouped-imports\n") pylint_cmk.add_file(f, repo_path() + "/cmk_base/inventory_plugins.py") # Now add the checks

6 years, 1 month

Fixed and enabled redefined-argument-from-local warning.

by Sven Panne

Module: check_mk Branch: master Commit: 43bbfbaba03ca323f0fedaf0aabc27c0eb5345fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43bbfbaba03ca3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 26 14:14:22 2018 +0200 Fixed and enabled redefined-argument-from-local warning. Change-Id: I3842db6f105d83805a690c4ddb2ea6ab600ac567 --- checks/ps.include | 8 ++++---- cmk/gui/bi.py | 4 ++-- cmk/gui/forms.py | 4 ++-- cmk/gui/plugins/views/layouts.py | 4 ++-- cmk/gui/valuespec.py | 18 +++++++++--------- cmk/gui/visuals.py | 14 +++++++------- cmk/gui/wato/__init__.py | 6 +++--- cmk/gui/watolib.py | 4 ++-- cmk/man_pages.py | 4 ++-- cmk_base/prediction.py | 2 +- tests/pylint/pylintrc | 1 - 11 files changed, 34 insertions(+), 35 deletions(-) diff --git a/checks/ps.include b/checks/ps.include index 707befc..ced3786 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -549,12 +549,12 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" for p in processes: cpu_usage, name, pid = 0.0, None, None - for item, (value, _unit) in p: - if item == "name": + for the_item, (value, _unit) in p: + if the_item == "name": name = value - if item == "pid": + if the_item == "pid": pid = value - elif item.startswith("cpu usage"): + elif the_item.startswith("cpu usage"): cpu_usage += value if cpu_usage >= warn_cpu_single: diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index 680ae8c..a749d52 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -1877,8 +1877,8 @@ def render_tree(node, indent = ""): h += indent + "Needed Hosts: %s\n" % " ".join([("%s/%s" % h_s) for h_s in node["reqhosts"]]) h += indent + "Aggregation: %s\n" % node["func"] h += indent + "Nodes:\n" - for node in node["nodes"]: - h += render_tree(node, indent + " ") + for n in node["nodes"]: + h += render_tree(n, indent + " ") h += "\n" return h diff --git a/cmk/gui/forms.py b/cmk/gui/forms.py index 6cd5424..e2b3efc 100644 --- a/cmk/gui/forms.py +++ b/cmk/gui/forms.py @@ -128,10 +128,10 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, html.begin_form(formname, method=method) - for keyname, title, entries in sections: + for keyname, title1, entries in sections: subvalue = value.get(keyname, {}) if type(entries) == list: - header(title) + header(title1) first = True for name, vs in entries: section(vs.title()) diff --git a/cmk/gui/plugins/views/layouts.py b/cmk/gui/plugins/views/layouts.py index 34e06ce..af2ee71 100644 --- a/cmk/gui/plugins/views/layouts.py +++ b/cmk/gui/plugins/views/layouts.py @@ -578,8 +578,8 @@ def render_grouped_list(rows, view, group_cells, cells, num_columns, show_checkb def count_group_members(row, rows): this_group = group_value(row, group_cells) members = 1 - for row in rows[1:]: - that_group = group_value(row, group_cells) + for r in rows[1:]: + that_group = group_value(r, group_cells) if that_group == this_group: members += 1 else: diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 9d18ec0..8ea125e 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -236,18 +236,18 @@ class Age(ValueSpec): takeover = 0 first = True - for uid, title, value, tkovr_fac in [ ("days", _("days"), days, 24), - ("hours", _("hours"), hours, 60), - ("minutes", _("mins"), minutes, 60), - ("seconds", _("secs"), seconds, 60) ]: + for uid, title, val, tkovr_fac in [ ("days", _("days"), days, 24), + ("hours", _("hours"), hours, 60), + ("minutes", _("mins"), minutes, 60), + ("seconds", _("secs"), seconds, 60) ]: if uid in self._display: - value += takeover + val += takeover takeover = 0 - html.number_input(varprefix + "_" + uid, value, 3 if first else 2) + html.number_input(varprefix + "_" + uid, val, 3 if first else 2) html.write(" %s " % title) first = False else: - takeover = (takeover + value) * tkovr_fac + takeover = (takeover + val) * tkovr_fac html.close_div() def from_html_vars(self, varprefix): @@ -4549,8 +4549,8 @@ class CAorCAChain(UploadOrPasteTextFile): ( "subject", _("Subject") ), ]: text += "<tr><td>%s:</td><td>" % title - for title, value in sorted(cert_info[what].items()): - text += "%s: %s<br>" % (title, value) + for title1, val in sorted(cert_info[what].items()): + text += "%s: %s<br>" % (title1, val) text += "</tr>" text += "</table>" return text diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index 4a7695e..9c34f78 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -431,11 +431,11 @@ def page_list(what, title, visuals, custom_columns = None, config.user.may("general.edit_foreign_%s" % what): foreign_visuals.append((owner, visual_name, visual)) - for title, items in [(_('Customized'), my_visuals), + for title1, items in [(_('Customized'), my_visuals), (_("Owned by other users"), foreign_visuals), (_('Builtin'), builtin_visuals)]: html.open_h3() - html.write(title) + html.write(title1) html.close_h3() table.begin(css = 'data', limit = None) @@ -477,16 +477,16 @@ def page_list(what, title, visuals, custom_columns = None, # Title table.cell(_('Title')) - title = _u(visual['title']) + title2 = _u(visual['title']) if _visual_can_be_linked(what, visual_name, visuals, visual, owner): - html.a(title, href="%s.py?%s=%s" % (what_s, visual_types[what]['ident_attr'], visual_name)) + html.a(title2, href="%s.py?%s=%s" % (what_s, visual_types[what]['ident_attr'], visual_name)) else: - html.write_text(title) + html.write_text(title2) html.help(_u(visual['description'])) # Custom cols - for title, renderer in custom_columns: - table.cell(title, renderer(visual)) + for title3, renderer in custom_columns: + table.cell(title3, renderer(visual)) # Owner if owner == "": diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 560d800..01efc21 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -11948,7 +11948,7 @@ def change_host_tags_in_rules(folder, operations, mode): for varname, ruleset in rulesets.get_rulesets().items(): rules_to_delete = set([]) - for folder, rulenr, rule in ruleset.get_rules(): + for _folder, _rulenr, rule in ruleset.get_rules(): # Handle deletion of complete tag group if type(operations) == list: # this list of tags to remove for tag in operations: @@ -15222,8 +15222,8 @@ class ModeCheckPlugins(WatoMode): handled_check_names.add(name) elif type(entries) == dict: - for key, subentries in entries.items(): - check_entries( key, subentries ) + for k, subentries in entries.items(): + check_entries( k, subentries ) for key, entries in self._manpages.items(): check_entries( key, entries ) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 314e7a4..4a20203 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -2678,10 +2678,10 @@ class SearchFolder(BaseFolder): def move_hosts(self, host_names, target_folder): auth_errors = [] - for folder, host_names in self._group_hostnames_by_folder(host_names): + for folder, host_names1 in self._group_hostnames_by_folder(host_names): try: # FIXME: this is not transaction safe, might get partially finished... - folder.move_hosts(host_names, target_folder) + folder.move_hosts(host_names1, target_folder) except MKAuthException, e: auth_errors.append(_("<li>Cannot move hosts from folder %s: %s</li>") % (folder.alias_path(), e)) self._invalidate_search() diff --git a/cmk/man_pages.py b/cmk/man_pages.py index 55eb41d..f2c703f 100644 --- a/cmk/man_pages.py +++ b/cmk/man_pages.py @@ -401,8 +401,8 @@ def _dialog_menu(title, text, choices, defvalue, oktext, canceltext): if defvalue != None: args += [ "--default-item", defvalue ] args += [ "--title", title, "--menu", text, "0", "0", "0" ] # "20", "60", "17" ] - for text, value in choices: - args += [ text, value ] + for txt, value in choices: + args += [ txt, value ] return _run_dialog(args) diff --git a/cmk_base/prediction.py b/cmk_base/prediction.py index ee57d51..67b5633 100644 --- a/cmk_base/prediction.py +++ b/cmk_base/prediction.py @@ -168,7 +168,7 @@ def compute_prediction(hostname, service_description, pred_file, timegroup, para consolidated = [] for i in xrange(num_points): point_line = [] - for from_time, scale, data in slices: + for _from_time, scale, data in slices: idx = int(i / float(scale)) if idx < len(data): d = data[idx] diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index fc2291e..601d132 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -20,7 +20,6 @@ disable= no-else-return, no-self-use, protected-access, - redefined-argument-from-local, reimported, relative-import, ungrouped-imports,

6 years, 1 month

Classify a a few warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 52a86e76c8cf73446dd45e079283d7f1dc4497ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52a86e76c8cf73… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 26 15:00:51 2018 +0200 Classify a a few warnings. Change-Id: I2ed23f54444a167b2068bc24999cbeb64ecc96f9 --- tests/pylint/pylintrc | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 601d132..577a98c 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -23,11 +23,6 @@ disable= reimported, relative-import, ungrouped-imports, - unused-argument, - unused-wildcard-import, - wildcard-import, - wrong-import-order, - wrong-import-position, #--------------------------------------------------------------------------- # We should really enable this, there could be some real exceptions waiting # to be thrown. But some work is needed first to sprinkle abc annotations @@ -83,15 +78,29 @@ disable= # when fixing these warnings! len-as-condition, #--------------------------------------------------------------------------- + # We should really find out where wildcard imports are just laziness or + # where they are actually needed (and why). + unused-wildcard-import, + wildcard-import, + #--------------------------------------------------------------------------- # Enabling this would be nice, but not crucial. At the moment, we have quite # a few violations, so we postpone fixing this. When we do it eventually, we # probably want to use "include-naming-hint=yes" in the BASIC section. invalid-name, #--------------------------------------------------------------------------- + # Enable these would improve readability, but currently there are quite a + # few places to fix. + wrong-import-position, + wrong-import-order, + #--------------------------------------------------------------------------- # Enabling this would be nice, but not crucial. At the moment, we have quite # a few violations, so we postpone fixing this. singleton-comparison, #--------------------------------------------------------------------------- + # Enabling this would be nice, but not crucial. At the moment, we have quite + # a few violations, so we postpone fixing this. + unused-argument, + #--------------------------------------------------------------------------- # Alas, these maintenance/security nightmares are still part of our base # "technology"... :-/ Nevertheless, reducing their usage is a very worthy # goal.

6 years, 1 month

CMK-596: Add Werk 5506

by Andreas Umbreit

Module: check_mk Branch: master Commit: 1e16d1057ede13a05ffdd0ff71a597dfb8c3594a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e16d1057ede13… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Thu Jul 19 08:12:55 2018 +0200 CMK-596: Add Werk 5506 5506 FIX cmk-update-agent.exe now ignores windows proxies by default By default, the agent updater is supposed to ignore all configured proxies on a host. Before this werk, it missed to bypass the system-wide configured proxy on windows. Please note that you can configure the agent updater to other behavior within the agent updater plugin ruleset. Change-Id: I3640260e313ebc3049e08d7acb9a5f329011c2ed --- .werks/5506 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/5506 b/.werks/5506 new file mode 100644 index 0000000..5697d62 --- /dev/null +++ b/.werks/5506 @@ -0,0 +1,13 @@ +Title: cmk-update-agent.exe now ignores windows proxies by default +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1531980360 + +By default, the agent updater is supposed to ignore all configured proxies on a host. Before this werk, it missed to bypass the system-wide configured proxy on windows. + +Please note that you can configure the agent updater to other behavior within the agent updater plugin ruleset.

6 years, 1 month

fixed to small folder select box

by Marcel Arentz

Module: check_mk Branch: master Commit: c32768ab6cfd6e42dc12f1e4355d3e1457bd2421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c32768ab6cfd6e… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jul 26 17:41:31 2018 +0200 fixed to small folder select box Change-Id: Id3a755b2fe651a210ae68866aeeb3066ac6413a8 --- web/htdocs/themes/facelift/theme.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 372b9fd..9aae213 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -686,7 +686,8 @@ div.graph_with_timeranges { color: #1A243D; } .wato div.folderpath ul li select { background: #FFFFFF; - border: 1px solid #cccfdb; } + border: 1px solid #cccfdb; + height: auto; } .wato div.folderpath ul li .left, .wato div.folderpath ul li .right { display: none; } .wato div.folderpath ul li div.content {

6 years, 1 month

CMK-628: set operator dropdown to 60px in new theme

by Marcel Arentz

Module: check_mk Branch: master Commit: 03135b412246b333f5179c6c21abaad8170939ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03135b412246b3… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jul 26 17:23:44 2018 +0200 CMK-628: set operator dropdown to 60px in new theme Change-Id: Ib2be3d4b28d2e50cb5e08219d96947077089d206 --- web/htdocs/themes/facelift/theme.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 295efea..372b9fd 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -211,8 +211,8 @@ body.main img.treeangle { body.main .popup_menu a, body.main .popup_menu span, body.main table.footer .popup_menu a, body.main table.footer .popup_menu span, body.main .popup_menu span { color: #1A243D; } -select[id^=host_tag_0] { - width: 100px !important; } +.op { + width: 60px !important; } .aggrtree img.treeangle, .bi_rule_tree img.treeangle, .invtree img.treeangle { filter: invert(0%) !important; }

6 years, 1 month

CMK-599: new color for folder icons in new theme

by Marcel Arentz

Module: check_mk Branch: master Commit: fd507e2ef6915b9fc5188474ace0df6f665c6f05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd507e2ef6915b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jul 26 16:33:12 2018 +0200 CMK-599: new color for folder icons in new theme Change-Id: I972c6e507b99ffa72b1fc46c44408b51b8efbfa6 --- web/htdocs/themes/facelift/images/folder_closed.png | Bin 1232 -> 2027 bytes web/htdocs/themes/facelift/images/folder_hi.png | Bin 0 -> 3077 bytes web/htdocs/themes/facelift/images/folder_open.png | Bin 2533 -> 2863 bytes .../themes/facelift/images/folder_open_original.png | Bin 1767 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/themes/facelift/images/folder_closed.png b/web/htdocs/themes/facelift/images/folder_closed.png index c18c77e..83ddad1 100644 Binary files a/web/htdocs/themes/facelift/images/folder_closed.png and b/web/htdocs/themes/facelift/images/folder_closed.png differ diff --git a/web/htdocs/themes/facelift/images/folder_hi.png b/web/htdocs/themes/facelift/images/folder_hi.png new file mode 100644 index 0000000..554daf0 Binary files /dev/null and b/web/htdocs/themes/facelift/images/folder_hi.png differ diff --git a/web/htdocs/themes/facelift/images/folder_open.png b/web/htdocs/themes/facelift/images/folder_open.png index 2b9e65c..c4f564f 100644 Binary files a/web/htdocs/themes/facelift/images/folder_open.png and b/web/htdocs/themes/facelift/images/folder_open.png differ diff --git a/web/htdocs/themes/facelift/images/folder_open_original.png b/web/htdocs/themes/facelift/images/folder_open_original.png deleted file mode 100644 index d326978..0000000 Binary files a/web/htdocs/themes/facelift/images/folder_open_original.png and /dev/null differ

6 years, 1 month

Add CSS classes to tag filter fields

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a58993885a06a39bc84dbf94f7fb54f4ce25efc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a58993885a06a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 26 17:06:37 2018 +0200 Add CSS classes to tag filter fields Change-Id: Ia68c53fe720e8629d9c33e8edfc06c515a57b536 --- cmk/gui/plugins/visuals/filters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmk/gui/plugins/visuals/filters.py b/cmk/gui/plugins/visuals/filters.py index f2f7b07..f5c625c 100644 --- a/cmk/gui/plugins/visuals/filters.py +++ b/cmk/gui/plugins/visuals/filters.py @@ -996,14 +996,14 @@ class FilterHostTags(Filter): html.open_td() html.dropdown(prefix + '_grp', [("", "")] + groups, onchange = 'host_tag_update_value(\'%s\', this.value)' % prefix, - style='width:129px', sorted=True) + style='width:129px', sorted=True, class_="grp") html.close_td() html.open_td() - html.dropdown(prefix + '_op', [("", "")] + operators, style="width:36px", sorted=True) + html.dropdown(prefix + '_op', [("", "")] + operators, style="width:36px", sorted=True, class_="op") html.close_td() html.open_td() choices = grouped[html.var(prefix + '_grp')] if html.var(prefix + '_grp') else [("", "")] - html.dropdown(prefix + '_val', choices, style="width:129px", sorted=True) + html.dropdown(prefix + '_val', choices, style="width:129px", sorted=True, class_="val") html.close_td() html.close_tr() html.close_table()

6 years, 1 month

Fixed exclusion of windows build directories from dist tars

by Lars Michelsen

Module: check_mk Branch: master Commit: 208e2643c6b1c546a2c8f9a9cc499bf4dd93883c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=208e2643c6b1c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 26 15:18:29 2018 +0200 Fixed exclusion of windows build directories from dist tars Change-Id: Ib2d2142edac0bde21da849fbca33f53d90694a36 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 31653f7..e35e221 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ endif fi ; \ done ; \ else \ - for F in $(DIST_ARCHIVE) enterprise/agents/plugins/{build,build-32,src} enterprise/agents/windows/{build64,build}; do \ + for F in $(DIST_ARCHIVE) enterprise/agents/plugins/{build,build-32,src} agents/windows/{build64,build} enterprise/agents/winbuild; do \ EXCLUDES+=" --exclude $$F" ; \ done ; \ fi ; \

6 years, 1 month

updated facelift theme

by Marcel Arentz

Module: check_mk Branch: master Commit: 51218b7fd7b4f57c254cae6cb56a1a60cd3ba3d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51218b7fd7b4f5… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jul 26 12:07:17 2018 +0200 updated facelift theme Fixes: CMK-630 CMK-635 CMK-637 CMK-633 CMK-626 CMK-618 CMK-636 Change-Id: I369292c89a3c424ba2a180806ace13032bf4ce25 --- web/htdocs/themes/facelift/theme.css | 142 ++++++++++++++++++++++------------- 1 file changed, 89 insertions(+), 53 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=51218b7fd7…

6 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018