Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

#2968 FIX Closing quicksearch results when moving mouse out of sidebar area

by Lars Michelsen

Module: check_mk Branch: master Commit: a1f9ba228a48912a611fd25e6fee621e6b42e52e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1f9ba228a4891… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 11:08:40 2016 +0100 #2968 FIX Closing quicksearch results when moving mouse out of sidebar area --- .werks/2968 | 9 +++++++++ ChangeLog | 1 + web/htdocs/js/sidebar.js | 9 +++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/2968 b/.werks/2968 new file mode 100644 index 0000000..43536c4 --- /dev/null +++ b/.werks/2968 @@ -0,0 +1,9 @@ +Title: Closing quicksearch results when moving mouse out of sidebar area +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1453889297 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index b45faa3..dfc730c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -268,6 +268,7 @@ * 2965 FIX: Fixed HTML code shown in filter selection of favorite hosts filter * 2966 FIX: Quicksearch: Fixed sorting of results when not only searching for hosts * 2967 FIX: Hosts/Services: Hiding action menu trigger for empty menus + * 2968 FIX: Closing quicksearch results when moving mouse out of sidebar area WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index c17ec7a..e5330d5 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -81,13 +81,18 @@ function registerEdgeListeners(obj) { continue; if (window.addEventListener) - edges[i].addEventListener("mousemove", stop_snapin_dragging, false); + edges[i].addEventListener("mousemove", on_mouse_leave, false); else - edges[i].onmousemove = stop_snapin_dragging; + edges[i].onmousemove = on_mouse_leave; } edges = null; } +function on_mouse_leave(e) { + mkSearchClose(); + return stop_snapin_dragging(e); +} + function stop_snapin_dragging(e) { stopDragScroll(e); snapinTerminateDrag(e);

8 years, 7 months

#2970 FIX Users now allowed to modify the sidebar (e.g. guests) can now not fold snapins anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: d7956582413ef45730438cd24ef9b694c3ba3017 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7956582413ef4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 11:46:54 2016 +0100 #2970 FIX Users now allowed to modify the sidebar (e.g. guests) can now not fold snapins anymore --- .bugs/2385 | 7 +++++-- .werks/2970 | 9 +++++++++ ChangeLog | 1 + web/htdocs/sidebar.py | 25 +++++++++++++++---------- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.bugs/2385 b/.bugs/2385 index 7135b9f..036c7db 100644 --- a/.bugs/2385 +++ b/.bugs/2385 @@ -1,8 +1,11 @@ Title: Resize of sidebar while zooming not working on all versions of Chromium browser Component: multisite -State: open +Class: bug +State: done Date: 2015-11-02 11:10:57 Targetversion: future -Class: bug This happens on Ubuntu 14.04 with Version 44.0.2403.89 Ubuntu 14.04 (64-bit). + +2016-01-27 11:25:10: changed state open -> done +fixed. diff --git a/.werks/2970 b/.werks/2970 new file mode 100644 index 0000000..8483f4e --- /dev/null +++ b/.werks/2970 @@ -0,0 +1,9 @@ +Title: Users now allowed to modify the sidebar (e.g. guests) can now not fold snapins anymore +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1453891578 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 6cae073..2dda256 100644 --- a/ChangeLog +++ b/ChangeLog @@ -270,6 +270,7 @@ * 2967 FIX: Hosts/Services: Hiding action menu trigger for empty menus * 2968 FIX: Closing quicksearch results when moving mouse out of sidebar area * 2969 FIX: Fixed folding of sidebar in Google Chrome + * 2970 FIX: Users now allowed to modify the sidebar (e.g. guests) can now not fold snapins anymore WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index a129a71..55bc832 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -305,7 +305,8 @@ def render_snapin(name, state): render_snapin_styles(snapin) html.write("<div id=\"snapin_container_%s\" class=snapin>\n" % name) - if state == "closed": + # When not permitted to open/close snapins, the snapins are always opened + if state == "closed" and config.may("general.configure_sidebar"): style = ' style="display:none"' headclass = "closed" minimaxi = "maxi" @@ -326,13 +327,13 @@ def render_snapin(name, state): html.write(">") - # Icon for mini/maximizing, does not need permission - html.write('<div class="minisnapin">') - iconbutton(minimaxi + "snapin", None, - "side", "toggle_sidebar_snapin(this, '%s')" % toggle_url, 'snapin_'+name) - html.write('</div>') - if config.may("general.configure_sidebar"): + # Icon for mini/maximizing + html.write('<div class="minisnapin">') + iconbutton(minimaxi + "snapin", None, + "side", "toggle_sidebar_snapin(this, '%s')" % toggle_url, 'snapin_'+name) + html.write('</div>') + # Button for closing (removing) a snapin html.write('<div class="closesnapin">') iconbutton("closesnapin", "sidebar_openclose.py?name=%s&state=off" % name, @@ -340,9 +341,13 @@ def render_snapin(name, state): html.write('</div>') # The heading. A click on the heading mini/maximizes the snapin - html.write("<b class=heading onclick=\"toggle_sidebar_snapin(this,'%s')\" " - "onmouseover=\"this.style.cursor='pointer'\" " - "onmouseout=\"this.style.cursor='auto'\">%s</b>" % (toggle_url, snapin["title"])) + if config.may("general.configure_sidebar"): + toggle_actions = " onclick=\"toggle_sidebar_snapin(this,'%s')\"" \ + " onmouseover=\"this.style.cursor='pointer'\"" \ + " onmouseout=\"this.style.cursor='auto'" % toggle_url + else: + toggle_actions = "" + html.write("<b class=heading%s>%s</b>" % (toggle_actions, snapin["title"])) # End of header html.write("</div>")

8 years, 7 months

Updated bug entries #0986, #0851, #2262

by Lars Michelsen

Module: check_mk Branch: master Commit: 47b59f53126561df9edc993e61908682dba5618d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47b59f53126561… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 11:48:12 2016 +0100 Updated bug entries #0986, #0851, #2262 --- .bugs/2262 | 6 ++++-- .bugs/851 | 7 +++++-- .bugs/986 | 7 +++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.bugs/2262 b/.bugs/2262 index ffe0b92..443e941 100644 --- a/.bugs/2262 +++ b/.bugs/2262 @@ -1,9 +1,11 @@ Title: A user without permissions for changing the sidebar (guest) should not be allowd to fold Component: multisite -State: open +Class: nastiness +State: done Date: 2014-12-01 14:53:36 Targetversion: 1.2.5i1 -Class: nastiness Reason: the folding state is not persisted. Therefore the snapins will fold back when the sidebar is reloaded. + +2016-01-27 11:47:00: changed state open -> done diff --git a/.bugs/851 b/.bugs/851 index 1c848cc..6a81eca 100644 --- a/.bugs/851 +++ b/.bugs/851 @@ -1,8 +1,11 @@ Title: Using a Macbook it takes somites 3 instead of 2 fingers to scroll the sidebar Component: multisite -State: open +Class: nastiness +State: done Date: 2015-08-10 15:31:35 Targetversion: 1.2.7 -Class: nastiness Bug found by MPI + +2016-01-27 11:48:10: changed state open -> done +This is already fixed. diff --git a/.bugs/986 b/.bugs/986 index 98b6544..1afbca6 100644 --- a/.bugs/986 +++ b/.bugs/986 @@ -1,9 +1,9 @@ Title: Delay sidebar reload after changes to site config Component: wato -State: open +Class: nastiness +State: done Date: 2013-10-15 01:37:53 Targetversion: 1.4.0 -Class: nastiness If you change the site configuration via WATO then the sidear is reloaded. But: at exactly the same time the @@ -15,3 +15,6 @@ point of time. Consequnce: - Site status is [dead] for all remote sites. Can't we delay the reload for a small time? + +2016-01-27 11:47:39: changed state open -> done +Has already been fixed.

8 years, 7 months

fixed broken manual checks page

by Andreas Boesl

Module: check_mk Branch: master Commit: 3140166c432e946f13c521156e01116db022be49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3140166c432e94… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 27 11:45:29 2016 +0100 fixed broken manual checks page --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 76f7d9b..af074fd 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11951,7 +11951,7 @@ def mode_rulesets(phase, group=None): html.context_button(_("All Rulesets"), folder_preserving_link([("mode", "ruleeditor"), ("host", only_host)]), "back") else: html.context_button(_("Deprecated Rulesets"), - make_link([("mode", "rulesets"), ("group", "static"), ("host", only_host), ("deprecated", "1")]), "rulesets_deprecated") + folder_preserving_link([("mode", "rulesets"), ("group", "static"), ("host", only_host), ("deprecated", "1")]), "rulesets_deprecated") html.context_button(only_host, folder_preserving_link([("mode", "edit_host"), ("host", only_host)]), "host") else: @@ -11960,7 +11960,7 @@ def mode_rulesets(phase, group=None): html.context_button(_("All Rulesets"), folder_preserving_link([("mode", "ruleeditor")]), "back") else: html.context_button(_("Deprecated Rulesets"), - make_link([("mode", "rulesets"), ("group", "static"), ("deprecated", "1")]), "rulesets_deprecated") + folder_preserving_link([("mode", "rulesets"), ("group", "static"), ("deprecated", "1")]), "rulesets_deprecated") if config.may("wato.hosts") or config.may("wato.seeall"): html.context_button(_("Folder"), folder_preserving_link([("mode", "folder")]), "folder") if group == "agents":

8 years, 7 months

Prevent password form completion on host search page

by Lars Michelsen

Module: check_mk Branch: master Commit: 8b9dbd0a3ecda222d3e25ad4c25f7df0de72a729 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b9dbd0a3ecda2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 08:25:05 2016 +0100 Prevent password form completion on host search page --- .bugs/2358 | 8 +++++--- .bugs/627 | 8 ++++++-- .bugs/787 | 7 +++++-- .bugs/879 | 7 +++++-- .bugs/888 | 7 +++++-- .bugs/957 | 7 +++++-- web/htdocs/wato.py | 1 + 7 files changed, 32 insertions(+), 13 deletions(-) diff --git a/.bugs/2358 b/.bugs/2358 index 68b85c3..9d2c1a3 100644 --- a/.bugs/2358 +++ b/.bugs/2358 @@ -1,8 +1,10 @@ Title: "Invalid check parameter" error in "Check Parameters" column in wato Component: wato -State: open +Class: bug +State: works4me Date: 2015-08-31 16:05:11 Targetversion: 1.2.7 -Class: bug -In the service list of a host in wato, if the "Show check parameters" button is pressed, many checks (i.e. cpu.loads, mounts) only show an error message in the new column: "Invalid check parameter: ..." \ No newline at end of file +In the service list of a host in wato, if the "Show check parameters" button is pressed, many checks (i.e. cpu.loads, mounts) only show an error message in the new column: "Invalid check parameter: ..." +2016-01-26 15:04:17: changed state open -> works4me +Has already been fixed. diff --git a/.bugs/627 b/.bugs/627 index ac19cdf..be3606a 100644 --- a/.bugs/627 +++ b/.bugs/627 @@ -1,10 +1,14 @@ Title: Use language name from .mo or .po? Component: multisite -State: open +Class: cleanup +State: wontfix Date: 2012-01-25 18:58:02 Targetversion: future -Class: cleanup The .po files contains meta-Data to the translation. There is a file "Language: ". Isn't it possible to extract the language alias name from that instead of keeping this in a separate non-standard file? + +2016-01-26 15:07:14: changed state open -> wontfix +It seems to be ok like it is for a long time now. I don't see a huge +benefit to change this. diff --git a/.bugs/787 b/.bugs/787 index 1621269..4d63389 100644 --- a/.bugs/787 +++ b/.bugs/787 @@ -1,9 +1,9 @@ Title: Perfdata varname of df should be fixed to 'size' Component: checks -State: open +Class: cleanup +State: wontfix Date: 2012-07-28 20:07:03 Targetversion: 1.2.3i1 -Class: cleanup Currently the fs check uses the name of the mount point as the variable name for the filesystem performance data. In the case of Windows mount points @@ -12,3 +12,6 @@ there is a backslash included which makes everything problematic. There is just one drawback: People with multiple RRDs will loose their filesystem history once again... :-( For some time we could offer an option that switches to the old format. + +2016-01-26 15:08:30: changed state open -> wontfix +This problem is not really problematic anymore. Won't change anything here. diff --git a/.bugs/879 b/.bugs/879 index 96a3c4a..20ea633 100644 --- a/.bugs/879 +++ b/.bugs/879 @@ -1,11 +1,14 @@ Title: jolokia agent: introduce timeouts Component: checks -State: open +Class: nastiness +State: done Date: 2012-11-20 17:03:46 Targetversion: future -Class: nastiness If one instance is e.g. out of memory then it does not answer timely on the jolokia URL. The agent plugin needs to introduce a (short) timeout and proceed then with the further instances. Otherwise the complete agent will hang and the remaining checks missing. + +2016-01-26 15:09:39: changed state open -> done +Has already been fixed. diff --git a/.bugs/888 b/.bugs/888 index 983b80a..cbe9f18 100644 --- a/.bugs/888 +++ b/.bugs/888 @@ -1,9 +1,9 @@ Title: EC Forwarding: Nagios fails if contactgroup is empty Component: wato -State: open +Class: nastiness +State: wontfix Date: 2013-02-14 10:12:11 Targetversion: 1.2.3 -Class: nastiness The problem is that Check_MK does not create a contact group if no hosts and services are assigned to it. We could check @@ -14,3 +14,6 @@ that and make Check_MK behave like that in OMD context. For WATO it is not easily possible to savely know wether a contact group will be empty, since many aspects are involved (only_hosts, D-WATO, manual confiugration out of WATO, etc.) + +2016-01-26 15:10:36: changed state open -> wontfix +Is not a problem anymore. diff --git a/.bugs/957 b/.bugs/957 index 52ed9a7..822606b 100644 --- a/.bugs/957 +++ b/.bugs/957 @@ -1,12 +1,15 @@ Title: field author in check manpages is mandatory Component: checks -State: open +Class: cleanup +State: done Date: 2013-07-05 12:33:13 Targetversion: 1.2.3 -Class: cleanup author field should no longer be used but cmk -M declares it as mandatory cmk -M mysql.connections Invalid check manpage /omd/sites/bs1st/share/check_mk/checkman/mysql.connections: missing 'author' + +2016-01-26 15:14:27: changed state open -> done +Already fixed. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 504aa60..10a7745 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2934,6 +2934,7 @@ def mode_search(phase): ## # Show search form html.begin_form("edit_host", method="GET") + html.prevent_password_auto_completion() forms.header(_("General Properties")) forms.section(_("Hostname")) html.text_input("host_search_host")

8 years, 7 months

Updated bug entries #0984

by Lars Michelsen

Module: check_mk Branch: master Commit: 06d480a0bf41e37f7374fe29a98254e9a6a03e3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06d480a0bf41e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 08:30:42 2016 +0100 Updated bug entries #0984 --- .bugs/984 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/984 b/.bugs/984 index aee8564..4036b47 100644 --- a/.bugs/984 +++ b/.bugs/984 @@ -1,9 +1,9 @@ Title: Better error message when site cannot be deleted Component: wato -State: open +Class: nastiness +State: done Date: 2013-10-11 16:32:01 Targetversion: 1.2.3i3 -Class: nastiness When you are using D-WATO and want to delete a site, this is prohibited if folders or hosts are assigned to that site. @@ -14,3 +14,6 @@ can be very hard to find that in a larger installation Resolution: print out the exakt name of affected hosts an folders and the error message. + +2016-01-27 08:30:39: changed state open -> done +Added link to host search to the error message.\

8 years, 7 months

#2964 FIX Deleting site having hosts assigned links to list of hosts now

by Lars Michelsen

Module: check_mk Branch: master Commit: e6754761cef8ba222168690939b00a897bc36ab0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6754761cef8ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 08:31:50 2016 +0100 #2964 FIX Deleting site having hosts assigned links to list of hosts now --- .werks/2964 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 13 +++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.werks/2964 b/.werks/2964 new file mode 100644 index 0000000..a99279c --- /dev/null +++ b/.werks/2964 @@ -0,0 +1,9 @@ +Title: Deleting site having hosts assigned links to list of hosts now +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1453879900 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 0895767..be46edd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -299,6 +299,7 @@ * 2943 FIX: Preventing issues with password completion of browsers on user and profile edit pages * 2831 FIX: Removing a previously set custom attribute for a contact did not work as intented... * 2973 FIX: showing subfolder info in WATO if there are more than four groups + * 2964 FIX: Deleting site having hosts assigned links to list of hosts now Notifications: * 2811 Mail notifications: Now able to add Host/Service Notes Url... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 10a7745..76f7d9b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8805,9 +8805,18 @@ def mode_sites(phase): if is_distributed(test_sites): # Make sure that site is not being used by hosts and folders if delid in Folder.root_folder().all_site_ids(): + search_url = html.makeactionuri([ + ("_change_site", "1"), + ("host_search_site", delid), + ("host_search", "1"), + ("folder", ""), + ("mode", "search"), + ("filled_in", "edit_host"), + ]) raise MKUserError(None, - _("You cannot delete this connection. " - "It has folders/hosts assigned to it.")) + _("You cannot delete this connection. It has folders/hosts " + "assigned to it. You can use the <a href=\"%s\">host " + "search</a> to get a list of the hosts.") % search_url) c = wato_confirm(_("Confirm deletion of site %s" % delid), _("Do you really want to delete the connection to the site %s?" % delid))

8 years, 7 months

#2965 FIX Fixed HTML code shown in filter selection of favorite hosts filter

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a7eb9beadee52df660f86dce9745fcf91d4840d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a7eb9beadee52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 10:26:33 2016 +0100 #2965 FIX Fixed HTML code shown in filter selection of favorite hosts filter --- .werks/2965 | 9 +++++++++ ChangeLog | 1 + web/htdocs/views.py | 7 +------ web/htdocs/visuals.py | 20 +++++++++++++------- web/plugins/visuals/filters.py | 2 +- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.werks/2965 b/.werks/2965 new file mode 100644 index 0000000..390db86 --- /dev/null +++ b/.werks/2965 @@ -0,0 +1,9 @@ +Title: Fixed HTML code shown in filter selection of favorite hosts filter +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1453886763 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index be46edd..3f059b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -265,6 +265,7 @@ * 2946 FIX: LDAP: User created during login does not trigger full user synchronisation anymore... * 2947 FIX: LDAP: Simplified automatic sync logic... * 2956 FIX: Fixed exception on "Availability of Single-Host Aggregations view + * 2965 FIX: Fixed HTML code shown in filter selection of favorite hosts filter WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 5f8a1e3..b4c5f69 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -714,12 +714,7 @@ def show_filter(f): f.display() html.write('</div>') else: - html.write('<div class="floatfilter %s">' % (f.double_height() and "double" or "single")) - html.write('<div class=legend>%s</div>' % f.title) - html.write('<div class=content>') - f.display() - html.write("</div>") - html.write("</div>") + visuals.show_filter(f) def show_filter_form(is_open, filters): diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index ac9da08..beb9b8a 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -813,6 +813,16 @@ def declare_filter(sort_index, f, comment = None): f.comment = comment f.sort_index = sort_index + +def show_filter(f): + html.write('<div class="floatfilter %s">' % (f.double_height() and "double" or "single")) + html.write('<div class=legend>%s</div>' % html.attrencode(f.title)) + html.write('<div class=content>') + f.display() + html.write("</div>") + html.write("</div>") + + # Base class for all filters # name: The unique id of that filter. This id is e.g. used in the # persisted view configuration @@ -1084,7 +1094,8 @@ class VisualFilterList(ListOfMultiple): self._filters[fname] = fspecs[fname]._filter # Convert to list and sort them! - fspecs = sorted(fspecs.items(), key=lambda x: (x[1]._filter.sort_index, x[1].title())) + fspecs = sorted(fspecs.items(), + key=lambda x: (x[1]._filter.sort_index, x[1].title())) kwargs.setdefault('title', _('Filters')) kwargs.setdefault('add_label', _('Add filter')) @@ -1118,12 +1129,7 @@ class VisualFilter(ValueSpec): self._filter.set_value(value) # A filter can not be used twice on a page, because the varprefix is not used - html.write('<div class="floatfilter %s">' % (self._filter.double_height() and "double" or "single")) - html.write('<div class=legend>%s</div>' % self._filter.title) - html.write('<div class=content>') - self._filter.display() - html.write("</div>") - html.write("</div>") + show_filter(self._filter) def value_to_text(self, value): # FIXME: optimize. Needed? diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 1a122c1..82e350f 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1058,7 +1058,7 @@ class FilterStarred(FilterTristate): icon = '<img class="icon inline" src="images/icon_starred.png"> ' FilterTristate.__init__(self, name = what + "_favorites", - title = icon + (what == "host" and _("Favorite Hosts") or _("Favorite Services")), + title = HTML(icon + (what == "host" and _("Favorite Hosts") or _("Favorite Services"))), info = what, column = what + "_favorite", # Column, not used deflt = -1,

8 years, 7 months

ibm_svc_array: fixed incompatibility with newer firmware versions

by Sebastian Herbord

Module: check_mk Branch: master Commit: 2dcbcad807ce357321162c4ba31eee90a7981965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dcbcad807ce35… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jan 27 08:47:20 2016 +0100 ibm_svc_array: fixed incompatibility with newer firmware versions --- checks/ibm_svc_array | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ibm_svc_array b/checks/ibm_svc_array index 225d851..c2d0572 100644 --- a/checks/ibm_svc_array +++ b/checks/ibm_svc_array @@ -34,12 +34,12 @@ def inventory_ibm_svc_array(info): for line in info: - if len(line) in (11, 12): + if len(line) > 10: yield line[0], None def check_ibm_svc_array(item, _no_params, info): for line in info: - if len(line) in (11, 12) and line[0] == item: + if len(line) > 10 and line[0] == item: raid_status = line[6] raid_level = line[7] tier = line[10]

8 years, 7 months

Remove clang-analyzer results in clean target.

by Sven Panne

Module: check_mk Branch: master Commit: 535a7e1aa27178bfbf3d68275eaa877d05fdc80e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=535a7e1aa27178… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 27 08:24:58 2016 +0100 Remove clang-analyzer results in clean target. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b537777..1ba1f5f 100644 --- a/Makefile +++ b/Makefile @@ -245,7 +245,7 @@ minify-js: fi clean: - rm -rf api dist.tmp rpm.topdir *.rpm *.deb *.exe \ + rm -rf api clang-analyzer dist.tmp rpm.topdir *.rpm *.deb *.exe \ mkeventd-*.tar.gz mk-livestatus-*.tar.gz \ $(NAME)-*.tar.gz *~ counters autochecks \ precompiled cache web/htdocs/js/*_min.js

8 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016