Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 4f045bf724cd95bd0a078dbd74357bbc3d303f8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f045bf724cd95… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 28 10:33:56 2015 +0100 Removed a few TODOs. --- livestatus/src/TableStateHistory.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 9dbc882..d497e2a 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -374,7 +374,6 @@ void TableStateHistory::answerQuery(Query *query) case LOG_VERSION: case ACKNOWLEDGE_ALERT_HOST: case ACKNOWLEDGE_ALERT_SERVICE: - // TODO: Check if a no-op is really the right thing to do here. break; case ALERT_SERVICE: case STATE_SERVICE: @@ -383,7 +382,7 @@ void TableStateHistory::answerQuery(Query *query) case FLAPPING_SERVICE: key = entry->_service; is_service = true; - // TODO: Do we really want to fall through? If yes, add a comment, otherwise fix it. + // fall-though case ALERT_HOST: case STATE_HOST: case STATE_HOST_INITIAL: @@ -705,7 +704,6 @@ int TableStateHistory::updateHostServiceState(Query *query, const LogEntry *entr case LOG_INITIAL_STATES: case ACKNOWLEDGE_ALERT_HOST: case ACKNOWLEDGE_ALERT_SERVICE: - // TODO: Check if a no-op is really the right thing to do here. break; case STATE_HOST: case STATE_HOST_INITIAL:

8 years, 8 months

Fixed typo

by Sven Panne

Module: check_mk Branch: master Commit: 96e12dfd696280ddbc976f586989d0583b6dd606 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96e12dfd696280… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 28 10:34:53 2015 +0100 Fixed typo --- livestatus/src/TableStateHistory.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index d497e2a..e4efdbd 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -382,7 +382,7 @@ void TableStateHistory::answerQuery(Query *query) case FLAPPING_SERVICE: key = entry->_service; is_service = true; - // fall-though + // fall-through case ALERT_HOST: case STATE_HOST: case STATE_HOST_INITIAL:

8 years, 8 months

winperf_if: fixed warning about dhcp in werk #2705 didn' t work on some localized windows versions

by Sebastian Herbord

Module: check_mk Branch: master Commit: 910956e51df152a1a73bd7ca90edf6c92ff62474 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=910956e51df152… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Oct 28 10:29:34 2015 +0100 winperf_if: fixed warning about dhcp in werk #2705 didn't work on some localized windows versions --- agents/windows/plugins/mk_dhcp_enabled.bat | 4 ++-- checks/winperf_if | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/agents/windows/plugins/mk_dhcp_enabled.bat b/agents/windows/plugins/mk_dhcp_enabled.bat index 4b4d2e3..0a64918 100644 --- a/agents/windows/plugins/mk_dhcp_enabled.bat +++ b/agents/windows/plugins/mk_dhcp_enabled.bat @@ -1,3 +1,3 @@ @echo off -echo ^<^<^<dhcp:sep^(44^)^>^>^> -wmic path Win32_NetworkAdapterConfiguration get Description, dhcpenabled /format:csv +echo ^<^<^<dhcp^>^>^> +wmic path Win32_NetworkAdapterConfiguration get Description, dhcpenabled diff --git a/checks/winperf_if b/checks/winperf_if index 5777404..9843a5f 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -285,6 +285,17 @@ def check_if_dhcp(item, params, info, nic_names, nic_index): header = lines.next() for line in lines: + # wmic is bugged on some windows versions such that we can't use proper csv output, only + # visual tables. Those aren't properly split up by the check_mk parser. + # Try to fix that mess + + # assumption 1: header fields contain no spaces + num_fields = len(header) + # assumption 2: only the leftmost field contains spaces + lm_field = " ".join(line[:(num_fields - 1) * -1]) + + line = [lm_field] + line[(len(line) - num_fields + 1):] + as_dict = dict(zip(header, map(lambda x: x.rstrip(), line))) name = winperf_if_normalize_nic_name(as_dict["Description"], nic_names) idx = nic_index.get(name)

8 years, 8 months

read/write/send/recv/etc. return ssize_t.

by Sven Panne

Module: check_mk Branch: master Commit: 93b191958d38e8b9fcdfce0663562480f25fe919 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93b191958d38e8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 28 10:29:53 2015 +0100 read/write/send/recv/etc. return ssize_t. --- agents/windows/check_mk_agent.cc | 2 +- livestatus/src/HostFileColumn.cc | 2 +- livestatus/src/Logfile.cc | 2 +- livestatus/src/unixcat.c | 8 +++++--- mkeventd/lib/check_mkevents.cc | 5 +++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 6c833f4..7e9a5ba 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3335,7 +3335,7 @@ void output(SOCKET &out, const char *format, ...) if (do_tcp) { while (write_to_socket && !g_should_terminate) { - int result = send(out, outbuffer, len, 0); + ssize_t result = send(out, outbuffer, len, 0); if (result == SOCKET_ERROR) { debug("send() failed"); int error = WSAGetLastError(); diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index b876313..9220914 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -86,7 +86,7 @@ char *HostFileColumn::getBlob(void *data, int *size) return 0; } - int read_bytes = read(fd, buffer, *size); + ssize_t read_bytes = read(fd, buffer, *size); close(fd); if (read_bytes != *size) { logger(LG_WARN, "Cannot read %d from %s", *size, path); diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 1456ecb..86fb5bb 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -298,7 +298,7 @@ char *Logfile::readIntoBuffer(int *size) return 0; } - int r = read(fd, buffer + 1, *size); + ssize_t r = read(fd, buffer + 1, *size); if (r < 0) { logger(LOG_WARNING, "Cannot read %d bytes from %s: %s", *size, _path, strerror(errno)); free(buffer); diff --git a/livestatus/src/unixcat.c b/livestatus/src/unixcat.c index ac67647..15e5e2d 100644 --- a/livestatus/src/unixcat.c +++ b/livestatus/src/unixcat.c @@ -27,6 +27,7 @@ #include <sys/stat.h> #include <sys/un.h> #include <errno.h> +#include <inttypes.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -60,7 +61,7 @@ struct thread_info }; -int read_with_timeout(int from, char *buffer, int size, int us) +ssize_t read_with_timeout(int from, char *buffer, int size, int us) { fd_set fds; FD_ZERO(&fds); @@ -106,11 +107,12 @@ void *copy_thread(void *info) } char *write_pos = buffer; while (r) { - int w = write(to, write_pos, r); + ssize_t w = write(to, write_pos, r); if (w > 0) r -= w; else if (w == 0 && r > 0) { - fprintf(stderr, "Error: Cannot write %d bytes to %d: %s\n", w, to, strerror(errno)); + fprintf(stderr, "Error: Cannot write %" PRIdMAX " bytes to %d: %s\n", + (intmax_t)w, to, strerror(errno)); break; } } diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index c9bcfeb..67a8b01 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -213,13 +213,14 @@ int main(int argc, char** argv) } // Send message - int length = write(sock, query_message.c_str(), query_message.length()); + ssize_t length = write(sock, query_message.c_str(), query_message.length()); + (void)length; // Make GCC happy // Get response char response_chunk[4096]; memset(response_chunk, 0, sizeof(response_chunk)); stringstream response_stream; - int read_length; + ssize_t read_length; while (0 < (read_length = read(sock, response_chunk, sizeof(response_chunk)))) { // replace binary 0 in response with space

8 years, 8 months

Make more recent autotools happy.

by Sven Panne

Module: check_mk Branch: master Commit: 863302f87bbba3fed969bdea35648ef974a56a5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=863302f87bbba3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 28 09:31:13 2015 +0100 Make more recent autotools happy. --- livestatus/configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 8718889..8aac38f 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -38,6 +38,8 @@ AC_PROG_CXX AC_PROG_CC AC_PROG_RANLIB AM_CONDITIONAL([HAVE_DIET], [which diet >/dev/null 2>&1]) +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it. :-P +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # Checks for libraries. AC_CHECK_LIB(socket, socket)

8 years, 8 months

Added ar-lib for now, we have to re-think how to handle generated files, anyway.

by Sven Panne

Module: check_mk Branch: master Commit: ba75626861074d3c1d595274e72c9617c3ea0628 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba75626861074d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 28 09:33:36 2015 +0100 Added ar-lib for now, we have to re-think how to handle generated files, anyway. --- livestatus/ar-lib | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) diff --git a/livestatus/ar-lib b/livestatus/ar-lib new file mode 100755 index 0000000..463b9ec --- /dev/null +++ b/livestatus/ar-lib @@ -0,0 +1,270 @@ +#! /bin/sh +# Wrapper for Microsoft lib.exe + +me=ar-lib +scriptversion=2012-03-01.08; # UTC + +# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Written by Peter Rosin <peda(a)lysator.liu.se>. +# +# This program 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; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake(a)gnu.org> or send patches to +# <automake-patches(a)gnu.org>. + + +# func_error message +func_error () +{ + echo "$me: $1" 1>&2 + exit 1 +} + +file_conv= + +# func_file_conv build_file +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv in + mingw) + file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` + ;; + cygwin) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_at_file at_file operation archive +# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE +# for each of them. +# When interpreting the content of the @FILE, do NOT use func_file_conv, +# since the user would need to supply preconverted file names to +# binutils ar, at least for MinGW. +func_at_file () +{ + operation=$2 + archive=$3 + at_file_contents=`cat "$1"` + eval set x "$at_file_contents" + shift + + for member + do + $AR -NOLOGO $operation:"$member" "$archive" || exit $? + done +} + +case $1 in + '') + func_error "no command. Try '$0 --help' for more information." + ;; + -h | --h*) + cat <<EOF +Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...] + +Members may be specified in a file named with @FILE. +EOF + exit $? + ;; + -v | --v*) + echo "$me, version $scriptversion" + exit $? + ;; +esac + +if test $# -lt 3; then + func_error "you must specify a program, an action and an archive" +fi + +AR=$1 +shift +while : +do + if test $# -lt 2; then + func_error "you must specify a program, an action and an archive" + fi + case $1 in + -lib | -LIB \ + | -ltcg | -LTCG \ + | -machine* | -MACHINE* \ + | -subsystem* | -SUBSYSTEM* \ + | -verbose | -VERBOSE \ + | -wx* | -WX* ) + AR="$AR $1" + shift + ;; + *) + action=$1 + shift + break + ;; + esac +done +orig_archive=$1 +shift +func_file_conv "$orig_archive" +archive=$file + +# strip leading dash in $action +action=${action#-} + +delete= +extract= +list= +quick= +replace= +index= +create= + +while test -n "$action" +do + case $action in + d*) delete=yes ;; + x*) extract=yes ;; + t*) list=yes ;; + q*) quick=yes ;; + r*) replace=yes ;; + s*) index=yes ;; + S*) ;; # the index is always updated implicitly + c*) create=yes ;; + u*) ;; # TODO: don't ignore the update modifier + v*) ;; # TODO: don't ignore the verbose modifier + *) + func_error "unknown action specified" + ;; + esac + action=${action#?} +done + +case $delete$extract$list$quick$replace,$index in + yes,* | ,yes) + ;; + yesyes*) + func_error "more than one action specified" + ;; + *) + func_error "no action specified" + ;; +esac + +if test -n "$delete"; then + if test ! -f "$orig_archive"; then + func_error "archive not found" + fi + for member + do + case $1 in + @*) + func_at_file "${1#@}" -REMOVE "$archive" + ;; + *) + func_file_conv "$1" + $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $? + ;; + esac + done + +elif test -n "$extract"; then + if test ! -f "$orig_archive"; then + func_error "archive not found" + fi + if test $# -gt 0; then + for member + do + case $1 in + @*) + func_at_file "${1#@}" -EXTRACT "$archive" + ;; + *) + func_file_conv "$1" + $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $? + ;; + esac + done + else + $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done + fi + +elif test -n "$quick$replace"; then + if test ! -f "$orig_archive"; then + if test -z "$create"; then + echo "$me: creating $orig_archive" + fi + orig_archive= + else + orig_archive=$archive + fi + + for member + do + case $1 in + @*) + func_file_conv "${1#@}" + set x "$@" "@$file" + ;; + *) + func_file_conv "$1" + set x "$@" "$file" + ;; + esac + shift + shift + done + + if test -n "$orig_archive"; then + $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $? + else + $AR -NOLOGO -OUT:"$archive" "$@" || exit $? + fi + +elif test -n "$list"; then + if test ! -f "$orig_archive"; then + func_error "archive not found" + fi + $AR -NOLOGO -LIST "$archive" || exit $? +fi

8 years, 8 months

Fixed and cleaned up .f12 script. Build with -Wall and -Wextra now.

by Sven Panne

Module: check_mk Branch: master Commit: 6f652ee7b639d84c32437d5336c6504ff0c04972 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f652ee7b639d8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 28 09:43:10 2015 +0100 Fixed and cleaned up .f12 script. Build with -Wall and -Wextra now. --- livestatus/.f12 | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/livestatus/.f12 b/livestatus/.f12 index b550ba2..54c9ce8 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -1,19 +1,26 @@ #!/bin/bash SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} +C_CXX_FLAGS="-g -O3 -Wall -Wextra" set -e -if [ ! -f configure ]; then - aclocal && autoheader && automake --add-missing && autoconf -fi -if [ ! -f Makefile ]; then - ./configure -fi - -make CFLAGS=-g -j 8 +for i in aclocal.m4 ar-lib compile config.h.in configure depcomp install-sh Makefile.in missing; do + if test ! -f $i; then + autoreconf --install + break + fi +done +# See AC_CONFIG_HEADER and AC_CONFIG_FILES in configure.ac +for i in config.h Makefile src/Makefile; do + if test ! -f $i; then + ./configure CFLAGS="$C_CXX_FLAGS" CXXFLAGS="$C_CXX_FLAGS" + break + fi +done +make -j8 sudo install src/livestatus.o /omd/sites/$SITE/lib/mk-livestatus/livestatus.o echo "Restarting site $SITE" sudo omd restart $SITE nagios

8 years, 8 months

logwatch: fixed a bug introduced with werk #2654

by Sebastian Herbord

Module: check_mk Branch: master Commit: 1dd449a6c91e9c1e3623bb438b363913a4026802 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dd449a6c91e9c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Oct 28 09:18:28 2015 +0100 logwatch: fixed a bug introduced with werk #2654 the check was reported as OK state if no new messages were reported recently, even if older messages were warn or crit --- checks/logwatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/logwatch b/checks/logwatch index a768b51..a4d1fcd 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -553,7 +553,7 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): # Render output # - if not collect_block.output_lines: + if collect_block.worst <= 0: return (0, "no error messages") else: count_txt = []

8 years, 8 months

Simplified iconbutton hover effect even more

by Lars Michelsen

Module: check_mk Branch: master Commit: a2ab5f17d400191c6a9a253d089c0775579b2feb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2ab5f17d40019… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 16:55:00 2015 +0100 Simplified iconbutton hover effect even more --- web/htdocs/htmllib.py | 6 +----- web/htdocs/js/checkmk.js | 7 ------- web/htdocs/pages.css | 2 +- web/htdocs/sidebar.py | 6 +++--- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0f2138a..6bf70db 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -425,9 +425,7 @@ class html: return '<a %s%s%s%s%sonfocus="if (this.blur) this.blur();" href="%s">' \ '<img align=absmiddle class=iconbutton title="%s" ' \ - 'src="images/button_%s.png" ' \ - 'onmouseover=\"hilite_icon(this, 1)\" ' \ - 'onmouseout=\"hilite_icon(this, 0)\">' \ + 'src="images/button_%s.png">' \ '</a>' % (id, onclick, style, target, cssclass, url, self.attrencode(help), icon) @@ -1590,8 +1588,6 @@ class html: self.write('<img align=absmiddle class=iconbutton ' 'src="images/button_magic_move.png" ' 'title="%s" ' - 'onmouseover="hilite_icon(this, 1)" ' - 'onmouseout="hilite_icon(this, 0)" ' 'onclick="start_magic_move(\'%s\')" >' % ( (helptext, ajax_url))) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index b7273b3..342b182 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -90,13 +90,6 @@ function change_class(o, a, b) { add_class(o, b); } -function hilite_icon(elem, onoff) { - if (onoff == 0) - remove_class(elem, "active"); - else - add_class(elem, "active"); -} - function pageHeight() { var h; diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index a889fd4..6740d7c 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -450,7 +450,7 @@ img.iconbutton { padding: 0px 2px; } -img.iconbutton.active { +img.iconbutton:hover { opacity: 0.5; filter: alpha(opacity=50); /* For IE8 and earlier */ } diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 034cb61..cc72fc0 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -112,9 +112,9 @@ def iconbutton(what, url, target="side", handler="", name="", css_class = ""): href = "%scheck_mk/%s" % (defaults.url_prefix, url) tg = "target=%s" % target css_class = css_class and " " + css_class or "" - html.write("<a href=\"%s\" %s %s><img class=\"iconbutton%s\" onmouseover=\"hilite_icon(this, 1)\" " - "onmouseout=\"hilite_icon(this, 0)\" align=absmiddle src=\"%scheck_mk/images/button_%s.png\"></a>\n " % - (href, onclick, tg, css_class, defaults.url_prefix, what)) + html.write("<a href=\"%s\" %s %s><img class=\"iconbutton%s\" " + "align=absmiddle src=\"%scheck_mk/images/button_%s.png\"></a>\n " % + (href, onclick, tg, css_class, defaults.url_prefix, what)) def nagioscgilink(text, target): html.write("<li class=sidebar><a target=\"main\" class=link href=\"%snagios/cgi-bin/%s\">%s</a></li>" % \

8 years, 8 months

Simplified host/service icon rendering; Added hover effect to action icons

by Lars Michelsen

Module: check_mk Branch: master Commit: c2167f5dcc4f10d7948e4afde5ff7de868bdcdc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2167f5dcc4f10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 18:26:34 2015 +0100 Simplified host/service icon rendering; Added hover effect to action icons --- web/htdocs/htmllib.py | 22 ++++++++++++++++------ web/htdocs/pages.css | 4 ++++ web/plugins/icons/builtin.py | 2 +- web/plugins/views/painters.py | 14 +++++--------- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 6bf70db..ddbda1b 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -395,18 +395,21 @@ class html: def icon(self, help, icon): self.write(self.render_icon(icon, help)) - def render_icon(self, icon_name, help="", middle=True, id=None): + def render_icon(self, icon_name, help="", middle=True, id=None, cssclass=None): align = middle and ' align=absmiddle' or '' title = help and ' title="%s"' % self.attrencode(help) or "" id = id and ' id="%s"' % id or '' + cssclass = cssclass and ' ' + cssclass - return '<img src="%s" class=icon%s%s%s />' % (self.detect_icon_path(icon_name), align, title, id) + return '<img src="%s" class="icon%s"%s%s%s />' % \ + (self.detect_icon_path(icon_name), cssclass, align, title, id) def empty_icon(self): self.write('<img class=icon src="images/trans.png" />') - def render_icon_button(self, url, help, icon, id="", onclick="", style="", target="", cssclass=""): + def render_icon_button(self, url, help, icon, id="", onclick="", + style="", target="", cssclass="", ty="button"): if id: id = "id='%s' " % id @@ -423,10 +426,15 @@ class html: if cssclass: cssclass = 'class="%s" ' % cssclass + if ty == "icon": + icon = self.detect_icon_path(icon) + else: + icon = "images/button_" + icon + ".png" + return '<a %s%s%s%s%sonfocus="if (this.blur) this.blur();" href="%s">' \ '<img align=absmiddle class=iconbutton title="%s" ' \ - 'src="images/button_%s.png">' \ - '</a>' % (id, onclick, style, target, cssclass, url, self.attrencode(help), icon) + 'src="%s"></a>' % (id, onclick, style, target, cssclass, + url, self.attrencode(help), icon) def icon_button(self, *args, **kwargs): @@ -477,7 +485,9 @@ class html: self.begin_context_buttons() if icon: - title = '<img src="%s">%s' % (self.attrencode(self.detect_icon_path(icon)), self.attrencode(title)) + title = '<img src="%s">%s' % \ + (self.attrencode(self.detect_icon_path(icon)), + self.attrencode(title)) if id: idtext = " id='%s'" % self.attrencode(id) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 6740d7c..18c92a7 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -1162,3 +1162,7 @@ tr.data td.pnpgraph div.pnp_graph > a.popup_trigger > img.icon { box-shadow: none; margin: 0; } + +div.popup_trigger img.iconbutton { + padding: 0; +} diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 955a994..ef8a083 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -85,7 +85,7 @@ def paint_action_menu(what, row, tags, host_custom_vars): url_vars.append(('_display_options', html.var('_display_options'))) return html.render_popup_trigger( - html.render_icon('menu', _('Open the action menu')), + html.render_icon('menu', _('Open the action menu'), cssclass="iconbutton"), 'action_menu', 'action_menu', url_vars=url_vars) multisite_icons_and_actions['action_menu'] = { diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 901f628..ce78910 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -295,17 +295,13 @@ def paint_icons(what, row): onclick = '' if url.startswith('onclick:'): - onclick = ' onclick="%s"' % url[8:] + onclick = url[8:] url = 'javascript:void(0)' - target = "" - if target_frame != "_self": - target = " target=\"%s\"" % target_frame - - output += '<a href="%s"%s%s>' % (url, target, onclick) - output += html.render_icon(icon_name, title) - if url_spec: - output += '</a>' + output += html.render_icon_button(url, title, icon_name, + onclick=onclick, target=target_frame, ty="icon") + else: + output += html.render_icon(icon_name, title) else: output += icon[1]

8 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015