Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

Retinafied help button, cleaned up help button rendering code

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ca16dace4c234d6c1306aed099eacce10b063cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ca16dace4c234… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 09:21:52 2015 +0100 Retinafied help button, cleaned up help button rendering code --- web/htdocs/htmllib.py | 7 ++++--- web/htdocs/images/helpbutton_active.png | Bin 1104 -> 0 bytes web/htdocs/images/helpbutton_active_hi.png | Bin 1153 -> 0 bytes web/htdocs/images/helpbutton_passive.png | Bin 991 -> 0 bytes web/htdocs/images/helpbutton_passive_hi.png | Bin 935 -> 0 bytes web/htdocs/images/icon_help.png | Bin 0 -> 3728 bytes web/htdocs/js/checkmk.js | 30 +++++++++++++++------------ web/htdocs/pages.css | 24 ++++++++++----------- 8 files changed, 32 insertions(+), 29 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 15d506d..1e36f51 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -923,8 +923,9 @@ class html: def top_heading_right(self): cssclass = self.help_visible and "active" or "passive" - self.write('<a id=helpbutton class=%s href="#" onclick="help_toggle();" style="display: none"></a>' % - cssclass) + self.icon_button(None, _("Toggle context help texts"), "help", id="helpbutton", + onclick="toggle_help()", style="display:none", ty="icon", cssclass=cssclass) + self.write("%s</td></tr></table>" % _("<a href=\"http://mathias-kettner.de\"><img src=\"images/logo_mk_small.png\"/></a>")) self.write("<hr class=header>\n") @@ -968,7 +969,7 @@ class html: def body_end(self): if self.have_help: - self.javascript("help_enable();") + self.javascript("enable_help();") if self.keybindings_enabled and self.keybindings: self.javascript("var keybindings = %r;\n" "document.body.onkeydown = keybindings_keydown;\n" diff --git a/web/htdocs/images/helpbutton_active.png b/web/htdocs/images/helpbutton_active.png deleted file mode 100644 index 53b6df8..0000000 Binary files a/web/htdocs/images/helpbutton_active.png and /dev/null differ diff --git a/web/htdocs/images/helpbutton_active_hi.png b/web/htdocs/images/helpbutton_active_hi.png deleted file mode 100644 index b929f1e..0000000 Binary files a/web/htdocs/images/helpbutton_active_hi.png and /dev/null differ diff --git a/web/htdocs/images/helpbutton_passive.png b/web/htdocs/images/helpbutton_passive.png deleted file mode 100644 index 266cb54..0000000 Binary files a/web/htdocs/images/helpbutton_passive.png and /dev/null differ diff --git a/web/htdocs/images/helpbutton_passive_hi.png b/web/htdocs/images/helpbutton_passive_hi.png deleted file mode 100644 index e79df53..0000000 Binary files a/web/htdocs/images/helpbutton_passive_hi.png and /dev/null differ diff --git a/web/htdocs/images/icon_help.png b/web/htdocs/images/icon_help.png new file mode 100644 index 0000000..d4851ca Binary files /dev/null and b/web/htdocs/images/icon_help.png differ diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 342b182..efd7095 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2070,24 +2070,28 @@ function vs_listofmultiple_init(varprefix) { //# | | //# '--------------------------------------------------------------------' -function help_enable() { - var aHelp = document.getElementById('helpbutton'); - aHelp.style.display = "inline-block"; +function enable_help() +{ + var help = document.getElementById('helpbutton'); + help.style.display = "inline-block"; } -function help_toggle() { - var aHelp = document.getElementById('helpbutton'); - if (aHelp.className == "active") { - aHelp.className = "passive"; - help_switch(false); - } - else { - aHelp.className = "active"; - help_switch(true); +function toggle_help() +{ + var help = document.getElementById('helpbutton'); + if (has_class(help, "active")) { + remove_class(help, "active"); + add_class(help, "passive"); + switch_help(false); + } else { + add_class(help, "active"); + remove_class(help, "passive"); + switch_help(true); } } -function help_switch(how) { +function switch_help(how) +{ // recursive scan for all div class=help elements var helpdivs = document.getElementsByClassName('help'); for (var i=0; i<helpdivs.length; i++) { diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 271d841..6a646c7 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -889,22 +889,20 @@ div.togglebutton.checkbox.off { opacity: 0.5; filter: alpha(opacity=50); } a#helpbutton { width: 19px; height: 19px; - margin: 0px 5px; + margin: 0 5px; position: relative; - top: 2px; - left: 3px; -} -a#helpbutton.active:hover { - background-image: url("images/helpbutton_active_hi.png"); -} -a#helpbutton.passive:hover { - background-image: url("images/helpbutton_passive_hi.png"); -} -a#helpbutton.active { - background-image: url("images/helpbutton_active.png"); + top: -8px; + left: -2px; } + a#helpbutton.passive { - background-image: url("images/helpbutton_passive.png"); + filter: grayscale(100%); + -webkit-filter: grayscale(100%); + -moz-filter: grayscale(100%); + -ms-filter: grayscale(100%); + -o-filter: grayscale(100%); + filter: gray; + -webkit-filter: grayscale(1); } div.help {

8 years, 11 months

Changed default bookmark icon

by Lars Michelsen

Module: check_mk Branch: master Commit: bd5cec12a881d21692e293df434dc3e7942c878e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd5cec12a881d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 09:41:36 2015 +0100 Changed default bookmark icon --- web/plugins/sidebar/shipped.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index e3b7b7d..9a5fa8f 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1215,8 +1215,9 @@ function add_bookmark() { for bookmark in bookmarks: icon = bookmark["icon"] if not icon: - icon = "kreversi" + icon = "kdict" + # FIXME: Use standard rendering functions linktext = '<img class=iconlink src="images/icons/%s.png">%s' % \ (html.attrencode(icon), html.attrencode(bookmark["title"])) html.write('<a target=main class="iconlink link" href="%s">%s</a><br>' % \ @@ -1225,8 +1226,7 @@ function add_bookmark() { html.end_foldable_container() begin_footnote_links() - html.write("<a href=\"javascript:void(0)\" " - "onclick=\"add_bookmark()\">%s</a>" % _('Add Bookmark')) + html.write(link(_("Add Bookmark"), "javascript:void(0)", onclick="add_bookmark()")) html.write(link(_("EDIT"), "bookmark_lists.py")) end_footnote_links()

8 years, 11 months

#2716 FIX Fixed error reporting on disabled checks page in case of broken man pages

by Lars Michelsen

Module: check_mk Branch: master Commit: 9b51d2ce2964209e44a7c6d8421a3017ddf31271 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b51d2ce296420… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 12:36:53 2015 +0100 #2716 FIX Fixed error reporting on disabled checks page in case of broken man pages --- .werks/2716 | 10 ++++++++++ ChangeLog | 1 + modules/automation.py | 25 +++++++++++++++---------- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.werks/2716 b/.werks/2716 new file mode 100644 index 0000000..90850b0 --- /dev/null +++ b/.werks/2716 @@ -0,0 +1,10 @@ +Title: Fixed error reporting on disabled checks page in case of broken man pages +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446118582 + + diff --git a/ChangeLog b/ChangeLog index 12497f6..fa5cf59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now * 2715 FIX: Fixed visibility of BI aggregations in editor + * 2716 FIX: Fixed error reporting on disabled checks page in case of broken man pages HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... diff --git a/modules/automation.py b/modules/automation.py index 778816f..d9b1223 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -507,16 +507,21 @@ def automation_get_check_information(): checks = {} for check_type, check in check_info.items(): - manfile = manuals.get(check_type) - if manfile: - title = file(manfile).readline().strip().split(":", 1)[1].strip() - else: - title = check_type - checks[check_type] = { "title" : title } - if check["group"]: - checks[check_type]["group"] = check["group"] - checks[check_type]["service_description"] = check.get("service_description","%s") - checks[check_type]["snmp"] = check_uses_snmp(check_type) + try: + manfile = manuals.get(check_type) + if manfile: + title = file(manfile).readline().strip().split(":", 1)[1].strip() + else: + title = check_type + checks[check_type] = { "title" : title } + if check["group"]: + checks[check_type]["group"] = check["group"] + checks[check_type]["service_description"] = check.get("service_description","%s") + checks[check_type]["snmp"] = check_uses_snmp(check_type) + except Exception, e: + if opt_debug: + raise + raise MKAutomationError("Failed to parse man page '%s': %s" % (check_type, e)) return checks

8 years, 11 months

Fixed hover effect of icon buttons in sidebar

by Lars Michelsen

Module: check_mk Branch: master Commit: a84ef797a20e92bcf7c199f911d7f0d90e8fdfb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a84ef797a20e92… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 12:42:05 2015 +0100 Fixed hover effect of icon buttons in sidebar --- web/htdocs/sidebar.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index c9cbf93..b395f90 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -355,6 +355,11 @@ div.snapin img.iconbutton { height: 10px; } +img.iconbutton:hover { + opacity: 0.5; + filter: alpha(opacity=50); /* For IE8 and earlier */ +} + div.snapin img.iconbutton.bookmark { width: 16px; height: 16px;

8 years, 11 months

Removed some unused images

by Lars Michelsen

Module: check_mk Branch: master Commit: c989954d71bebe3f2aa1982a816af4906894cce3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c989954d71bebe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 12:17:18 2015 +0100 Removed some unused images --- web/htdocs/images/bg_flapping.png | Bin 260 -> 0 bytes web/htdocs/images/button_checkbox.png | Bin 684 -> 0 bytes web/htdocs/images/button_checkbox_down.png | Bin 855 -> 0 bytes web/htdocs/images/button_checkbox_off.png | Bin 847 -> 0 bytes web/htdocs/images/metanav_30.png | Bin 149 -> 0 bytes web/htdocs/images/metanav_30_hi.png | Bin 170 -> 0 bytes web/htdocs/images/metanav_40.png | Bin 156 -> 0 bytes web/htdocs/images/metanav_40_hi.png | Bin 177 -> 0 bytes web/htdocs/images/metanav_button.png | Bin 189 -> 0 bytes web/htdocs/images/metanav_button_hi.png | Bin 191 -> 0 bytes web/htdocs/images/sidebar_logout_hi.png | Bin 672 -> 0 bytes web/htdocs/images/sidebar_logout_lo.png | Bin 699 -> 0 bytes web/htdocs/images/sidebar_profile_hi.png | Bin 721 -> 0 bytes web/htdocs/images/sidebar_profile_lo.png | Bin 780 -> 0 bytes web/htdocs/views.css | 6 ------ 15 files changed, 6 deletions(-) diff --git a/web/htdocs/images/bg_flapping.png b/web/htdocs/images/bg_flapping.png deleted file mode 100644 index 4495a01..0000000 Binary files a/web/htdocs/images/bg_flapping.png and /dev/null differ diff --git a/web/htdocs/images/button_checkbox.png b/web/htdocs/images/button_checkbox.png deleted file mode 100644 index 2491400..0000000 Binary files a/web/htdocs/images/button_checkbox.png and /dev/null differ diff --git a/web/htdocs/images/button_checkbox_down.png b/web/htdocs/images/button_checkbox_down.png deleted file mode 100644 index 64a6518..0000000 Binary files a/web/htdocs/images/button_checkbox_down.png and /dev/null differ diff --git a/web/htdocs/images/button_checkbox_off.png b/web/htdocs/images/button_checkbox_off.png deleted file mode 100644 index 68b5180..0000000 Binary files a/web/htdocs/images/button_checkbox_off.png and /dev/null differ diff --git a/web/htdocs/images/metanav_30.png b/web/htdocs/images/metanav_30.png deleted file mode 100644 index 589e703..0000000 Binary files a/web/htdocs/images/metanav_30.png and /dev/null differ diff --git a/web/htdocs/images/metanav_30_hi.png b/web/htdocs/images/metanav_30_hi.png deleted file mode 100644 index c6e37d5..0000000 Binary files a/web/htdocs/images/metanav_30_hi.png and /dev/null differ diff --git a/web/htdocs/images/metanav_40.png b/web/htdocs/images/metanav_40.png deleted file mode 100644 index 2ed2681..0000000 Binary files a/web/htdocs/images/metanav_40.png and /dev/null differ diff --git a/web/htdocs/images/metanav_40_hi.png b/web/htdocs/images/metanav_40_hi.png deleted file mode 100644 index 5a3c0ac..0000000 Binary files a/web/htdocs/images/metanav_40_hi.png and /dev/null differ diff --git a/web/htdocs/images/metanav_button.png b/web/htdocs/images/metanav_button.png deleted file mode 100644 index 2d1f1c9..0000000 Binary files a/web/htdocs/images/metanav_button.png and /dev/null differ diff --git a/web/htdocs/images/metanav_button_hi.png b/web/htdocs/images/metanav_button_hi.png deleted file mode 100644 index efdfd66..0000000 Binary files a/web/htdocs/images/metanav_button_hi.png and /dev/null differ diff --git a/web/htdocs/images/sidebar_logout_hi.png b/web/htdocs/images/sidebar_logout_hi.png deleted file mode 100644 index d3600f6..0000000 Binary files a/web/htdocs/images/sidebar_logout_hi.png and /dev/null differ diff --git a/web/htdocs/images/sidebar_logout_lo.png b/web/htdocs/images/sidebar_logout_lo.png deleted file mode 100644 index 5198e10..0000000 Binary files a/web/htdocs/images/sidebar_logout_lo.png and /dev/null differ diff --git a/web/htdocs/images/sidebar_profile_hi.png b/web/htdocs/images/sidebar_profile_hi.png deleted file mode 100644 index 1e8e13f..0000000 Binary files a/web/htdocs/images/sidebar_profile_hi.png and /dev/null differ diff --git a/web/htdocs/images/sidebar_profile_lo.png b/web/htdocs/images/sidebar_profile_lo.png deleted file mode 100644 index 0782929..0000000 Binary files a/web/htdocs/images/sidebar_profile_lo.png and /dev/null differ diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 884dd5a..f30ab00 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -202,11 +202,9 @@ div.optiondial.refresh { } div.optiondial.num_columns { background-image: url("images/dial_num_columns.png"); } -/* div.optiondial.num_columns:hover { background-image: url("images/dial_num_columns_hi.png"); } */ div.optiondial.num_columns.off { background-image: url("images/dial_num_columns_off.png"); } div.optiondial.refresh { background-image: url("images/dial_refresh.png"); } -/* div.optiondial.refresh:hover { background-image: url("images/dial_refresh_hi.png"); } */ div.optiondial.refresh.off { background-image: url("images/dial_refresh_off.png"); } div.view_form { @@ -279,7 +277,6 @@ table.tiled td { } .tile.sstate0, .tile.hhstate0 { border-color: #0f0; - /* background-color: #afa; */ } .tile.sstate1 { border-color: #ff0; @@ -527,8 +524,6 @@ table.data.availability tr.summary td { } table.data td.flapping, table.timeline td.flapping, div.avlegend.timeline div.state.flapping { - /* background-image: url("images/bg_flapping.png"); - background-repeat: repeat; */ background-color: #f0f; } @@ -804,4 +799,3 @@ td.if_state.if_not_available { color: black; background-color: #cccccc; } -

8 years, 11 months

Fixed filters set icon

by Lars Michelsen

Module: check_mk Branch: master Commit: 6fe8868599c764a10408147941eea7fe15c48c79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fe8868599c764… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 15:24:55 2015 +0100 Fixed filters set icon --- web/htdocs/images/{icon_filter_set.png => icon_filters_set.png} | Bin 2608 -> 2608 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_filter_set.png b/web/htdocs/images/icon_filters_set.png similarity index 100% rename from web/htdocs/images/icon_filter_set.png rename to web/htdocs/images/icon_filters_set.png

8 years, 11 months

Unified sidebar snapin titles

by Lars Michelsen

Module: check_mk Branch: master Commit: 24442ada466e4d5467a3622b3ff17905a6b7fb40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24442ada466e4d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 15:18:02 2015 +0100 Unified sidebar snapin titles --- web/plugins/sidebar/shipped.py | 48 ++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 9a5fa8f..2d663a1 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -48,7 +48,8 @@ def render_about(): sidebar_snapins["about"] = { "title" : _("About Check_MK"), - "description" : _("Version information and Links to Documentation, Homepage and Download of Check_MK"), + "description" : _("Version information and Links to Documentation, " + "Homepage and Download of Check_MK"), "render" : render_about, "allowed" : [ "admin", "user", "guest" ], } @@ -212,14 +213,14 @@ def render_groups(what): html.write('</ul>') sidebar_snapins["hostgroups"] = { - "title" : _("Hostgroups"), + "title" : _("Host Groups"), "description" : _("Directs links to all host groups"), "render" : lambda: render_groups("host"), "restart": True, "allowed" : [ "user", "admin", "guest" ] } sidebar_snapins["servicegroups"] = { - "title" : _("Servicegroups"), + "title" : _("Service Groups"), "description" : _("Direct links to all service groups"), "render" : lambda: render_groups("service"), "restart": True, @@ -305,8 +306,9 @@ snapin_allhosts_styles = """ """ sidebar_snapins["hosts"] = { - "title" : _("All hosts"), - "description" : _("A summary state of each host with a link to the view showing its services"), + "title" : _("All Hosts"), + "description" : _("A summary state of each host with a link to the view " + "showing its services"), "render" : lambda: render_hosts("hosts"), "allowed" : [ "user", "admin", "guest" ], "refresh" : True, @@ -314,8 +316,9 @@ sidebar_snapins["hosts"] = { } sidebar_snapins["summary_hosts"] = { - "title" : _("Summary hosts"), - "description" : _("A summary state of all summary hosts (summary hosts hold aggregated service states and are a feature of Check_MK)"), + "title" : _("Summary Hosts"), + "description" : _("A summary state of all summary hosts (summary hosts hold " + "aggregated service states and are a feature of Check_MK)"), "render" : lambda: render_hosts("summary"), "allowed" : [ "user", "admin", "guest" ], "refresh" : True, @@ -323,8 +326,9 @@ sidebar_snapins["summary_hosts"] = { } sidebar_snapins["problem_hosts"] = { - "title" : _("Problem hosts"), - "description" : _("A summary state of all hosts that have a problem, with links to problems of those hosts"), + "title" : _("Problem Hosts"), + "description" : _("A summary state of all hosts that have a problem, with " + "links to problems of those hosts"), "render" : lambda: render_hosts("problems"), "allowed" : [ "user", "admin", "guest" ], "refresh" : True, @@ -471,8 +475,9 @@ def render_sitestatus(): sidebar_snapins["sitestatus"] = { - "title" : _("Site status"), - "description" : _("Connection state of each site and button for enabling and disabling the site connection"), + "title" : _("Site Status"), + "description" : _("Connection state of each site and button for enabling " + "and disabling the site connection"), "render" : render_sitestatus, "allowed" : [ "user", "admin" ], "refresh" : True, @@ -657,7 +662,7 @@ def render_performance(): html.write("</table>\n") sidebar_snapins["performance"] = { - "title" : _("Server performance"), + "title" : _("Server Performance"), "description" : _("Live monitor of the overall performance of all monitoring servers"), "refresh" : True, "render" : render_performance, @@ -838,7 +843,7 @@ def render_current_time(): html.write("<div class=time>%s</div>" % time.strftime("%H:%M")) sidebar_snapins["time"] = { - "title" : _("Server time"), + "title" : _("Server Time"), "description" : _("A large clock showing the current time of the web server"), "refresh" : True, "render" : render_current_time, @@ -921,7 +926,8 @@ def render_nagios(): sidebar_snapins["nagios_legacy"] = { "title" : _("Old Nagios GUI"), - "description" : _("The classical sidebar of Nagios 3.2.0 with links to your local Nagios instance (no multi site support)"), + "description" : _("The classical sidebar of Nagios 3.2.0 with links to " + "your local Nagios instance (no multi site support)"), "render" : render_nagios, "allowed" : [ "user", "admin", "guest", ], } @@ -976,8 +982,9 @@ def render_master_control(): html.end_foldable_container() sidebar_snapins["master_control"] = { - "title" : _("Master control"), - "description" : _("Buttons for switching globally states such as enabling checks and notifications"), + "title" : _("Master Control"), + "description" : _("Buttons for switching globally states such as enabling " + "checks and notifications"), "render" : render_master_control, "allowed" : [ "admin", ], "styles" : """ @@ -1346,7 +1353,9 @@ def render_custom_links(): sidebar_snapins["custom_links"] = { "title" : _("Custom Links"), - "description" : _("This snapin contains custom links which can be configured via the configuration variable <tt>custom_links</tt> in <tt>multisite.mk</tt>"), + "description" : _("This snapin contains custom links which can be " + "configured via the configuration variable " + "<tt>custom_links</tt> in <tt>multisite.mk</tt>"), "render" : render_custom_links, "allowed" : [ "user", "admin", "guest" ], "styles" : """ @@ -1807,8 +1816,9 @@ def render_tag_tree(): sidebar_snapins["tag_tree"] = { "title" : _("Virtual Host Tree"), - "description" : _("This snapin shows tree views of your hosts based on their tag classifications. You " - "can configure which tags to use in your global settings of Multisite."), + "description" : _("This snapin shows tree views of your hosts based on their tag " + "classifications. You can configure which tags to use in your " + "global settings of Multisite."), "render" : render_tag_tree, "refresh" : True, "allowed" : [ "admin", "user", "guest" ],

8 years, 11 months

Fixed agent output downloading

by Lars Michelsen

Module: check_mk Branch: master Commit: dc5a372cb6464c2e1c4d754ad82b1682791c6a1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc5a372cb6464c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 14:31:23 2015 +0100 Fixed agent output downloading --- modules/automation.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index d9b1223..6b8f8e3 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1212,21 +1212,21 @@ def automation_bake_agents(): def automation_get_agent_output(args): hostname, ty = args - if ty == "agent": - return get_plain_hostinfo(hostname) + success = True + output = "" + agent_data = "" - else: - path = snmpwalks_dir + "/" + hostname - success = True - output = "" - agent_data = "" - try: + try: + if ty == "agent": + agent_data = get_plain_hostinfo(hostname) + else: + path = snmpwalks_dir + "/" + hostname do_snmpwalk_on(hostname, snmpwalks_dir + "/" + hostname) agent_data = file(snmpwalks_dir + "/" + hostname).read() - except Exception, e: - success = False - output = "Error walking %s: %s\n" % (hostname, e) - if opt_debug: - raise + except Exception, e: + success = False + output = "Failed to fetch data from %s: %s\n" % (hostname, e) + if opt_debug: + raise - return success, output, agent_data + return success, output, agent_data

8 years, 11 months

Updated bug entries #2320

by Lars Michelsen

Module: check_mk Branch: master Commit: 250fde17924dc97928a6e65749866266b1fa85fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=250fde17924dc9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 16:16:06 2015 +0100 Updated bug entries #2320 --- .bugs/2320 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2320 b/.bugs/2320 new file mode 100644 index 0000000..9bb2ea4 --- /dev/null +++ b/.bugs/2320 @@ -0,0 +1,9 @@ +Title: Interval configured in "regular service discovery" is handled differently in cores +Component: core +State: open +Date: 2015-10-29 16:07:59 +Targetversion: 1.2.6 +Class: bug + +The global settings interval is used only as normal interval on cmc(?) and +e.g. with nagios core this is handled differently.

8 years, 11 months

Fixed sidebar search hover effect

by Lars Michelsen

Module: check_mk Branch: master Commit: e9b29c071b7b679be5049468186370f687742570 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9b29c071b7b67… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 14:17:02 2015 +0100 Fixed sidebar search hover effect --- web/plugins/sidebar/search.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index a1475e1..9f1a677 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -58,6 +58,19 @@ sidebar_snapins["search"] = { z-index:100; } +#mk_side_search img.iconbutton { + opacity: 1; + filter: alpha(opacity=100); /* For IE8 and earlier */ +} + +#mk_side_search img.iconbutton:hover { + filter: grayscale(20%); + -webkit-filter: grayscale(20%); + -moz-filter: grayscale(20%); + -ms-filter: grayscale(20%); + -o-filter: grayscale(20%); +} + #mk_side_search input { margin: 0; padding: 0px 5px;

8 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015