Checkmk git commits November 2013

checkmk-commits@lists.checkmk.com

6 participants
274 discussions

Check_MK Git: check_mk: FIX Interface Checks: Counters are now skipped when interface is down

by Lars Michelsen

Module: check_mk Branch: master Commit: b8dcb4d2b5a44a555f903340a4d0080e7b5bec90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8dcb4d2b5a44a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 21 11:06:27 2013 +0100 FIX Interface Checks: Counters are now skipped when interface is down In most cases it was no problem to check the counter values, as they are reset to zero for most devices. But for some devices, the counters are still having values - and maybe also change. To handle this, we simply ignore the counter values for down interfaces. --- .werks/233 | 11 +++++++++++ ChangeLog | 1 + checks/if.include | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/.werks/233 b/.werks/233 new file mode 100644 index 0000000..2f8d076 --- /dev/null +++ b/.werks/233 @@ -0,0 +1,11 @@ +Title: Interface Checks: Counters are now skipped when interface is down +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1385028294 +Class: fix + +In most cases it was no problem to check the counter values, as they +are reset to zero for most devices. But for some devices, the counters +are still having values - and maybe also change. To handle this, we +simply ignore the counter values for down interfaces. diff --git a/ChangeLog b/ChangeLog index f4953e8..fe66ca4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 0209 FIX: Cleaned up bad code in fileinfo.groups check * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process inventory... * 0037 FIX: checkman: alcatel power - now with correct classification... + * 0233 FIX: Interface Checks: Counters are now skipped when interface is down... Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/checks/if.include b/checks/if.include index edf9723..54938e4 100644 --- a/checks/if.include +++ b/checks/if.include @@ -444,6 +444,14 @@ def check_if_common_single(item, params, info, force_counter_wrap = False): speed_b_in = assumed_speed_in and assumed_speed_in / 8 or ref_speed speed_b_out = assumed_speed_out and assumed_speed_out / 8 or ref_speed + # When the interface is reported as down, there is no need to try to handle, + # the performance counters. Most devices do reset the counter values to zero, + # but we spotted devices, which do report error packes even for down interfaces. + # To deal with it, we simply skip over all performance counter checks for down + # interfaces. + if operstatus == "down": + return state, infotext + # Performance counters this_time = time.time() rates = []

10 years, 10 months

Check_MK Git: check_mk: brocade_mlx: at memory and CPU checks return a clear UNKNOWN message, if line module is not running

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 9275ce5b9af73aacddd9473e67e10b5747c32e81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9275ce5b9af73a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Nov 21 11:15:46 2013 +0100 brocade_mlx: at memory and CPU checks return a clear UNKNOWN message, if line module is not running --- checks/brocade_mlx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/checks/brocade_mlx b/checks/brocade_mlx index 9eb14b3..582f920 100644 --- a/checks/brocade_mlx +++ b/checks/brocade_mlx @@ -161,6 +161,9 @@ def check_brocade_mlx_module_mem(item, params, info): warn, crit = params["levels"] for module_id, module_descr, module_state, mem_total, mem_avail in info[2]: if combine_item(module_id, module_descr) == item: + if module_state != "10": + return 3, "Module is not in state 10 (running)" + mem_avail = saveint(mem_avail) mem_total = saveint(mem_total) mem_used = mem_total - mem_avail @@ -219,6 +222,9 @@ def check_brocade_mlx_module_cpu(item, params, info): warn, crit = params["levels"] for module_id, module_descr, module_state, mem_total, mem_avail in info[2]: if combine_item(module_id, module_descr) == item: + if module_state != "10": + return 3, "Module is not in state 10 (running)" + cpu_util1 = "" cpu_util5 = "" cpu_util60 = ""

10 years, 10 months

Check_MK Git: check_mk: FIX fixed problem with invalid logline classification

by Andreas Boesl

Module: check_mk Branch: master Commit: 1f8c86ccd57223e3bea09d3cf6abb44c473dce46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f8c86ccd57223… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 20 18:36:14 2013 +0100 FIX fixed problem with invalid logline classification Two consecutive logfile queries, each with different logclasses, could lead to invalid/missing logfile entries. --- .werks/233 | 9 +++++++++ ChangeLog | 1 + livestatus/src/LogEntry.cc | 18 ++++++------------ livestatus/src/LogEntry.h | 2 +- livestatus/src/Logfile.cc | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.werks/233 b/.werks/233 new file mode 100644 index 0000000..e069f59 --- /dev/null +++ b/.werks/233 @@ -0,0 +1,9 @@ +Title: fixed problem with invalid logline classification +Level: 2 +Component: livestatus +Version: 1.2.3i7 +Date: 1384968812 +Class: fix + +Two consecutive logfile queries, each with different logclasses, +could lead to invalid/missing logfile entries. diff --git a/ChangeLog b/ChangeLog index f4953e8..2c3230a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ * 0067 livedump: new option to mark the mode at the beginning of the dump and documentation fixes... * 0023 FIX: table statehist: code cleanup / minor performance improvements * 0034 FIX: table statehist: no more missing entries if only one logfile exists + * 0233 FIX: fixed problem with invalid logline classification... 1.2.3i6: diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 8ee3982..86b6482 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -31,7 +31,7 @@ #include "strutil.h" #include "logger.h" -LogEntry::LogEntry(unsigned lineno, char *line, unsigned logclasses = LOGCLASS_ALL) +LogEntry::LogEntry(unsigned lineno, char *line) { // zero all elements as fast as possible -> default values bzero(this, sizeof(LogEntry)); @@ -68,25 +68,19 @@ LogEntry::LogEntry(unsigned lineno, char *line, unsigned logclasses = LOGCLASS_A _time = atoi(_msg+1); _text = _msg + 13; // also skip space after timestamp - // If LOGCLASS_INFO is in logclasses we can't thin out the function calls - logclasses = 1 << LOGCLASS_INFO & logclasses ? LOGCLASS_ALL : logclasses; - // now classify the log message. Some messages // refer to other table, some do not. - if (((1 << LOGCLASS_ALERT & logclasses) && handleStatusEntry()) || - ((1 << LOGCLASS_NOTIFICATION & logclasses) && handleNotificationEntry()) || - ((1 << LOGCLASS_PASSIVECHECK & logclasses) && handlePassiveCheckEntry()) || - ((1 << LOGCLASS_COMMAND & logclasses) && handleExternalCommandEntry()) + if (handleStatusEntry() || + handleNotificationEntry() || + handlePassiveCheckEntry() || + handleExternalCommandEntry() ) { updateReferences(); } else { - (1 << LOGCLASS_PROGRAM & logclasses) && handleProgrammEntry(); // Performance killer strstr! - (1 << LOGCLASS_TEXT & logclasses) && handleTextEntry(); + handleTextEntry() || handleProgrammEntry(); // Performance killer strstr in handleProgrammEntry! } - - // rest is LOGCLASS_INFO } diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index 1a3d18c..0b7c526 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -83,7 +83,7 @@ struct LogEntry contact *_contact; command *_command; - LogEntry(unsigned lineno, char *line, unsigned logclasses); + LogEntry(unsigned lineno, char *line); ~LogEntry(); unsigned updateReferences(); diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 213cbaa..b0f84c9 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -174,7 +174,7 @@ long Logfile::freeMessages(unsigned logclasses) inline bool Logfile::processLogLine(uint32_t lineno, unsigned logclasses) { - LogEntry *entry = new LogEntry(lineno, _linebuffer, logclasses); + LogEntry *entry = new LogEntry(lineno, _linebuffer); // ignored invalid lines if (entry->_logclass == LOGCLASS_INVALID) { delete entry;

10 years, 10 months

Check_MK Git: check_mk: Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 5803375b1d4ee43371bff7ef0fb04585cab4d72c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5803375b1d4ee4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 20 18:33:15 2013 +0100 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 0c56bea..6d26270 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -233 +283

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #1025, #0925

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ce4db5b45ae5bb4bf413cc805c1cc5917ddb71e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ce4db5b45ae5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 20 15:05:54 2013 +0100 Updated bug entries #1025, #0925 --- .bugs/1025 | 6 ++++-- .bugs/925 | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.bugs/1025 b/.bugs/1025 index 6e927e5..a1ebc7e 100644 --- a/.bugs/1025 +++ b/.bugs/1025 @@ -1,11 +1,13 @@ Title: HTML tags are interpreted on Global Settings page Component: wato -State: open +Class: bug +State: done Date: 2013-11-14 23:58:41 Targetversion: 1.2.3i6 -Class: bug Mail template, parameters in mail command or page title might contain < or > chars which are interpreted as html tags on the global settings page. These tags should really be escaped somehow. + +2013-11-20 15:04:54: changed state open -> done diff --git a/.bugs/925 b/.bugs/925 index f773bca..603b335 100644 --- a/.bugs/925 +++ b/.bugs/925 @@ -1,12 +1,14 @@ Title: HTML mails not rendered correctly in outlook Component: core -State: open +Class: bug +State: done Date: 2013-06-27 13:58:29 Targetversion: 1.2.3i6 -Class: bug It seems that current outlook versions, like e.g. 2010, use some sort of stripped html. The html code sent by the html/graph mails does not seem to be compatible to this. We should try to reproduce this on a system and then fix it there. This requires a lot trial/error - so we should do this together with a customer on an affected system. + +2013-11-20 15:05:33: changed state open -> done

10 years, 10 months

Check_MK Git: check_mk: FIX Added HTML escaping to several global settings attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: 9bbecaa8d43efe5673bd63af7919873e8b1b50d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bbecaa8d43efe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 20 14:48:24 2013 +0100 FIX Added HTML escaping to several global settings attributes --- .werks/220 | 8 ++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 4 +-- web/htdocs/sidebar.py | 2 +- web/plugins/wato/check_mk_configuration.py | 38 +++++++++++++++++++++------- web/plugins/wato/globals_notification.py | 15 ++++++++--- 6 files changed, 53 insertions(+), 15 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9bbecaa8d4…

10 years, 10 months

Check_MK Git: check_mk: FIX Improved output of long contact group names in WATO folders

by Lars Michelsen

Module: check_mk Branch: master Commit: 66ad4e799b912caaccecf77a88cfcf1358a4140e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66ad4e799b912c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 20 14:10:46 2013 +0100 FIX Improved output of long contact group names in WATO folders --- .werks/219 | 8 ++++++++ ChangeLog | 1 + web/htdocs/wato.css | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/.werks/219 b/.werks/219 new file mode 100644 index 0000000..6b82a0d --- /dev/null +++ b/.werks/219 @@ -0,0 +1,8 @@ +Title: Improved output of long contact group names in WATO folders +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1384953020 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c647592..f53ec03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ * 0095 FIX: Fixed problem with portnumber in Wato Distributed Monitoring dialog * 0213 FIX: LDAP: Various small improvements for handling the LDAP user connector * 0039 FIX: Encoding bug on rendering global settings... + * 0219 FIX: Improved output of long contact group names in WATO folders Notifications: * 0005 Added notification script for sending SMS via mobilant.com... diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index d00bd0f..fb0550d 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -393,7 +393,11 @@ table.validationerror img { position: absolute; bottom: 23px; left: 20px; + width: 140px; color: #bde; + overflow:hidden; + white-space: nowrap; + text-overflow: ellipsis; } .wato div.floatfolder .title {

10 years, 10 months

Check_MK Git: check_mk: New Check for Areca Raid Controllers

by Bastian Kuhn

Module: check_mk Branch: master Commit: e680d189362bcacd02f0585e16fd02a4023fd9df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e680d189362bca… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 20 14:46:31 2013 +0100 New Check for Areca Raid Controllers --- .werks/97 | 7 ++++ ChangeLog | 1 + agents/plugins/arc_raid_status.sh | 5 +++ checkman/arc_raid_status | 19 ++++++++++ checks/arc_raid_status | 70 +++++++++++++++++++++++++++++++++++++ 5 files changed, 102 insertions(+) diff --git a/.werks/97 b/.werks/97 new file mode 100644 index 0000000..0471348 --- /dev/null +++ b/.werks/97 @@ -0,0 +1,7 @@ +Title: New Check for Areca Raid Controllers +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1384955153 +Class: feature + diff --git a/ChangeLog b/ChangeLog index c647592..beab0ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 0069 veeam_client: limits for time since last backup introduced * 0214 Logwatch: context lines can now be disabled using nocontext=1... * 0038 New checks for casa: casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power + * 0097 New Check for Areca Raid Controllers * 0024 FIX: cisco_wlc: removed configuration parameter ap_model * 0065 FIX: veeam_client: check behaviour improved when backup is in progress * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress diff --git a/agents/plugins/arc_raid_status.sh b/agents/plugins/arc_raid_status.sh new file mode 100644 index 0000000..fa3a722 --- /dev/null +++ b/agents/plugins/arc_raid_status.sh @@ -0,0 +1,5 @@ +#cli64 can be found at: +# ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/CLI/ + +echo "<<<arc_raid_status>>>" +cli64 rsf info | tail -n +3 | head -n -2 diff --git a/checkman/arc_raid_status b/checkman/arc_raid_status new file mode 100644 index 0000000..105c905 --- /dev/null +++ b/checkman/arc_raid_status @@ -0,0 +1,19 @@ +title: Areca Raid Controllers +agents: linux +catalog: os/storage +license: GPL +distribution: check_mk +description: + This check monitors the health and current Status of a areca raid controller. + The check returns a {CRIT} for Degarde and Incompleted, {WARN} in case of Rebuilding. + Also {CRIT} is returned is an case that the number of disks in the array Changes. + The cli64 has be installed for the agent plugin to work. It can be downloaded here: + ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/CLI/ + + +item: + The numeric number of the array, reported by areca cli tool + +inventory: + One check is created for array + diff --git a/checks/arc_raid_status b/checks/arc_raid_status new file mode 100644 index 0000000..9d72745 --- /dev/null +++ b/checks/arc_raid_status @@ -0,0 +1,70 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +# Example output from agent: +# 1 Raid Set # 00 3 2250.5GB 0.0GB 123 Normal +# ( # Name Disks TotalCap FreeCap DiskChannels State ) + +def inventory_arc_raid_status(info): + return [ ( x[0], saveint(x[-5]) ) for x in info ] + +def check_arc_raid_status(item, params, info): + for line in info: + if line[0] == item: + messages = [] + state = 0 + + raid_state = line[-1] + label = "" + if raid_state in [ "Degarde", "Incompleted" ]: + state = 2 + label = "(!!)" + elif raid_state == "Rebuilding": + state = 1 + label = "(!)" + elif raid_state != "Normal": + state = 2 + label = "(!!)" + messages.append("Raid in state: %s%s" % ( raid_state, label )) + + # Check the number of disks + i_disks = params + c_disks = saveint(line[-5]) + if i_disks != c_disks: + message.append("Number of disks has changed from %d to %d(!!)" % ( i_disks, c_disks )) + state = 2 + + return state, ", ".join(messages) + + return 3, "Array not found" + +check_info["arc_raid_status"] = { + "check_function" : check_arc_raid_status, + "inventory_function" : inventory_arc_raid_status, + "service_description" : "Raid Array #%s", + "has_perfdata" : False, +} +

10 years, 10 months

Check_MK Git: check_mk: FIX Fixed rendering of HTML mails for Outlook ( at least 2013)

by Lars Michelsen

Module: check_mk Branch: master Commit: 13d6d408ec43ba11f60d9165e72aeb82fc8d9728 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13d6d408ec43ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 20 13:42:34 2013 +0100 FIX Fixed rendering of HTML mails for Outlook (at least 2013) The HTML mails generated by the flexible notification script are now rendered nicely with Outlook. This change has been made with Outlook 2013. --- .werks/218 | 10 ++++++ ChangeLog | 1 + notifications/mail | 90 +++++++++++++++++++++------------------------------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/.werks/218 b/.werks/218 new file mode 100644 index 0000000..c26c16a --- /dev/null +++ b/.werks/218 @@ -0,0 +1,10 @@ +Title: Fixed rendering of HTML mails for Outlook (at least 2013) +Level: 2 +Component: notifications +Version: 1.2.3i7 +Date: 1384951271 +Class: fix + +The HTML mails generated by the flexible notification script are +now rendered nicely with Outlook. This change has been made with +Outlook 2013. diff --git a/ChangeLog b/ChangeLog index 8538a3c..c647592 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ Notifications: * 0005 Added notification script for sending SMS via mobilant.com... * 0032 FIX: mail notification plugin: replace windows forbidden characters in mail images + * 0218 FIX: Fixed rendering of HTML mails for Outlook (at least 2013)... Reporting & Availability: * 0051 Option for showing timeline directly in availability table... diff --git a/notifications/mail b/notifications/mail index a4248ec..8ee0a36 100755 --- a/notifications/mail +++ b/notifications/mail @@ -22,21 +22,20 @@ tmpl_head_html = ''' body { background-color: #426D8A; padding: 5px; + font-family: arial,helvetica,sans-serif; + font-size: 10px; } -table.data { +table { border-spacing: 0px; - margin: 0; - padding: 0; border-collapse: collapse; - empty-cells: show; + margin: 5px 0 0 0; + padding: 0; width: 100%; -} - -table.data { color: black; + empty-cells: show; } -table.data th { +table th { font-weight: normal; border-right: 1px solid #ccc; background-color: #999; @@ -46,37 +45,29 @@ table.data th { font-size: 9pt; height: 14px; } -table.data th:last-child { +table th:last-child { border-right-style: none; } -table.data tr.data > td { +table tr > td { border-right: 1px solid #ccc; padding: 2px 4px; height: 22px; vertical-align: middle; } -table.data tr.data td:last-child { +table tr td:last-child { border-right-style: none; } -table.data a { +table a { text-decoration: none; color: black; } -table.data a:hover { +table a:hover { text-decoration: underline; } -table.data.single { - margin-top: 5px; - border-spacing: 1px; - padding: 0; - border-collapse: collapse; - empty-cells: show; -} - -table.data.single tr.data td { +table tr td { padding-bottom: 4px; padding: 4px 5px 2px 5px; text-align: left; @@ -85,16 +76,16 @@ table.data.single tr.data td { vertical-align: top; font-size: 9pt; } -table.data.single tr.data td.left { +table tr td.left { width: 10%; white-space: nowrap; vertical-align: top; padding-right: 20px; } -table.data.single tr.even0 td.left { +table tr.even0 td.left { background-color: #bbb; } -table.data.single tr.odd0 td.left { +table tr.odd0 td.left { background-color: #ccc; } @@ -114,49 +105,40 @@ tr.odd3 { background-color: #ffe0a0; } tr.even3 { background-color: #ffefaf; } td.state { - text-align: center; font-weight: bold; } -/* OK/UP */ .state0, .stateOK, .hstate0, .hstateUP, .state0 a, .hstate0 a { - background-color: #0b3; color: #fff; + background-color: #0b3; color: #fff; } -.hstate { - white-space: nowrap; -} -/* WARN */ .state1, .stateWARNING, .state1 a, tr.groupheader td.state1 { background-color: #ff0; color: #000; } -/* CRIT/DOWN */ .state2, .stateCRITICAL, .hstate1, .hstateDOWN, .state2 a, .hstate2 a { background-color: #f00; color: #fff; } -/* UNKNOWN / UNREACH */ .state3, .stateUNKNOWN, .hstate2, .hstateUNREACHABLE, .state3 a, .hstate2 a { background-color: #f80; color: #fff; } -/* PENDING */ .statep, .statePENDING, .hstatep, .hstatePENDING, .statep a, .hstatep a { background-color: #888; color: #fff; } -/* in DOWNTIME */ .stated, .stateDOWNTIME, .hstated, .hstateDOWNTIME, .stated a, .hstated a { background-color: #0af; color: #fff; } td.graphs { width: 617px; + padding: 10px; } -td.graphs img { - margin: 10px; +img { + margin-right: 10px; } </style> </head> @@ -182,30 +164,30 @@ $LONGHOSTOUTPUT$ ''' tmpl_host_html = tmpl_head_html + ''' -<table class="data single"> -<tr class="data even0"> +<table> +<tr class="even0"> <th colspan=2>Object Information</th> </tr> -<tr class="data odd0"> +<tr class="odd0"> <td class=left>Name</td> <td>$LINKEDHOSTNAME$ ($HOSTALIAS$)</td> </tr> -<tr class="data even0"> +<tr class="even0"> <td class=left>Address</td> <td>$HOSTADDRESS$</td> </tr> <tr> <th colspan=2>State</th> </tr> -<tr class="data odd0"> +<tr class="odd0"> <td class=left>State</td> - <td class="state hstate"> + <td class="state"> <span class="hstate$LASTHOSTSTATE$">$LASTHOSTSTATE$</span> → <span class="hstate$HOSTSTATEID$">$HOSTSTATE$ ($NOTIFICATIONTYPE$)</span> since $LASTHOSTSTATECHANGE_REL$ </td> </tr> -<tr class="data even0"> +<tr class="even0"> <td class="left">Output</td> <td>$HOSTOUTPUT$</td> </tr> @@ -230,34 +212,34 @@ $LONGSERVICEOUTPUT$ ''' tmpl_service_html = tmpl_head_html + ''' -<table class="data single"> -<tr class="data even0"> +<table> +<tr class="even0"> <th colspan=2>Object Information</th> </tr> -<tr class="data odd0"> +<tr class="odd0"> <td class=left>Hostname</td> <td>$LINKEDHOSTNAME$ ($HOSTALIAS$)</td> </tr> -<tr class="data even0"> +<tr class="even0"> <td class=left>Address</td> <td>$HOSTADDRESS$</td> </tr> -<tr class="data odd0"> +<tr class="odd0"> <td class=left>Service description</td> <td>$LINKEDSERVICEDESC$</td> </tr> <tr> <th colspan=2>State</th> </tr> -<tr class="data odd0"> +<tr class="odd0"> <td class=left>State</td> - <td class="state svcstate"> + <td class="state"> <span class="state$LASTSERVICESTATE$">$LASTSERVICESTATE$</span> → <span class="state$SERVICESTATEID$">$SERVICESTATE$ ($NOTIFICATIONTYPE$)</span> since $LASTSERVICESTATECHANGE_REL$ </td> </tr> -<tr class="data even0"> +<tr class="even0"> <td class="left">Output</td> <td>$SERVICEOUTPUT$</td> </tr> @@ -422,7 +404,7 @@ def main(): if graph_code: context['GRAPH_CODE'] = ( '<tr><th colspan=2>Graphs</th></tr>' - '<tr class="data even0"><td colspan=2 class=graphs>%s</td></tr>' % graph_code + '<tr class="even0"><td colspan=2 class=graphs>%s</td></tr>' % graph_code ) else: context['GRAPH_CODE'] = ''

10 years, 10 months

Check_MK Git: check_mk: Fixed input rendering of float valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: 5f51d67e52bd6bf948f571bd8d39e53460cf3303 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f51d67e52bd6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 20 09:54:29 2013 +0100 Fixed input rendering of float valuespec --- web/htdocs/valuespec.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a5015a4..5435948 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -231,7 +231,7 @@ class Integer(ValueSpec): else: return 0 - def render_input(self, varprefix, value): + def render_input(self, varprefix, value, convfunc = saveint): if self._label: html.write(self._label) html.write(" ") @@ -239,7 +239,7 @@ class Integer(ValueSpec): style = "text-align: right;" else: style = "" - html.number_input(varprefix, self._display_format % saveint(value), size = self._size, style = style) + html.number_input(varprefix, self._display_format % convfunc(value), size = self._size, style = style) if self._unit: html.write(" ") html.write(self._unit) @@ -840,6 +840,9 @@ class Float(Integer): self._display_format = kwargs.get("display_format", "%.2f") self._allow_int = kwargs.get("allow_int", False) + def render_input(self, varprefix, value): + Integer.render_input(self, varprefix, value, convfunc = savefloat) + def canonical_value(self): return float(Integer.canonical_value(self))

10 years, 10 months

← Newer
1
...
9
10
11
12
13
14
15
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2013