Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

solaris_mem: Fix: parse function now allways returns a dict.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8eb03d2608662e01ef47f5029c34b3a2b57b161b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eb03d2608662e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jul 16 13:21:48 2018 +0200 solaris_mem: Fix: parse function now allways returns a dict. Change-Id: I4770b95246b6f47f69f7c0ef614079c7e6bbf6ee --- checks/solaris_mem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/solaris_mem b/checks/solaris_mem index 2c2bb3a..5fc402e 100644 --- a/checks/solaris_mem +++ b/checks/solaris_mem @@ -42,7 +42,7 @@ def parse_solaris_mem(info): # The 1.2.4 agent seems to create an empty section under some circumstances if not info: - return + return {} values = [] mem_tokens = " ".join(info[0][1:]).split(",")

6 years, 2 months

Refreshes Pipfile.lock

by Sven Panne

Module: check_mk Branch: master Commit: dfe58877ba5e003da915ef2a5058bbb98e128dac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfe58877ba5e00… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 16 14:37:34 2018 +0200 Refreshes Pipfile.lock Change-Id: Ia63a73ac75a89ff4d727a6e4009a58edca973bac --- tests/static/Pipfile.lock | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/static/Pipfile.lock b/tests/static/Pipfile.lock index 991941e..21bd779 100644 --- a/tests/static/Pipfile.lock +++ b/tests/static/Pipfile.lock @@ -18,15 +18,17 @@ "default": { "mypy": { "hashes": [ - "sha256:01cf289838f266ae7c6550c813181ee77d21eac9459dbf067e7a95a0a2db9721", - "sha256:bc251cb31bc236d9fe4bcc442c994c45fff2541f7161ee52dc949741fe9ca3dd" + "sha256:673ea75fb750289b7d1da1331c125dc62fc1c3a8db9129bb372ae7b7d5bf300a", + "sha256:c770605a579fdd4a014e9f0a34b6c7a36ce69b08100ff728e96e27445cef3b3c" ], "index": "pypi", - "version": "==0.600" + "version": "==0.620" }, "typed-ast": { "hashes": [ "sha256:0948004fa228ae071054f5208840a1e88747a357ec1101c17217bfe99b299d58", + "sha256:10703d3cec8dcd9eef5a630a04056bbc898abc19bac5691612acba7d1325b66d", + "sha256:1f6c4bd0bdc0f14246fd41262df7dfc018d65bb05f6e16390b7ea26ca454a291", "sha256:25d8feefe27eb0303b73545416b13d108c6067b846b543738a25ff304824ed9a", "sha256:29464a177d56e4e055b5f7b629935af7f49c196be47528cc94e0a7bf83fbc2b9", "sha256:2e214b72168ea0275efd6c884b114ab42e316de3ffa125b267e732ed2abda892", @@ -38,6 +40,9 @@ "sha256:6de012d2b166fe7a4cdf505eee3aaa12192f7ba365beeefaca4ec10e31241a85", "sha256:79b91ebe5a28d349b6d0d323023350133e927b4de5b651a8aa2db69c761420c6", "sha256:8550177fa5d4c1f09b5e5f524411c44633c80ec69b24e0e98906dd761941ca46", + "sha256:898f818399cafcdb93cbbe15fc83a33d05f18e29fb498ddc09b0214cdfc7cd51", + "sha256:94b091dc0f19291adcb279a108f5d38de2430411068b219f41b343c03b28fb1f", + "sha256:a26863198902cda15ab4503991e8cf1ca874219e0118cbf07c126bce7c4db129", "sha256:a8034021801bc0440f2e027c354b4eafd95891b573e12ff0418dec385c76785c", "sha256:bc978ac17468fe868ee589c795d06777f75496b1ed576d308002c8a5756fb9ea", "sha256:c05b41bc1deade9f90ddc5d988fe506208019ebba9f2578c622516fd201f5863",

6 years, 2 months

Refreshed Pipfile.lock

by Sven Panne

Module: check_mk Branch: master Commit: 6f059447787ff520ab208fe25a251cd5d6ebac52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f059447787ff5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 16 14:30:17 2018 +0200 Refreshed Pipfile.lock Change-Id: Idbbd1f2046764e0367c1ec478e8f868ef287e1cf --- Pipfile.lock | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index a6c305e..cd602d3 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -680,17 +680,17 @@ }, "gitdb2": { "hashes": [ - "sha256:b60e29d4533e5e25bb50b7678bbc187c8f6bcff1344b4f293b2ba55c85795f09", - "sha256:cf9a4b68e8c4da8d42e48728c944ff7af2d8c9db303ac1ab32eac37aa4194b0e" + "sha256:87783b7f4a8f6b71c7fe81d32179b3c8781c1a7d6fa0c69bff2f315b00aff4f8", + "sha256:bb4c85b8a58531c51373c89f92163b92f30f81369605a67cd52d1fc21246c044" ], - "version": "==2.0.3" + "version": "==2.0.4" }, "gitpython": { "hashes": [ - "sha256:1ec4c44846cf76a1e55769560673a97731849c9d05401e035e607495f10db959", - "sha256:b60b045cf64a321e5b620debb49890099fa6c7be6dfb7fb249027e5d34227301" + "sha256:563221e5a44369c6b79172f455584c9ebbb122a13368cc82cb4b5addff788f82", + "sha256:8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8" ], - "version": "==2.1.10" + "version": "==2.1.11" }, "html5lib": { "hashes": [ @@ -850,11 +850,11 @@ }, "pytest": { "hashes": [ - "sha256:8ea01fc4fcc8e1b1e305252b4bc80a1528019ab99fd3b88666c9dc38d754406c", - "sha256:90898786b3d0b880b47645bae7b51aa9bbf1e9d1e4510c2cfd15dd65c70ea0cd" + "sha256:0453c8676c2bee6feb0434748b068d5510273a916295fd61d306c4f22fbfd752", + "sha256:4b208614ae6d98195430ad6bde03641c78553acee7c83cec2e85d613c0cd383d" ], "index": "pypi", - "version": "==3.6.2" + "version": "==3.6.3" }, "pytest-cov": { "hashes": [ @@ -882,16 +882,19 @@ }, "pyyaml": { "hashes": [ - "sha256:16b20e970597e051997d90dc2cddc713a2876c47e3d92d59ee198700c5427736", - "sha256:3262c96a1ca437e7e4763e2843746588a965426550f3797a79fca9c6199c431f", - "sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab", - "sha256:5ac82e411044fb129bae5cfbeb3ba626acb2af31a8d17d175004b70862a741a7", - "sha256:827dc04b8fa7d07c44de11fabbc888e627fa8293b695e0f99cb544fdfa1bf0d1", - "sha256:bc6bced57f826ca7cb5125a10b23fd0f2fff3b7c4701d64c439a300ce665fff8", - "sha256:c01b880ec30b5a6e6aa67b09a2fe3fb30473008c85cd6a67359a1b15ed6d83a4", - "sha256:e863072cdf4c72eebf179342c94e6989c67185842d9997960b3e69290b2fa269" + "sha256:3d7da3009c0f3e783b2c873687652d83b1bbfd5c88e9813fb7e5b03c0dd3108b", + "sha256:3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf", + "sha256:40c71b8e076d0550b2e6380bada1f1cd1017b882f7e16f09a65be98e017f211a", + "sha256:558dd60b890ba8fd982e05941927a3911dc409a63dcb8b634feaa0cda69330d3", + "sha256:a7c28b45d9f99102fa092bb213aa12e0aaf9a6a1f5e395d36166639c1f96c3a1", + "sha256:aa7dd4a6a427aed7df6fb7f08a580d68d9b118d90310374716ae90b710280af1", + "sha256:bc558586e6045763782014934bfaf39d48b8ae85a2713117d16c39864085c613", + "sha256:d46d7982b62e0729ad0175a9bc7e10a566fc07b224d2c79fafb5e032727eaa04", + "sha256:d5eef459e30b09f5a098b9cea68bebfeb268697f78d647bd255a085371ac7f3f", + "sha256:e01d3203230e1786cd91ccfdc8f8454c8069c91bee3962ad93b87a4b2860f537", + "sha256:e170a9e6fcfd19021dd29845af83bb79236068bf5fd4df3327c1be18182b2531" ], - "version": "==3.12" + "version": "==3.13" }, "singledispatch": { "hashes": [ @@ -911,10 +914,10 @@ }, "smmap2": { "hashes": [ - "sha256:b78ee0f1f5772d69ff50b1cbdb01b8c6647a8354f02f23b488cf4b2cfc923956", - "sha256:c7530db63f15f09f8251094b22091298e82bf6c699a6b8344aaaef3f2e1276c3" + "sha256:0dd53d991af487f9b22774fa89451358da3607c02b9b886a54736c6a313ece0b", + "sha256:dc216005e529d57007ace27048eb336dcecb7fc413cfb3b2f402bb25972b69c6" ], - "version": "==2.0.3" + "version": "==2.0.4" }, "stevedore": { "hashes": [

6 years, 2 months

6343 FIX Analyze parameters: Shows parameters of clustered services now

by Lars Michelsen

Module: check_mk Branch: master Commit: 1004b50236c3a64142b2764b9a81ecbce0f57a51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1004b50236c3a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 14:27:51 2018 +0200 6343 FIX Analyze parameters: Shows parameters of clustered services now When the diagnose page to analyze the parameters of a service was opened for a service that is assigned to a cluster host, it was not showing the "Check origin and parameters" section. The effective parameters were not shown. Change-Id: Ia6fcc4a8956aac4f766394d39b3eb9b1fc5dc6ec --- .werks/6343 | 14 ++++++++++++++ cmk_base/automations/check_mk.py | 13 ++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.werks/6343 b/.werks/6343 new file mode 100644 index 0000000..da279a0 --- /dev/null +++ b/.werks/6343 @@ -0,0 +1,14 @@ +Title: Analyze parameters: Shows parameters of clustered services now +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531469273 + +When the diagnose page to analyze the parameters of a service was opened for +a service that is assigned to a cluster host, it was not showing the +"Check origin and parameters" section. The effective parameters were not +shown. diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 96b061f..daa8b73 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -570,10 +570,21 @@ class AutomationAnalyseServices(Automation): "parameters" : params, } + # TODO: There is a lot of duplicated logic with discovery.py/check_table.py. Clean this + # whole function up. + if config.is_cluster(hostname): + autochecks = [] + for node in config.nodes_of(hostname): + for check_plugin_name, item, paramstring in cmk_base.autochecks.read_autochecks_of(node): + descr = config.service_description(node, check_plugin_name, item) + if hostname == config.host_of_clustered_service(node, descr): + autochecks.append((check_plugin_name, item, paramstring)) + else: + autochecks = cmk_base.autochecks.read_autochecks_of(hostname) # 2. Load all autochecks of the host in question and try to find # our service there - for entry in cmk_base.autochecks.read_autochecks_of(hostname): + for entry in autochecks: ct, item, params = entry # new format without host name if (ct, item) not in table:

6 years, 2 months

Fixed catching multiple errors

by Simon Betz

Module: check_mk Branch: master Commit: e55377c1e7b2689edca8d509a905ff3cc9d28d91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e55377c1e7b268… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 16 14:00:02 2018 +0200 Fixed catching multiple errors Change-Id: I94d13332fc02d3e9b027ffee7881d65a6ba85a48 --- cmk/gui/bi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index 4ad3040..8684899 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -678,7 +678,7 @@ class BISitedataManager(object): if time.time() - os.stat(filepath).st_mtime > self._clear_orphaned_caches_after: log("Cleanup orphaned file", filename) os.unlink(filepath) - except IndexError, IOError: + except (IndexError, IOError): try: os.unlink(filepath) except:

6 years, 2 months

Fixed catching multiple errors

by Simon Betz

Module: check_mk Branch: master Commit: 5df6f283410aeb8b16d0da92df50efccc0d8874a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5df6f283410aeb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 16 13:51:45 2018 +0200 Fixed catching multiple errors Change-Id: I3cbed8ff7ebc99fad1802c00b3a1d14dea5e6514 --- checks/brocade_sys | 2 +- checks/hr_mem | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/brocade_sys b/checks/brocade_sys index ecb06ad..bf28a10 100644 --- a/checks/brocade_sys +++ b/checks/brocade_sys @@ -31,7 +31,7 @@ def parse_brocade_sys(info): "cpu_util" : int(info[0][0]), "mem_used_percent" : int(info[0][1]), } - except IndexError, ValueError: + except (IndexError, ValueError): return {} diff --git a/checks/hr_mem b/checks/hr_mem index 2025fdf..a84f4b0 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -45,7 +45,7 @@ def parse_hr_mem(info): size = int(hrsize) * int(hrunits) / 1048576.0 used = int(hrused) * int(hrunits) / 1048576.0 parsed.setdefault(map_types[hrtype], []).append((hrdescr.lower(), size, used)) - except ValueError, KeyError: + except (ValueError, KeyError): pass return parsed

6 years, 2 months

Changed wato plugin utils from module to component

by Lars Michelsen

Module: check_mk Branch: master Commit: c31240114a4ef1c5db6e4518ab2d7c9bd9a6522f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c31240114a4ef1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 12:03:32 2018 +0200 Changed wato plugin utils from module to component Change-Id: I5e23b77e42ed37f4353d3242ae49c742a234ac29 --- cmk/gui/plugins/wato/{utils.py => utils/__init__.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/cmk/gui/plugins/wato/utils.py b/cmk/gui/plugins/wato/utils/__init__.py similarity index 100% rename from cmk/gui/plugins/wato/utils.py rename to cmk/gui/plugins/wato/utils/__init__.py

6 years, 2 months

Fixed circular dependency between WATO plugins and wato module

by Lars Michelsen

Module: check_mk Branch: master Commit: 32a7c8eeb953f12eaf25f630b66154f92da0c98b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32a7c8eeb953f1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 12:09:02 2018 +0200 Fixed circular dependency between WATO plugins and wato module The plugins must not refer to cmk.gui.wato or it's submodules. Moved shared functionality from cmk.gui.wato to cmk.gui.plugins.wato.utils. Change-Id: I56a47c0362105eabb94a2d2b2b41bf45b1414000 --- cmk/gui/plugins/wato/utils/__init__.py | 8 ++++---- cmk/gui/{wato => plugins/wato/utils}/base_modes.py | 0 cmk/gui/{wato => plugins/wato/utils}/context_buttons.py | 0 cmk/gui/{wato => plugins/wato/utils}/html_elements.py | 0 cmk/gui/{wato => plugins/wato/utils}/main_menu.py | 0 cmk/gui/wato/__init__.py | 10 +++++----- cmk/gui/wato/pages/global_settings.py | 4 ++-- cmk/gui/wato/pages/groups.py | 2 +- cmk/gui/wato/pages/sites.py | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 91457b3..e9f4fff 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -43,20 +43,20 @@ from cmk.gui.valuespec import (TextAscii, Dictionary, RadioChoice, Tuple, CascadingDropdown, ListChoice, ListOfStrings, DualListChoice, ValueSpec) -from cmk.gui.wato.base_modes import WatoMode -from cmk.gui.wato.context_buttons import ( +from cmk.gui.plugins.wato.utils.base_modes import WatoMode +from cmk.gui.plugins.wato.utils.context_buttons import ( global_buttons, changelog_button, home_button, ) -from cmk.gui.wato.html_elements import ( +from cmk.gui.plugins.wato.utils.html_elements import ( wato_styles, wato_confirm, search_form, ) -from cmk.gui.wato.main_menu import ( +from cmk.gui.plugins.wato.utils.main_menu import ( MainMenu, MenuItem, WatoModule, diff --git a/cmk/gui/wato/base_modes.py b/cmk/gui/plugins/wato/utils/base_modes.py similarity index 100% rename from cmk/gui/wato/base_modes.py rename to cmk/gui/plugins/wato/utils/base_modes.py diff --git a/cmk/gui/wato/context_buttons.py b/cmk/gui/plugins/wato/utils/context_buttons.py similarity index 100% rename from cmk/gui/wato/context_buttons.py rename to cmk/gui/plugins/wato/utils/context_buttons.py diff --git a/cmk/gui/wato/html_elements.py b/cmk/gui/plugins/wato/utils/html_elements.py similarity index 100% rename from cmk/gui/wato/html_elements.py rename to cmk/gui/plugins/wato/utils/html_elements.py diff --git a/cmk/gui/wato/main_menu.py b/cmk/gui/plugins/wato/utils/main_menu.py similarity index 100% rename from cmk/gui/wato/main_menu.py rename to cmk/gui/plugins/wato/utils/main_menu.py diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index dda85e9..a01ab6d 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -120,7 +120,7 @@ import cmk.gui.gui_background_job as gui_background_job import cmk.gui.i18n import cmk.gui.pages import cmk.gui.plugin_registry -import cmk.gui.wato.base_modes +import cmk.gui.plugins.wato.utils.base_modes from cmk.gui.i18n import _u, _ from cmk.gui.globals import html from cmk.gui.htmllib import HTML @@ -131,7 +131,7 @@ from cmk.gui.valuespec import * from cmk.gui.display_options import display_options from cmk.gui.plugins.userdb.htpasswd import encrypt_password -from cmk.gui.wato.base_modes import WatoMode, WatoWebApiMode +from cmk.gui.plugins.wato.utils.base_modes import WatoMode, WatoWebApiMode from cmk.gui.wato.pages.global_settings import GlobalSettingsMode, EditGlobalSettingMode from cmk.gui.wato.pages.sites import ModeSites, ModeEditSite from cmk.gui.wato.pages.password_store import ModePasswords, ModeEditPassword @@ -232,7 +232,7 @@ from cmk.gui.watolib import ( modes = {} -from .html_elements import ( +from cmk.gui.plugins.wato.utils.html_elements import ( wato_styles, wato_confirm, wato_html_head, @@ -241,7 +241,7 @@ from .html_elements import ( search_form, ) -from .context_buttons import ( +from cmk.gui.plugins.wato.utils.context_buttons import ( global_buttons, changelog_button, home_button, @@ -250,7 +250,7 @@ from .context_buttons import ( folder_status_button, ) -from cmk.gui.wato.main_menu import ( +from cmk.gui.plugins.wato.utils.main_menu import ( MainMenu, MenuItem, WatoModule, diff --git a/cmk/gui/wato/pages/global_settings.py b/cmk/gui/wato/pages/global_settings.py index 6f61700..e3811ef 100644 --- a/cmk/gui/wato/pages/global_settings.py +++ b/cmk/gui/wato/pages/global_settings.py @@ -29,14 +29,14 @@ import abc import cmk.gui.config as config import cmk.gui.watolib as watolib import cmk.gui.forms as forms -from cmk.gui.wato.base_modes import WatoMode +from cmk.gui.plugins.wato.utils.base_modes import WatoMode from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.exceptions import MKGeneralException, MKAuthException from cmk.gui.log import logger from cmk.gui.htmllib import HTML -from cmk.gui.wato.html_elements import ( +from cmk.gui.plugins.wato.utils.html_elements import ( search_form, wato_confirm, ) diff --git a/cmk/gui/wato/pages/groups.py b/cmk/gui/wato/pages/groups.py index c241a78..bc28aaa 100644 --- a/cmk/gui/wato/pages/groups.py +++ b/cmk/gui/wato/pages/groups.py @@ -47,7 +47,7 @@ from cmk.gui.valuespec import ( TextAscii, ) -from cmk.gui.wato.main_menu import ( +from cmk.gui.plugins.wato.utils.main_menu import ( MainMenu, MenuItem, ) diff --git a/cmk/gui/wato/pages/sites.py b/cmk/gui/wato/pages/sites.py index f004492..20c03e1 100644 --- a/cmk/gui/wato/pages/sites.py +++ b/cmk/gui/wato/pages/sites.py @@ -37,7 +37,7 @@ from cmk.gui.globals import html from cmk.gui.exceptions import MKUserError from cmk.gui.log import logger -from cmk.gui.wato.html_elements import ( +from cmk.gui.plugins.wato.utils.html_elements import ( wato_html_head, wato_confirm, )

6 years, 2 months

All plugins are now imported in deterministic order

by Lars Michelsen

Module: check_mk Branch: master Commit: f02db6fa3df5e96c6164ab1da658acf05ecb3465 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f02db6fa3df5e9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 11:43:01 2018 +0200 All plugins are now imported in deterministic order Change-Id: I4a285c9ebfd874ff9dd259e4b8c8dedd33eeb7b5 --- cmk/gui/plugins/cron/__init__.py | 2 +- cmk/gui/plugins/metrics/__init__.py | 2 +- cmk/gui/plugins/sidebar/__init__.py | 2 +- cmk/gui/plugins/userdb/__init__.py | 2 +- cmk/gui/plugins/views/icons/__init__.py | 2 +- cmk/gui/plugins/views/perfometers/__init__.py | 2 +- cmk/gui/plugins/wato/__init__.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmk/gui/plugins/cron/__init__.py b/cmk/gui/plugins/cron/__init__.py index e2fbe7a..e2ead03 100644 --- a/cmk/gui/plugins/cron/__init__.py +++ b/cmk/gui/plugins/cron/__init__.py @@ -30,7 +30,7 @@ import glob from cmk.gui.i18n import _ from cmk.gui.globals import html -modules = glob.glob(os.path.join(os.path.dirname(__file__), "*.py")) +modules = sorted(glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))) __all__ = [ os.path.basename(f)[:-3] for f in modules if f not in [ "__init__.py", "utils.py" ] ] #. diff --git a/cmk/gui/plugins/metrics/__init__.py b/cmk/gui/plugins/metrics/__init__.py index 61e0cae..91b1989 100644 --- a/cmk/gui/plugins/metrics/__init__.py +++ b/cmk/gui/plugins/metrics/__init__.py @@ -27,7 +27,7 @@ import os import glob -modules = glob.glob(os.path.join(os.path.dirname(__file__), "*.py")) +modules = sorted(glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))) __all__ = [ os.path.basename(f)[:-3] for f in modules if f not in [ "__init__.py", "utils.py" ] ] #. diff --git a/cmk/gui/plugins/sidebar/__init__.py b/cmk/gui/plugins/sidebar/__init__.py index 7054431..7e96ca9 100644 --- a/cmk/gui/plugins/sidebar/__init__.py +++ b/cmk/gui/plugins/sidebar/__init__.py @@ -27,7 +27,7 @@ import os import glob -modules = glob.glob(os.path.join(os.path.dirname(__file__), "*.py")) +modules = sorted(glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))) __all__ = [ os.path.basename(f)[:-3] for f in modules if f not in [ "__init__.py", "utils.py" ] ] #. diff --git a/cmk/gui/plugins/userdb/__init__.py b/cmk/gui/plugins/userdb/__init__.py index 1d6268e..b2a8a80 100644 --- a/cmk/gui/plugins/userdb/__init__.py +++ b/cmk/gui/plugins/userdb/__init__.py @@ -31,7 +31,7 @@ import abc from cmk.gui.i18n import _ from cmk.gui.globals import html -modules = glob.glob(os.path.join(os.path.dirname(__file__), "*.py")) +modules = sorted(glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))) __all__ = [ os.path.basename(f)[:-3] for f in modules if f not in [ "__init__.py", "utils.py" ] ] #. diff --git a/cmk/gui/plugins/views/icons/__init__.py b/cmk/gui/plugins/views/icons/__init__.py index a2ef9c0..3f9d367 100644 --- a/cmk/gui/plugins/views/icons/__init__.py +++ b/cmk/gui/plugins/views/icons/__init__.py @@ -34,7 +34,7 @@ import cmk.gui.config as config from cmk.gui.globals import html from cmk.gui.htmllib import HTML -modules = glob.glob(os.path.join(os.path.dirname(__file__), "*.py")) +modules = sorted(glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))) __all__ = [ os.path.basename(f)[:-3] for f in modules if f not in [ "__init__.py", "utils.py" ] ] #. diff --git a/cmk/gui/plugins/views/perfometers/__init__.py b/cmk/gui/plugins/views/perfometers/__init__.py index 1029465..ce44307 100644 --- a/cmk/gui/plugins/views/perfometers/__init__.py +++ b/cmk/gui/plugins/views/perfometers/__init__.py @@ -43,7 +43,7 @@ from cmk.gui.globals import html from cmk.gui.htmllib import HTML from cmk.gui.exceptions import MKGeneralException -modules = glob.glob(os.path.join(os.path.dirname(__file__), "*.py")) +modules = sorted(glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))) __all__ = [ os.path.basename(f)[:-3] for f in modules if f not in [ "__init__.py", "utils.py" ] ] #. diff --git a/cmk/gui/plugins/wato/__init__.py b/cmk/gui/plugins/wato/__init__.py index 6ddf308..00df213 100644 --- a/cmk/gui/plugins/wato/__init__.py +++ b/cmk/gui/plugins/wato/__init__.py @@ -27,7 +27,7 @@ import os import glob -modules = glob.glob(os.path.join(os.path.dirname(__file__), "*.py")) +modules = sorted(glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))) __all__ = [ os.path.basename(f)[:-3] for f in modules if f not in [ "__init__.py", "utils.py" ] ] #.

6 years, 2 months

6347 FIX Add hover title to make long permission titles visible

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c8ec07b4b195c402dcccc2751ab6172f04947ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c8ec07b4b195c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 13 14:18:48 2018 +0200 6347 FIX Add hover title to make long permission titles visible Some permissions on the "Edit role" page have a title that is longer than the title area which leads to stripped titles. To make them readable the stripped titles now show the full text when hovering over it. The texts may be improved in the future to be shorter. Change-Id: I10393ffc705948e66068a33709731305cf414997 --- .werks/6347 | 15 +++++++++++++++ cmk/gui/forms.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6347 b/.werks/6347 new file mode 100644 index 0000000..5377064 --- /dev/null +++ b/.werks/6347 @@ -0,0 +1,15 @@ +Title: Add hover title to make long permission titles visible +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531484201 + +Some permissions on the "Edit role" page have a title that is longer than the +title area which leads to stripped titles. To make them readable the stripped +titles now show the full text when hovering over it. + +The texts may be improved in the future to be shorter. diff --git a/cmk/gui/forms.py b/cmk/gui/forms.py index f963309..7d49b08 100644 --- a/cmk/gui/forms.py +++ b/cmk/gui/forms.py @@ -277,7 +277,7 @@ def section(title = None, checkbox = None, id = None, simple=False, hide = False if legend: html.open_td(class_=["legend", "simple" if simple else None]) if title: - html.open_div(class_=["title", "withcheckbox" if checkbox else None]) + html.open_div(class_=["title", "withcheckbox" if checkbox else None], title=title) html.write(title) html.span('.'*100, class_="dots") html.close_div()

6 years, 2 months

← Newer
1
...
22
23
24
25
26
27
28
...
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