Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Minor layout fix

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e4433e5034b9d3b6688ad597ecb882c612018dad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4433e5034b9d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 10 09:48:17 2012 +0200 Minor layout fix --- web/htdocs/wato.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 25fab38..930497e 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -802,6 +802,7 @@ div.varname { .wato .globalvars td.right img.iconbutton { width: auto; height: auto; + margin-left: -3px; }

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0685

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f2aba27e5ca1015a7a6325e6226c948971d0276b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2aba27e5ca101… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 10 10:34:44 2012 +0200 Updated bug entries #0685 --- .bugs/685 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/685 b/.bugs/685 new file mode 100644 index 0000000..2d39456 --- /dev/null +++ b/.bugs/685 @@ -0,0 +1,13 @@ +Title: Logout or password change and relogin leads to side.py +Component: multisite +State: open +Date: 2012-05-10 10:33:12 +Targetversion: 1.2.0 +Class: bug + +When logging out and in again - or when you are logged out due +to a password change - then you are not logged into the main +frameset but into side.py (or whatever frame had done the +logout int the first place). + +Happens with cookie based authentication.

12 years, 1 month

Check_MK Git: check_mk: Converted three checkboxes to label=

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 853d1786d33e9a5aae64c920c7652471f5fda624 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=853d1786d33e9a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 10 10:43:46 2012 +0200 Converted three checkboxes to label= --- web/htdocs/wato.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2c44274..d504d56 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4226,8 +4226,8 @@ class HostTagAttribute(Attribute): value = value + "|" + "|".join(secondary_tags) if len(choices) == 1: - html.checkbox(varname, value != "", cssclass = '', onclick='wato_fix_visibility();', add_attr = ["tags=%s"%choices[0][0]]) - html.write(" " + choices[0][1]) + html.checkbox(varname, value != "", cssclass = '', onclick='wato_fix_visibility();', + add_attr = ["tags=%s"%choices[0][0]], label = choices[0][1]) else: html.select(varname, choices, value, onchange='wato_fix_visibility();') @@ -7702,8 +7702,8 @@ def mode_edit_user(phase): html.write(_("Notifications enabled<br><i>Notifications are sent out " "when the status of a host or service changes.</i>")) html.write("</td><td class=content>") - html.checkbox("notifications_enabled", user.get("notifications_enabled", True)) - html.write(" " + _("enable notifications")) + html.checkbox("notifications_enabled", user.get("notifications_enabled", True), + label = _("enable notifications")) html.write("</td></tr>") # Notification period @@ -7745,10 +7745,10 @@ def mode_edit_user(phase): html.write("%s:<ul>" % title) user_opts = user.get(what + "_notification_options", opts) for opt in opts: - html.checkbox(what + "_" + opt, opt in user_opts) opt_name = notification_option_names[what].get(opt, notification_option_names["both"].get(opt)) - html.write(" %s<br>" % opt_name) + html.checkbox(what + "_" + opt, opt in user_opts, label = opt_name) + html.write("<br>") html.write("</ul>") html.write("</td></tr>")

12 years, 1 month

Check_MK Git: check_mk: Introduce new togglable help in Multisite

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e5db2aaea780a0906296a60a51a37946e9bb8f24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5db2aaea780a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 10 18:17:22 2012 +0200 Introduce new togglable help in Multisite Still most places where help is rendered needs to be tagged correctly in order to work --- ChangeLog | 1 + web/.f12 | 2 +- web/htdocs/help.py | 6 ++++ web/htdocs/htmllib.py | 28 ++++++++++++++---- web/htdocs/images/helpbutton_active.png | Bin 0 -> 1227 bytes web/htdocs/images/helpbutton_active_hi.png | Bin 0 -> 1266 bytes web/htdocs/images/helpbutton_passive.png | Bin 0 -> 1216 bytes web/htdocs/images/helpbutton_passive_hi.png | Bin 0 -> 1199 bytes web/htdocs/js/checkmk.js | 26 +++++++++++++++++ web/htdocs/pages.css | 41 +++++++++++++++++++++++++++ web/htdocs/wato.css | 2 +- web/htdocs/wato.py | 12 ++++---- web/plugins/pages/shipped.py | 2 + 13 files changed, 106 insertions(+), 14 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e5db2aaea7…

12 years, 1 month

Check_MK Git: check_mk: Cleanup of CSS styles for forms

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 481b05139d0a7b4ac59b5f360044f6b0436fc196 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=481b05139d0a7b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 10:15:02 2012 +0200 Cleanup of CSS styles for forms --- web/htdocs/pages.css | 49 +++++++++++-------------------------------------- web/htdocs/wato.css | 25 +------------------------ web/htdocs/wato.py | 2 +- 3 files changed, 13 insertions(+), 63 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 82ba271..057c07c 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -355,6 +355,9 @@ table.form { empty-cells: show; border-spacing: 0px; margin: 0px 10px 10px 0px; + border-width: 1px; + border-style: none none solid solid; + border-color: #2f5f74; } /* Sorry for the mess here. It is due to using foldable_containter within a form table (currently only in WATO in the host and @@ -362,31 +365,27 @@ table.form { table.form.nomargin { margin: 0; + border-bottom-style: none; } -table.form.nomargin td.legend, +/* table.form.nomargin td.legend, table.form.nomargin td.content, table.form.nomargin td.checkbox, table.form.nomargin td.buttons { border-top-style: none; -} +}*/ + table.form.nomargin td.title { - border-top-style: none; background-image: url("images/form_background.png"); background-repeat: repeat; } + table.form > tbody > tr > td { padding: 5px 8px; color: #000; border-width: 1px; - border-style: solid; border-color: #2f5f73; + border-style: solid solid none none; } -/*table.form > tbody > tr > th { - border-width: 1px; - border-color: #fff; - border-style: solid solid none solid; - padding: 4px 4px; -}*/ table.form img.toggleheader { width: 20px; @@ -399,24 +398,10 @@ table.form img.toggleheader.hover { cursor: pointer; } -/* Left side where title and help is printed */ -/*table.form td.legend, -table.form td.title, -table.form td.content, -table.form td.checkbox { - color: #000; - border-width: 1px; - border-style: solid; - border-color: #2f5f73; -}*/ /* Bottom row with action buttons, right justified */ table.form td.buttons { color: #274750; - border-width: 1px; - border-style: solid; - border-color: #2f5f73; - /* text-align: right; */ } /* Inter-heading row over complete width */ @@ -426,7 +411,7 @@ table.form td.title { } table.form td.legend.border { - border-right-style: solid; +/* border-right-style: solid; */ } table.form td.hilite { background-image: url("images/form_background.png"); @@ -436,19 +421,7 @@ table.form td.hilite { table.form td.lgend.button { text-align: right; - border-right: 1px solid #fff; -} - -/* table.form td.content { - border-width: 1px; - border-style: solid; - border-color: #2f5f73; - border-left-style: none; -}*/ - -td.legend, td.content { - /* border: 1px solid #884; */ - /* padding: 2px 0.5ex; */ +/* border-right: 1px solid #fff; */ } td.content hr { diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 8292b30..145875b 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -85,9 +85,6 @@ Boston, MA 02110-1301 USA. margin-left: 0px; } -.wato table.form td { - /* border-style: dashed; */ -} .wato table.form td.legend { width: 300px; @@ -99,10 +96,7 @@ Boston, MA 02110-1301 USA. font-size: 9pt; font-weight: normal; } -1* Foldable sections in host properties */ -.wato table.form td.title { - /* border-style: none none solid none; */ -} +/* Foldable sections in host properties */ .wato table.form td.title i { font-weight: normal; @@ -116,20 +110,6 @@ Boston, MA 02110-1301 USA. /* color: #eee; */ } -.wato table.form td.content { - /* border-left-style: solid; */ - /* width: 494px; */ -} - -.wato table.form tr.top td, -.wato table.form tr.top td, -.wato table.form tr.top td.checkbox { - /* border-top-style: none; */ -} - -.wato table.form.nomargin td.checkbox { - /* border-top-style: none; */ -} .wato table.form td.checkbox { @@ -138,9 +118,6 @@ Boston, MA 02110-1301 USA. /* padding-top: 7px; */ /* vertical-align: top; */ text-align: center; - /* border-width: 1px; */ - /* border-style: solid none solid none; */ - /* border-color: #2f5f73 */ } .wato form.new_rule { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c93b383..d9eca53 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4734,7 +4734,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute if topic_is_volatile: volatile_topics.append((topic or _("Basic settings")).encode('utf-8')) if topic == topics[-1]: - html.write('<table class="form nomargin">') + html.write('<table class="form">') def dump_json(obj): return repr(obj).replace('None', 'null')

12 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 604e4525fe01229b2fa877ecb7ecd656bf489684 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=604e4525fe0122… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 10:15:05 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 1 month

Check_MK Git: check_mk: FIX: Fixed editing of ListOf in valuespec editors ( e.g. used in logwatch pattern editor)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6d91d0058e39e4c01c2c9d10a0997830d8e6cf06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d91d0058e39e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 10 14:03:31 2012 +0200 FIX: Fixed editing of ListOf in valuespec editors (e.g. used in logwatch pattern editor) --- ChangeLog | 2 ++ web/htdocs/js/checkmk.js | 38 +++++++++++++++++++++++++------------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 176376f..dbee015 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ on hosts with more than 500 services. * FIX: make config options directly active after resetting them to their defaults (didn't work for start_url, etc. + * FIX: Fixed editing of ListOf in valuespec editors (e.g. used in logwatch + pattern editor) Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 5f66f93..6cc7ca7 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1490,17 +1490,20 @@ function valuespec_listof_add(varprefix, magic) { var htmlcode = oPrototype.innerHTML; htmlcode = replace_all(htmlcode, magic, strcount); var oTable = document.getElementById(varprefix + "_table"); - if (count == 0) { // first: no <tbody> present! - oTable.innerHTML = "<tbody><tr>" + htmlcode + "</tr></tbody>"; - valuespec_listof_fixarrows(oTable.childNodes[0]); - } - else { - var oTbody = oTable.childNodes[0]; - var oTr = document.createElement("tr") - oTr.innerHTML = htmlcode; - oTbody.appendChild(oTr); - valuespec_listof_fixarrows(oTbody); + + var oTbody = oTable.childNodes[0]; + if(oTbody == undefined) { // no row -> no <tbody> present! + oTbody = document.createElement('tbody'); + oTable.appendChild(oTbody); } + + // Hack for IE. innerHTML does not work on tbody/tr correctly. + var container = document.createElement('div'); + container.innerHTML = '<table><tbody><tr>' + htmlcode + '</tr></tbody></tr>'; + var oTr = container.childNodes[0].childNodes[0].childNodes[0] // TR + oTbody.appendChild(oTr); + + valuespec_listof_fixarrows(oTbody); } // When deleting we do not fix up indices but simply @@ -1522,6 +1525,7 @@ function valuespec_listof_delete(oA, varprefix, nr) { function valuespec_listof_move(oA, varprefix, nr, where) { var oTr = oA.parentNode.parentNode; // TR to move var oTbody = oTr.parentNode; + var oTable = oTbody.parentNode; if (where == "up") { var sib = oTr.previousSibling; @@ -1541,8 +1545,16 @@ function valuespec_listof_move(oA, varprefix, nr, where) { function valuespec_listof_fixarrows(oTbody) { - for (var i in oTbody.childNodes) { - var oTd = oTbody.childNodes[i].childNodes[0]; /* TD with buttons */ + if(!oTbody || typeof(oTbody.rows) == undefined) { + return; + } + + for(var i = 0, row; row = oTbody.rows[i]; i++) { + if(row.cells.length == 0) + continue; + var oTd = row.cells[0]; /* TD with buttons */ + if(row.cells[0].childNodes.length == 0) + continue; var oIndex = oTd.childNodes[0]; oIndex.value = "" + (parseInt(i) + 1); if (oTd.childNodes.length > 4) { /* movable */ @@ -1558,7 +1570,7 @@ function valuespec_listof_fixarrows(oTbody) { } var oDownTrans = oTd.childNodes[4]; var oDown = oTd.childNodes[5]; - if (i >= oTbody.childNodes.length - 1) { + if (i >= oTbody.rows.length - 1) { oDownTrans.style.display = ""; oDown.style.display = "none"; }

12 years, 1 month

Check_MK Git: check_mk: FIX: Logwatch: Logwatch services in rules configured using WATO must be

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59dd2c4a6d3a2a1616b987c3196f01f58e147826 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59dd2c4a6d3a2a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 10 15:02:02 2012 +0200 FIX: Logwatch: Logwatch services in rules configured using WATO must be given as item, not as whole service name --- ChangeLog | 2 ++ checks/logwatch | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbee015..fbb8433 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,8 @@ Checks & Agents: * FIX: Logwatch: fixed missing linebreak during reclassifing lines of logfiles + * FIX: Logwatch: Logwatch services in rules configured using WATO must be + given as item, not as whole service name BI: * FIX: make rotating folding arrows black (white was not visible) diff --git a/checks/logwatch b/checks/logwatch index 007c235..4154102 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -97,7 +97,9 @@ def logwatch_precompile(hostname, item, _unused): # Initialize the patterns list with the logwatch_rules params = [] description = check_info['logwatch']['service_description'] % item - rules = service_extra_conf(hostname, description, logwatch_rules) + + # This is the new (-> WATO controlled) variable + rules = service_extra_conf(hostname, item, logwatch_rules) for rule in rules: for pattern in rule: params.append((pattern[0], pattern[1]))

12 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1ff965ab88f9fba9a29c5d0806502fc0cbca9a60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ff965ab88f9fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 11 08:14:29 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 1 month

Check_MK Git: check_mk: fixed logwatch pattern item select help text

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ae67c2b058e28bd20dd5340d9a33daa640f6ade9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae67c2b058e28b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 10 14:05:34 2012 +0200 fixed logwatch pattern item select help text --- checks/mssql_versions | 39 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 3 +- 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/checks/mssql_versions b/checks/mssql_versions new file mode 100644 index 0000000..c24189d --- /dev/null +++ b/checks/mssql_versions @@ -0,0 +1,39 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# <<<mssql_versions>>> +# MSSQL$SQLEXPRESS 10.50.1600.1 + +def inventory_mssql_versions(info): + return [ (line[0].replace('$', '_'), None) for line in info if len(line) >= 2 ] + +def check_mssql_versions(item, _unused, info): + for line in info: + if line[0].replace('$', '_') == item: + return (0, 'OK - Server is running Version %s' % line[1]) + return (2, "UNKNOWN - Server instance not existing or not running") + +check_info['mssql_versions'] = (check_mssql_versions, "MSSQL %s Version", 0, inventory_mssql_versions ) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4893395..034a499 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -126,7 +126,8 @@ register_rule(group + '/' + subgroup_applications, ), itemtype = 'item', itemname = 'logfile', - itemhelp = _("One or several regular expressions for matching logfile lines."), + itemhelp = _("Put the item names of the logfiles here. For example \"System$\" " + "to select the service \"LOG System\"."), match = 'list', )

12 years, 1 month

← Newer
1
...
31
32
33
34
35
36
37
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012