Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

GUI CSS: Decoupled styles for login from the classic theme (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 1069a48351703183a39be756685aa74fa776e15d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1069a483517031… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Wed Mar 13 15:26:56 2019 +0100 GUI CSS: Decoupled styles for login from the classic theme (CMK-1171) Change-Id: Ie57983ab6877830b4bf4c1069887d98dca8774f2 --- web/htdocs/themes/facelift/scss/_login.scss | 188 ++++++++++++++++++++++++++++ web/htdocs/themes/facelift/scss/_main.scss | 62 --------- web/htdocs/themes/facelift/theme.scss | 2 +- 3 files changed, 189 insertions(+), 63 deletions(-) diff --git a/web/htdocs/themes/facelift/scss/_login.scss b/web/htdocs/themes/facelift/scss/_login.scss new file mode 100644 index 0000000..210fa66 --- /dev/null +++ b/web/htdocs/themes/facelift/scss/_login.scss @@ -0,0 +1,188 @@ +/* ++------------------------------------------------------------------+ +| ____ _ _ __ __ _ __ | +| / ___| |__ ___ ___| | __ | \/ | |/ / | +| | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +| | |___| | | | __/ (__| < | | | | . \ | +| \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +| | +| Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | ++------------------------------------------------------------------+ + +This file is part of Check_MK. +The official homepage is at http://mathias-kettner.de/check_mk. + +check_mk is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by +the Free Software Foundation in version 2. check_mk is distributed +in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more de- +ails. You should have received a copy of the GNU General Public +License along with GNU Make; see the file COPYING. If not, write +to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +Boston, MA 02110-1301 USA. + +*/ + +/*-------------------------------------------------------------------------. +| _ _ | +| | | ___ __ _(_)_ __ | +| | | / _ \ / _` | | '_ \ | +| | |__| (_) | (_| | | | | | | +| |_____\___/ \__, |_|_| |_| | +| |___/ | ++--------------------------------------------------------------------------+ +| Styling of the login page (when not HTTP Basic Auth is used) | +'-------------------------------------------------------------------------*/ + +body.login { + text-align: center; + vertical-align: middle; +} + +body.login { + div#login { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: 770px; + height: 605px; + margin: auto; + background: transparent; + } + + #login_window { + position: relative; + top: 187px; + left: 10px; + width: 370px; + height: 230px; + margin: -30px auto 10px; + background: $theme-color-sidebar-background; + border: 2px solid $theme-color-table-border-dark; + border-radius: 8px; + box-shadow: 0 0 20px rgba(0, 0, 0, 0.1); + } + + #version { + position: absolute; + top: 40px; + right: 40px; + width: 150px; + font-size: 11px; + letter-spacing: $theme-letter-spacing-table; + color: $theme-color-lightgrey; + text-align: right; + } + + div#login #version::before { + position: absolute; + top: -8px; + left: -156px; + width: 200px; + height: 30px; + background-image: url("images/mk-logo.png"); + background-position: 16px center; + background-repeat: no-repeat; + background-size: auto 24px; + content: " "; + } + + label { + color: #fff; + } + + #label_user, #label_pass { + left: 40px; + font-size: $theme-font-size-global; + letter-spacing: $theme-letter-spacing-table; + } + + #label_user, #input_user, #label_pass, #input_pass { + position: absolute; + } + + #label_user { + top: 80px; + } + + #input_user { + top: 72px; + } + + #label_pass { + top: 120px; + } + #input_pass { + top: 112px; + } + + #input_user, #input_pass { + left: 140px; + width: 171px; + height: 17px; + background-repeat: no-repeat; + border-radius: $theme-border-radius; + outline: none; + box-shadow: none; + } + +/* TODO: No important styles */ + #_login { + position: absolute; + right: 15px; + bottom: 40px; + left: 40px; + width: calc(100% - 80px); + padding: 8px 16px !important; + margin: 0; + font-weight: $theme-font-weight-bold; + border-color: $theme-color-state-warning-border !important; + } + + #login_error { + position: absolute; + bottom: 4px; + left: 92px; + z-index: 100; + width: 180px; + height: 30px; + padding: 0; + margin: 0; + color: $theme-color-white; + background-color: $theme-color-state-2-background; + background-image: none; + background-repeat: no-repeat; + border: 1px solid $theme-color-state-error-border; + border-radius: $theme-border-radius; + } + + #login_error div.error { + padding: 8px 0 0; + margin: 0; + color: $theme-color-white; + background-color: transparent; + border-style: none; + border-radius: 0; + box-shadow: 0 0 0; + } + + #foot { + position: relative; + top: 187px; + left: 10px; + width: 350px; + margin: 0 auto 10px; + font-size: 11px; + color: $theme-color-darkgrey; + text-align: center; + } + + div#login div#foot a, div#login div#foot body.main .popup_menu span, + body.main .popup_menu div#login div#foot span { + color: $theme-color-darkgrey; + } +} diff --git a/web/htdocs/themes/facelift/scss/_main.scss b/web/htdocs/themes/facelift/scss/_main.scss index dcb6e0b..0bb6881 100644 --- a/web/htdocs/themes/facelift/scss/_main.scss +++ b/web/htdocs/themes/facelift/scss/_main.scss @@ -113,68 +113,6 @@ select:not([multiple]) { margin: 0; margin-bottom: 8px; } -div#login { - background: transparent; } - div#login div#login_window { - background: $theme-color-sidebar-background; - border: 2px solid $theme-color-table-border-dark; - border-radius: 8px; - box-shadow: 0px 0px 20px rgba(0, 0, 0, 0.1); } - div#login div#login_window div#login_error { - bottom: 4px; - background-image: none; - background-color: $theme-color-state-2-background; - color: $theme-color-white; - border: 1px solid $theme-color-state-error-border; - border-radius: $theme-border-radius; - left: 92px; } - div#login div#login_window div#login_error div.error { - color: $theme-color-white; } - div#login div#foot { - color: $theme-color-darkgrey; } - div#login div#foot a, div#login div#foot body.main .popup_menu span, body.main .popup_menu div#login div#foot span { - color: $theme-color-darkgrey; } - div#login #version { - color: $theme-color-lightgrey; - letter-spacing: $theme-letter-spacing-table; - top: 40px; - right: 40px; } - div#login #version::before { - content: " "; - height: 30px; - width: 200px; - position: absolute; - top: -8px; - left: -156px; - background-image: url(images/mk-logo.png); - background-size: auto 24px; - background-position: 16px center; - background-repeat: no-repeat; } - div#login #input_user, div#login #input_pass { - left: 140px; - border-radius: $theme-border-radius; - width: 171px; } - div#login #label_user, div#login #label_pass { - left: 40px; - font-size: $theme-font-size-global; - letter-spacing: $theme-letter-spacing-table; } - div#login #input_user { - top: 72px; } - div#login #label_user { - top: 80px; } - div#login #label_pass { - top: 120px; } - div#login #input_pass { - top: 112px; } - div#login #_login { - left: 40px !important; - margin: 0px; - bottom: 40px; - padding: 8px 16px !important; - font-weight: $theme-font-weight-bold; - width: calc(100% - 80px); - border-color: $theme-color-state-warning-border !important; } - table.vs_duallist a.control, table.vs_duallist body.main .popup_menu span.control, body.main .popup_menu table.vs_duallist span.control { border-style: solid; border-color: $theme-color-nuance-1; diff --git a/web/htdocs/themes/facelift/theme.scss b/web/htdocs/themes/facelift/theme.scss index e22fa20..5c2a4b1 100644 --- a/web/htdocs/themes/facelift/theme.scss +++ b/web/htdocs/themes/facelift/theme.scss @@ -12,7 +12,6 @@ @import "../classic/scss/_status.scss"; @import "../classic/scss/_bi.scss"; @import "../classic/scss/_dashboard.scss"; -@import "../classic/scss/_login.scss"; @import "../classic/scss/_logwatch.scss"; @import "../classic/scss/_prediction.scss"; @import "../classic/scss/_views.scss"; @@ -36,5 +35,6 @@ @import "scss/_variables.scss"; @import "scss/_main.scss"; +@import "scss/_login.scss"; @import "scss/_tables.scss"; @import "scss/_sidebar.scss";

5 years, 6 months

Another formatting fix

by Lars Michelsen

Module: check_mk Branch: master Commit: 018fbfd3bc5857b5809bb90264ddf4fa8c707fcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=018fbfd3bc5857… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 14 17:23:06 2019 +0100 Another formatting fix Change-Id: I0b91919329b71e6e18c5dfca31e1603b43333abc --- tests/unit/cmk/gui/watolib/test_tags.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/unit/cmk/gui/watolib/test_tags.py b/tests/unit/cmk/gui/watolib/test_tags.py index 1e642dd..6b04e0e 100644 --- a/tests/unit/cmk/gui/watolib/test_tags.py +++ b/tests/unit/cmk/gui/watolib/test_tags.py @@ -81,7 +81,8 @@ def test_tag_config_get_hosttag_topics(test_cfg): })) cfg.tag_groups.append(tags.HosttagGroup(("tgid2", "Topics/titlor", [("tgid2", "tagid2", [])]))) - assert sorted(cfg.get_hosttag_topics()) == sorted([("Topigzr", "Topigzr"), ("Topics", "Topics")]) + assert sorted(cfg.get_hosttag_topics()) == sorted([("Topigzr", "Topigzr"), ("Topics", + "Topics")]) def test_tag_config_remove_tag_group(test_cfg):

5 years, 6 months

GUI CSS: Decoupled styles for quicksearch and wiki from the classic theme (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 5303d0e1a727b0e1025f79317c48c661624cd3e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5303d0e1a727b0… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Sat Mar 9 14:40:22 2019 +0100 GUI CSS: Decoupled styles for quicksearch and wiki from the classic theme (CMK-1171) Change-Id: Ib30a69d9379d1f2d1aea92d3d5bcfe5834797cb5 --- web/htdocs/themes/facelift/scss/_main.scss | 12 --- web/htdocs/themes/facelift/scss/_sidebar.scss | 121 ++++++++++++++++++++++++++ web/htdocs/themes/facelift/theme.scss | 36 +++++++- 3 files changed, 155 insertions(+), 14 deletions(-) diff --git a/web/htdocs/themes/facelift/scss/_main.scss b/web/htdocs/themes/facelift/scss/_main.scss index f3c6f30..dcb6e0b 100644 --- a/web/htdocs/themes/facelift/scss/_main.scss +++ b/web/htdocs/themes/facelift/scss/_main.scss @@ -93,10 +93,6 @@ div.snapin select { div.snapin textarea { width: 100% !important; } -#mk_side_search_field { - width: 100% !important; - height: 100% !important; } - select:not([multiple]) { -webkit-appearance: none !important; -moz-appearance: none !important; @@ -1031,9 +1027,6 @@ table.cmc_stats, table.mkeventd_performance, table.performance { clear: both; margin: 8px 0px 16px; } -#mk_side_search img, #wiki_search img { - display: none; } - div.statebullet { border-radius: 50%; box-shadow: none; } @@ -1090,11 +1083,6 @@ div#side_footer span#msg_label { font-size: $theme-font-size-global; } -#mk_side_search, #wiki_search { - width: 100%; } - #mk_side_search input, #mk_side_search select, #mk_side_search textarea, #mk_side_search #mk_side_search_field, #wiki_search input, #wiki_search select, #wiki_search textarea, #wiki_search #mk_side_search_field { - box-sizing: border-box; } - .checkbox label::before { box-shadow: none; border: 1px solid $theme-color-table-border-dark; diff --git a/web/htdocs/themes/facelift/scss/_sidebar.scss b/web/htdocs/themes/facelift/scss/_sidebar.scss index e69de29..d3a463d 100644 --- a/web/htdocs/themes/facelift/scss/_sidebar.scss +++ b/web/htdocs/themes/facelift/scss/_sidebar.scss @@ -0,0 +1,121 @@ +/* ++------------------------------------------------------------------+ +| ____ _ _ __ __ _ __ | +| / ___| |__ ___ ___| | __ | \/ | |/ / | +| | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +| | |___| | | | __/ (__| < | | | | . \ | +| \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +| | +| Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | ++------------------------------------------------------------------+ + +This file is part of Check_MK. +The official homepage is at http://mathias-kettner.de/check_mk. + +check_mk is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by +the Free Software Foundation in version 2. check_mk is distributed +in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more de- +ails. You should have received a copy of the GNU General Public +License along with GNU Make; see the file COPYING. If not, write +to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +Boston, MA 02110-1301 USA. +*/ + +/*-------------------------------------------------------------------------. +| ____ _ _ _ | +| / ___|(_) __| | ___| |__ __ _ _ __ | +| \___ \| |/ _` |/ _ \ '_ \ / _` | '__| | +| ___) | | (_| | __/ |_) | (_| | | | +| |____/|_|\__,_|\___|_.__/ \__,_|_| | +| | ++--------------------------------------------------------------------------+ +| Styling for the sidebar and its snapins. | +'-------------------------------------------------------------------------*/ + + +// Styles for wiki and quicksearch sidebar snapins +#snapin_container_wiki div.content { + font-weight: bold; + color: #fff; +} + +#snapin_container_wiki div.content p { + font-weight: normal; +} + +/* TODO: Reproduce this html element */ +#wiki_navigation { + text-align: left; +} + +#mk_side_search, #wiki_search { + width: 100%; + padding: 0; +} + +#mk_side_search img, #wiki_search img { + display: none; } + +#mk_side_search input, #wiki_search input { + float: left; + margin: 0; + font-size: 11px; + background-repeat: no-repeat; +} + +#mk_side_search input { + width: 100%; + height: 100%; +} + +#wiki_search input { + width: 194px; + height: 25px; +} + +#mk_side_search input, #mk_side_search select, #mk_side_search textarea, +#mk_side_search #mk_side_search_field, #wiki_search input, #wiki_search select, +#wiki_search textarea, #wiki_search #mk_side_search_field { + box-sizing: border-box; +} + +#mk_side_clear, #wiki_side_clear { + clear: both; +} + +#mk_side_search div.topic { + margin-top: 3px; + margin-left: 2px; + font-size: 125%; +} + +#mk_search_results { + position: relative; + float: left; + width: 223px; + font-size: 80%; + color: #000; + background-color: #dfdfdf; + border: 1px solid #fff; +} + +#mk_search_results a { + display: block; + width: 217px; + padding-left: 5px; + color: #000; + text-align: left; + text-decoration: none; +} + +#mk_search_results a:hover, #mk_search_results a.active { + background-color: #bfbfbf; +} + +#mk_search_results div.error, #mk_search_results div.warning { + padding: 2px; + font-size: 12px; +} diff --git a/web/htdocs/themes/facelift/theme.scss b/web/htdocs/themes/facelift/theme.scss index dc53629..e22fa20 100644 --- a/web/htdocs/themes/facelift/theme.scss +++ b/web/htdocs/themes/facelift/theme.scss @@ -1,6 +1,38 @@ // This theme is based on the classic theme, so first load the whole -// classic themen and then the overrides. -@import "../classic/theme.scss"; +// classic theme and then the overrides. +/* Instead of an import, copy all classic theme imports to stepwise + decouple the facelift and classic theme by transferring the + modularized scss files and then getting rid of the overriding + _main.scss + */ +@import "~select2/dist/css/select2"; + +@import "../classic/scss/_check_mk.scss"; +@import "../classic/scss/_pages.scss"; +@import "../classic/scss/_status.scss"; +@import "../classic/scss/_bi.scss"; +@import "../classic/scss/_dashboard.scss"; +@import "../classic/scss/_login.scss"; +@import "../classic/scss/_logwatch.scss"; +@import "../classic/scss/_prediction.scss"; +@import "../classic/scss/_views.scss"; +@import "../classic/scss/_wato.scss"; +@import "../classic/scss/_mobile.scss"; +@import "../classic/scss/_sidebar.scss"; + +// CEE specific files +@import "../../../../enterprise/web/htdocs/themes/classic/scss/_graphs.scss"; +@import "../../../../enterprise/web/htdocs/themes/classic/scss/_reporting.scss"; +@if $ENTERPRISE = "yes" { + @include graphs; + @include reporting; +} + +//@import "../../../../managed/web/htdocs/themes/classic/scss/_managed.scss"; +//@if $MANAGED = "yes" { +// @include managed; +//} + @import "scss/_variables.scss"; @import "scss/_main.scss";

5 years, 6 months

7237 FIX Increased size of host/service notes url input fields

by Lars Michelsen

Module: check_mk Branch: master Commit: 6fbf2e0f86462b9d084c34d32a67f89260a0f973 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fbf2e0f86462b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 14 17:28:59 2019 +0100 7237 FIX Increased size of host/service notes url input fields Change-Id: I709d16f90e3f3700a25aaee20dbedec02eb3b674 --- .werks/7237 | 11 +++++++++++ cmk/gui/plugins/wato/check_mk_configuration.py | 2 ++ 2 files changed, 13 insertions(+) diff --git a/.werks/7237 b/.werks/7237 new file mode 100644 index 0000000..8d872e0 --- /dev/null +++ b/.werks/7237 @@ -0,0 +1,11 @@ +Title: Increased size of host/service notes url input fields +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1552390551 + + diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index d900ecc..86a216a 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -3541,6 +3541,7 @@ class RulespecExtraServiceConfNotesUrl(ServiceRulespec): help=_("With this setting you can set links to documentations " "for each service"), attrencode=True, + size = 80, ) @@ -3562,6 +3563,7 @@ class RulespecExtraHostConfNotesUrl(HostRulespec): help=_("With this setting you can set links to documentations " "for Hosts"), attrencode=True, + size = 80, )

5 years, 6 months

Fixed unstable test

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ab6a607cb0cc8b6a07bd5e201b3a84c72cd5193 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ab6a607cb0cc8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 14 16:54:37 2019 +0100 Fixed unstable test Change-Id: I9041f9c22f7ae7335ab34221dc4bbaca0fd9ac43 --- tests/unit/cmk/gui/watolib/test_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/cmk/gui/watolib/test_tags.py b/tests/unit/cmk/gui/watolib/test_tags.py index e9976df..1e642dd 100644 --- a/tests/unit/cmk/gui/watolib/test_tags.py +++ b/tests/unit/cmk/gui/watolib/test_tags.py @@ -81,7 +81,7 @@ def test_tag_config_get_hosttag_topics(test_cfg): })) cfg.tag_groups.append(tags.HosttagGroup(("tgid2", "Topics/titlor", [("tgid2", "tagid2", [])]))) - assert cfg.get_hosttag_topics() == sorted([("Topigzr", "Topigzr"), ("Topics", "Topics")]) + assert sorted(cfg.get_hosttag_topics()) == sorted([("Topigzr", "Topigzr"), ("Topics", "Topics")]) def test_tag_config_remove_tag_group(test_cfg):

5 years, 6 months

WATO service discovery: Fixed incorrect creation of disable rule for duplicate service description

by Andreas Boesl

Module: check_mk Branch: master Commit: baad4089ad5f484b7b653ba575148df036e524a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baad4089ad5f48… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 14 16:43:14 2019 +0100 WATO service discovery: Fixed incorrect creation of disable rule for duplicate service description Change-Id: Ia3d71d96a23ed281b1f682dc07927c3f0ce6b354 --- .werks/6708 | 14 ++++++++++++++ cmk/gui/wato/pages/services.py | 35 ++++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/.werks/6708 b/.werks/6708 new file mode 100644 index 0000000..20a148a --- /dev/null +++ b/.werks/6708 @@ -0,0 +1,14 @@ +Title: WATO service discovery: Fixed incorrect creation of disable rule for duplicate service description +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1551265114 + +Different check_types may have the same service description, for example <tt>CPU utilization</tt>. +If you created a <tt>Disabled check</tt> rule for some SNMP based CPU utilization check and +used the service discovery page, a <tt>Disabled service</tt> rule was automatically created for this SNMP +based check. As a side effect, the TCP based CPU utilization check was disabled as well.. diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index ea48703..bba55ef 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -666,7 +666,8 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): return discovery_result def _do_discovery(self, discovery_result, request): - services_to_save, remove_disabled_rule, add_disabled_rule = {}, [], [] + autochecks_to_save, remove_disabled_rule, add_disabled_rule, saved_services = {}, set( + ), set(), set() apply_changes = False for table_source, check_type, _checkgroup, item, paramstring, _params, \ descr, _state, _output, _perfdata in discovery_result.check_table: @@ -691,24 +692,29 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): if table_source == DiscoveryState.UNDECIDED: if table_target == DiscoveryState.MONITORED: - services_to_save[(check_type, item)] = paramstring + autochecks_to_save[(check_type, item)] = paramstring + saved_services.add(descr) elif table_target == DiscoveryState.IGNORED: - add_disabled_rule.append(descr) + add_disabled_rule.add(descr) elif table_source == DiscoveryState.VANISHED: if table_target != DiscoveryState.REMOVED: - services_to_save[(check_type, item)] = paramstring + autochecks_to_save[(check_type, item)] = paramstring + saved_services.add(descr) if table_target == DiscoveryState.IGNORED: - add_disabled_rule.append(descr) + add_disabled_rule.add(descr) elif table_source == DiscoveryState.MONITORED: if table_target in [ DiscoveryState.MONITORED, DiscoveryState.IGNORED, ]: - services_to_save[(check_type, item)] = paramstring + autochecks_to_save[(check_type, item)] = paramstring + if table_target == DiscoveryState.IGNORED: - add_disabled_rule.append(descr) + add_disabled_rule.add(descr) + else: + saved_services.add(descr) elif table_source == DiscoveryState.IGNORED: if table_target in [ @@ -716,28 +722,31 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): DiscoveryState.UNDECIDED, DiscoveryState.VANISHED, ]: - remove_disabled_rule.append(descr) + remove_disabled_rule.add(descr) if table_target in [ DiscoveryState.MONITORED, DiscoveryState.IGNORED, ]: - services_to_save[(check_type, item)] = paramstring + autochecks_to_save[(check_type, item)] = paramstring + saved_services.add(descr) if table_target == DiscoveryState.IGNORED: - add_disabled_rule.append(descr) + add_disabled_rule.add(descr) elif table_source in [ DiscoveryState.CLUSTERED_NEW, DiscoveryState.CLUSTERED_OLD, ]: - services_to_save[(check_type, item)] = paramstring + autochecks_to_save[(check_type, item)] = paramstring + saved_services.add(descr) if apply_changes: need_sync = False if remove_disabled_rule or add_disabled_rule: + add_disabled_rule = add_disabled_rule - remove_disabled_rule - saved_services self._save_host_service_enable_disable_rules(remove_disabled_rule, add_disabled_rule) need_sync = True - self._save_services(services_to_save, need_sync) + self._save_services(autochecks_to_save, need_sync) def _save_services(self, checks, need_sync): message = _("Saved check configuration of host '%s' with %d services") % \ @@ -781,7 +790,7 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): # Check whether or not the service still needs a host specific setting after removing # the host specific setting above and remove all services from the service list # that are fine without an additional change. - for service in services[:]: + for service in list(services): value_without_host_rule = ruleset.analyse_ruleset(self._host.name(), service)[0] if (not value and value_without_host_rule in [None, False]) \ or value == value_without_host_rule:

5 years, 6 months

Fixed formating

by Lars Michelsen

Module: check_mk Branch: master Commit: 066b1c4f17de18a2f2bddcfca29a7129b37b2b8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=066b1c4f17de18… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 14 16:52:58 2019 +0100 Fixed formating Change-Id: I7676fc3f49967e11b33cfab1c76aaca881ce00b4 --- cmk/gui/plugins/wato/check_parameters/oracle_jobs.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters/oracle_jobs.py b/cmk/gui/plugins/wato/check_parameters/oracle_jobs.py index 37c5fb8..e4bc60f 100644 --- a/cmk/gui/plugins/wato/check_parameters/oracle_jobs.py +++ b/cmk/gui/plugins/wato/check_parameters/oracle_jobs.py @@ -99,9 +99,10 @@ class RulespecCheckgroupParametersOracleJobs(CheckParameterRulespecWithItem): MonitoringState( default_value=1, title=_("State in case of Job has no log information"), - help=_("It is possible that a job has no log informations. This also means " - "that the job has no last running state as this is obtained from the log. " - "The last run state is ignored when no log information is found."), + help=_( + "It is possible that a job has no log informations. This also means " + "that the job has no last running state as this is obtained from the log. " + "The last run state is ignored when no log information is found."), )), ], )

5 years, 6 months

Cleanup ModeTags: Use HosttagsConfiguration as helper object

by Lars Michelsen

Module: check_mk Branch: master Commit: 26e94fb69ac39410ecf748030c4a6792c56df784 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26e94fb69ac394… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 18:13:00 2019 +0100 Cleanup ModeTags: Use HosttagsConfiguration as helper object * Using it as helper object is much clearer than inheriting * Add tests for HosttagsConfiguration functionality CMK-1813 Change-Id: I1c642b5c82e87fe7e87c4f54504cf1fec80196b0 --- cmk/gui/wato/pages/tags.py | 71 ++++----- cmk/gui/watolib/tags.py | 21 ++- tests/unit/cmk/gui/watolib/test_tags.py | 258 ++++++++++++++++++++++++++++++++ 3 files changed, 308 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=26e94fb69a…

5 years, 6 months

Started renaming GUI from "host tags" to "tags"

by Lars Michelsen

Module: check_mk Branch: master Commit: 08034b47dd7cedfafdfe025647e2fa94411317e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08034b47dd7ced… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 14:22:50 2019 +0100 Started renaming GUI from "host tags" to "tags" CMK-1813 Change-Id: I9b2f42335d13d804af4d22bb25a1d7520f790574 --- cmk/gui/plugins/wato/builtin_modules.py | 14 +- cmk/gui/plugins/wato/utils/__init__.py | 3 +- cmk/gui/wato/__init__.py | 10 +- cmk/gui/wato/pages/tags.py | 118 +++++++------- .../cmk/gui/plugins/wato/utils/test_main_menu.py | 171 +-------------------- .../images/{icon_hosttag.png => icon_tag.png} | Bin .../images/{icon_hosttag.png => icon_tag.png} | Bin 7 files changed, 72 insertions(+), 244 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=08034b47dd…

5 years, 6 months

Renamed WATO host_tags modules to tags

by Lars Michelsen

Module: check_mk Branch: master Commit: be3f45a13667833151b6a9daa774f798693016d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be3f45a1366783… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 13:58:56 2019 +0100 Renamed WATO host_tags modules to tags CMK-1813 Change-Id: I1feeffa89d4c7b0c9d9ebeb907a965d4ae8ecbf3 --- cmk/gui/plugins/wato/utils/__init__.py | 2 +- cmk/gui/wato/__init__.py | 2 +- cmk/gui/wato/pages/{host_tags.py => tags.py} | 2 +- cmk/gui/watolib/__init__.py | 2 +- cmk/gui/watolib/host_attributes.py | 2 +- cmk/gui/watolib/{host_tags.py => tags.py} | 0 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index ed800f9..da6c301 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -113,7 +113,7 @@ from cmk.gui.plugins.wato.utils.valuespecs import ( ) import cmk.gui.watolib as watolib from cmk.gui.watolib.password_store import PasswordStore -from cmk.gui.watolib.host_tags import group_hosttags_by_topic +from cmk.gui.watolib.tags import group_hosttags_by_topic from cmk.gui.watolib.timeperiods import TimeperiodSelection from cmk.gui.watolib.users import notification_script_title from cmk.gui.watolib.groups import ( diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 4317380..f80d3e7 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -203,7 +203,7 @@ from cmk.gui.wato.pages.groups import ( ) from cmk.gui.wato.pages.host_diagnose import ModeDiagHost from cmk.gui.wato.pages.host_rename import ModeBulkRenameHost, ModeRenameHost -from cmk.gui.wato.pages.host_tags import ( +from cmk.gui.wato.pages.tags import ( ModeHostTags, ModeEditHosttagConfiguration, ModeEditAuxtag, diff --git a/cmk/gui/wato/pages/host_tags.py b/cmk/gui/wato/pages/tags.py similarity index 99% rename from cmk/gui/wato/pages/host_tags.py rename to cmk/gui/wato/pages/tags.py index 3f381e6..6f3690d 100644 --- a/cmk/gui/wato/pages/host_tags.py +++ b/cmk/gui/wato/pages/tags.py @@ -47,7 +47,7 @@ from cmk.gui.valuespec import ( Transform, ) -from cmk.gui.watolib.host_tags import is_builtin_aux_tag +from cmk.gui.watolib.tags import is_builtin_aux_tag from cmk.gui.plugins.wato.utils.main_menu import ( MainMenu, diff --git a/cmk/gui/watolib/__init__.py b/cmk/gui/watolib/__init__.py index e729d6a..ba639ad 100644 --- a/cmk/gui/watolib/__init__.py +++ b/cmk/gui/watolib/__init__.py @@ -211,7 +211,7 @@ from cmk.gui.watolib.rulesets import ( Ruleset, Rule, ) -from cmk.gui.watolib.host_tags import ( +from cmk.gui.watolib.tags import ( parse_hosttag_title, is_builtin_host_tag_group, group_hosttags_by_topic, diff --git a/cmk/gui/watolib/host_attributes.py b/cmk/gui/watolib/host_attributes.py index e5bef08..de14208 100644 --- a/cmk/gui/watolib/host_attributes.py +++ b/cmk/gui/watolib/host_attributes.py @@ -41,7 +41,7 @@ from cmk.gui.valuespec import ( Checkbox, DropdownChoice, ) -from cmk.gui.watolib.host_tags import group_hosttags_by_topic +from cmk.gui.watolib.tags import group_hosttags_by_topic from cmk.gui.watolib.utils import host_attribute_matches diff --git a/cmk/gui/watolib/host_tags.py b/cmk/gui/watolib/tags.py similarity index 100% rename from cmk/gui/watolib/host_tags.py rename to cmk/gui/watolib/tags.py

5 years, 6 months

← Newer
1
...
22
23
24
25
26
27
28
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019